diff --git a/android/app/build.gradle b/android/app/build.gradle index 1e0938a288fe..5600b6971b7b 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 1001023602 - versionName "1.2.36-2" + versionCode 1001023603 + versionName "1.2.36-3" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/assets/images/simple-illustrations/simple-illustration__shield.svg b/assets/images/simple-illustrations/simple-illustration__shield.svg deleted file mode 100644 index 5d56b9c3acb2..000000000000 --- a/assets/images/simple-illustrations/simple-illustration__shield.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index dd5b332dffc5..1cb734fde960 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.36.2 + 1.2.36.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 55d7bc5bbc2e..66d60e085b67 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.36.2 + 1.2.36.3 diff --git a/package-lock.json b/package-lock.json index be3c4ed99b02..a88652479b69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.36-2", + "version": "1.2.36-3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.36-2", + "version": "1.2.36-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 42330cec607b..6bd74b59fcb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.36-2", + "version": "1.2.36-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.", diff --git a/src/components/Icon/Illustrations.js b/src/components/Icon/Illustrations.js index ebfd86846692..20c2006a3b82 100644 --- a/src/components/Icon/Illustrations.js +++ b/src/components/Icon/Illustrations.js @@ -17,7 +17,6 @@ import RocketOrange from '../../../assets/images/product-illustrations/rocket--o import TadaYellow from '../../../assets/images/product-illustrations/tada--yellow.svg'; import TadaBlue from '../../../assets/images/product-illustrations/tada--blue.svg'; import GpsTrackOrange from '../../../assets/images/product-illustrations/gps-track--orange.svg'; -import ShieldYellow from '../../../assets/images/simple-illustrations/simple-illustration__shield.svg'; import MoneyReceipts from '../../../assets/images/simple-illustrations/simple-illustration__money-receipts.svg'; import PinkBill from '../../../assets/images/simple-illustrations/simple-illustration__bill.svg'; import CreditCardsNew from '../../../assets/images/simple-illustrations/simple-illustration__credit-cards.svg'; @@ -55,7 +54,6 @@ export { TadaYellow, TadaBlue, GpsTrackOrange, - ShieldYellow, MoneyReceipts, PinkBill, CreditCardsNew, diff --git a/src/languages/en.js b/src/languages/en.js index bd745b387245..d5ddcbc3a337 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -796,9 +796,6 @@ export default { letsChatCTA: 'Yes, let\'s chat', letsChatText: 'Thanks for doing that. We need your help verifying a few pieces of information, but we can work this out quickly over chat. Ready?', letsChatTitle: 'Let\'s chat!', - enable2FATitle: 'Prevent fraud, enable two-factor authentication!', - enable2FAText: 'We take your security seriously, so please set up two-factor authentication for your account now. That will allow us to dispute Expensify Card digital transactions, and will reduce your risk for fraud.', - secureYourAccount: 'Secure your account', }, beneficialOwnersStep: { additionalInformation: 'Additional information', diff --git a/src/languages/es.js b/src/languages/es.js index 063faca6e4e2..fb0790e31645 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -798,9 +798,6 @@ export default { letsChatCTA: 'Sí, vamos a chatear', letsChatText: 'Gracias. Necesitamos tu ayuda para verificar la información, pero podemos hacerlo rápidamente a través del chat. ¿Estás listo?', letsChatTitle: '¡Vamos a chatear!', - enable2FATitle: 'Evita fraudes, activa la autenticación de dos factores!', - enable2FAText: 'Tu seguridad es importante para nosotros, por favor configura ahora la autenticación de dos factores. Eso nos permitirá disputar las transacciones de la Tarjeta Expensify y reducirá tu riesgo de fraude.', - secureYourAccount: 'Asegura tu cuenta', }, beneficialOwnersStep: { additionalInformation: 'Información adicional', diff --git a/src/pages/ReimbursementAccount/Enable2FAPrompt.js b/src/pages/ReimbursementAccount/Enable2FAPrompt.js deleted file mode 100644 index 6b89006bb43d..000000000000 --- a/src/pages/ReimbursementAccount/Enable2FAPrompt.js +++ /dev/null @@ -1,46 +0,0 @@ -import React from 'react'; -import {View} from 'react-native'; -import Text from '../../components/Text'; -import styles from '../../styles/styles'; -import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; -import * as Expensicons from '../../components/Icon/Expensicons'; -import * as Illustrations from '../../components/Icon/Illustrations'; -import Section from '../../components/Section'; -import * as Link from '../../libs/actions/Link'; -import CONFIG from '../../CONFIG'; -import ROUTES from '../../ROUTES'; -import themeColors from '../../styles/themes/default'; - -const propTypes = { - ...withLocalizePropTypes, -}; -const Enable2FAPrompt = props => ( -
{ - Link.openOldDotLink(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.BANK_ACCOUNT}"}`); - }, - icon: Expensicons.Shield, - shouldShowRightIcon: true, - iconRight: Expensicons.NewWindow, - iconFill: themeColors.success, - wrapperStyle: [styles.cardMenuItem], - }, - ]} - > - - - {props.translate('validationStep.enable2FAText')} - - -
-); - -Enable2FAPrompt.propTypes = propTypes; -Enable2FAPrompt.displayName = 'Enable2FAPrompt'; - -export default withLocalize(Enable2FAPrompt); diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js index 6279cca7519c..97c3d62d54b0 100644 --- a/src/pages/ReimbursementAccount/ValidationStep.js +++ b/src/pages/ReimbursementAccount/ValidationStep.js @@ -1,10 +1,9 @@ import lodashGet from 'lodash/get'; import React from 'react'; -import {ScrollView, View} from 'react-native'; +import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import Str from 'expensify-common/lib/str'; import _ from 'underscore'; -import PropTypes from 'prop-types'; import styles from '../../styles/styles'; import themeColors from '../../styles/themes/default'; import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; @@ -28,20 +27,12 @@ import Section from '../../components/Section'; import CONST from '../../CONST'; import Button from '../../components/Button'; import MenuItem from '../../components/MenuItem'; -import Enable2FAPrompt from './Enable2FAPrompt'; const propTypes = { ...withLocalizePropTypes, /** Bank account currently in setup */ reimbursementAccount: reimbursementAccountPropTypes, - - /** User's account who is setting up bank account */ - account: PropTypes.shape({ - - /** If user has Two factor authentication enabled */ - requiresTwoFactorAuth: PropTypes.bool, - }), }; const defaultProps = { @@ -50,9 +41,6 @@ const defaultProps = { errors: {}, maxAttemptsReached: false, }, - account: { - requiresTwoFactorAuth: false, - }, }; class ValidationStep extends React.Component { @@ -129,7 +117,6 @@ class ValidationStep extends React.Component { const maxAttemptsReached = lodashGet(this.props, 'reimbursementAccount.maxAttemptsReached'); const isVerifying = !maxAttemptsReached && state === BankAccount.STATE.VERIFYING; - const requiresTwoFactorAuth = lodashGet(this.props, 'account.requiresTwoFactorAuth'); return ( @@ -173,7 +160,7 @@ class ValidationStep extends React.Component { {this.props.translate('validationStep.descriptionCTA')} - + - {!requiresTwoFactorAuth && ( - - - - )} )} {isVerifying && ( - +
- {!requiresTwoFactorAuth && ( - - )} - + )} ); @@ -250,8 +229,5 @@ export default compose( reimbursementAccount: { key: ONYXKEYS.REIMBURSEMENT_ACCOUNT, }, - account: { - key: ONYXKEYS.ACCOUNT, - }, }), )(ValidationStep);