From ff05140ce99bd9ea09ac23393d9e2e36842814fb Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 23 Nov 2021 14:34:02 -0800 Subject: [PATCH 1/3] Merge pull request #6451 from Expensify/version-BUILD-5bf393b0acceea83c98772ff73eca60f6937f0d8 (cherry picked from commit e24b86b5217ef885f6da0eb1b17bbcfec143d13d) --- 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 ce3968f5ea83..5c63f931940d 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 1001011605 - versionName "1.1.16-5" + versionCode 1001011606 + versionName "1.1.16-6" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 72fbb0414fa9..d0a6eda08c6c 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.16.5 + 1.1.16.6 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a0fcf9e54368..ec0a329b14b5 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.16.5 + 1.1.16.6 diff --git a/package-lock.json b/package-lock.json index 2e1d3e53eed7..9eaf41c7b764 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-5", + "version": "1.1.16-6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d6b210db070..e98649b903cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.16-5", + "version": "1.1.16-6", "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 deef03c8df35593e2b0f949a6397e61026e51998 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 19 Nov 2021 12:12:03 -0500 Subject: [PATCH 2/3] Merge pull request #6319 from Expensify/cmartins-autoApproveTriggerCleanUp Deep link to add secondary login in OldDot (cherry picked from commit ceba16fbc8d2af2e97cad6a77ec7bd5a069f81f4) --- src/languages/en.js | 11 ++- src/languages/es.js | 11 ++- src/libs/Pusher/EventType.js | 1 + src/libs/actions/User.js | 1 + src/pages/ReimbursementAccount/EnableStep.js | 17 ++-- .../card/WorkspaceCardVBANoECardView.js | 79 +++++++++++-------- 6 files changed, 77 insertions(+), 43 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 009ab4093e12..318746fe04aa 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -685,12 +685,17 @@ export default { headerWithEcard: 'Cards are ready!', noVBACopy: 'Connect a bank account to issue Expensify Cards to your workspace members, and access these incredible benefits and more:', VBANoECardCopy: 'Add a work email address to issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:', +<<<<<<< HEAD VBAWithECardCopy: 'Access these incredible benefits and more:', +======= + VBAWithECardCopy: 'Enjoy all these incredible benefits:', +>>>>>>> ceba16fbc (Merge pull request #6319 from Expensify/cmartins-autoApproveTriggerCleanUp) benefit1: 'Up to 2% cash back', benefit2: 'Digital and physical cards', benefit3: 'No personal liability', benefit4: 'Customizable limits', - chatWithConcierge: 'Chat with Concierge', + addWorkEmail: 'Add work email address', + checkingDomain: 'Hang tight! We are still working on enabling your Expensify Cards. Check back here in a few minutes.', }, reimburse: { captureReceipts: 'Capture receipts', @@ -754,9 +759,9 @@ export default { streamlinePayments: 'Streamline payments', oneMoreThing: 'One more thing!', allSet: 'You\'re all set!', - accountDescriptionNoCards: 'This bank account will be used to reimburse expenses, collect invoices, and pay bills all from the same account.\n\nConcierge can help you add a work email address to enable the Expensify Card.', + accountDescriptionNoCards: 'This bank account will be used to reimburse expenses, collect invoices, and pay bills all from the same account.\n\nPlease add a work email address as a secondary login to enable the Expensify Card.', accountDescriptionWithCards: 'This bank account will be used to issue corporate cards, reimburse expenses, collect invoices, and pay bills all from the same account.', - chatWithConcierge: 'Chat with Concierge', + addWorkEmail: 'Add work email address', letsFinishInChat: 'Let\'s finish in chat!', almostDone: 'Almost done!', disconnectBankAccount: 'Disconnect bank account', diff --git a/src/languages/es.js b/src/languages/es.js index 2fac0a7f4b35..3affe8971d5f 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -687,12 +687,17 @@ export default { headerWithEcard: '¡Tus tarjetas están listas!', noVBACopy: 'Conecte una cuenta bancaria para emitir tarjetas Expensify a los miembros de su espacio de trabajo y acceda a estos increíbles beneficios y más:', VBANoECardCopy: 'Agrega tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:', +<<<<<<< HEAD VBAWithECardCopy: 'Acceda a estos increíbles beneficios y más:', +======= + VBAWithECardCopy: 'Disfruta de todas estas increíbles ventajas:', +>>>>>>> ceba16fbc (Merge pull request #6319 from Expensify/cmartins-autoApproveTriggerCleanUp) benefit1: 'Hasta un 2% de devolución en tus gastos', benefit2: 'Tarjetas digitales y físicas', benefit3: 'Sin responsabilidad personal', benefit4: 'Límites personalizables', - chatWithConcierge: 'Chatea con Concierge', + addWorkEmail: 'Añadir correo electrónico de trabajo', + checkingDomain: '¡Un momento! Estamos todavía trabajando para habilitar tu Tarjeta Expensify. Vuelve aquí en unos minutos.', }, reimburse: { captureReceipts: 'Captura recibos', @@ -756,9 +761,9 @@ export default { streamlinePayments: 'Optimiza pagos', oneMoreThing: '¡Una cosa más!', allSet: '¡Todo listo!', - accountDescriptionNoCards: 'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta. Concierge puede ayudarte a añadir tu correo de trabajo para activar la Tarjeta Expensify.', + accountDescriptionNoCards: 'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.\n\nPor favor añade un correo electrónico de trabajo como tu nombre de usuario secundario para activar la Tarjeta Expensify.', accountDescriptionWithCards: 'Esta cuenta bancaria se utilizará para emitir tarjetas corporativas, reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.', - chatWithConcierge: 'Chat con Concierge', + addWorkEmail: 'Añadir correo electrónico de trabajo', letsFinishInChat: '¡Continuemos en el chat!', almostDone: '¡Casi listo!', disconnectBankAccount: 'Desconectar cuenta bancaria', diff --git a/src/libs/Pusher/EventType.js b/src/libs/Pusher/EventType.js index 8eb739869fd2..76cb1b354c1d 100644 --- a/src/libs/Pusher/EventType.js +++ b/src/libs/Pusher/EventType.js @@ -7,4 +7,5 @@ export default { REPORT_COMMENT_EDIT: 'reportCommentEdit', REPORT_TOGGLE_PINNED: 'reportTogglePinned', PREFERRED_LOCALE: 'preferredLocale', + EXPENSIFY_CARD_UPDATE: 'expensifyCardUpdate', }; diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js index 1966758a2145..49b561ceb985 100644 --- a/src/libs/actions/User.js +++ b/src/libs/actions/User.js @@ -343,4 +343,5 @@ export { setPreferredSkinTone, setShouldUseSecureStaging, clearUserErrorMessage, + subscribeToExpensifyCardUpdates, }; diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js index d3e1366b7b2c..a2dbefbae0df 100644 --- a/src/pages/ReimbursementAccount/EnableStep.js +++ b/src/pages/ReimbursementAccount/EnableStep.js @@ -10,18 +10,19 @@ import Navigation from '../../libs/Navigation/Navigation'; import Text from '../../components/Text'; import compose from '../../libs/compose'; import ONYXKEYS from '../../ONYXKEYS'; -import {ChatBubble, Close} from '../../components/Icon/Expensicons'; +import {Mail, Close} from '../../components/Icon/Expensicons'; import MenuItem from '../../components/MenuItem'; import getBankIcon from '../../components/Icon/BankIcons'; import {getPaymentMethods} from '../../libs/actions/PaymentMethods'; import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator'; import bankAccountPropTypes from '../../components/bankAccountPropTypes'; -import {navigateToConciergeChat} from '../../libs/actions/Report'; import confettiPop from '../../../assets/images/confetti-pop.gif'; import Icon from '../../components/Icon'; import WorkspaceSection from '../workspace/WorkspaceSection'; import {ConciergeBlue} from '../../components/Icon/Illustrations'; import {requestResetFreePlanBankAccount} from '../../libs/actions/BankAccounts'; +import {openOldDotLink} from '../../libs/actions/Link'; +import {subscribeToExpensifyCardUpdates} from '../../libs/actions/User'; const propTypes = { /** Are we loading payment methods? */ @@ -72,10 +73,11 @@ class EnableStep extends React.Component { }]; if (!isUsingExpensifyCard) { menuItems.unshift({ - title: this.props.translate('workspace.bankAccount.chatWithConcierge'), - icon: ChatBubble, + title: this.props.translate('workspace.bankAccount.addWorkEmail'), + icon: Mail, onPress: () => { - navigateToConciergeChat(); + openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); + subscribeToExpensifyCardUpdates(); }, shouldShowRightIcon: true, }); @@ -111,6 +113,11 @@ class EnableStep extends React.Component { : this.props.translate('workspace.bankAccount.accountDescriptionWithCards')} + {this.props.user.isCheckingDomain && ( + + {this.props.translate('workspace.card.checkingDomain')} + + )} ); diff --git a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js index a0b158532edb..b0a143519c0e 100644 --- a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js +++ b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js @@ -1,55 +1,70 @@ import React from 'react'; import {View} from 'react-native'; +import {withOnyx} from 'react-native-onyx'; import Text from '../../../components/Text'; import styles from '../../../styles/styles'; import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; -import {Concierge} from '../../../components/Icon/Expensicons'; +import {Mail} from '../../../components/Icon/Expensicons'; import {JewelBoxBlue} from '../../../components/Icon/Illustrations'; import UnorderedList from '../../../components/UnorderedList'; import WorkspaceSection from '../WorkspaceSection'; -import {navigateToConciergeChat} from '../../../libs/actions/Report'; import Navigation from '../../../libs/Navigation/Navigation'; +import {openOldDotLink} from '../../../libs/actions/Link'; +import {subscribeToExpensifyCardUpdates} from '../../../libs/actions/User'; +import ONYXKEYS from '../../../ONYXKEYS'; +import compose from '../../../libs/compose'; const propTypes = { ...withLocalizePropTypes, }; const WorkspaceCardVBANoECardView = props => ( - { - Navigation.dismissModal(); - navigateToConciergeChat(); + <> + { + Navigation.dismissModal(); + openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}'); + subscribeToExpensifyCardUpdates(); + }, + icon: Mail, + shouldShowRightIcon: true, }, - icon: Concierge, - shouldShowRightIcon: true, - }, - ]} - > - - {props.translate('workspace.card.VBANoECardCopy')} - - - + > + + {props.translate('workspace.card.VBANoECardCopy')} + - - {props.translate('workspace.card.conciergeCanHelp')} - - + + + {props.user.isCheckingDomain && ( + + {props.translate('workspace.card.checkingDomain')} + + )} + ); WorkspaceCardVBANoECardView.propTypes = propTypes; WorkspaceCardVBANoECardView.displayName = 'WorkspaceCardVBANoECardView'; -export default withLocalize(WorkspaceCardVBANoECardView); +export default compose( + withLocalize, + withOnyx({ + user: { + key: ONYXKEYS.USER, + }, + }), +)(WorkspaceCardVBANoECardView); From eb389498be08e4364772273bd4c638ffce3a2b59 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Tue, 23 Nov 2021 14:49:44 -0800 Subject: [PATCH 3/3] Resolve merge conflicts --- src/languages/en.js | 4 ---- src/languages/es.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 318746fe04aa..39d4a861734c 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -685,11 +685,7 @@ export default { headerWithEcard: 'Cards are ready!', noVBACopy: 'Connect a bank account to issue Expensify Cards to your workspace members, and access these incredible benefits and more:', VBANoECardCopy: 'Add a work email address to issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:', -<<<<<<< HEAD VBAWithECardCopy: 'Access these incredible benefits and more:', -======= - VBAWithECardCopy: 'Enjoy all these incredible benefits:', ->>>>>>> ceba16fbc (Merge pull request #6319 from Expensify/cmartins-autoApproveTriggerCleanUp) benefit1: 'Up to 2% cash back', benefit2: 'Digital and physical cards', benefit3: 'No personal liability', diff --git a/src/languages/es.js b/src/languages/es.js index 3affe8971d5f..7185a5be3cbe 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -687,11 +687,7 @@ export default { headerWithEcard: '¡Tus tarjetas están listas!', noVBACopy: 'Conecte una cuenta bancaria para emitir tarjetas Expensify a los miembros de su espacio de trabajo y acceda a estos increíbles beneficios y más:', VBANoECardCopy: 'Agrega tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:', -<<<<<<< HEAD VBAWithECardCopy: 'Acceda a estos increíbles beneficios y más:', -======= - VBAWithECardCopy: 'Disfruta de todas estas increíbles ventajas:', ->>>>>>> ceba16fbc (Merge pull request #6319 from Expensify/cmartins-autoApproveTriggerCleanUp) benefit1: 'Hasta un 2% de devolución en tus gastos', benefit2: 'Tarjetas digitales y físicas', benefit3: 'Sin responsabilidad personal',