From 862cce7e3554134c498902addd1077e2fe736cef Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 29 May 2023 14:14:35 -0400 Subject: [PATCH 1/2] Merge pull request #19755 from Expensify/version-BUILD-129B6B26-0890-4F23-B659-121ECD426E6F Update version to 1.3.19-5 on main (cherry picked from commit f332c64efcd5a840ea22fcd01b64cd1ff82abb4f) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 64bf1a1e2277..66b62ebb2f18 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001031904 - versionName "1.3.19-4" + versionCode 1001031905 + versionName "1.3.19-5" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 20ec4f624b3d..2c77f9183387 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.19.4 + 1.3.19.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5577345e1c83..9d012205885e 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.19.4 + 1.3.19.5 diff --git a/package-lock.json b/package-lock.json index adf0670c37c5..a86956eb4fd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.19-4", + "version": "1.3.19-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.19-4", + "version": "1.3.19-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c0819e274327..cc0efef8cdca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.19-4", + "version": "1.3.19-5", "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.", From c7bee90d4b2b6964c212fcfe7281c5f1bfa5f0a2 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 29 May 2023 12:07:14 -0600 Subject: [PATCH 2/2] Merge pull request #19748 from Expensify/cmartins-fixUnitRates Fix unit rates (cherry picked from commit 6bebb33357a9e39d5d91ed73ca013c1222b96d68) --- src/libs/actions/Policy.js | 2 +- .../reimburse/WorkspaceRateAndUnitPage.js | 5 ++-- .../reimburse/WorkspaceReimburseView.js | 23 +++++++++++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 8fd37a7e30f8..66bcf0ba1392 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -670,7 +670,7 @@ function updateWorkspaceCustomUnitAndRate(policyID, currentCustomUnit, newCustom value: { customUnits: { [currentCustomUnit.customUnitID]: { - ...currentCustomUnit.customUnitID, + customUnitID: currentCustomUnit.customUnitID, rates: { [currentCustomUnit.rates.customUnitRateID]: { ...currentCustomUnit.rates, diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js index 31d218f49a4f..2140adefae7f 100644 --- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js +++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js @@ -105,7 +105,6 @@ class WorkspaceRateAndUnitPage extends React.Component { const distanceCustomRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), (rate) => rate.name === 'Default Rate'); return ( Policy.clearCustomUnitErrors(this.props.policy.id, lodashGet(distanceCustomUnit, 'customUnitID', ''), lodashGet(distanceCustomRate, 'customUnitRateID', '')) } diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js index a065c6c918b9..b1b802a65208 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js @@ -24,6 +24,7 @@ import {withNetwork} from '../../../components/OnyxProvider'; import networkPropTypes from '../../../components/networkPropTypes'; import WorkspaceReimburseSection from './WorkspaceReimburseSection'; import * as BankAccounts from '../../../libs/actions/BankAccounts'; +import OfflineWithFeedback from '../../../components/OfflineWithFeedback'; const propTypes = { /** Policy values needed in the component */ @@ -131,6 +132,8 @@ class WorkspaceReimburseView extends React.Component { render() { const viewAllReceiptsUrl = `expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`; + const distanceCustomUnit = _.find(lodashGet(this.props, 'policy.customUnits', {}), (unit) => unit.name === 'Distance'); + const distanceCustomRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), (rate) => rate.name === 'Default Rate'); return ( <>
{this.props.translate('workspace.reimburse.trackDistanceCopy')} - Navigation.navigate(ROUTES.getWorkspaceRateAndUnitRoute(this.props.policy.id))} - wrapperStyle={[styles.mhn5, styles.wAuto]} - /> + + Navigation.navigate(ROUTES.getWorkspaceRateAndUnitRoute(this.props.policy.id))} + wrapperStyle={[styles.mhn5, styles.wAuto]} + brickRoadIndicator={(lodashGet(distanceCustomUnit, 'errors') || lodashGet(distanceCustomRate, 'errors')) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} + /> +