Don't sign out until Onyx.clear() is finished

Expensify · Jan 3, 2023 · 6def1b3 · 6def1b3
1 parent e58cad2
commit 6def1b3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
@@ -29,26 +29,14 @@ Onyx.connect({
 function signOut() {
     Log.info('Flushing logs before signing out', true, {}, true);
 
-    const optimisticData = [
-        {
-            onyxMethod: CONST.ONYX.METHOD.SET,
-            key: ONYXKEYS.SESSION,
-            value: null,
-        },
-        {
-            onyxMethod: CONST.ONYX.METHOD.SET,
-            key: ONYXKEYS.CREDENTIALS,
-            value: {},
-        },
-    ];
     API.write('LogOut', {
         // Send current authToken because we will immediately clear it once triggering this command
         authToken: NetworkStore.getAuthToken(),
         partnerUserID: lodashGet(credentials, 'autoGeneratedLogin', ''),
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
         shouldRetry: false,
-    }, {optimisticData});
+    });
 
     Timing.clearData();
 }

diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
@@ -37,10 +37,8 @@ function clearStorageAndRedirect(errorMessage) {
         keysToPreserve.push(ONYXKEYS.NETWORK);
     }
 
-    Timing.start('clear');
     Onyx.clear(keysToPreserve)
         .then(() => {
-            Timing.end('clear');
             if (!errorMessage) {
                 return;
             }