Merge pull request #26854 from akamefi202/request-money-link

Expensify · Sep 18, 2023 · d2c8fcf · d2c8fcf
2 parents cb31434 + f2da0c7
commit d2c8fcf
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js
@@ -99,6 +99,12 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
     // Because we use Onyx to store IOU info, when we try to make two different money requests from different tabs,
     // it can result in an IOU sent with improper values. In such cases we want to reset the flow and redirect the user to the first step of the IOU.
     useEffect(() => {
+        const moneyRequestID = `${iouType}${reportID}`;
+        const shouldReset = iou.id !== moneyRequestID;
+        if (shouldReset) {
+            IOU.resetMoneyRequestInfo(moneyRequestID);
+        }
+
         if (isEditing) {
             // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
             if (prevMoneyRequestID.current !== iou.id) {
@@ -109,11 +115,6 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
                 return;
             }
-            const moneyRequestID = `${iouType}${reportID}`;
-            const shouldReset = iou.id !== moneyRequestID;
-            if (shouldReset) {
-                IOU.resetMoneyRequestInfo(moneyRequestID);
-            }
 
             if (!isDistanceRequestTab && (_.isEmpty(iou.participantAccountIDs) || iou.amount === 0 || shouldReset)) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);