Merge pull request #37481 from wildan-m/wildan/fix/36632-simultant-si…

…gnout Correct simultaneous logout when the account is closed.
Expensify · Mar 4, 2024 · 780e2ac · 780e2ac
2 parents 4f21d80 + e3434de
commit 780e2ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
@@ -97,10 +97,6 @@ function signOut() {
     };
 
     API.write(WRITE_COMMANDS.LOG_OUT, params);
-    clearCache().then(() => {
-        Log.info('Cleared all cache data', true, {}, true);
-    });
-    Timing.clearData();
 }
 
 /**
@@ -591,6 +587,10 @@ function cleanupSession() {
     NetworkConnection.clearReconnectionCallbacks();
     SessionUtils.resetDidUserLogInDuringSession();
     resetHomeRouteParams();
+    clearCache().then(() => {
+        Log.info('Cleared all cache data', true, {}, true);
+    });
+    Timing.clearData();
 }
 
 function clearAccountMessages() {

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
@@ -487,7 +487,7 @@ const isChannelMuted = (reportId: string) =>
     });
 
 function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
-    const reportActionsOnly = pushJSON.filter((update) => update.key.includes('reportActions_'));
+    const reportActionsOnly = pushJSON.filter((update) => update.key?.includes('reportActions_'));
     // "reportActions_5134363522480668" -> "5134363522480668"
     const reportIDs = reportActionsOnly.map((value) => value.key.split('_')[1]);