Merge branch 'main' into @zfurtak/migrate-AssigneeStep

Author: zfurtak

Mobile-Expensify

@@ -2,6 +2,7 @@
 import * as core from '@actions/core';
 import '@shopify/flash-list/jestSetup';
 import type * as RNAppLogs from 'react-native-app-logs';
+import type {ReadDirItem} from 'react-native-fs';
 import 'react-native-gesture-handler/jestSetup';
 import type * as RNKeyboardController from 'react-native-keyboard-controller';
 import mockStorage from 'react-native-onyx/dist/storage/__mocks__';
@@ -69,6 +70,12 @@ jest.mock('react-native-fs', () => ({
                 res();
             }),
     ),
+    readDir: jest.fn(
+        () =>
+            new Promise<ReadDirItem[]>((res) => {
+                res([]);
+            }),
+    ),
     CachesDirectoryPath: jest.fn(),
 }));
 

jest/setup.ts

@@ -321,7 +321,7 @@
     "eslint-plugin-storybook": "^0.12.0",
     "eslint-plugin-testing-library": "^7.11.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
-    "glob": "^10.3.0",
+    "glob": "^10.4.5",
     "googleapis": "^144.0.0",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",

package-lock.json

@@ -132,6 +132,9 @@ const ONYXKEYS = {
     /** Whether the user is a member of a policy other than their personal */
     HAS_NON_PERSONAL_POLICY: 'hasNonPersonalPolicy',
 
+    /** Key under which selfDM id is stored. Returned by OpenApp */
+    SELF_DM_REPORT_ID: 'selfDMReportID',
+
     /** NVP keys */
 
     /** This NVP contains list of at most 5 recent attendees */
@@ -1297,6 +1300,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS]: Record<string, OnyxTypes.ExportTemplate>;
     [ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE]: DistanceExpenseType;
     [ONYXKEYS.HAS_DENIED_CONTACT_IMPORT_PROMPT]: boolean | undefined;
+    [ONYXKEYS.SELF_DM_REPORT_ID]: string | undefined;
 };
 
 type OnyxDerivedValuesMapping = {

package.json

@@ -148,17 +148,23 @@ const ROUTES = {
     REQUIRE_TWO_FACTOR_AUTH: '2fa-required',
 
     BANK_ACCOUNT: 'bank-account',
+    BANK_ACCOUNT_VERIFY_ACCOUNT: {
+        route: `bank-account/${VERIFY_ACCOUNT}`,
+        // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
+        getRoute: (policyID?: string, backTo?: string) => getUrlWithBackToParam(`bank-account/${VERIFY_ACCOUNT}?policyID=${policyID}`, backTo),
+    },
     BANK_ACCOUNT_NEW: 'bank-account/new',
     BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
     BANK_ACCOUNT_WITH_STEP_TO_OPEN: {
         route: 'bank-account/:stepToOpen?',
-        getRoute: (policyID: string | undefined, stepToOpen: ReimbursementAccountStepToOpen = '', backTo?: string) => {
+        getRoute: (policyID: string | undefined, stepToOpen: ReimbursementAccountStepToOpen = '', backTo?: string, subStepToOpen?: typeof CONST.BANK_ACCOUNT.STEP.COUNTRY) => {
             if (!policyID) {
                 Log.warn('Invalid policyID is used to build the BANK_ACCOUNT_WITH_STEP_TO_OPEN route');
             }
-
+            // TODO this backTo comes from drilling it through bank account form screens
+            // should be removed once https://github.com/Expensify/App/pull/72219 is resolved
             // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
-            return getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}`, backTo);
+            return getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}${subStepToOpen ? `&subStep=${subStepToOpen}` : ''}`, backTo);
         },
     },
     BANK_ACCOUNT_ENTER_SIGNER_INFO: {
@@ -380,7 +386,7 @@ const ROUTES = {
         getRoute: (newContactMethod: string, backTo?: string) => {
             const encodedMethod = encodeURIComponent(newContactMethod);
             // TODO this backTo comes from drilling it through settings screens
-            // should be removed once https://github.com/Expensify/App/pull/70980 is resolved
+            // should be removed once https://github.com/Expensify/App/pull/72219 is resolved
             // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
             return getUrlWithBackToParam(`settings/profile/contact-methods/new/${encodedMethod}/confirm-magic-code`, backTo);
         },

src/ONYXKEYS.ts

@@ -766,6 +766,7 @@ const SCREENS = {
     ENABLE_PAYMENTS_ROOT: 'EnablePayments_Root',
     ADD_PERSONAL_BANK_ACCOUNT_ROOT: 'AddPersonalBankAccount_Root',
     REIMBURSEMENT_ACCOUNT_ROOT: 'Reimbursement_Account_Root',
+    REIMBURSEMENT_ACCOUNT_VERIFY_ACCOUNT: 'Reimbursement_Account_Verify_Account',
     WALLET_STATEMENT_ROOT: 'WalletStatement_Root',
     SIGN_IN_ROOT: 'SignIn_Root',
     DETAILS_ROOT: 'Details_Root',

src/ROUTES.ts

@@ -25,6 +25,7 @@ function ValidateCodeActionContent({
     isLoading,
     threeDotsMenuItems = [],
     onThreeDotsButtonPress = () => {},
+    isPageModal = true,
 }: ValidateCodeActionContentProps) {
     const themeStyles = useThemeStyles();
     const validateCodeFormRef = useRef<ValidateCodeFormHandle>(null);
@@ -84,6 +85,7 @@ function ValidateCodeActionContent({
                         clearError={clearError}
                         buttonStyles={[themeStyles.justifyContentEnd, themeStyles.flex1]}
                         ref={validateCodeFormRef}
+                        isInPageModal={isPageModal}
                     />
                 </View>
             </ScrollView>

src/SCREENS.ts

@@ -89,6 +89,9 @@ type ValidateCodeFormProps = {
 
     /** Function to call when skip button is pressed */
     handleSkipButtonPress?: () => void;
+
+    /** Whether the modal is used as a page modal. Used to determine input auto focus timing. */
+    isInPageModal?: boolean;
 };
 
 function BaseValidateCodeForm({
@@ -107,6 +110,7 @@ function BaseValidateCodeForm({
     isLoading,
     shouldShowSkipButton = false,
     handleSkipButtonPress,
+    isInPageModal = false,
 }: ValidateCodeFormProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -200,14 +204,14 @@ function BaseValidateCodeForm({
         }
         // Delay prevents the input from gaining focus before the RHP slide out animation finishes,
         // which would cause the wide RHP to flicker in the background.
-        if (wideRHPRouteKeys.length > 0 && !isMobileSafari()) {
+        if ((wideRHPRouteKeys.length > 0 && !isMobileSafari()) || isInPageModal) {
             focusTimeoutRef.current = setTimeout(() => {
                 inputValidateCodeRef.current?.clear();
             }, CONST.ANIMATED_TRANSITION);
         } else {
             inputValidateCodeRef.current?.clear();
         }
-    }, [validateCodeSent, wideRHPRouteKeys.length]);
+    }, [validateCodeSent, wideRHPRouteKeys.length, isInPageModal]);
 
     /**
      * Request a validate code / magic code be sent to verify this contact method

src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx

@@ -49,6 +49,7 @@ function ValidateCodeActionModal({
                 threeDotsMenuItems={threeDotsMenuItems}
                 onThreeDotsButtonPress={onThreeDotsButtonPress}
                 isLoading={isLoading}
+                isPageModal={false}
             />
         </Modal>
     );