Merge pull request #3935 from Expensify/cherry-pick-staging-3932

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001007600
-        versionName "1.0.76-0"
+        versionCode 1001007601
+        versionName "1.0.76-1"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.76.0</string>
+	<string>1.0.76.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.76.0</string>
+	<string>1.0.76.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.76-0",
+  "version": "1.0.76-1",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

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}`,

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,
                 },
             },