From 8de612df66e2c3c171e6d0c6824c1efdbc404549 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 25 Nov 2021 16:58:29 -0800 Subject: [PATCH 1/3] Merge pull request #6493 from Expensify/version-BUILD-4d0a82e37f2b3b916d569bd87ed8e1dae4d3f5c1 (cherry picked from commit 2aaa8fd10bec0cfb6346140595a5f55540edacd9) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bd11afc5684c..c3672e7c396a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,8 +149,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001011609 - versionName "1.1.16-9" + versionCode 1001011610 + versionName "1.1.16-10" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index cbd23dd985ba..47c1a0d221e7 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.16.9 + 1.1.16.10 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index cff0516ad211..8741ab5bc6ef 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.16.9 + 1.1.16.10 diff --git a/package-lock.json b/package-lock.json index a9dbf391c7f9..f8905085e968 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-9", + "version": "1.1.16-10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a8e56bcfbd99..0b65d6c63a08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-9", + "version": "1.1.16-10", "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 ffc4a73efac4f20f3ce06f5330f256e60dc54113 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 25 Nov 2021 17:56:02 -0700 Subject: [PATCH 2/3] Merge pull request #6483 from Expensify/cmartins-fixCONSTimport [No QA] Fix const import on staging (cherry picked from commit 4d0a82e37f2b3b916d569bd87ed8e1dae4d3f5c1) --- src/pages/ReimbursementAccount/EnableStep.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js index b9fbb008a32f..d1507e48600a 100644 --- a/src/pages/ReimbursementAccount/EnableStep.js +++ b/src/pages/ReimbursementAccount/EnableStep.js @@ -10,7 +10,12 @@ import Navigation from '../../libs/Navigation/Navigation'; import Text from '../../components/Text'; import compose from '../../libs/compose'; import ONYXKEYS from '../../ONYXKEYS'; +<<<<<<< HEAD import {Mail, Close} from '../../components/Icon/Expensicons'; +======= +import CONST from '../../CONST'; +import * as Expensicons from '../../components/Icon/Expensicons'; +>>>>>>> 4d0a82e37 (Merge pull request #6483 from Expensify/cmartins-fixCONSTimport) import MenuItem from '../../components/MenuItem'; import getBankIcon from '../../components/Icon/BankIcons'; import {getPaymentMethods} from '../../libs/actions/PaymentMethods'; @@ -19,10 +24,17 @@ import bankAccountPropTypes from '../../components/bankAccountPropTypes'; import confettiPop from '../../../assets/images/confetti-pop.gif'; import Icon from '../../components/Icon'; import WorkspaceSection from '../workspace/WorkspaceSection'; +<<<<<<< HEAD import {ConciergeBlue} from '../../components/Icon/Illustrations'; import {requestResetFreePlanBankAccount} from '../../libs/actions/BankAccounts'; import {openOldDotLink} from '../../libs/actions/Link'; import {subscribeToExpensifyCardUpdates} from '../../libs/actions/User'; +======= +import * as Illustrations from '../../components/Icon/Illustrations'; +import * as BankAccounts from '../../libs/actions/BankAccounts'; +import * as Link from '../../libs/actions/Link'; +import * as User from '../../libs/actions/User'; +>>>>>>> 4d0a82e37 (Merge pull request #6483 from Expensify/cmartins-fixCONSTimport) const propTypes = { /** Are we loading payment methods? */ From bb65f1789086265db59fd1d9f166e9b046712125 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 25 Nov 2021 18:10:36 -0700 Subject: [PATCH 3/3] resolve conflicts --- ios/Podfile.lock | 2 +- src/pages/ReimbursementAccount/EnableStep.js | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 39f38e7206ee..2574f4091645 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -825,7 +825,7 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53 - FBReactNativeSpec: 1d564cbdef3e1546843d1f1ceb0e4463b7993e3a + FBReactNativeSpec: 9f813f735901d719751da82f0365b5c506c28f14 Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f FirebaseABTesting: c3e48ebf5e7e5c674c5a131c68e941d7921d83dc FirebaseAnalytics: 4751d6a49598a2b58da678cc07df696bcd809ab9 diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js index d1507e48600a..b7806447695f 100644 --- a/src/pages/ReimbursementAccount/EnableStep.js +++ b/src/pages/ReimbursementAccount/EnableStep.js @@ -10,12 +10,8 @@ import Navigation from '../../libs/Navigation/Navigation'; import Text from '../../components/Text'; import compose from '../../libs/compose'; import ONYXKEYS from '../../ONYXKEYS'; -<<<<<<< HEAD -import {Mail, Close} from '../../components/Icon/Expensicons'; -======= import CONST from '../../CONST'; -import * as Expensicons from '../../components/Icon/Expensicons'; ->>>>>>> 4d0a82e37 (Merge pull request #6483 from Expensify/cmartins-fixCONSTimport) +import {Mail, Close} from '../../components/Icon/Expensicons'; import MenuItem from '../../components/MenuItem'; import getBankIcon from '../../components/Icon/BankIcons'; import {getPaymentMethods} from '../../libs/actions/PaymentMethods'; @@ -24,17 +20,10 @@ import bankAccountPropTypes from '../../components/bankAccountPropTypes'; import confettiPop from '../../../assets/images/confetti-pop.gif'; import Icon from '../../components/Icon'; import WorkspaceSection from '../workspace/WorkspaceSection'; -<<<<<<< HEAD import {ConciergeBlue} from '../../components/Icon/Illustrations'; import {requestResetFreePlanBankAccount} from '../../libs/actions/BankAccounts'; import {openOldDotLink} from '../../libs/actions/Link'; import {subscribeToExpensifyCardUpdates} from '../../libs/actions/User'; -======= -import * as Illustrations from '../../components/Icon/Illustrations'; -import * as BankAccounts from '../../libs/actions/BankAccounts'; -import * as Link from '../../libs/actions/Link'; -import * as User from '../../libs/actions/User'; ->>>>>>> 4d0a82e37 (Merge pull request #6483 from Expensify/cmartins-fixCONSTimport) const propTypes = { /** Are we loading payment methods? */