From 43daf9d754fec546b287d617e4d90e0f8da391ac Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 15 Sep 2022 13:31:31 -0400 Subject: [PATCH 1/2] Merge pull request #11014 from Expensify/version-BUILD-BA4FF65C-7903-4994-AFC1-EB76080AD846 Update version to 1.2.0-5 on main (cherry picked from commit 916452af6f4d4b83dc3d77efd00203c53be4eeb8) --- 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 b683c8e32809..2bc3c6839023 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -155,8 +155,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001020004 - versionName "1.2.0-4" + versionCode 1001020005 + versionName "1.2.0-5" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index cea7a6ce044c..25250fb78772 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.0.4 + 1.2.0.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3a11abf9877f..e9b832b4f5cc 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.0.4 + 1.2.0.5 diff --git a/package-lock.json b/package-lock.json index a9d0ae3fa8b4..e7d4a5359f5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.0-4", + "version": "1.2.0-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.0-4", + "version": "1.2.0-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c6f96cfb24d0..e874b21eb79d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.0-4", + "version": "1.2.0-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 adb83a2e641d650aed6b514e395f01a7ec4d750a Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Thu, 15 Sep 2022 10:25:31 -0700 Subject: [PATCH 2/2] Merge pull request #10974 from Expensify/jasper-removeOnyxRates Remove usages of `onyxRates` (cherry picked from commit 05f41cb8fd713bf2d173a575873546688564b5b8) --- src/libs/actions/Policy.js | 8 ++++---- .../workspace/reimburse/WorkspaceReimburseView.js | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index d8af8be7d7f1..5fac77a56380 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -529,7 +529,7 @@ function clearCustomUnitErrors(policyID, customUnitID, customUnitRateID) { [customUnitID]: { errors: null, pendingAction: null, - onyxRates: { + rates: { [customUnitRateID]: { errors: null, pendingAction: null, @@ -626,7 +626,7 @@ function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, new value: { customUnits: { [customUnitID]: { - onyxRates: { + rates: { [newCustomUnitRate.customUnitRateID]: { ...newCustomUnitRate, errors: null, @@ -646,7 +646,7 @@ function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, new value: { customUnits: { [customUnitID]: { - onyxRates: { + rates: { [newCustomUnitRate.customUnitRateID]: { pendingAction: null, }, @@ -664,7 +664,7 @@ function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, new value: { customUnits: { [customUnitID]: { - onyxRates: { + rates: { [currentCustomUnitRate.customUnitRateID]: { ...currentCustomUnitRate, errors: { diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js index 053e49348872..903775c4f157 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js @@ -40,7 +40,7 @@ const propTypes = { attributes: PropTypes.shape({ unit: PropTypes.string, }), - onyxRates: PropTypes.objectOf( + rates: PropTypes.objectOf( PropTypes.shape({ customUnitRateID: PropTypes.string, name: PropTypes.string, @@ -63,7 +63,7 @@ class WorkspaceReimburseView extends React.Component { constructor(props) { super(props); const distanceCustomUnit = _.find(lodashGet(props, 'policy.customUnits', {}), unit => unit.name === 'Distance'); - const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'onyxRates', {}), rate => rate.name === 'Default Rate'); + const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), rate => rate.name === 'Default Rate'); this.state = { unitID: lodashGet(distanceCustomUnit, 'customUnitID', ''), @@ -99,7 +99,7 @@ class WorkspaceReimburseView extends React.Component { .values() .findWhere({name: CONST.CUSTOM_UNITS.NAME_DISTANCE}) .value(); - const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'onyxRates', {}), rate => rate.name === 'Default Rate'); + const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), rate => rate.name === 'Default Rate'); this.setState({ unitID: lodashGet(distanceCustomUnit, 'customUnitID', ''), unitName: lodashGet(distanceCustomUnit, 'name', ''), @@ -177,7 +177,7 @@ class WorkspaceReimburseView extends React.Component { }); const distanceCustomUnit = _.find(lodashGet(this.props, 'policy.customUnits', {}), unit => unit.name === 'Distance'); - const currentCustomUnitRate = lodashGet(distanceCustomUnit, ['onyxRates', this.state.unitRateID], {}); + const currentCustomUnitRate = lodashGet(distanceCustomUnit, ['rates', this.state.unitRateID], {}); Policy.updateCustomUnitRate(this.props.policyID, currentCustomUnitRate, this.state.unitID, { ...currentCustomUnitRate, rate: numValue.toFixed(3) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET, @@ -223,10 +223,10 @@ class WorkspaceReimburseView extends React.Component { Policy.clearCustomUnitErrors(this.props.policyID, this.state.unitID, this.state.unitRateID)} >