[Session] Move deactivated field off the session object (#3780)

bluesky-social · May 1, 2024 · 66ad554 · 66ad554
1 parent 339f265
commit 66ad554
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
@@ -422,13 +422,14 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         logger.error(`session: could not decode jwt`)
       }
 
+      const accountOrSessionDeactivated =
+        isSessionDeactivated(account.accessJwt) || account.deactivated
+
       const prevSession = {
         accessJwt: account.accessJwt || '',
         refreshJwt: account.refreshJwt || '',
         did: account.did,
         handle: account.handle,
-        deactivated:
-          isSessionDeactivated(account.accessJwt) || account.deactivated,
       }
 
       if (canReusePrevSession) {
@@ -440,7 +441,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         await fetchingGates
         upsertAccount(account)
 
-        if (prevSession.deactivated) {
+        if (accountOrSessionDeactivated) {
           // don't attempt to resume
           // use will be taken to the deactivated screen
           logger.debug(`session: reusing session for deactivated account`)