fix: handle comment suggestions

Expensify · Oct 22, 2023 · cc298bd · cc298bd
1 parent 4d4ca6c
commit cc298bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/libs/actions/Wallet.js b/src/libs/actions/Wallet.js
@@ -216,7 +216,7 @@ function acceptWalletTerms(parameters) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.WALLET_TERMS,
             value: {
-                submitting: true,
+                isLoading: true,
             },
         },
     ];
@@ -227,7 +227,7 @@ function acceptWalletTerms(parameters) {
             key: ONYXKEYS.WALLET_TERMS,
             value: {
                 errors: null,
-                submitting: false,
+                isLoading: false,
             },
         },
     ];
@@ -245,7 +245,7 @@ function acceptWalletTerms(parameters) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.WALLET_TERMS,
             value: {
-                submitting: false,
+                isLoading: false,
             },
         },
     ];

diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js
@@ -108,7 +108,7 @@ function TermsStep(props) {
                     }}
                     message={errorMessage}
                     isAlertVisible={error || Boolean(errorMessage)}
-                    isLoading={!!props.walletTerms.submitting}
+                    isLoading={!!props.walletTerms.isLoading}
                     containerStyles={[styles.mh0, styles.mv4]}
                 />
             </ScrollView>

diff --git a/src/pages/EnablePayments/walletTermsPropTypes.js b/src/pages/EnablePayments/walletTermsPropTypes.js
@@ -14,5 +14,5 @@ export default PropTypes.shape({
     chatReportID: PropTypes.string,
 
     /** Boolean to indicate whether the submission of wallet terms is being processed */
-    submitting: PropTypes.bool,
+    isLoading: PropTypes.bool,
 });
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.js b/src/pages/settings/Wallet/WalletPage/WalletPage.js
@@ -2,6 +2,7 @@ import React, {useCallback, useEffect, useState, useRef} from 'react';
 import {ActivityIndicator, View, InteractionManager, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import lodashGet from 'lodash/get';
 import PaymentMethodList from '../PaymentMethodList';
 import ROUTES from '../../../../ROUTES';
 import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
@@ -68,7 +69,7 @@ function WalletPage({bankAccountList, betas, cardList, fundList, isLoadingPaymen
     const hasAssignedCard = !_.isEmpty(cardList);
     const shouldShowEmptyState = !hasBankAccount && !hasWallet && !hasAssignedCard;
 
-    const {isPendingOnfidoResult} = userWallet;
+    const isPendingOnfidoResult = lodashGet(userWallet, 'isPendingOnfidoResult', false);
 
     const updateShouldShowLoadingSpinner = useCallback(() => {
         // In order to prevent a loop, only update state of the spinner if there is a change

diff --git a/src/types/onyx/UserWallet.ts b/src/types/onyx/UserWallet.ts
@@ -25,7 +25,7 @@ type UserWallet = {
     /** The user's wallet tier */
     tier?: number;
 
-    /** Whether the kyc is pending and is yet to be confirmed */
+    /** Whether the Onfido result is pending. KYC is not complete and the wallet will not be activated until we have the Onfido verification result */
     isPendingOnfidoResult?: boolean;
 
     /** The ID of the linked account */