diff --git a/src/state/session/util/index.ts b/src/state/session/util/index.ts index 184a797de2..8064032fde 100644 --- a/src/state/session/util/index.ts +++ b/src/state/session/util/index.ts @@ -37,6 +37,7 @@ export function agentToSessionAccount( deactivated: isSessionDeactivated(agent.session.accessJwt), refreshJwt: agent.session.refreshJwt, accessJwt: agent.session.accessJwt, + pdsUrl: agent.pdsUrl?.toString(), } } diff --git a/src/state/session/v2.tsx b/src/state/session/v2.tsx index e4d7c30258..468afca7bc 100644 --- a/src/state/session/v2.tsx +++ b/src/state/session/v2.tsx @@ -263,6 +263,11 @@ export function Provider({children}: React.PropsWithChildren<{}>) { service: account.service, }) + // restore the correct PDS URL if available + if (account.pdsUrl) { + newAgent.pdsUrl = newAgent.api.xrpc.uri = new URL(account.pdsUrl) + } + const prevSession = { ...account, accessJwt: account.accessJwt || '',