Merge pull request Expensify#67479 from nkdengineer/fix/67142-1

Fix creating second scan expense unexpected error is shown

Author: Gonals

src/hooks/useShowNotFoundPageInIOUStep.ts

@@ -0,0 +1,30 @@
+import {useMemo} from 'react';
+import type {ValueOf} from 'type-fest';
+import {canEditFieldOfMoneyRequest} from '@libs/ReportUtils';
+import type {IOUAction, IOUType} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxInputOrEntry, Report} from '@src/types/onyx';
+import useOnyx from './useOnyx';
+
+// eslint-disable-next-line rulesdir/no-negated-variables
+const useShowNotFoundPageInIOUStep = (action: IOUAction, iouType: IOUType, report: OnyxInputOrEntry<Report>, fieldToEdit: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => {
+    const isEditing = action === CONST.IOU.ACTION.EDIT;
+    const reportActionsReportID = useMemo(() => {
+        let actionsReportID;
+        if (isEditing) {
+            actionsReportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID : report?.parentReportID;
+        }
+        return actionsReportID;
+    }, [isEditing, iouType, report?.reportID, report?.parentReportID]);
+
+    const [reportAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportActionsReportID}`, {
+        canEvict: false,
+        canBeMissing: true,
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        selector: (reportActions) => reportActions?.[`${report?.parentReportActionID}`],
+    });
+    return isEditing && !canEditFieldOfMoneyRequest(reportAction, fieldToEdit);
+};
+
+export default useShowNotFoundPageInIOUStep;

src/pages/iou/request/step/IOURequestEditReportCommon.tsx

@@ -48,9 +48,19 @@ type Props = {
     removeFromReport?: () => void;
     isEditing?: boolean;
     isUnreported?: boolean;
+    shouldShowNotFoundPage?: boolean;
 };
 
-function IOURequestEditReportCommon({backTo, transactionsReports, selectReport, policyID: policyIDFromProps, removeFromReport, isEditing = false, isUnreported}: Props) {
+function IOURequestEditReportCommon({
+    backTo,
+    transactionsReports,
+    selectReport,
+    policyID: policyIDFromProps,
+    removeFromReport,
+    isEditing = false,
+    isUnreported,
+    shouldShowNotFoundPage = false,
+}: Props) {
     const {translate, localeCompare} = useLocalize();
     const {options} = useOptionsList();
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: (reports) => mapOnyxCollectionItems(reports, reportSelector), canBeMissing: true});
@@ -119,7 +129,7 @@ function IOURequestEditReportCommon({backTo, transactionsReports, selectReport,
             shouldShowWrapper
             testID="IOURequestEditReportCommon"
             includeSafeAreaPaddingBottom
-            shouldShowNotFoundPage={expenseReports.length === 0}
+            shouldShowNotFoundPage={expenseReports.length === 0 || shouldShowNotFoundPage}
         >
             <SelectionList
                 sections={[{data: reportOptions}]}

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

@@ -7,6 +7,7 @@ import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentU
 import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import {createDraftTransaction, removeDraftTransaction} from '@libs/actions/TransactionEdit';
 import {convertToBackendAmount, isValidCurrencyCode} from '@libs/CurrencyUtils';
 import {navigateToParticipantPage} from '@libs/IOUUtils';
@@ -92,6 +93,8 @@ function IOURequestStepAmount({
     const {amount: transactionAmount} = getTransactionDetails(currentTransaction) ?? {amount: 0};
     const {currency: originalCurrency} = getTransactionDetails(isEditing && !isEmptyObject(draftTransaction) ? draftTransaction : transaction) ?? {currency: CONST.CURRENCY.USD};
     const currency = isValidCurrencyCode(selectedCurrency) ? selectedCurrency : originalCurrency;
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.AMOUNT);
 
     // For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace request, as
     // the user will have to add a merchant.
@@ -315,6 +318,7 @@ function IOURequestStepAmount({
             testID={IOURequestStepAmount.displayName}
             shouldShowWrapper={!!backTo || isEditing}
             includeSafeAreaPaddingBottom
+            shouldShowNotFoundPage={shouldShowNotFoundPage}
         >
             <MoneyRequestAmountForm
                 isEditing={!!backTo || isEditing}

src/pages/iou/request/step/IOURequestStepDate.tsx

@@ -81,6 +81,8 @@ function IOURequestStepDate({
             shouldShowNotFound = !canEditMoneyRequest && !canEditingSplitBill;
         } else if (isSplitExpense) {
             shouldShowNotFound = !canEditSplitExpense;
+        } else {
+            shouldShowNotFound = !canEditMoneyRequest;
         }
     }
 

src/pages/iou/request/step/IOURequestStepDistance.tsx

@@ -19,6 +19,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import usePrevious from '@hooks/usePrevious';
+import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {
     createDistanceRequest,
@@ -139,6 +140,8 @@ function IOURequestStepDistance({
     const [recentWaypoints, {status: recentWaypointsStatus}] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS, {canBeMissing: true});
     const iouRequestType = getRequestType(transaction);
     const customUnitRateID = getRateID(transaction);
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.DISTANCE);
 
     // Sets `amount` and `split` share data before moving to the next step to avoid briefly showing `0.00` as the split share for participants
     const setDistanceRequestData = useCallback(
@@ -529,7 +532,7 @@ function IOURequestStepDistance({
             headerTitle={translate('common.distance')}
             onBackButtonPress={navigateBack}
             testID={IOURequestStepDistance.displayName}
-            shouldShowNotFoundPage={isEditing && !transaction?.comment?.waypoints}
+            shouldShowNotFoundPage={(isEditing && !transaction?.comment?.waypoints) || shouldShowNotFoundPage}
             shouldShowWrapper={!isCreatingNewRequest}
         >
             <>

src/pages/iou/request/step/IOURequestStepDistanceRate.tsx

@@ -5,6 +5,7 @@ import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getIOURequestPolicyID, setMoneyRequestDistanceRate, setMoneyRequestTaxAmount, setMoneyRequestTaxRate, updateMoneyRequestDistanceRate} from '@libs/actions/IOU';
 import {convertToBackendAmount} from '@libs/CurrencyUtils';
@@ -32,7 +33,7 @@ function IOURequestStepDistanceRate({
     report,
     reportDraft,
     route: {
-        params: {action, reportID, backTo, transactionID},
+        params: {action, reportID, backTo, transactionID, iouType},
     },
     transaction,
 }: IOURequestStepDistanceRateProps) {
@@ -74,6 +75,8 @@ function IOURequestStepDistanceRate({
             isSelected,
         };
     });
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.DISTANCE_RATE);
 
     const initiallyFocusedOption = sections.find((item) => item.isSelected)?.keyForList;
 
@@ -108,6 +111,7 @@ function IOURequestStepDistanceRate({
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID={IOURequestStepDistanceRate.displayName}
+            shouldShowNotFoundPage={shouldShowNotFoundPage}
         >
             <Text style={[styles.mh5, styles.mv4]}>{translate('iou.chooseARate')}</Text>
 

src/pages/iou/request/step/IOURequestStepMerchant.tsx

@@ -8,6 +8,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
+import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import {getTransactionDetails, isExpenseRequest, isPolicyExpenseChat} from '@libs/ReportUtils';
@@ -43,7 +44,8 @@ function IOURequestStepMerchant({
     const {translate} = useLocalize();
     const {inputCallbackRef} = useAutoFocusInput();
     const isEditing = action === CONST.IOU.ACTION.EDIT;
-
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, report, CONST.EDIT_REQUEST_FIELD.MERCHANT);
     // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
     const isEditingSplitBill = iouType === CONST.IOU.TYPE.SPLIT && isEditing;
     const merchant = getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
@@ -114,6 +116,7 @@ function IOURequestStepMerchant({
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID={IOURequestStepMerchant.displayName}
+            shouldShowNotFoundPage={shouldShowNotFoundPage}
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}

src/pages/iou/request/step/IOURequestStepReport.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {InteractionManager} from 'react-native';
 import type {ListItem} from '@components/SelectionList/types';
 import useOnyx from '@hooks/useOnyx';
+import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import {changeTransactionsReport, setTransactionReport} from '@libs/actions/Transaction';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
@@ -126,6 +127,9 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
         Navigation.dismissModal();
     };
 
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, reportOrDraftReport, CONST.EDIT_REQUEST_FIELD.REPORT);
+
     return (
         <IOURequestEditReportCommon
             backTo={backTo}
@@ -135,6 +139,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
             removeFromReport={removeFromReport}
             isEditing={isEditing}
             isUnreported={isUnreported}
+            shouldShowNotFoundPage={shouldShowNotFoundPage}
         />
     );
 }