From 62c4f41efc66e70a9aa8fcd1653cf451983bfbf4 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 4 Oct 2022 17:18:03 -0400 Subject: [PATCH 1/2] Merge pull request #11593 from Expensify/version-BUILD-A11FB3F7-8C26-4024-A98B-8652ECA2DAC5 Update version to 1.2.11-3 on main (cherry picked from commit 5d05cc7e1df9ecb036dcedbff766310ffa6bcf1a) --- 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 cfff4ef2be5a..4bd11d4e5a88 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001021102 - versionName "1.2.11-2" + versionCode 1001021103 + versionName "1.2.11-3" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 19a70a9bfe3a..af004baa6d89 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.11.2 + 1.2.11.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a3bc9009ea2b..2abe543d2735 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.11.2 + 1.2.11.3 diff --git a/package-lock.json b/package-lock.json index 5ba725a822d7..56600d4fd275 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.11-2", + "version": "1.2.11-3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.11-2", + "version": "1.2.11-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a2510e60e43b..ec6c26f23cb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.11-2", + "version": "1.2.11-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.", From c44672a1b7c3501bf2af180d34073f122df7ad09 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 4 Oct 2022 15:12:38 -0600 Subject: [PATCH 2/2] Merge pull request #11556 from Expensify/marco-fixWorkspaceBankAccountStep2 [CP Staging] save routingNumber and accountNumber in connectBankAccountManually (cherry picked from commit 6c089c8a65028fd4f9af054ee5002b489897daac) --- src/libs/ReimbursementAccountUtils.js | 1 + src/libs/actions/FormActions.js | 9 +++++++++ src/pages/ReimbursementAccount/CompanyStep.js | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/libs/ReimbursementAccountUtils.js b/src/libs/ReimbursementAccountUtils.js index 4074f1e8ab6c..2e6570880233 100644 --- a/src/libs/ReimbursementAccountUtils.js +++ b/src/libs/ReimbursementAccountUtils.js @@ -35,6 +35,7 @@ function getDefaultStateForField(props, fieldName, defaultValue = '') { function getBankAccountFields(props, fieldNames) { return { ..._.pick(lodashGet(props, 'reimbursementAccount.achData'), ...fieldNames), + ..._.pick(lodashGet(props, 'reimbursementAccountDraftValues'), ...fieldNames), ..._.pick(props.reimbursementAccountDraft, ...fieldNames), }; } diff --git a/src/libs/actions/FormActions.js b/src/libs/actions/FormActions.js index 188d10b759b7..0cadc9236548 100644 --- a/src/libs/actions/FormActions.js +++ b/src/libs/actions/FormActions.js @@ -24,7 +24,16 @@ function setDraftValues(formID, draftValues) { Onyx.merge(`${formID}DraftValues`, draftValues); } +/** + * @param {String} formID + * @returns {String} + */ +function getDraftValuesKey(formID) { + return `${formID}DraftValues`; +} + export { + getDraftValuesKey, setIsLoading, setErrors, setDraftValues, diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js index 29ea6bfea723..4c806b821f7e 100644 --- a/src/pages/ReimbursementAccount/CompanyStep.js +++ b/src/pages/ReimbursementAccount/CompanyStep.js @@ -26,6 +26,7 @@ import AddressForm from './AddressForm'; import ReimbursementAccountForm from './ReimbursementAccountForm'; import * as ReimbursementAccount from '../../libs/actions/ReimbursementAccount'; import * as ReimbursementAccountUtils from '../../libs/ReimbursementAccountUtils'; +import * as FormActions from '../../libs/actions/FormActions'; const propTypes = { ...withLocalizePropTypes, @@ -312,6 +313,9 @@ export default compose( reimbursementAccountDraft: { key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT, }, + reimbursementAccountDraftValues: { + key: FormActions.getDraftValuesKey(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM), + }, session: { key: ONYXKEYS.SESSION, },