Merge pull request #3932 from Expensify/Rory-FixIOUCurrencyRoutes

Fix IOU currency routes (cherry picked from commit 1cc22a1)
Expensify · Jul 8, 2021 · cf0c46c · cf0c46c
1 parent 5512d06
commit cf0c46c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/ROUTES.js b/src/ROUTES.js
@@ -10,6 +10,9 @@ const IOU_REQUEST = 'iou/request';
 const IOU_BILL = 'iou/split';
 const IOU_SEND = 'iou/send';
 const IOU_DETAILS = 'iou/details';
+const IOU_REQUEST_CURRENCY = `${IOU_REQUEST}/currency`;
+const IOU_BILL_CURRENCY = `${IOU_BILL}/currency`;
+const IOU_SEND_CURRENCY = `${IOU_SEND}/currency`;
 
 export default {
     BANK_ACCOUNT: 'bank-account/:stepToOpen?',
@@ -35,17 +38,17 @@ export default {
     IOU_BILL,
     IOU_SEND,
     IOU_REQUEST_WITH_REPORT_ID: `${IOU_REQUEST}/:reportID?`,
-    IOU_BILL_WITH_REPORTID: `${IOU_BILL}/:reportID?`,
-    IOU_SEND_WITH_REPORTID: `${IOU_SEND}/:reportID?`,
+    IOU_BILL_WITH_REPORT_ID: `${IOU_BILL}/:reportID?`,
+    IOU_SEND_WITH_REPORT_ID: `${IOU_SEND}/:reportID?`,
     getIouRequestRoute: reportID => `${IOU_REQUEST}/${reportID}`,
     getIouSplitRoute: reportID => `${IOU_BILL}/${reportID}`,
     getIOUSendRoute: reportID => `${IOU_SEND}/${reportID}`,
-    IOU_BILL_CURRENCY: `${IOU_BILL}/:reportID/currency`,
-    IOU_REQUEST_CURRENCY: `${IOU_REQUEST}/:reportID/currency`,
-    IOU_SEND_CURRENCY: `${IOU_SEND}/:reportID/currency`,
-    getIouRequestCurrencyRoute: reportID => `${IOU_REQUEST}/${reportID}/currency`,
-    getIouBillCurrencyRoute: reportID => `${IOU_BILL}/${reportID}/currency`,
-    getIouSendCurrencyRoute: reportID => `${IOU_SEND}/${reportID}/currency`,
+    IOU_BILL_CURRENCY: `${IOU_BILL_CURRENCY}/:reportID?`,
+    IOU_REQUEST_CURRENCY: `${IOU_REQUEST_CURRENCY}/:reportID?`,
+    IOU_SEND_CURRENCY: `${IOU_SEND_CURRENCY}/:reportID?`,
+    getIouRequestCurrencyRoute: reportID => `${IOU_REQUEST_CURRENCY}/${reportID}`,
+    getIouBillCurrencyRoute: reportID => `${IOU_BILL_CURRENCY}/${reportID}`,
+    getIouSendCurrencyRoute: reportID => `${IOU_SEND_CURRENCY}/${reportID}`,
     IOU_DETAILS,
     IOU_DETAILS_WITH_IOU_REPORT_ID: `${IOU_DETAILS}/:chatReportID/:iouReportID/`,
     getIouDetailsRoute: (chatReportID, iouReportID) => `iou/details/${chatReportID}/${iouReportID}`,

diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
@@ -104,13 +104,13 @@ export default {
             },
             IOU_Bill: {
                 screens: {
-                    IOU_Bill_Root: ROUTES.IOU_BILL_WITH_REPORTID,
+                    IOU_Bill_Root: ROUTES.IOU_BILL_WITH_REPORT_ID,
                     IOU_Bill_Currency: ROUTES.IOU_BILL_CURRENCY,
                 },
             },
             IOU_Send: {
                 screens: {
-                    IOU_Send_Root: ROUTES.IOU_SEND_WITH_REPORTID,
+                    IOU_Send_Root: ROUTES.IOU_SEND_WITH_REPORT_ID,
                     IOU_Send_Currency: ROUTES.IOU_SEND_CURRENCY,
                 },
             },