[WIP] Remove default values from WorkspaceInitialPage

.eslintrc.changed.js

@@ -24,9 +24,7 @@ module.exports = {
             files: [
                 'src/libs/actions/IOU.ts',
                 'src/libs/actions/Report.ts',
-                'src/pages/workspace/WorkspaceInitialPage.tsx',
                 'src/pages/home/report/PureReportActionItem.tsx',
-                'src/libs/SidebarUtils.ts',
             ],
             rules: {
                 'rulesdir/no-default-id-values': 'off',

src/ROUTES.ts

@@ -4,6 +4,7 @@ import type CONST from './CONST';
 import type {IOUAction, IOUType} from './CONST';
 import type {IOURequestType} from './libs/actions/IOU';
 import Log from './libs/Log';
+import type {ReimbursementAccountStepToOpen} from './libs/ReimbursementAccountUtils';
 import type {ExitReason} from './types/form/ExitSurveyReasonForm';
 import type {ConnectionName, SageIntacctMappingName} from './types/onyx/Policy';
 import type AssertTypesNotEqual from './types/utils/AssertTypesNotEqual';
@@ -112,7 +113,12 @@ const ROUTES = {
     BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
     BANK_ACCOUNT_WITH_STEP_TO_OPEN: {
         route: 'bank-account/:stepToOpen?',
-        getRoute: (stepToOpen = '', policyID = '', backTo?: string) => getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}`, backTo),
+        getRoute: (policyID: string | undefined, stepToOpen: ReimbursementAccountStepToOpen = '', backTo?: string) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the BANK_ACCOUNT_WITH_STEP_TO_OPEN route');
+            }
+            return getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}`, backTo);
+        },
     },
     WORKSPACE_SWITCHER: 'workspace-switcher',
     SETTINGS: 'settings',
@@ -757,7 +763,12 @@ const ROUTES = {
     },
     WORKSPACE_PROFILE: {
         route: 'settings/workspaces/:policyID/profile',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_PROFILE route');
+            }
+            return `settings/workspaces/${policyID}/profile` as const;
+        },
     },
     WORKSPACE_PROFILE_ADDRESS: {
         route: 'settings/workspaces/:policyID/profile/address',
@@ -934,7 +945,12 @@ const ROUTES = {
     },
     WORKSPACE_WORKFLOWS: {
         route: 'settings/workspaces/:policyID/workflows',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_WORKFLOWS route');
+            }
+            return `settings/workspaces/${policyID}/workflows` as const;
+        },
     },
     WORKSPACE_WORKFLOWS_APPROVALS_NEW: {
         route: 'settings/workspaces/:policyID/workflows/approvals/new',
@@ -967,7 +983,12 @@ const ROUTES = {
     },
     WORKSPACE_INVOICES: {
         route: 'settings/workspaces/:policyID/invoices',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_INVOICES route');
+            }
+            return `settings/workspaces/${policyID}/invoices` as const;
+        },
     },
     WORKSPACE_INVOICES_COMPANY_NAME: {
         route: 'settings/workspaces/:policyID/invoices/company-name',
@@ -979,7 +1000,12 @@ const ROUTES = {
     },
     WORKSPACE_MEMBERS: {
         route: 'settings/workspaces/:policyID/members',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/members` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_MEMBERS route');
+            }
+            return `settings/workspaces/${policyID}/members` as const;
+        },
     },
     WORKSPACE_MEMBERS_IMPORT: {
         route: 'settings/workspaces/:policyID/members/import',
@@ -991,7 +1017,11 @@ const ROUTES = {
     },
     POLICY_ACCOUNTING: {
         route: 'settings/workspaces/:policyID/accounting',
-        getRoute: (policyID: string, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {
+        getRoute: (policyID: string | undefined, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING route');
+            }
+
             let queryParams = '';
             if (newConnectionName) {
                 queryParams += `?newConnectionName=${newConnectionName}`;
@@ -1029,7 +1059,12 @@ const ROUTES = {
     },
     WORKSPACE_CATEGORIES: {
         route: 'settings/workspaces/:policyID/categories',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_CATEGORIES route');
+            }
+            return `settings/workspaces/${policyID}/categories` as const;
+        },
     },
     WORKSPACE_CATEGORY_SETTINGS: {
         route: 'settings/workspaces/:policyID/category/:categoryName',
@@ -1094,11 +1129,21 @@ const ROUTES = {
     },
     WORKSPACE_MORE_FEATURES: {
         route: 'settings/workspaces/:policyID/more-features',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/more-features` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_MORE_FEATURES route');
+            }
+            return `settings/workspaces/${policyID}/more-features` as const;
+        },
     },
     WORKSPACE_TAGS: {
         route: 'settings/workspaces/:policyID/tags',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_TAGS route');
+            }
+            return `settings/workspaces/${policyID}/tags` as const;
+        },
     },
     WORKSPACE_TAG_CREATE: {
         route: 'settings/workspaces/:policyID/tags/new',
@@ -1142,7 +1187,12 @@ const ROUTES = {
     },
     WORKSPACE_TAXES: {
         route: 'settings/workspaces/:policyID/taxes',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/taxes` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_TAXES route');
+            }
+            return `settings/workspaces/${policyID}/taxes` as const;
+        },
     },
     WORKSPACE_TAXES_SETTINGS: {
         route: 'settings/workspaces/:policyID/taxes/settings',
@@ -1207,7 +1257,12 @@ const ROUTES = {
     },
     WORKSPACE_REPORT_FIELDS: {
         route: 'settings/workspaces/:policyID/reportFields',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_REPORT_FIELDS route');
+            }
+            return `settings/workspaces/${policyID}/reportFields` as const;
+        },
     },
     WORKSPACE_CREATE_REPORT_FIELD: {
         route: 'settings/workspaces/:policyID/reportFields/new',
@@ -1274,7 +1329,12 @@ const ROUTES = {
     },
     WORKSPACE_EXPENSIFY_CARD: {
         route: 'settings/workspaces/:policyID/expensify-card',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_EXPENSIFY_CARD route');
+            }
+            return `settings/workspaces/${policyID}/expensify-card` as const;
+        },
     },
     WORKSPACE_EXPENSIFY_CARD_DETAILS: {
         route: 'settings/workspaces/:policyID/expensify-card/:cardID',
@@ -1314,7 +1374,12 @@ const ROUTES = {
     },
     WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT: {
         route: 'settings/workspaces/:policyID/expensify-card/choose-bank-account',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/choose-bank-account` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT route');
+            }
+            return `settings/workspaces/${policyID}/expensify-card/choose-bank-account` as const;
+        },
     },
     WORKSPACE_EXPENSIFY_CARD_SETTINGS: {
         route: 'settings/workspaces/:policyID/expensify-card/settings',
@@ -1338,11 +1403,21 @@ const ROUTES = {
     },
     WORKSPACE_RULES: {
         route: 'settings/workspaces/:policyID/rules',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_RULES route');
+            }
+            return `settings/workspaces/${policyID}/rules` as const;
+        },
     },
     WORKSPACE_DISTANCE_RATES: {
         route: 'settings/workspaces/:policyID/distance-rates',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_DISTANCE_RATES route');
+            }
+            return `settings/workspaces/${policyID}/distance-rates` as const;
+        },
     },
     WORKSPACE_CREATE_DISTANCE_RATE: {
         route: 'settings/workspaces/:policyID/distance-rates/new',
@@ -1370,7 +1445,12 @@ const ROUTES = {
     },
     WORKSPACE_PER_DIEM: {
         route: 'settings/workspaces/:policyID/per-diem',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/per-diem` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the WORKSPACE_PER_DIEM route');
+            }
+            return `settings/workspaces/${policyID}/per-diem` as const;
+        },
     },
     WORKSPACE_PER_DIEM_IMPORT: {
         route: 'settings/workspaces/:policyID/per-diem/import',

src/components/KYCWall/BaseKYCWall.tsx

@@ -4,16 +4,16 @@ import {Dimensions} from 'react-native';
 import type {EmitterSubscription, GestureResponderEvent, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import AddPaymentMethodMenu from '@components/AddPaymentMethodMenu';
-import * as BankAccounts from '@libs/actions/BankAccounts';
+import {openPersonalBankAccountSetupView} from '@libs/actions/BankAccounts';
 import {completePaymentOnboarding} from '@libs/actions/IOU';
 import getClickedTargetLocation from '@libs/getClickedTargetLocation';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PaymentUtils from '@libs/PaymentUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import * as PaymentMethods from '@userActions/PaymentMethods';
-import * as Policy from '@userActions/Policy/Policy';
-import * as Wallet from '@userActions/Wallet';
+import {hasExpensifyPaymentMethod} from '@libs/PaymentUtils';
+import {isExpenseReport as isExpenseReportReportUtils, isIOUReport} from '@libs/ReportUtils';
+import {kycWallRef} from '@userActions/PaymentMethods';
+import {createWorkspaceFromIOUPayment} from '@userActions/Policy/Policy';
+import {setKYCWallSource} from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -104,19 +104,19 @@ function KYCWall({
             onSelectPaymentMethod(paymentMethod);
 
             if (paymentMethod === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT) {
-                BankAccounts.openPersonalBankAccountSetupView();
+                openPersonalBankAccountSetupView();
             } else if (paymentMethod === CONST.PAYMENT_METHODS.DEBIT_CARD) {
                 Navigation.navigate(addDebitCardRoute);
             } else if (paymentMethod === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT) {
-                if (iouReport && ReportUtils.isIOUReport(iouReport)) {
-                    const {policyID, workspaceChatReportID, reportPreviewReportActionID, adminsChatReportID} = Policy.createWorkspaceFromIOUPayment(iouReport) ?? {};
+                if (iouReport && isIOUReport(iouReport)) {
+                    const {policyID, workspaceChatReportID, reportPreviewReportActionID, adminsChatReportID} = createWorkspaceFromIOUPayment(iouReport) ?? {};
                     completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, adminsChatReportID, policyID);
                     if (workspaceChatReportID) {
                         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(workspaceChatReportID, reportPreviewReportActionID));
                     }
 
                     // Navigate to the bank account set up flow for this specific policy
-                    Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('', policyID));
+                    Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(policyID, ''));
 
                     return;
                 }
@@ -140,7 +140,7 @@ function KYCWall({
              * Set the source, so we can tailor the process according to how we got here.
              * We do not want to set this on mount, as the source can change upon completing the flow, e.g. when upgrading the wallet to Gold.
              */
-            Wallet.setKYCWallSource(source, chatReportID);
+            setKYCWallSource(source, chatReportID);
 
             if (shouldShowAddPaymentMenu) {
                 setShouldShowAddPaymentMenu(false);
@@ -152,13 +152,13 @@ function KYCWall({
 
             transferBalanceButtonRef.current = targetElement;
 
-            const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
+            const isExpenseReport = isExpenseReportReportUtils(iouReport);
             const paymentCardList = fundList ?? {};
 
             // Check to see if user has a valid payment method on file and display the add payment popover if they don't
             if (
                 (isExpenseReport && reimbursementAccount?.achData?.state !== CONST.BANK_ACCOUNT.STATE.OPEN) ||
-                (!isExpenseReport && bankAccountList !== null && !PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, bankAccountList, shouldIncludeDebitCard))
+                (!isExpenseReport && bankAccountList !== null && !hasExpensifyPaymentMethod(paymentCardList, bankAccountList, shouldIncludeDebitCard))
             ) {
                 Log.info('[KYC Wallet] User does not have valid payment method');
 
@@ -213,7 +213,7 @@ function KYCWall({
     useEffect(() => {
         let dimensionsSubscription: EmitterSubscription | null = null;
 
-        PaymentMethods.kycWallRef.current = {continueAction};
+        kycWallRef.current = {continueAction};
 
         if (shouldListenForResize) {
             dimensionsSubscription = Dimensions.addEventListener('change', setMenuPosition);
@@ -224,7 +224,7 @@ function KYCWall({
                 dimensionsSubscription.remove();
             }
 
-            PaymentMethods.kycWallRef.current = null;
+            kycWallRef.current = null;
         };
     }, [chatReportID, setMenuPosition, shouldListenForResize, continueAction]);
 

src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/DebugTabView.tsx

@@ -13,6 +13,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import {getRouteForCurrentStep as getReimbursementAccountRouteForCurrentStep} from '@libs/ReimbursementAccountUtils';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import {getChatTabBrickRoadReport} from '@libs/WorkspacesSettingsUtils';
 import CONST from '@src/CONST';
@@ -81,7 +82,10 @@ function getSettingsRoute(status: IndicatorStatus | undefined, reimbursementAcco
         case CONST.INDICATOR_STATUS.HAS_POLICY_ERRORS:
             return ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithErrors);
         case CONST.INDICATOR_STATUS.HAS_REIMBURSEMENT_ACCOUNT_ERRORS:
-            return ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(reimbursementAccount?.achData?.currentStep, reimbursementAccount?.achData?.policyID);
+            return ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(
+                reimbursementAccount?.achData?.policyID,
+                getReimbursementAccountRouteForCurrentStep(reimbursementAccount?.achData?.currentStep ?? CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT),
+            );
         case CONST.INDICATOR_STATUS.HAS_SUBSCRIPTION_ERRORS:
             return ROUTES.SETTINGS_SUBSCRIPTION;
         case CONST.INDICATOR_STATUS.HAS_SUBSCRIPTION_INFO:

src/libs/Navigation/types.ts

@@ -14,6 +14,7 @@ import type {TupleToUnion, ValueOf} from 'type-fest';
 import type {SearchQueryString} from '@components/Search/types';
 import type {IOURequestType} from '@libs/actions/IOU';
 import type {SaveSearchParams} from '@libs/API/parameters';
+import type {ReimbursementAccountStepToOpen} from '@libs/ReimbursementAccountUtils';
 import type CONST from '@src/CONST';
 import type {Country, IOUAction, IOUType} from '@src/CONST';
 import type NAVIGATORS from '@src/NAVIGATORS';
@@ -1343,7 +1344,7 @@ type AddPersonalBankAccountNavigatorParamList = {
 
 type ReimbursementAccountNavigatorParamList = {
     [SCREENS.REIMBURSEMENT_ACCOUNT_ROOT]: {
-        stepToOpen?: string;
+        stepToOpen?: ReimbursementAccountStepToOpen;
         backTo?: Routes;
         policyID?: string;
     };

src/libs/ReimbursementAccountUtils.ts

@@ -0,0 +1,38 @@
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import type {ReimbursementAccountStep} from '@src/types/onyx/ReimbursementAccount';
+
+type ReimbursementAccountStepToOpen = ValueOf<typeof REIMBURSEMENT_ACCOUNT_ROUTE_NAMES> | '';
+
+const REIMBURSEMENT_ACCOUNT_ROUTE_NAMES = {
+    COMPANY: 'company',
+    PERSONAL_INFORMATION: 'personal-information',
+    BENEFICIAL_OWNERS: 'beneficial-owners',
+    CONTRACT: 'contract',
+    VALIDATE: 'validate',
+    ENABLE: 'enable',
+    NEW: 'new',
+} as const;
+
+function getRouteForCurrentStep(currentStep: ReimbursementAccountStep): ReimbursementAccountStepToOpen {
+    switch (currentStep) {
+        case CONST.BANK_ACCOUNT.STEP.COMPANY:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.COMPANY;
+        case CONST.BANK_ACCOUNT.STEP.REQUESTOR:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.PERSONAL_INFORMATION;
+        case CONST.BANK_ACCOUNT.STEP.BENEFICIAL_OWNERS:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.BENEFICIAL_OWNERS;
+        case CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.CONTRACT;
+        case CONST.BANK_ACCOUNT.STEP.VALIDATION:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.VALIDATE;
+        case CONST.BANK_ACCOUNT.STEP.ENABLE:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.ENABLE;
+        case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
+        default:
+            return REIMBURSEMENT_ACCOUNT_ROUTE_NAMES.NEW;
+    }
+}
+
+export {getRouteForCurrentStep, REIMBURSEMENT_ACCOUNT_ROUTE_NAMES};
+export type {ReimbursementAccountStepToOpen};