Merge pull request Expensify#30114 from Expensify/marcaaron-preventAc…

…tivateWalletOnOnfidoFailure [CP staging] Prevent second attempts to activate wallet when Onfido checks fail
software-mansion-labs · Oct 24, 2023 · 4430ae2 · 4430ae2
2 parents d282473 + c0f2e74
commit 4430ae2
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -870,6 +870,7 @@ export default {
         assignedCardsDescription: 'These are cards assigned by a Workspace admin to manage company spend.',
         expensifyCard: 'Expensify Card',
         walletActivationPending: "We're reviewing your information, please check back in a few minutes!",
+        walletActivationFailed: 'Unfortunately your wallet cannot be enabled at this time. Please chat with Concierge for further assistance.',
     },
     cardPage: {
         expensifyCard: 'Expensify Card',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -866,6 +866,7 @@ export default {
         assignedCardsDescription: 'Son tarjetas asignadas por un administrador del Espacio de Trabajo para gestionar los gastos de la empresa.',
         expensifyCard: 'Tarjeta Expensify',
         walletActivationPending: 'Estamos revisando su información, por favor vuelve en unos minutos.',
+        walletActivationFailed: 'Lamentablemente, no podemos activar tu billetera en este momento. Chatea con Concierge para obtener más ayuda.',
     },
     cardPage: {
         expensifyCard: 'Tarjeta Expensify',

diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.js
@@ -33,19 +33,20 @@ function EnablePaymentsPage({userWallet}) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
-    const {isPendingOnfidoResult} = userWallet;
+    const {isPendingOnfidoResult, hasFailedOnfido} = userWallet;
 
     useEffect(() => {
         if (isOffline) {
             return;
         }
 
-        if (!isPendingOnfidoResult) {
-            Wallet.openEnablePaymentsPage();
-        } else {
+        if (isPendingOnfidoResult || hasFailedOnfido) {
             Navigation.navigate(ROUTES.SETTINGS_WALLET, CONST.NAVIGATION.TYPE.UP);
+            return;
         }
-    }, [isOffline, isPendingOnfidoResult]);
+
+        Wallet.openEnablePaymentsPage();
+    }, [isOffline, isPendingOnfidoResult, hasFailedOnfido]);
 
     if (_.isEmpty(userWallet)) {
         return <FullScreenLoadingIndicator />;

diff --git a/src/pages/EnablePayments/userWalletPropTypes.js b/src/pages/EnablePayments/userWalletPropTypes.js
@@ -25,4 +25,7 @@ export default PropTypes.shape({
 
     /** The wallet's programID, used to show the correct terms. */
     walletProgramID: PropTypes.string,
+
+    /** Whether the user has failed Onfido completely */
+    hasFailedOnfido: PropTypes.bool,
 });
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.js b/src/pages/settings/Wallet/WalletPage/WalletPage.js
@@ -70,6 +70,7 @@ function WalletPage({bankAccountList, betas, cardList, fundList, isLoadingPaymen
     const shouldShowEmptyState = !hasBankAccount && !hasWallet && !hasAssignedCard;
 
     const isPendingOnfidoResult = lodashGet(userWallet, 'isPendingOnfidoResult', false);
+    const hasFailedOnfido = lodashGet(userWallet, 'hasFailedOnfido', false);
 
     const updateShouldShowLoadingSpinner = useCallback(() => {
         // In order to prevent a loop, only update state of the spinner if there is a change
@@ -311,6 +312,8 @@ function WalletPage({bankAccountList, betas, cardList, fundList, isLoadingPaymen
 
     // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
     const isPopoverBottomMount = anchorPosition.anchorPositionTop === 0 || isSmallScreenWidth;
+    const alertTextStyle = [styles.inlineSystemMessage, styles.flexShrink1];
+    const alertViewStyle = [styles.flexRow, styles.alignItemsCenter, styles.w100, styles.ph5];
 
     return (
         <>
@@ -393,12 +396,24 @@ function WalletPage({bankAccountList, betas, cardList, fundList, isLoadingPaymen
 
                                                     if (isPendingOnfidoResult) {
                                                         return (
-                                                            <View style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.ph5]}>
+                                                            <View style={alertViewStyle}>
                                                                 <Icon
                                                                     src={Expensicons.Hourglass}
                                                                     fill={themeColors.icon}
                                                                 />
-                                                                <Text style={[styles.inlineSystemMessage, styles.flexShrink1]}>{translate('walletPage.walletActivationPending')}</Text>
+                                                                <Text style={alertTextStyle}>{translate('walletPage.walletActivationPending')}</Text>
+                                                            </View>
+                                                        );
+                                                    }
+
+                                                    if (hasFailedOnfido) {
+                                                        return (
+                                                            <View style={alertViewStyle}>
+                                                                <Icon
+                                                                    src={Expensicons.Exclamation}
+                                                                    fill={themeColors.icon}
+                                                                />
+                                                                <Text style={alertTextStyle}>{translate('walletPage.walletActivationFailed')}</Text>
                                                             </View>
                                                         );
                                                     }

diff --git a/src/types/onyx/UserWallet.ts b/src/types/onyx/UserWallet.ts
@@ -16,6 +16,9 @@ type UserWallet = {
     /** What step in the activation flow are we on? */
     currentStep: ValueOf<typeof CONST.WALLET.STEP>;
 
+    /** If the user failed the Onfido verification check */
+    hasFailedOnfido?: boolean;
+
     /** If we should show the FailedKYC view after the user submitted their info with a non fixable error */
     shouldShowFailedKYC?: boolean;