Merge pull request Expensify#89461 from shubham1206agra/refactor-clearCustomStatus

Refactor: isolate clearCustomStatus from ONYXKEYS.SESSION Onyx data

Author: roryabraham

src/libs/Navigation/AppNavigator/UserStatusHandler.tsx

@@ -1,14 +1,9 @@
 import {useEffect} from 'react';
 import useAutoUpdateTimezone from '@hooks/useAutoUpdateTimezone';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import * as User from '@userActions/User';
+import {clearCustomStatus, clearDraftCustomStatus} from '@userActions/User';
 import CONST from '@src/CONST';
 
-function clearStatus() {
-    User.clearCustomStatus();
-    User.clearDraftCustomStatus();
-}
-
 /**
  * Component that does not render anything and owns the timezone auto-update logic and
  * the status-clear timer effect.
@@ -21,6 +16,11 @@ function UserStatusHandler() {
 
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
 
+    const clearStatus = () => {
+        clearCustomStatus(currentUserPersonalDetails.accountID);
+        clearDraftCustomStatus();
+    };
+
     useEffect(() => {
         if (!currentUserPersonalDetails.status?.clearAfter) {
             return;
@@ -71,7 +71,7 @@ function UserStatusHandler() {
         }
 
         clearStatus();
-    }, [currentUserPersonalDetails.status?.clearAfter]);
+    }, [clearStatus, currentUserPersonalDetails.status?.clearAfter]);
 
     return null;
 }

src/libs/actions/User.ts

@@ -1255,13 +1255,13 @@ function updateCustomStatus(currentUserAccountIDParam: number, status: Status) {
 /**
  * Clears the custom status
  */
-function clearCustomStatus() {
+function clearCustomStatus(currentUserAccountIDParam: number) {
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.PERSONAL_DETAILS_LIST>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
             value: {
-                [currentUserAccountID]: {
+                [currentUserAccountIDParam]: {
                     status: null, // Clearing the field
                 },
             },

src/pages/settings/Profile/CustomStatus/StatusPage.tsx

@@ -141,7 +141,7 @@ function StatusPage() {
         if (navigateBackToPreviousScreenTask.current) {
             return;
         }
-        clearCustomStatus();
+        clearCustomStatus(currentUserPersonalDetails.accountID);
         updateDraftCustomStatus({
             text: '',
             emojiCode: '',