2 files changed, 9 insertions, 1 deletions
diff --git a/src/state/queries/index.ts b/src/state/queries/index.ts
index e7c5f577b..e30528ca1 100644
--- a/src/state/queries/index.ts
+++ b/src/state/queries/index.ts
@@ -1,7 +1,9 @@
 import {BskyAgent} from '@atproto/api'
 
+import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+
 export const PUBLIC_BSKY_AGENT = new BskyAgent({
-  service: 'https://public.api.bsky.app',
+  service: PUBLIC_BSKY_SERVICE,
 })
 
 export const STALE = {
diff --git a/src/state/session/util/readLastActiveAccount.ts b/src/state/session/util/readLastActiveAccount.ts
new file mode 100644
index 000000000..e0768b8a8
--- /dev/null
+++ b/src/state/session/util/readLastActiveAccount.ts
@@ -0,0 +1,6 @@
+import * as persisted from '#/state/persisted'
+
+export function readLastActiveAccount() {
+  const {currentAccount, accounts} = persisted.get('session')
+  return accounts.find(a => a.did === currentAccount?.did)
+}