From 9dcb5a939e6e13fbe6d337cc5ebe4f2eece75794 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 25 Nov 2021 11:19:51 -0800 Subject: [PATCH 1/3] Merge pull request #6480 from Expensify/version-BUILD-dd291dcda0886133405de87573022edd6357818a (cherry picked from commit d0d1d5803796d8156eafa91089dd0674155c6ab7) --- 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 37ca932255d1..bd11afc5684c 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 1001011608 - versionName "1.1.16-8" + versionCode 1001011609 + versionName "1.1.16-9" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index bc346cf06b02..cbd23dd985ba 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.16.8 + 1.1.16.9 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 4bec7322479a..cff0516ad211 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.16.8 + 1.1.16.9 diff --git a/package-lock.json b/package-lock.json index 7916c7a3d4fe..a9dbf391c7f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-8", + "version": "1.1.16-9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ce7dfc73ce9e..a8e56bcfbd99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-8", + "version": "1.1.16-9", "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 4aeec901264ba8c6e818744a1e5e9f004c454c85 Mon Sep 17 00:00:00 2001 From: Maxence Coulibaly Date: Thu, 25 Nov 2021 19:17:29 +0000 Subject: [PATCH 2/3] Merge pull request #6479 from Expensify/cmartins-encodeURL Encode secondary login URL (cherry picked from commit dd291dcda0886133405de87573022edd6357818a) --- src/CONST.js | 2 +- src/pages/ReimbursementAccount/EnableStep.js | 13 +++++++++++++ .../workspace/card/WorkspaceCardVBANoECardView.js | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/CONST.js b/src/CONST.js index b62c38fb0057..bcbd01937263 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -137,7 +137,7 @@ const CONST = { PRIVACY_URL: 'https://use.expensify.com/privacy', LICENSES_URL: 'https://use.expensify.com/licenses', PLAY_STORE_URL: 'https://play.google.com/store/apps/details?id=com.expensify.chat&hl=en', - ADD_SECONDARY_LOGIN_URL: 'settings?param={%22section%22:%22account%22}', + ADD_SECONDARY_LOGIN_URL: encodeURI('settings?param={"section":"account","openModal":"secondaryLogin"}'), MANAGE_CARDS_URL: 'domain_companycards', FEES_URL: 'https://use.expensify.com/fees', CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid', diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js index a2dbefbae0df..cc97996452ce 100644 --- a/src/pages/ReimbursementAccount/EnableStep.js +++ b/src/pages/ReimbursementAccount/EnableStep.js @@ -19,10 +19,18 @@ 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'; +import CONST from '../../CONST'; +>>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) const propTypes = { /** Are we loading payment methods? */ @@ -76,8 +84,13 @@ class EnableStep extends React.Component { title: this.props.translate('workspace.bankAccount.addWorkEmail'), icon: Mail, onPress: () => { +<<<<<<< HEAD openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); subscribeToExpensifyCardUpdates(); +======= + Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); + User.subscribeToExpensifyCardUpdates(); +>>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) }, shouldShowRightIcon: true, }); diff --git a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js index b0a143519c0e..656682bb0405 100644 --- a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js +++ b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js @@ -13,6 +13,7 @@ import {openOldDotLink} from '../../../libs/actions/Link'; import {subscribeToExpensifyCardUpdates} from '../../../libs/actions/User'; import ONYXKEYS from '../../../ONYXKEYS'; import compose from '../../../libs/compose'; +import CONST from '../../../CONST'; const propTypes = { ...withLocalizePropTypes, @@ -28,8 +29,13 @@ const WorkspaceCardVBANoECardView = props => ( title: props.translate('workspace.card.addWorkEmail'), onPress: () => { Navigation.dismissModal(); +<<<<<<< HEAD openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); subscribeToExpensifyCardUpdates(); +======= + Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); + User.subscribeToExpensifyCardUpdates(); +>>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) }, icon: Mail, shouldShowRightIcon: true, From 77a41fe7e008efe6f6d18d7c3b7bf82aff651959 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 25 Nov 2021 13:49:06 -0700 Subject: [PATCH 3/3] resolve conflicts --- src/pages/ReimbursementAccount/EnableStep.js | 15 +-------------- .../workspace/card/WorkspaceCardVBANoECardView.js | 7 +------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js index cc97996452ce..b9fbb008a32f 100644 --- a/src/pages/ReimbursementAccount/EnableStep.js +++ b/src/pages/ReimbursementAccount/EnableStep.js @@ -19,18 +19,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'; -import CONST from '../../CONST'; ->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) const propTypes = { /** Are we loading payment methods? */ @@ -84,13 +76,8 @@ class EnableStep extends React.Component { title: this.props.translate('workspace.bankAccount.addWorkEmail'), icon: Mail, onPress: () => { -<<<<<<< HEAD - openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); + openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); subscribeToExpensifyCardUpdates(); -======= - Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); - User.subscribeToExpensifyCardUpdates(); ->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) }, shouldShowRightIcon: true, }); diff --git a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js index 656682bb0405..0f45d1bd486a 100644 --- a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js +++ b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js @@ -29,13 +29,8 @@ const WorkspaceCardVBANoECardView = props => ( title: props.translate('workspace.card.addWorkEmail'), onPress: () => { Navigation.dismissModal(); -<<<<<<< HEAD - openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); + openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); subscribeToExpensifyCardUpdates(); -======= - Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL); - User.subscribeToExpensifyCardUpdates(); ->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL) }, icon: Mail, shouldShowRightIcon: true,