about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authordan <dan.abramov@gmail.com>2024-05-01 01:36:56 +0100
committerGitHub <noreply@github.com>2024-05-01 01:36:56 +0100
commit66ad5543f1fb74c8e75edba7d626cdeeb8297d44 (patch)
treea3909e0fa9ed92057b7a000640aabb8d57e5f486 /src
parent339f26567af36bf250b58dc15974aac5339a8996 (diff)
downloadvoidsky-66ad5543f1fb74c8e75edba7d626cdeeb8297d44.tar.zst
[Session] Move deactivated field off the session object (#3780)
Diffstat (limited to 'src')
-rw-r--r--src/state/session/index.tsx7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 2eb389bd1..6cdfa145d 100644
--- 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`)