From 07d88e21fbec08fd4e2d3e2f6095c1fe3ca02ed8 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Thu, 25 Apr 2024 14:52:56 -0500
Subject: [PATCH] Port over new pdsUrl handling

---
 src/state/session/util/index.ts | 1 +
 src/state/session/v2.tsx        | 5 +++++
 2 files changed, 6 insertions(+)

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 || '',