Merge branch 'main' into jliexpensify-patch-3

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037402
-        versionName "1.3.74-2"
+        versionCode 1001037403
+        versionName "1.3.74-3"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/get-paid-back/reports/Reimbursements.md

@@ -1,5 +1,42 @@
----
-title: Reimbursements
-description: Reimbursements
----
-## Resource Coming Soon!
+# Overview
+
+If you want to know more about how and when you’ll be reimbursed through Expensify, we’ve answered your questions below. 
+
+# How to Get Reimbursed 
+
+To get paid back after submitting a report for reimbursement, you’ll want to be sure to connect your bank account. You can do that under **Settings** > **Account** > **Payments** > **Add a Deposit Account**. Once your employer has approved your report, the reimbursement will be paid into the account you added.
+
+# Deep Dive
+
+## Reimbursement Timing 
+
+### US Bank Accounts
+
+If your company uses Expensify's ACH reimbursement we'll first check to see if the report is eligible for Rapid Reimbursement (next business day). For a report to be eligible for Rapid Reimbursement it must fall under two limits:
+
+ - $100 per deposit bank account per day or less for the individuals being reimbursed or businesses receiving payments for bills.
+ - Less than $10,000 being disbursed in a 24-hour time period from the verified bank account being used to pay the reimbursement.
+
+If the request passes both checks, then you can expect to see funds deposited into your bank account on the next business day.
+
+If either limit has been reached, then you can expect to see funds deposited within your bank account within the typical ACH timeframe of 3-5 business days.
+
+### International Bank Accounts
+
+If receiving reimbursement to an international deposit account via Global Reimbursement, you should expect to see funds deposited in your bank account within 4 business days.
+
+## Bank Processing Timeframes
+
+Banks only process transactions and ACH activity on weekdays that are not bank holidays. These are considered business days. Additionally, the business day on which a transaction will be processed depends upon whether or not a request is created before or after the cutoff time, which is typically 3 pm PST.
+For example, if your reimbursement is initiated at 4 pm on Wednesday, this is past the bank's cutoff time,  and it will not begin processing until the next business day.
+If that same reimbursement starts processing on Thursday, and it's estimated to take 3-5 business days, this will cover a weekend, and both days are not considered business days. So, assuming there are no bank holidays added into this mix, here is how that reimbursement timeline would play out:
+
+**Wednesday**: Reimbursement initiated after 3 pm PST; will be processed the next business day by your company’s bank.
+**Thursday**: Your company's bank will begin processing the withdrawal request
+**Friday**: Business day 1
+**Saturday**: Weekend
+**Sunday**: Weekend
+**Monday**: Business day 2
+**Tuesday**: Business day 3
+**Wednesday**: Business day 4
+**Thursday**: Business day 5

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.74.2</string>
+	<string>1.3.74.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.74-2",
+  "version": "1.3.74-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST.ts

@@ -1369,6 +1369,7 @@ const CONST = {
         MERCHANT: 'merchant',
         CATEGORY: 'category',
         RECEIPT: 'receipt',
+        DISTANCE: 'distance',
         TAG: 'tag',
     },
     FOOTER: {

src/ROUTES.ts

@@ -5,19 +5,18 @@ import CONST from './CONST';
  * This is a file containing constants for all of the routes we want to be able to go to
  */
 
-// prettier-ignore
 export default {
     HOME: '',
     /** This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated */
     CONCIERGE: 'concierge',
     FLAG_COMMENT: {
         route: 'flag/:reportID/:reportActionID',
-        getRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}`
+        getRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}`,
     },
     SEARCH: 'search',
     DETAILS: {
         route: 'details',
-        getRoute: (login: string) => `details?login=${encodeURIComponent(login)}`
+        getRoute: (login: string) => `details?login=${encodeURIComponent(login)}`,
     },
     PROFILE: {
         route: 'a/:accountID',
@@ -31,7 +30,7 @@ export default {
     VALIDATE_LOGIN: 'v/:accountID/:validateCode',
     GET_ASSISTANCE: {
         route: 'get-assistance/:taskID',
-        getRoute: (taskID: string) => `get-assistance/${taskID}`
+        getRoute: (taskID: string) => `get-assistance/${taskID}`,
     },
     UNLINK_LOGIN: 'u/:accountID/:validateCode',
     APPLE_SIGN_IN: 'sign-in-with-apple',
@@ -102,137 +101,141 @@ export default {
     REPORT: 'r',
     REPORT_WITH_ID: {
         route: 'r/:reportID?/:reportActionID?',
-        getRoute: (reportID: string) => `r/${reportID}`
+        getRoute: (reportID: string) => `r/${reportID}`,
     },
     EDIT_REQUEST: {
         route: 'r/:threadReportID/edit/:field',
-        getRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}`
+        getRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}`,
     },
     EDIT_CURRENCY_REQUEST: {
         route: 'r/:threadReportID/edit/currency',
         getRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}`,
     },
     REPORT_WITH_ID_DETAILS_SHARE_CODE: {
         route: 'r/:reportID/details/shareCode',
-        getRoute: (reportID: string) => `r/${reportID}/details/shareCode`
+        getRoute: (reportID: string) => `r/${reportID}/details/shareCode`,
     },
     REPORT_ATTACHMENTS: {
         route: 'r/:reportID/attachment',
-        getRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURI(source)}`
+        getRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURI(source)}`,
     },
     REPORT_PARTICIPANTS: {
         route: 'r/:reportID/participants',
-        getRoute: (reportID: string) => `r/${reportID}/participants`
+        getRoute: (reportID: string) => `r/${reportID}/participants`,
     },
     REPORT_WITH_ID_DETAILS: {
         route: 'r/:reportID/details',
-        getRoute: (reportID: string) => `r/${reportID}/details`
+        getRoute: (reportID: string) => `r/${reportID}/details`,
     },
     REPORT_SETTINGS: {
         route: 'r/:reportID/settings',
-        getRoute: (reportID: string) => `r/${reportID}/settings`
+        getRoute: (reportID: string) => `r/${reportID}/settings`,
     },
     REPORT_SETTINGS_ROOM_NAME: {
         route: 'r/:reportID/settings/room-name',
-        getRoute: (reportID: string) => `r/${reportID}/settings/room-name`
+        getRoute: (reportID: string) => `r/${reportID}/settings/room-name`,
     },
     REPORT_SETTINGS_NOTIFICATION_PREFERENCES: {
         route: 'r/:reportID/settings/notification-preferences',
-        getRoute: (reportID: string) => `r/${reportID}/settings/notification-preferences`
+        getRoute: (reportID: string) => `r/${reportID}/settings/notification-preferences`,
     },
     REPORT_SETTINGS_WRITE_CAPABILITY: {
         route: 'r/:reportID/settings/who-can-post',
-        getRoute: (reportID: string) => `r/${reportID}/settings/who-can-post`
+        getRoute: (reportID: string) => `r/${reportID}/settings/who-can-post`,
     },
     REPORT_WELCOME_MESSAGE: {
         route: 'r/:reportID/welcomeMessage',
-        getRoute: (reportID: string) => `r/${reportID}/welcomeMessage`
+        getRoute: (reportID: string) => `r/${reportID}/welcomeMessage`,
     },
     SPLIT_BILL_DETAILS: {
         route: 'r/:reportID/split/:reportActionID',
-        getRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`
+        getRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`,
     },
     TASK_TITLE: {
         route: 'r/:reportID/title',
-        getRoute: (reportID: string) => `r/${reportID}/title`
+        getRoute: (reportID: string) => `r/${reportID}/title`,
     },
     TASK_DESCRIPTION: {
         route: 'r/:reportID/description',
-        getRoute: (reportID: string) => `r/${reportID}/description`
+        getRoute: (reportID: string) => `r/${reportID}/description`,
     },
     TASK_ASSIGNEE: {
         route: 'r/:reportID/assignee',
-        getRoute: (reportID: string) => `r/${reportID}/assignee`
+        getRoute: (reportID: string) => `r/${reportID}/assignee`,
     },
     PRIVATE_NOTES_VIEW: {
         route: 'r/:reportID/notes/:accountID',
-        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}`
+        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}`,
     },
     PRIVATE_NOTES_LIST: {
         route: 'r/:reportID/notes',
-        getRoute: (reportID: string) => `r/${reportID}/notes`
+        getRoute: (reportID: string) => `r/${reportID}/notes`,
     },
     PRIVATE_NOTES_EDIT: {
         route: 'r/:reportID/notes/:accountID/edit',
-        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}/edit`
+        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}/edit`,
     },
 
     // To see the available iouType, please refer to CONST.IOU.MONEY_REQUEST_TYPE
     MONEY_REQUEST: {
         route: ':iouType/new/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}`,
     },
     MONEY_REQUEST_AMOUNT: {
         route: ':iouType/new/amount/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/amount/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/amount/${reportID}`,
     },
     MONEY_REQUEST_PARTICIPANTS: {
         route: ':iouType/new/participants/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}`,
     },
     MONEY_REQUEST_CONFIRMATION: {
         route: ':iouType/new/confirmation/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
     },
     MONEY_REQUEST_DATE: {
         route: ':iouType/new/date/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/date/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/date/${reportID}`,
     },
     MONEY_REQUEST_CURRENCY: {
         route: ':iouType/new/currency/:reportID?',
         getRoute: (iouType: string, reportID: string, currency: string, backTo: string) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
     },
     MONEY_REQUEST_DESCRIPTION: {
         route: ':iouType/new/description/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/description/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/description/${reportID}`,
     },
     MONEY_REQUEST_CATEGORY: {
         route: ':iouType/new/category/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/category/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/category/${reportID}`,
     },
     MONEY_REQUEST_TAG: {
         route: ':iouType/new/tag/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`,
     },
     MONEY_REQUEST_MERCHANT: {
         route: ':iouType/new/merchant/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`,
     },
     MONEY_REQUEST_WAYPOINT: {
         route: ':iouType/new/waypoint/:waypointIndex',
-        getRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`
+        getRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`,
     },
     MONEY_REQUEST_RECEIPT: {
         route: ':iouType/new/receipt/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/receipt/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/receipt/${reportID}`,
     },
-    MONEY_REQUEST_ADDRESS: {
+    MONEY_REQUEST_DISTANCE: {
         route: ':iouType/new/address/:reportID?',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/address/${reportID}`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/address/${reportID}`,
+    },
+    MONEY_REQUEST_EDIT_WAYPOINT: {
+        route: 'r/:threadReportID/edit/distance/:transactionID/waypoint/:waypointIndex',
+        getRoute: (threadReportID: number, transactionID: string, waypointIndex: number) => `r/${threadReportID}/edit/distance/${transactionID}/waypoint/${waypointIndex}`,
     },
     MONEY_REQUEST_DISTANCE_TAB: {
         route: ':iouType/new/:reportID?/distance',
-        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`,
     },
     MONEY_REQUEST_MANUAL_TAB: ':iouType/new/:reportID?/manual',
     MONEY_REQUEST_SCAN_TAB: ':iouType/new/:reportID?/scan',
@@ -259,47 +262,47 @@ export default {
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
     WORKSPACE_INITIAL: {
         route: 'workspace/:policyID',
-        getRoute: (policyID: string) => `workspace/${policyID}`
+        getRoute: (policyID: string) => `workspace/${policyID}`,
     },
     WORKSPACE_INVITE: {
         route: 'workspace/:policyID/invite',
-        getRoute: (policyID: string) => `workspace/${policyID}/invite`
+        getRoute: (policyID: string) => `workspace/${policyID}/invite`,
     },
     WORKSPACE_INVITE_MESSAGE: {
         route: 'workspace/:policyID/invite-message',
-        getRoute: (policyID: string) => `workspace/${policyID}/invite-message`
+        getRoute: (policyID: string) => `workspace/${policyID}/invite-message`,
     },
     WORKSPACE_SETTINGS: {
         route: 'workspace/:policyID/settings',
-        getRoute: (policyID: string) => `workspace/${policyID}/settings`
+        getRoute: (policyID: string) => `workspace/${policyID}/settings`,
     },
     WORKSPACE_CARD: {
         route: 'workspace/:policyID/card',
-        getRoute: (policyID: string) => `workspace/${policyID}/card`
+        getRoute: (policyID: string) => `workspace/${policyID}/card`,
     },
     WORKSPACE_REIMBURSE: {
         route: 'workspace/:policyID/reimburse',
-        getRoute: (policyID: string) => `workspace/${policyID}/reimburse`
+        getRoute: (policyID: string) => `workspace/${policyID}/reimburse`,
     },
     WORKSPACE_RATE_AND_UNIT: {
         route: 'workspace/:policyID/rateandunit',
-        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit`
+        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit`,
     },
     WORKSPACE_BILLS: {
         route: 'workspace/:policyID/bills',
-        getRoute: (policyID: string) => `workspace/${policyID}/bills`
+        getRoute: (policyID: string) => `workspace/${policyID}/bills`,
     },
     WORKSPACE_INVOICES: {
         route: 'workspace/:policyID/invoices',
-        getRoute: (policyID: string) => `workspace/${policyID}/invoices`
+        getRoute: (policyID: string) => `workspace/${policyID}/invoices`,
     },
     WORKSPACE_TRAVEL: {
         route: 'workspace/:policyID/travel',
-        getRoute: (policyID: string) => `workspace/${policyID}/travel`
+        getRoute: (policyID: string) => `workspace/${policyID}/travel`,
     },
     WORKSPACE_MEMBERS: {
         route: 'workspace/:policyID/members',
-        getRoute: (policyID: string) => `workspace/${policyID}/members`
+        getRoute: (policyID: string) => `workspace/${policyID}/members`,
     },
 
     // These are some on-off routes that will be removed once they're no longer needed (see GH issues for details)