Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Display banner to enable 2FA when setting up VBBA" #13407

Merged
merged 1 commit into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

2 changes: 0 additions & 2 deletions src/components/Icon/Illustrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -55,7 +54,6 @@ export {
TadaYellow,
TadaBlue,
GpsTrackOrange,
ShieldYellow,
MoneyReceipts,
PinkBill,
CreditCardsNew,
Expand Down
3 changes: 0 additions & 3 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -797,9 +797,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',
Expand Down
3 changes: 0 additions & 3 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -799,9 +799,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',
Expand Down
46 changes: 0 additions & 46 deletions src/pages/ReimbursementAccount/Enable2FAPrompt.js

This file was deleted.

32 changes: 4 additions & 28 deletions src/pages/ReimbursementAccount/ValidationStep.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 = {
Expand All @@ -50,9 +41,6 @@ const defaultProps = {
errors: {},
maxAttemptsReached: false,
},
account: {
requiresTwoFactorAuth: false,
},
};

class ValidationStep extends React.Component {
Expand Down Expand Up @@ -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 (
<View style={[styles.flex1, styles.justifyContentBetween]}>
Expand Down Expand Up @@ -173,7 +160,7 @@ class ValidationStep extends React.Component {
{this.props.translate('validationStep.descriptionCTA')}
</Text>
</View>
<View style={[styles.mv5]}>
<View style={[styles.mv5, styles.flex1]}>
<TextInput
inputID="amount1"
shouldSaveDraft
Expand All @@ -196,15 +183,10 @@ class ValidationStep extends React.Component {
keyboardType="decimal-pad"
/>
</View>
{!requiresTwoFactorAuth && (
<View style={[styles.mln5, styles.mrn5]}>
<Enable2FAPrompt />
</View>
)}
</Form>
)}
{isVerifying && (
<ScrollView style={[styles.flex1]}>
<View style={[styles.flex1]}>
<Section
title={this.props.translate('workspace.bankAccount.letsFinishInChat')}
icon={Illustrations.ConciergeBubble}
Expand All @@ -231,10 +213,7 @@ class ValidationStep extends React.Component {
wrapperStyle={[styles.cardMenuItem, styles.mv3]}
/>
</Section>
{!requiresTwoFactorAuth && (
<Enable2FAPrompt />
)}
</ScrollView>
</View>
)}
</View>
);
Expand All @@ -250,8 +229,5 @@ export default compose(
reimbursementAccount: {
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
},
account: {
key: ONYXKEYS.ACCOUNT,
},
}),
)(ValidationStep);