Merge pull request Expensify#89465 from shubham1206agra/refactor-requestUnlockAccount

Refactor: isolate requestUnlockAccount from ONYXKEYS.SESSION Onyx data

Author: roryabraham

src/libs/actions/User.ts

@@ -1509,9 +1509,9 @@ function lockAccount(accountID?: number, domainAccountID?: number, domainName?:
     return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.LOCK_ACCOUNT, params, {optimisticData, successData, failureData});
 }
 
-function requestUnlockAccount(accountID?: number) {
+function requestUnlockAccount(accountID: number) {
     const params: LockAccountParams = {
-        accountID: accountID ?? currentUserAccountID,
+        accountID,
     };
 
     API.write(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, params);

src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx

@@ -3,6 +3,7 @@ import ConfirmationPage from '@components/ConfirmationPage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -12,6 +13,7 @@ import ROUTES from '@src/ROUTES';
 
 function UnlockAccountPage() {
     const {translate} = useLocalize();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['EmptyStateSpyPigeon']);
 
@@ -33,7 +35,7 @@ function UnlockAccountPage() {
                     descriptionStyle={styles.colorMuted}
                     buttonText={translate('unlockAccountPage.chatWithConcierge')}
                     onButtonPress={() => {
-                        requestUnlockAccount();
+                        requestUnlockAccount(currentUserPersonalDetails.accountID);
                         Navigation.navigate(ROUTES.CONCIERGE);
                     }}
                     containerStyle={styles.h100}

tests/actions/UserTest.ts

@@ -799,17 +799,6 @@ describe('actions/User', () => {
 
             expect(mockAPI.write).toHaveBeenCalledWith(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, {accountID});
         });
-
-        it('should fall back to currentUserAccountID when no accountID is provided', async () => {
-            const currentAccountID = 888;
-            await Onyx.merge(ONYXKEYS.SESSION, {accountID: currentAccountID, email: 'user@expensify.com'});
-            await waitForBatchedUpdates();
-
-            UserActions.requestUnlockAccount();
-            await waitForBatchedUpdates();
-
-            expect(mockAPI.write).toHaveBeenCalledWith(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, {accountID: currentAccountID});
-        });
     });
 
     describe('respondToProactiveAppReview', () => {