Merge pull request #35461 from DylanDylann/fix/34615-v2

remove MoneyRequestConfirmPage

src/ROUTES.ts

@@ -285,10 +285,6 @@ const ROUTES = {
  route: ':iouType/new/participants/:reportID?',
  getRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}` as const,
  },
- MONEY_REQUEST_CONFIRMATION: {
- route: ':iouType/new/confirmation/:reportID?',
- getRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}` as const,
- },
  MONEY_REQUEST_CURRENCY: {
  route: ':iouType/new/currency/:reportID?',
  getRoute: (iouType: string, reportID: string, currency: string, backTo: string) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}` as const,
@@ -311,8 +307,9 @@ const ROUTES = {
  `create/${iouType}/start/${transactionID}/${reportID}` as const,
  },
  MONEY_REQUEST_STEP_CONFIRMATION: {
- route: 'create/:iouType/confirmation/:transactionID/:reportID',
- getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) => `create/${iouType}/confirmation/${transactionID}/${reportID}` as const,
+ route: ':action/:iouType/confirmation/:transactionID/:reportID',
+ getRoute: (action: ValueOf<typeof CONST.IOU.ACTION>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) =>
+ `${action}/${iouType}/confirmation/${transactionID}/${reportID}` as const,
  },
  MONEY_REQUEST_STEP_AMOUNT: {
  route: 'create/:iouType/amount/:transactionID/:reportID',

src/SCREENS.ts

@@ -151,7 +151,6 @@ const SCREENS = {
  STEP_TAX_RATE: 'Money_Request_Step_Tax_Rate',
  AMOUNT: 'Money_Request_Amount',
  PARTICIPANTS: 'Money_Request_Participants',
- CONFIRMATION: 'Money_Request_Confirmation',
  CURRENCY: 'Money_Request_Currency',
  WAYPOINT: 'Money_Request_Waypoint',
  EDIT_WAYPOINT: 'Money_Request_Edit_Waypoint',

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

@@ -88,7 +88,6 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
  [SCREENS.MONEY_REQUEST.STEP_WAYPOINT]: () => require('../../../../pages/iou/request/step/IOURequestStepWaypoint').default as React.ComponentType,
  [SCREENS.MONEY_REQUEST.AMOUNT]: () => require('../../../../pages/iou/steps/NewRequestAmountPage').default as React.ComponentType,
  [SCREENS.MONEY_REQUEST.PARTICIPANTS]: () => require('../../../../pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage').default as React.ComponentType,
- [SCREENS.MONEY_REQUEST.CONFIRMATION]: () => require('../../../../pages/iou/steps/MoneyRequestConfirmPage').default as React.ComponentType,
  [SCREENS.MONEY_REQUEST.CURRENCY]: () => require('../../../../pages/iou/IOUCurrencySelection').default as React.ComponentType,
  [SCREENS.MONEY_REQUEST.HOLD]: () => require('../../../../pages/iou/HoldReasonPage').default as React.ComponentType,
  [SCREENS.IOU_SEND.ADD_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,

src/libs/Navigation/linkingConfig/config.ts

@@ -526,7 +526,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
  [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.PARTICIPANTS]: ROUTES.MONEY_REQUEST_PARTICIPANTS.route,
- [SCREENS.MONEY_REQUEST.CONFIRMATION]: ROUTES.MONEY_REQUEST_CONFIRMATION.route,
  [SCREENS.MONEY_REQUEST.CURRENCY]: ROUTES.MONEY_REQUEST_CURRENCY.route,
  [SCREENS.MONEY_REQUEST.RECEIPT]: ROUTES.MONEY_REQUEST_RECEIPT.route,
  [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: ROUTES.IOU_SEND_ENABLE_PAYMENTS,

src/libs/Navigation/types.ts

@@ -345,8 +345,10 @@ type MoneyRequestNavigatorParamList = {
  iouType: string;
  reportID: string;
  };
- [SCREENS.MONEY_REQUEST.CONFIRMATION]: {
+ [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: {
+ action: ValueOf<typeof CONST.IOU.ACTION>;
  iouType: string;
+ transactionID: string;
  reportID: string;
  };
  [SCREENS.MONEY_REQUEST.CURRENCY]: {

src/libs/actions/IOU.ts

@@ -1,5 +1,4 @@
 import type {ParamListBase, StackNavigationState} from '@react-navigation/native';
-import type {StackScreenProps} from '@react-navigation/stack';
 import {format} from 'date-fns';
 import fastMerge from 'expensify-common/lib/fastMerge';
 import Str from 'expensify-common/lib/str';
@@ -45,11 +44,10 @@ import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticIOUR
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as UserUtils from '@libs/UserUtils';
 import ViolationsUtils from '@libs/Violations/ViolationsUtils';
-import type {MoneyRequestNavigatorParamList, NavigationPartialRoute} from '@navigation/types';
+import type {NavigationPartialRoute} from '@navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Participant, Split} from '@src/types/onyx/IOU';
 import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
@@ -63,8 +61,6 @@ import * as CachedPDFPaths from './CachedPDFPaths';
 import * as Policy from './Policy';
 import * as Report from './Report';
 
-type MoneyRequestRoute = StackScreenProps<MoneyRequestNavigatorParamList, typeof SCREENS.MONEY_REQUEST.CONFIRMATION>['route'];
-
 type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
 
 type OneOnOneIOUReport = OnyxTypes.Report | undefined | null;
@@ -5080,7 +5076,9 @@ function navigateToNextPage(iou: OnyxEntry<OnyxTypes.IOU>, iouType: string, repo
 
  // If we're adding a receipt, that means the user came from the confirmation page and we need to navigate back to it.
  if (path.slice(1) === ROUTES.MONEY_REQUEST_RECEIPT.getRoute(iouType, report?.reportID)) {
- Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report?.reportID));
+ Navigation.navigate(
+ ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType as ValueOf<typeof CONST.IOU.TYPE>, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, report?.reportID ?? '1'),
+ );
  return;
  }
 
@@ -5096,23 +5094,14 @@ function navigateToNextPage(iou: OnyxEntry<OnyxTypes.IOU>, iouType: string, repo
  : (chatReport?.participantAccountIDs ?? []).filter((accountID) => currentUserAccountID !== accountID).map((accountID) => ({accountID, selected: true}));
  setMoneyRequestParticipants(participants);
  }
- Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID));
+ Navigation.navigate(
+ ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType as ValueOf<typeof CONST.IOU.TYPE>, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, report.reportID),
+ );
  return;
  }
  Navigation.navigate(ROUTES.MONEY_REQUEST_PARTICIPANTS.getRoute(iouType));
 }
 
-/**
- * When the money request or split bill creation flow is initialized via FAB, the reportID is not passed as a navigation
- * parameter.
- * Gets a report id from the first participant of the IOU object stored in Onyx.
- */
-function getIOUReportID(iou?: OnyxTypes.IOU, route?: MoneyRequestRoute): string {
- // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null
- // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
- return route?.params.reportID || iou?.participants?.[0]?.reportID || '';
-}
-
 /**
  * Put money request on HOLD
  */
@@ -5317,7 +5306,6 @@ export {
  updateMoneyRequestDescription,
  replaceReceipt,
  detachReceipt,
- getIOUReportID,
  editMoneyRequest,
  putOnHold,
  unholdRequest,

src/pages/iou/request/step/IOURequestStepAmount.js

@@ -145,7 +145,7 @@ function IOURequestStepAmount({
  // to the confirm step.
  if (report.reportID) {
  IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
- Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(iouType, transactionID, reportID));
+ Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID));
  return;
  }