diff --git a/src/CONST.ts b/src/CONST.ts index b9e9181afd5b..e358a850c33e 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1017,8 +1017,10 @@ const CONST = { ACTIVATE: 'ActivateStep', }, TIER_NAME: { + PLATINUM: 'PLATINUM', GOLD: 'GOLD', SILVER: 'SILVER', + BRONZE: 'BRONZE', }, WEB_MESSAGE_TYPE: { STATEMENT: 'STATEMENT_NAVIGATE', diff --git a/src/components/KYCWall/BaseKYCWall.js b/src/components/KYCWall/BaseKYCWall.js index 1c1552d55844..db3c85ef818c 100644 --- a/src/components/KYCWall/BaseKYCWall.js +++ b/src/components/KYCWall/BaseKYCWall.js @@ -1,3 +1,4 @@ +import _ from 'underscore'; import React from 'react'; import {withOnyx} from 'react-native-onyx'; import {Dimensions} from 'react-native'; @@ -123,9 +124,9 @@ class KYCWall extends React.Component { } if (!isExpenseReport) { // Ask the user to upgrade to a gold wallet as this means they have not yet gone through our Know Your Customer (KYC) checks - const hasGoldWallet = this.props.userWallet.tierName && this.props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD; - if (!hasGoldWallet) { - Log.info('[KYC Wallet] User does not have gold wallet'); + const hasActivatedWallet = this.props.userWallet.tierName && _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], this.props.userWallet.tierName); + if (!hasActivatedWallet) { + Log.info('[KYC Wallet] User does not have active wallet'); Navigation.navigate(this.props.enablePaymentsRoute); return; } diff --git a/src/pages/EnablePayments/ActivateStep.js b/src/pages/EnablePayments/ActivateStep.js index 268c2664e01d..2d23f39d25e5 100644 --- a/src/pages/EnablePayments/ActivateStep.js +++ b/src/pages/EnablePayments/ActivateStep.js @@ -1,3 +1,4 @@ +import _ from 'underscore'; import React from 'react'; import {withOnyx} from 'react-native-onyx'; import * as LottieAnimations from '../../components/LottieAnimations'; @@ -29,8 +30,8 @@ const defaultProps = { }; function ActivateStep(props) { - const isGoldWallet = props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD; - const animation = isGoldWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo; + const isActivatedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName); + const animation = isActivatedWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo; const continueButtonText = props.walletTerms.chatReportID ? props.translate('activateStep.continueToPayment') : props.translate('activateStep.continueToTransfer'); return ( @@ -38,9 +39,9 @@ function ActivateStep(props) { diff --git a/src/pages/settings/Wallet/TransferBalancePage.js b/src/pages/settings/Wallet/TransferBalancePage.js index f33c92bea02b..ae54dab569f7 100644 --- a/src/pages/settings/Wallet/TransferBalancePage.js +++ b/src/pages/settings/Wallet/TransferBalancePage.js @@ -167,7 +167,9 @@ function TransferBalancePage(props) { const isButtonDisabled = !isTransferable || !selectedAccount; const errorMessage = !_.isEmpty(props.walletTransfer.errors) ? _.chain(props.walletTransfer.errors).values().first().value() : ''; - const shouldShowTransferView = PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, props.bankAccountList) && props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD; + const shouldShowTransferView = + PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, props.bankAccountList) && + _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName); return (