diff --git a/src/ROUTES.ts b/src/ROUTES.ts index c55bfb86f95d..d686f31266b3 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -1125,6 +1125,45 @@ const DYNAMIC_ROUTES = { path: 'initial-list-value', entryScreens: [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE], }, + MONEY_REQUEST_STEP_TAX_RATE: { + path: 'taxRate', + entryScreens: [ + SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, + SCREENS.REPORT, + SCREENS.RIGHT_MODAL.SEARCH_REPORT, + SCREENS.RIGHT_MODAL.EXPENSE_REPORT, + SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, + SCREENS.SHARE.SUBMIT_DETAILS, + ], + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined) => getUrlWithParams('taxRate', {action, iouType, transactionID, reportID}), + queryParams: ['action', 'iouType', 'transactionID', 'reportID'], + }, + MONEY_REQUEST_STEP_TAX_AMOUNT: { + path: 'taxAmount', + entryScreens: [ + SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, + SCREENS.REPORT, + SCREENS.RIGHT_MODAL.SEARCH_REPORT, + SCREENS.RIGHT_MODAL.EXPENSE_REPORT, + SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, + SCREENS.SHARE.SUBMIT_DETAILS, + ], + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined) => getUrlWithParams('taxAmount', {action, iouType, transactionID, reportID}), + queryParams: ['action', 'iouType', 'transactionID', 'reportID'], + }, + MONEY_REQUEST_ATTENDEE: { + path: 'attendees', + entryScreens: [ + SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, + SCREENS.REPORT, + SCREENS.RIGHT_MODAL.SEARCH_REPORT, + SCREENS.RIGHT_MODAL.EXPENSE_REPORT, + SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, + SCREENS.SHARE.SUBMIT_DETAILS, + ], + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined) => getUrlWithParams('attendees', {action, iouType, transactionID, reportID}), + queryParams: ['action', 'iouType', 'transactionID', 'reportID'], + }, } as const satisfies DynamicRoutes; const ROUTES = { @@ -1854,26 +1893,6 @@ const ROUTES = { return getUrlWithBackToParam(`${action as string}/${iouType as string}/amount/${transactionID}/${reportID}/${reportActionID ? `${reportActionID}/` : ''}${pageIndex}`, backTo); }, }, - MONEY_REQUEST_STEP_TAX_RATE: { - route: ':action/:iouType/taxRate/:transactionID/:reportID?', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => { - if (!transactionID || !reportID) { - Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_TAX_RATE route'); - } - - return getUrlWithBackToParam(`${action as string}/${iouType as string}/taxRate/${transactionID}/${reportID}`, backTo); - }, - }, - MONEY_REQUEST_STEP_TAX_AMOUNT: { - route: ':action/:iouType/taxAmount/:transactionID/:reportID?', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => { - if (!transactionID || !reportID) { - Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_TAX_AMOUNT route'); - } - - return getUrlWithBackToParam(`${action as string}/${iouType as string}/taxAmount/${transactionID}/${reportID}`, backTo); - }, - }, MONEY_REQUEST_STEP_CATEGORY_CREATE: { route: ':action/:iouType/category/new/:transactionID/:reportID/:reportActionID?', getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, reportActionID?: string, backTo = '') => { @@ -1894,16 +1913,6 @@ const ROUTES = { return getUrlWithBackToParam(`${action as string}/${iouType as string}/category/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo); }, }, - MONEY_REQUEST_ATTENDEE: { - route: ':action/:iouType/attendees/:transactionID/:reportID', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => { - if (!transactionID || !reportID) { - Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_ATTENDEE route'); - } - - return getUrlWithBackToParam(`${action as string}/${iouType as string}/attendees/${transactionID}/${reportID}`, backTo); - }, - }, MONEY_REQUEST_ACCOUNTANT: { route: ':action/:iouType/accountant/:transactionID/:reportID', getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => { diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 8f58e99213a8..07dbf5e740dd 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -342,8 +342,8 @@ const SCREENS = { STEP_SCAN: 'Money_Request_Step_Scan', STEP_TAG: 'Money_Request_Step_Tag', STEP_WAYPOINT: 'Money_Request_Step_Waypoint', - STEP_TAX_AMOUNT: 'Money_Request_Step_Tax_Amount', - STEP_TAX_RATE: 'Money_Request_Step_Tax_Rate', + DYNAMIC_STEP_TAX_AMOUNT: 'Dynamic_Money_Request_Step_Tax_Amount', + DYNAMIC_STEP_TAX_RATE: 'Dynamic_Money_Request_Step_Tax_Rate', STEP_VENDOR: 'Money_Request_Step_Vendor', RECEIPT_VIEW: 'Money_Request_Receipt_View', STEP_SEND_FROM: 'Money_Request_Step_Send_From', @@ -353,7 +353,7 @@ const SCREENS = { EDIT_WAYPOINT: 'Money_Request_Edit_Waypoint', RECEIPT: 'Money_Request_Receipt', STATE_SELECTOR: 'Money_Request_State_Selector', - STEP_ATTENDEES: 'Money_Request_Attendee', + DYNAMIC_STEP_ATTENDEES: 'Dynamic_Money_Request_Attendee', STEP_ACCOUNTANT: 'Money_Request_Accountant', STEP_DESTINATION: 'Money_Request_Destination', STEP_TIME: 'Money_Request_Time', diff --git a/src/components/MoneyRequestConfirmationList/sections/AttendeeField.tsx b/src/components/MoneyRequestConfirmationList/sections/AttendeeField.tsx index 29c1b9ca7c7c..294b0b4e6a3a 100644 --- a/src/components/MoneyRequestConfirmationList/sections/AttendeeField.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/AttendeeField.tsx @@ -8,6 +8,7 @@ import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import {enrichAndSortAttendees} from '@libs/AttendeeUtils'; +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import {getAttendeesListDisplayString} from '@libs/TransactionUtils'; @@ -15,7 +16,7 @@ import CONST from '@src/CONST'; import type {IOUAction, IOUType} from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import type * as OnyxTypes from '@src/types/onyx'; import type {OnyxEntry} from 'react-native-onyx'; @@ -76,7 +77,7 @@ function AttendeeField({formattedAmountPerAttendee, isReadOnly, transactionID, a return; } - Navigation.navigate(ROUTES.MONEY_REQUEST_ATTENDEE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute())); + Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_ATTENDEE.getRoute(action, iouType, transactionID, reportID))); }} interactive={!isReadOnly} brickRoadIndicator={shouldDisplayAttendeesError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} diff --git a/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx b/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx index cd4e45a99d43..60eb0e09808b 100644 --- a/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx +++ b/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx @@ -11,6 +11,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {setMoneyRequestTaxAmount} from '@libs/actions/IOU/MoneyRequest'; import {convertToBackendAmount, convertToFrontendAmountAsString, getLocalizedCurrencySymbol} from '@libs/CurrencyUtils'; import {isMovingTransactionFromTrackExpense} from '@libs/IOUUtils'; +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import {getCalculatedTaxAmount, getTaxAmount, getTaxRateTitle} from '@libs/TransactionUtils'; @@ -20,7 +21,7 @@ import CONST from '@src/CONST'; import type {IOUAction, IOUType} from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import type * as OnyxTypes from '@src/types/onyx'; import type {OnyxEntry} from 'react-native-onyx'; @@ -140,7 +141,7 @@ function TaxFields({policy, policyForMovingExpenses, iouCurrencyCode, canModifyT return; } - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute())); + Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID))); }} disabled={didConfirm} interactive={canModifyTaxFields} @@ -180,7 +181,7 @@ function TaxFields({policy, policyForMovingExpenses, iouCurrencyCode, canModifyT return; } - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute())); + Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID))); }} disabled={didConfirm} interactive={canModifyTaxFields} diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index b428c7f7ea91..ea759e6ab96c 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -55,6 +55,7 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import {insertTagIntoTransactionTagsString} from '@libs/IOUUtils'; import {getRateFromMerchant} from '@libs/MergeTransactionUtils'; import {isBillableEnabledOnPolicy, isSingleTransactionReport} from '@libs/MoneyRequestReportUtils'; +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import {hasEnabledOptions} from '@libs/OptionsListUtils'; import Parser from '@libs/Parser'; import { @@ -137,7 +138,7 @@ import variables from '@styles/variables'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; +import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails'; import type * as OnyxTypes from '@src/types/onyx'; import type {TransactionPendingFieldsKey} from '@src/types/onyx/Transaction'; @@ -1437,12 +1438,8 @@ function MoneyRequestView({ } Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute( - CONST.IOU.ACTION.EDIT, - iouType, - transaction.transactionID, - transactionThreadReport?.reportID, - getReportRHPActiveRoute(), + createDynamicRoute( + DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID), ), ); }} @@ -1469,12 +1466,8 @@ function MoneyRequestView({ } Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute( - CONST.IOU.ACTION.EDIT, - iouType, - transaction.transactionID, - transactionThreadReport?.reportID, - getReportRHPActiveRoute(), + createDynamicRoute( + DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID), ), ); }} @@ -1510,7 +1503,11 @@ function MoneyRequestView({ style={[styles.moneyRequestMenuItem]} titleStyle={styles.flex1} onPress={() => { - Navigation.navigate(ROUTES.MONEY_REQUEST_ATTENDEE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID)); + Navigation.navigate( + createDynamicRoute( + DYNAMIC_ROUTES.MONEY_REQUEST_ATTENDEE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID), + ), + ); }} brickRoadIndicator={getErrorForField('attendees') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} errorText={getErrorForField('attendees')} diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index e8574be05242..90020a74cc94 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -178,8 +178,8 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator require('../../../../pages/iou/request/IOURequestStartPage').default, [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: () => require('../../../../pages/iou/request/step/IOURequestStepConfirmation').default, [SCREENS.MONEY_REQUEST.STEP_AMOUNT]: () => require('../../../../pages/iou/request/step/IOURequestStepAmount').default, - [SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: () => require('../../../../pages/iou/request/step/IOURequestStepTaxAmountPage').default, - [SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: () => require('../../../../pages/iou/request/step/IOURequestStepTaxRatePage').default, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_AMOUNT]: () => require('../../../../pages/iou/request/step/DynamicIOURequestStepTaxAmountPage').default, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_RATE]: () => require('../../../../pages/iou/request/step/DynamicIOURequestStepTaxRatePage').default, [SCREENS.MONEY_REQUEST.STEP_CATEGORY]: () => require('../../../../pages/iou/request/step/IOURequestStepCategory').default, [SCREENS.MONEY_REQUEST.STEP_CATEGORY_CREATE]: () => require('../../../../pages/iou/request/step/IOURequestStepCategoryCreate').default, [SCREENS.MONEY_REQUEST.STEP_VENDOR]: () => require('../../../../pages/iou/request/step/IOURequestStepVendor').default, @@ -204,7 +204,7 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Wallet/AddDebitCardPage').default, [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/Pay/EnablePaymentsPage').default, [SCREENS.MONEY_REQUEST.STATE_SELECTOR]: () => require('../../../../pages/settings/Profile/PersonalDetails/StateSelectionPage').default, - [SCREENS.MONEY_REQUEST.STEP_ATTENDEES]: () => require('../../../../pages/iou/request/step/IOURequestStepAttendees').default, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_ATTENDEES]: () => require('../../../../pages/iou/request/step/DynamicIOURequestStepAttendees').default, [SCREENS.MONEY_REQUEST.STEP_ACCOUNTANT]: () => require('../../../../pages/iou/request/step/IOURequestStepAccountant').default, [SCREENS.MONEY_REQUEST.STEP_UPGRADE]: () => require('../../../../pages/iou/request/step/IOURequestStepUpgrade').default, [SCREENS.MONEY_REQUEST.STEP_DESTINATION]: () => require('../../../../pages/iou/request/step/IOURequestStepDestination').default, diff --git a/src/libs/Navigation/linkingConfig/OldRoutes.ts b/src/libs/Navigation/linkingConfig/OldRoutes.ts index 27ed312e628c..10c055f9510b 100644 --- a/src/libs/Navigation/linkingConfig/OldRoutes.ts +++ b/src/libs/Navigation/linkingConfig/OldRoutes.ts @@ -117,6 +117,9 @@ const oldRoutes: Record = { '/settings/wallet/enable-payments/terms*': '/settings/wallet/enable-payments/fees-and-terms/terms$1', '/missing-personal-details/*': '/settings/wallet/missing-personal-details/$1', '/workspaces/*/workflows/approvals/expenses-from': '/workspaces/$1/workflows/approvals/new/expenses-from', + '/*/*/taxRate/*/*': '/r/$4/taxRate?action=$1&iouType=$2&transactionID=$3&reportID=$4', + '/*/*/taxAmount/*/*': '/r/$4/taxAmount?action=$1&iouType=$2&transactionID=$3&reportID=$4', + '/*/*/attendees/*/*': '/r/$4/attendees?action=$1&iouType=$2&transactionID=$3&reportID=$4', /* eslint-enable @typescript-eslint/naming-convention */ }; diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index f4839edce363..6790017942a1 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1775,13 +1775,13 @@ const config: LinkingOptions['config'] = { [SCREENS.MONEY_REQUEST.RECEIPT_VIEW]: ROUTES.MONEY_REQUEST_RECEIPT_VIEW.route, [SCREENS.MONEY_REQUEST.STEP_TAG]: ROUTES.MONEY_REQUEST_STEP_TAG.route, [SCREENS.MONEY_REQUEST.STEP_WAYPOINT]: ROUTES.MONEY_REQUEST_STEP_WAYPOINT.route, - [SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.route, - [SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: ROUTES.MONEY_REQUEST_STEP_TAX_RATE.route, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_AMOUNT]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.path, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_RATE]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_RATE.path, [SCREENS.MONEY_REQUEST.STATE_SELECTOR]: { path: ROUTES.MONEY_REQUEST_STATE_SELECTOR.route, exact: true, }, - [SCREENS.MONEY_REQUEST.STEP_ATTENDEES]: ROUTES.MONEY_REQUEST_ATTENDEE.route, + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_ATTENDEES]: DYNAMIC_ROUTES.MONEY_REQUEST_ATTENDEE.path, [SCREENS.MONEY_REQUEST.STEP_ACCOUNTANT]: ROUTES.MONEY_REQUEST_ACCOUNTANT.route, [SCREENS.MONEY_REQUEST.STEP_UPGRADE]: ROUTES.MONEY_REQUEST_UPGRADE.route, [SCREENS.MONEY_REQUEST.STEP_DESTINATION]: ROUTES.MONEY_REQUEST_STEP_DESTINATION.route, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 8685eba094e9..0cbaa1994b82 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -2045,13 +2045,11 @@ type MoneyRequestNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- backTo is needed to track where editing was initiated from (search/view or r/:reportID) backTo?: Routes; }; - [SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: { + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_AMOUNT]: { action: IOUAction; iouType: Exclude; transactionID: string; reportID: string; - // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md - backTo: Routes; }; [SCREENS.MONEY_REQUEST.STEP_TAG]: { action: IOUAction; @@ -2063,13 +2061,11 @@ type MoneyRequestNavigatorParamList = { reportActionID: string; orderWeight: string; }; - [SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: { + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TAX_RATE]: { action: IOUAction; iouType: Exclude; transactionID: string; reportID: string; - // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md - backTo: Routes; }; [SCREENS.MONEY_REQUEST.STEP_WAYPOINT]: { iouType: IOUType; @@ -2242,13 +2238,11 @@ type MoneyRequestNavigatorParamList = { /** ID of the expense report being rejected */ reportID: string; }; - [SCREENS.MONEY_REQUEST.STEP_ATTENDEES]: { + [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_ATTENDEES]: { action: IOUAction; iouType: Exclude; transactionID: string; reportID: string; - // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md - backTo: Routes; }; [SCREENS.MONEY_REQUEST.STEP_ACCOUNTANT]: { action: IOUAction; diff --git a/src/pages/iou/request/step/IOURequestStepAttendees.tsx b/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx similarity index 89% rename from src/pages/iou/request/step/IOURequestStepAttendees.tsx rename to src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx index 64fec5f71ffe..ac49a7413a4b 100644 --- a/src/pages/iou/request/step/IOURequestStepAttendees.tsx +++ b/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx @@ -1,5 +1,6 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDelegateAccountID from '@hooks/useDelegateAccountID'; +import useDynamicBackPath from '@hooks/useDynamicBackPath'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -19,6 +20,7 @@ import MoneyRequestAttendeeSelector from '@pages/iou/request/MoneyRequestAttende import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails'; import type {Attendee} from '@src/types/onyx/IOU'; @@ -32,14 +34,15 @@ import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotF import StepScreenWrapper from './StepScreenWrapper'; import withWritableReportOrNotFound from './withWritableReportOrNotFound'; -type IOURequestStepAttendeesProps = WithWritableReportOrNotFoundProps; +type DynamicIOURequestStepAttendeesProps = WithWritableReportOrNotFoundProps; -function IOURequestStepAttendees({ +function DynamicIOURequestStepAttendees({ route: { - params: {transactionID, reportID, iouType, backTo, action}, + params: {transactionID, reportID, iouType, action}, }, -}: IOURequestStepAttendeesProps) { +}: DynamicIOURequestStepAttendeesProps) { const currentUserPersonalDetails = useCurrentUserPersonalDetails(); + const backPath = useDynamicBackPath(DYNAMIC_ROUTES.MONEY_REQUEST_ATTENDEE.path); const isEditing = action === CONST.IOU.ACTION.EDIT; // eslint-disable-next-line rulesdir/no-default-id-values const [transaction] = useOnyx(`${isEditing ? ONYXKEYS.COLLECTION.TRANSACTION : ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID || CONST.DEFAULT_NUMBER_ID}`); @@ -96,11 +99,11 @@ function IOURequestStepAttendees({ } } - Navigation.goBack(backTo, {shouldSkipFocusRestore: true}); + Navigation.goBack(backPath, {shouldSkipFocusRestore: true}); }, [ attendees, previousAttendees, - backTo, + backPath, transactionID, isEditing, report, @@ -121,7 +124,7 @@ function IOURequestStepAttendees({ ]); const navigateBack = () => { - Navigation.goBack(backTo); + Navigation.goBack(backPath); }; return ( @@ -129,7 +132,7 @@ function IOURequestStepAttendees({ headerTitle={translate('iou.attendees')} onBackButtonPress={navigateBack} shouldShowWrapper - testID="IOURequestStepAttendees" + testID="DynamicIOURequestStepAttendees" > & { +type DynamicIOURequestStepTaxAmountPageProps = WithWritableReportOrNotFoundProps & { transaction: OnyxEntry; }; @@ -59,14 +60,15 @@ function getTaxAmount(transaction: OnyxEntry, policy: OnyxEntry { - Navigation.goBack(backTo); + Navigation.goBack(backPath); }; const saveAndNavigateBack = () => { - Navigation.goBack(backTo, {shouldSkipFocusRestore: true}); + Navigation.goBack(backPath, {shouldSkipFocusRestore: true}); }; const updateTaxAmount = (currentAmount: CurrentMoney) => { @@ -155,39 +157,22 @@ function IOURequestStepTaxAmountPage({ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing setMoneyRequestCurrency(transactionID, currency || CONST.CURRENCY.USD); - if (backTo) { - saveAndNavigateBack(); - return; - } - - // If a reportID exists in the report object, it's because the user started this flow from using the + button in the composer - // inside a report. In this case, the participants can be automatically assigned from the report and the user can skip the participants step and go straight - // to the confirm step. - if (report?.reportID) { - // TODO: Is this really needed at all? - setMoneyRequestParticipantsFromReport(transactionID, report, currentUserPersonalDetails.accountID); - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID)); - return; - } - - // If there was no reportID, then that means the user started this flow from the global + menu - // and an optimistic reportID was generated. In that case, the next step is to select the participants for this request. - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID)); + navigateBack(); }; return ( { textInput.current = e; }} @@ -201,8 +186,8 @@ function IOURequestStepTaxAmountPage({ ); } -const IOURequestStepTaxAmountPageWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepTaxAmountPage); +const DynamicIOURequestStepTaxAmountPageWithWritableReportOrNotFound = withWritableReportOrNotFound(DynamicIOURequestStepTaxAmountPage); -const IOURequestStepTaxAmountPageWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepTaxAmountPageWithWritableReportOrNotFound); +const DynamicIOURequestStepTaxAmountPageWithFullTransactionOrNotFound = withFullTransactionOrNotFound(DynamicIOURequestStepTaxAmountPageWithWritableReportOrNotFound); -export default IOURequestStepTaxAmountPageWithFullTransactionOrNotFound; +export default DynamicIOURequestStepTaxAmountPageWithFullTransactionOrNotFound; diff --git a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx b/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx similarity index 88% rename from src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx rename to src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx index 77028c9a215f..cbe474518fd8 100644 --- a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx +++ b/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx @@ -3,6 +3,7 @@ import TaxPicker from '@components/TaxPicker'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDelegateAccountID from '@hooks/useDelegateAccountID'; +import useDynamicBackPath from '@hooks/useDynamicBackPath'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; @@ -23,6 +24,7 @@ import {updateMoneyRequestTaxRate} from '@userActions/IOU/UpdateMoneyRequest'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails'; import type {Policy, Transaction} from '@src/types/onyx'; @@ -39,7 +41,7 @@ import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; import withWritableReportOrNotFound from './withWritableReportOrNotFound'; -type IOURequestStepTaxRatePageProps = WithWritableReportOrNotFoundProps & { +type DynamicIOURequestStepTaxRatePageProps = WithWritableReportOrNotFoundProps & { transaction: OnyxEntry; }; @@ -50,15 +52,16 @@ function getTaxAmount(policy: OnyxEntry, transaction: OnyxEntry { - Navigation.goBack(backTo); + Navigation.goBack(backPath); }; const saveAndNavigateBack = () => { - Navigation.goBack(backTo, {shouldSkipFocusRestore: true}); + Navigation.goBack(backPath, {shouldSkipFocusRestore: true}); }; const taxRateTitle = getTaxRateTitle(policy, currentTransaction, isMovingTransactionFromTrackExpense(action), policyForMovingExpenses); @@ -165,7 +168,7 @@ function IOURequestStepTaxRatePage({ headerTitle={translate('iou.taxRate')} onBackButtonPress={navigateBack} shouldShowWrapper - testID="IOURequestStepTaxRatePage" + testID="DynamicIOURequestStepTaxRatePage" >