Merge pull request #35641 from DylanDylann/fix/34611

src/ROUTES.ts

@@ -354,9 +354,9 @@ const ROUTES = {
  getUrlWithBackToParam(`create/${iouType}/distance/${transactionID}/${reportID}`, backTo),
  },
  MONEY_REQUEST_STEP_MERCHANT: {
- route: 'create/:iouType/merchant/:transactionID/:reportID',
- getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
- getUrlWithBackToParam(`create/${iouType}/merchant/${transactionID}/${reportID}`, backTo),
+ route: ':action/:iouType/merchant/:transactionID/:reportID',
+ getRoute: (action: ValueOf<typeof CONST.IOU.ACTION>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
+ getUrlWithBackToParam(`${action}/${iouType}/merchant/${transactionID}/${reportID}`, backTo),
  },
  MONEY_REQUEST_STEP_PARTICIPANTS: {
  route: 'create/:iouType/participants/:transactionID/:reportID',

src/SCREENS.ts

@@ -150,7 +150,6 @@ const SCREENS = {
  CONFIRMATION: 'Money_Request_Confirmation',
  CURRENCY: 'Money_Request_Currency',
  CATEGORY: 'Money_Request_Category',
- MERCHANT: 'Money_Request_Merchant',
  WAYPOINT: 'Money_Request_Waypoint',
  EDIT_WAYPOINT: 'Money_Request_Edit_Waypoint',
  DISTANCE: 'Money_Request_Distance',

src/components/MoneyRequestConfirmationList.js

@@ -435,7 +435,7 @@ function MoneyRequestConfirmationList(props) {
  IOU.setMoneyRequestPendingFields(props.transactionID, {waypoints: isDistanceRequestWithPendingRoute ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : null});
 
  const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate, currency, translate, toLocaleDigit);
- IOU.setMoneyRequestMerchant_temporaryForRefactor(props.transactionID, distanceMerchant);
+ IOU.setMoneyRequestMerchant(props.transactionID, distanceMerchant, false);
  }, [isDistanceRequestWithPendingRoute, hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, props.isDistanceRequest, props.transactionID]);
 
  /**
@@ -739,11 +739,15 @@ function MoneyRequestConfirmationList(props) {
  style={[styles.moneyRequestMenuItem]}
  titleStyle={styles.flex1}
  onPress={() => {
- if (props.isEditingSplitBill) {
- Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(props.reportID, props.reportActionID, CONST.EDIT_REQUEST_FIELD.MERCHANT));
- return;
- }
- Navigation.navigate(ROUTES.MONEY_REQUEST_MERCHANT.getRoute(props.iouType, props.reportID));
+ Navigation.navigate(
+ ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(
+ CONST.IOU.ACTION.EDIT,
+ props.iouType,
+ transaction.transactionID,
+ props.reportID,
+ Navigation.getActiveRouteWithoutParams(),
+ ),
+ );
  }}
  disabled={didConfirm}
  interactive={!props.isReadOnly}

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

@@ -486,7 +486,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
  IOU.setMoneyRequestPendingFields(transaction.transactionID, {waypoints: isDistanceRequestWithPendingRoute ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : null});
 
  const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate, currency, translate, toLocaleDigit);
- IOU.setMoneyRequestMerchant_temporaryForRefactor(transaction.transactionID, distanceMerchant);
+ IOU.setMoneyRequestMerchant(transaction.transactionID, distanceMerchant, true);
  }, [isDistanceRequestWithPendingRoute, hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, isDistanceRequest, transaction]);
 
  /**
@@ -710,11 +710,9 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
  style={[styles.moneyRequestMenuItem]}
  titleStyle={styles.flex1}
  onPress={() => {
- if (isEditingSplitBill) {
- Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(reportID, reportActionID, CONST.EDIT_REQUEST_FIELD.MERCHANT));
- return;
- }
- Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+ Navigation.navigate(
+ ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+ );
  }}
  disabled={didConfirm}
  interactive={!isReadOnly}

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -334,7 +334,11 @@ function MoneyRequestView({
  interactive={canEditMerchant}
  shouldShowRightIcon={canEditMerchant}
  titleStyle={styles.flex1}
- onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}
+ onPress={() =>
+ Navigation.navigate(
+ ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.REQUEST, transaction?.transactionID ?? '', report.reportID),
+ )
+ }
  brickRoadIndicator={hasViolations('merchant') || (hasErrors && isEmptyMerchant && isPolicyExpenseChat) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
  error={hasErrors && isPolicyExpenseChat && isEmptyMerchant ? translate('common.error.enterMerchant') : ''}
  />

src/components/transactionPropTypes.js

@@ -67,6 +67,17 @@ export default PropTypes.shape({
  }),
  ),
 
+ /** Selected participants */
+ participants: PropTypes.arrayOf(
+ PropTypes.shape({
+ accountID: PropTypes.number,
+ login: PropTypes.string,
+ isPolicyExpenseChat: PropTypes.bool,
+ isOwnPolicyExpenseChat: PropTypes.bool,
+ selected: PropTypes.bool,
+ }),
+ ),
+
  /** The original currency of the transaction */
  currency: PropTypes.string,
 

src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx

@@ -100,7 +100,6 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
  [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.CATEGORY]: () => require('../../../pages/iou/MoneyRequestCategoryPage').default as React.ComponentType,
- [SCREENS.MONEY_REQUEST.MERCHANT]: () => require('../../../pages/iou/MoneyRequestMerchantPage').default as React.ComponentType,
  [SCREENS.IOU_SEND.ADD_BANK_ACCOUNT]: () => require('../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,
  [SCREENS.IOU_SEND.ADD_DEBIT_CARD]: () => require('../../../pages/settings/Wallet/AddDebitCardPage').default as React.ComponentType,
  [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: () => require('../../../pages/EnablePayments/EnablePaymentsPage').default as React.ComponentType,

src/libs/Navigation/linkingConfig/config.ts

@@ -423,7 +423,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
  [SCREENS.MONEY_REQUEST.CONFIRMATION]: ROUTES.MONEY_REQUEST_CONFIRMATION.route,
  [SCREENS.MONEY_REQUEST.CURRENCY]: ROUTES.MONEY_REQUEST_CURRENCY.route,
  [SCREENS.MONEY_REQUEST.CATEGORY]: ROUTES.MONEY_REQUEST_CATEGORY.route,
- [SCREENS.MONEY_REQUEST.MERCHANT]: ROUTES.MONEY_REQUEST_MERCHANT.route,
  [SCREENS.MONEY_REQUEST.RECEIPT]: ROUTES.MONEY_REQUEST_RECEIPT.route,
  [SCREENS.MONEY_REQUEST.DISTANCE]: ROUTES.MONEY_REQUEST_DISTANCE.route,
  [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: ROUTES.IOU_SEND_ENABLE_PAYMENTS,

src/libs/Navigation/types.ts

@@ -278,11 +278,12 @@ type MoneyRequestNavigatorParamList = {
  reportID: string;
  backTo: string;
  };
- [SCREENS.MONEY_REQUEST.MERCHANT]: {
- iouType: string;
+ [SCREENS.MONEY_REQUEST.STEP_MERCHANT]: {
+ action: ValueOf<typeof CONST.IOU.ACTION>;
+ iouType: ValueOf<typeof CONST.IOU.TYPE>;
+ transactionID: string;
  reportID: string;
- field: string;
- threadReportID: string;
+ backTo: string;
  };
  [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: undefined;
  [SCREENS.IOU_SEND.ADD_BANK_ACCOUNT]: undefined;

src/libs/actions/IOU.ts

@@ -291,9 +291,8 @@ function setMoneyRequestDescription(transactionID: string, comment: string, isDr
  Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {comment: comment.trim()}});
 }
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-function setMoneyRequestMerchant_temporaryForRefactor(transactionID: string, merchant: string) {
- Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {merchant: merchant.trim()});
+function setMoneyRequestMerchant(transactionID: string, merchant: string, isDraft: boolean) {
+ Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {merchant});
 }
 
 function setMoneyRequestPendingFields(transactionID: string, pendingFields: PendingFields) {
@@ -3820,10 +3819,6 @@ function setMoneyRequestCurrency(currency: string) {
  Onyx.merge(ONYXKEYS.IOU, {currency});
 }
 
-function setMoneyRequestMerchant(merchant: string) {
- Onyx.merge(ONYXKEYS.IOU, {merchant: merchant.trim()});
-}
-
 function setMoneyRequestCategory(category: string) {
  Onyx.merge(ONYXKEYS.IOU, {category});
 }
@@ -3962,7 +3957,6 @@ export {
  setMoneyRequestCurrency_temporaryForRefactor,
  setMoneyRequestDescription,
  setMoneyRequestOriginalCurrency_temporaryForRefactor,
- setMoneyRequestMerchant_temporaryForRefactor,
  setMoneyRequestParticipants_temporaryForRefactor,
  setMoneyRequestPendingFields,
  setMoneyRequestReceipt,

src/pages/EditRequestPage.js

@@ -22,7 +22,6 @@ import ROUTES from '@src/ROUTES';
 import EditRequestAmountPage from './EditRequestAmountPage';
 import EditRequestCategoryPage from './EditRequestCategoryPage';
 import EditRequestDistancePage from './EditRequestDistancePage';
-import EditRequestMerchantPage from './EditRequestMerchantPage';
 import EditRequestReceiptPage from './EditRequestReceiptPage';
 import EditRequestTagPage from './EditRequestTagPage';
 import reportActionPropTypes from './home/report/reportActionPropTypes';
@@ -74,13 +73,7 @@ const defaultProps = {
 function EditRequestPage({report, route, policy, policyCategories, policyTags, parentReportActions, transaction}) {
  const parentReportActionID = lodashGet(report, 'parentReportActionID', '0');
  const parentReportAction = lodashGet(parentReportActions, parentReportActionID, {});
- const {
- amount: transactionAmount,
- currency: transactionCurrency,
- merchant: transactionMerchant,
- category: transactionCategory,
- tag: transactionTag,
- } = ReportUtils.getTransactionDetails(transaction);
+ const {amount: transactionAmount, currency: transactionCurrency, category: transactionCategory, tag: transactionTag} = ReportUtils.getTransactionDetails(transaction);
 
  const defaultCurrency = lodashGet(route, 'params.currency', '') || transactionCurrency;
  const fieldToEdit = lodashGet(route, ['params', 'field'], '');
@@ -128,31 +121,6 @@ function EditRequestPage({report, route, policy, policyCategories, policyTags, p
  [transaction, report, policy, policyTags, policyCategories],
  );
 
- const saveMerchant = useCallback(
- ({merchant: newMerchant}) => {
- const newTrimmedMerchant = newMerchant.trim();
-
- // In case the merchant hasn't been changed, do not make the API request.
- // In case the merchant has been set to empty string while current merchant is partial, do nothing too.
- if (newTrimmedMerchant === transactionMerchant || (newTrimmedMerchant === '' && transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT)) {
- Navigation.dismissModal();
- return;
- }
-
- // An empty newTrimmedMerchant is only possible for the P2P IOU case
- IOU.updateMoneyRequestMerchant(
- transaction.transactionID,
- report.reportID,
- newTrimmedMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
- policy,
- policyTags,
- policyCategories,
- );
- Navigation.dismissModal();
- },
- [transactionMerchant, transaction, report, policy, policyTags, policyCategories],
- );
-
  const saveTag = useCallback(
  ({tag: newTag}) => {
  let updatedTag = newTag;
@@ -191,16 +159,6 @@ function EditRequestPage({report, route, policy, policyCategories, policyTags, p
  );
  }
 
- if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.MERCHANT) {
- return (
- <EditRequestMerchantPage
- defaultMerchant={transactionMerchant}
- isPolicyExpenseChat={isPolicyExpenseChat}
- onSubmit={saveMerchant}
- />
- );
- }
-
  if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.CATEGORY && shouldShowCategories) {
  return (
  <EditRequestCategoryPage

src/pages/EditSplitBillPage.tsx

@@ -17,7 +17,6 @@ import type {Report, ReportActions, Transaction} from '@src/types/onyx';
 import type {OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
 import EditRequestAmountPage from './EditRequestAmountPage';
 import EditRequestCategoryPage from './EditRequestCategoryPage';
-import EditRequestMerchantPage from './EditRequestMerchantPage';
 import EditRequestTagPage from './EditRequestTagPage';
 
 type EditSplitBillOnyxProps = {
@@ -44,7 +43,6 @@ function EditSplitBillPage({route, transaction, draftTransaction, report}: EditS
  const {
  amount: transactionAmount,
  currency: transactionCurrency,
- merchant: transactionMerchant,
  category: transactionCategory,
  tag: transactionTag,
  } = ReportUtils.getTransactionDetails(draftTransaction ?? transaction) ?? {};
@@ -82,17 +80,6 @@ function EditSplitBillPage({route, transaction, draftTransaction, report}: EditS
  );
  }
 
- if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.MERCHANT) {
- return (
- <EditRequestMerchantPage
- defaultMerchant={transactionMerchant ?? ''}
- onSubmit={(transactionChanges) => {
- setDraftSplitTransaction({merchant: transactionChanges.merchant.trim()});
- }}
- />
- );
- }
-
  if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.CATEGORY) {
  return (
  <EditRequestCategoryPage