Refactor: isolate requestUnlockAccount from ONYXKEYS.SESSION Onyx data

Author: shubham1206agra

src/libs/actions/User.ts

@@ -1452,9 +1452,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(currentAccountIDParam: number, accountID: number | undefined) {
     const params: LockAccountParams = {
-        accountID: accountID ?? currentUserAccountID,
+        accountID: accountID ?? currentAccountIDParam,
     };
 
     API.write(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, params);

src/pages/domain/Members/DomainMemberDetailsPage.tsx

@@ -10,6 +10,7 @@ import MenuItem from '@components/MenuItem';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import VacationDelegateMenuItem from '@components/VacationDelegateMenuItem';
 import useConfirmModal from '@hooks/useConfirmModal';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -36,6 +37,7 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
     const {domainAccountID, accountID} = route.params;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const icons = useMemoizedLazyExpensifyIcons(['RemoveMembers', 'Flag', 'Unlock', 'CircularArrowBackwards']);
     const [isModalVisible, setIsModalVisible] = useState(false);
     const [shouldForceCloseAccount, setShouldForceCloseAccount] = useState<boolean>();
@@ -119,7 +121,7 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
     );
 
     const showUnlockAccountModal = () => {
-        requestUnlockAccount(accountID);
+        requestUnlockAccount(currentUserPersonalDetails.accountID, accountID);
         showConfirmModal({
             title: translate('lockAccountPage.unlockTitle'),
             prompt: translate('lockAccountPage.unlockDescription'),

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, undefined);
                         Navigation.navigate(ROUTES.CONCIERGE);
                     }}
                     containerStyle={styles.h100}

tests/actions/UserTest.ts

@@ -792,8 +792,9 @@ describe('actions/User', () => {
 
     describe('requestUnlockAccount', () => {
         it('should call API.write with REQUEST_UNLOCK_ACCOUNT command and explicit accountID', async () => {
+            const currentAccountID = 888;
             const accountID = 123456;
-            UserActions.requestUnlockAccount(accountID);
+            UserActions.requestUnlockAccount(currentAccountID, accountID);
             await waitForBatchedUpdates();
 
             expect(mockAPI.write).toHaveBeenCalledWith(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, {accountID});
@@ -804,7 +805,7 @@ describe('actions/User', () => {
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: currentAccountID, email: 'user@expensify.com'});
             await waitForBatchedUpdates();
 
-            UserActions.requestUnlockAccount();
+            UserActions.requestUnlockAccount(currentAccountID, undefined);
             await waitForBatchedUpdates();
 
             expect(mockAPI.write).toHaveBeenCalledWith(WRITE_COMMANDS.REQUEST_UNLOCK_ACCOUNT, {accountID: currentAccountID});