From b61aeb657a29a32b8ef2f77ebc5f6ebfcf473fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muzyk?= <mimuzyk@gmail.com>
Date: Tue, 4 Mar 2025 19:22:19 +0100
Subject: [PATCH 1/3] fix: Pass only latest error entry point screen

---
 .../VerifiedBankAccountFlowEntryPoint.tsx                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
index 2d760a1e97ddd..267acd2813a5d 100644
--- a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
+++ b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
@@ -18,7 +18,7 @@ import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils';
+import {getEarliestErrorField, getLatestError, getLatestErrorField} from '@libs/ErrorUtils';
 import getPlaidDesktopMessage from '@libs/getPlaidDesktopMessage';
 import {REIMBURSEMENT_ACCOUNT_ROUTE_NAMES} from '@libs/ReimbursementAccountUtils';
 import WorkspaceResetBankAccountModal from '@pages/workspace/WorkspaceResetBankAccountModal';
@@ -220,7 +220,7 @@ function VerifiedBankAccountFlowEntryPoint({
                         </View>
                     )}
                     <OfflineWithFeedback
-                        errors={errors}
+                        errors={getLatestError(errors)}
                         shouldShowErrorMessages
                         onClose={resetReimbursementAccount}
                     >

From 4729bf789cea1cd4b0c65f3e5753f42c997df547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muzyk?= <mimuzyk@gmail.com>
Date: Wed, 5 Mar 2025 09:25:39 +0100
Subject: [PATCH 2/3] fix: do not display error at all

---
 .../VerifiedBankAccountFlowEntryPoint.tsx     | 92 +++++++++----------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
index 267acd2813a5d..c05fecf49901d 100644
--- a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
+++ b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
@@ -18,7 +18,7 @@ import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {getEarliestErrorField, getLatestError, getLatestErrorField} from '@libs/ErrorUtils';
+import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils';
 import getPlaidDesktopMessage from '@libs/getPlaidDesktopMessage';
 import {REIMBURSEMENT_ACCOUNT_ROUTE_NAMES} from '@libs/ReimbursementAccountUtils';
 import WorkspaceResetBankAccountModal from '@pages/workspace/WorkspaceResetBankAccountModal';
@@ -219,57 +219,55 @@ function VerifiedBankAccountFlowEntryPoint({
                             </Text>
                         </View>
                     )}
-                    <OfflineWithFeedback
-                        errors={getLatestError(errors)}
-                        shouldShowErrorMessages
-                        onClose={resetReimbursementAccount}
-                    >
-                        {shouldShowContinueSetupButton === true ? (
-                            <>
-                                <MenuItem
-                                    title={translate('workspace.bankAccount.continueWithSetup')}
-                                    icon={Connect}
-                                    iconFill={theme.icon}
-                                    onPress={onContinuePress}
-                                    shouldShowRightIcon
-                                    wrapperStyle={[styles.cardMenuItem, styles.mt4]}
-                                    disabled={!!pendingAction || !isEmptyObject(errors)}
-                                />
-                                <MenuItem
-                                    title={translate('workspace.bankAccount.startOver')}
-                                    icon={RotateLeft}
-                                    iconFill={theme.icon}
-                                    // TODO add method for non USD accounts in next issue - https://github.com/Expensify/App/issues/50912
-                                    onPress={requestResetFreePlanBankAccount}
-                                    shouldShowRightIcon
-                                    wrapperStyle={[styles.cardMenuItem, styles.mt4]}
-                                    disabled={!!pendingAction || !isEmptyObject(errors)}
-                                />
-                            </>
-                        ) : (
-                            <>
-                                {!hasForeignCurrency && !shouldShowContinueSetupButton && (
-                                    <MenuItem
-                                        title={translate('bankAccount.connectOnlineWithPlaid')}
-                                        icon={Bank}
-                                        iconFill={theme.icon}
-                                        disabled={!!isPlaidDisabled}
-                                        onPress={handleConnectPlaid}
-                                        shouldShowRightIcon
-                                        wrapperStyle={[styles.cardMenuItem, styles.mt4]}
-                                    />
-                                )}
+                    {shouldShowContinueSetupButton === true ? (
+                        <OfflineWithFeedback
+                            errors={errors}
+                            shouldShowErrorMessages
+                            onClose={resetReimbursementAccount}
+                        >
+                            <MenuItem
+                                title={translate('workspace.bankAccount.continueWithSetup')}
+                                icon={Connect}
+                                iconFill={theme.icon}
+                                onPress={onContinuePress}
+                                shouldShowRightIcon
+                                wrapperStyle={[styles.cardMenuItem, styles.mt4]}
+                                disabled={!!pendingAction || !isEmptyObject(errors)}
+                            />
+                            <MenuItem
+                                title={translate('workspace.bankAccount.startOver')}
+                                icon={RotateLeft}
+                                iconFill={theme.icon}
+                                // TODO add method for non USD accounts in next issue - https://github.com/Expensify/App/issues/50912
+                                onPress={requestResetFreePlanBankAccount}
+                                shouldShowRightIcon
+                                wrapperStyle={[styles.cardMenuItem, styles.mt4]}
+                                disabled={!!pendingAction || !isEmptyObject(errors)}
+                            />
+                        </OfflineWithFeedback>
+                    ) : (
+                        <>
+                            {!hasForeignCurrency && !shouldShowContinueSetupButton && (
                                 <MenuItem
-                                    title={translate('bankAccount.connectManually')}
-                                    icon={Connect}
+                                    title={translate('bankAccount.connectOnlineWithPlaid')}
+                                    icon={Bank}
                                     iconFill={theme.icon}
-                                    onPress={handleConnectManually}
+                                    disabled={!!isPlaidDisabled}
+                                    onPress={handleConnectPlaid}
                                     shouldShowRightIcon
                                     wrapperStyle={[styles.cardMenuItem, styles.mt4]}
                                 />
-                            </>
-                        )}
-                    </OfflineWithFeedback>
+                            )}
+                            <MenuItem
+                                title={translate('bankAccount.connectManually')}
+                                icon={Connect}
+                                iconFill={theme.icon}
+                                onPress={handleConnectManually}
+                                shouldShowRightIcon
+                                wrapperStyle={[styles.cardMenuItem, styles.mt4]}
+                            />
+                        </>
+                    )}
                 </Section>
                 <View style={[styles.mv0, styles.mh5, styles.flexRow, styles.justifyContentBetween]}>
                     <TextLink href={CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}>{translate('common.privacy')}</TextLink>

From a49c13a4cc7d66da3fc39b42a32172f22e2c1c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muzyk?= <mimuzyk@gmail.com>
Date: Fri, 7 Mar 2025 08:38:23 +0100
Subject: [PATCH 3/3] fix: pass only latest error

---
 .../VerifiedBankAccountFlowEntryPoint.tsx                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
index c05fecf49901d..0765fd2622d8b 100644
--- a/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
+++ b/src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx
@@ -18,7 +18,7 @@ import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils';
+import {getEarliestErrorField, getLatestError, getLatestErrorField} from '@libs/ErrorUtils';
 import getPlaidDesktopMessage from '@libs/getPlaidDesktopMessage';
 import {REIMBURSEMENT_ACCOUNT_ROUTE_NAMES} from '@libs/ReimbursementAccountUtils';
 import WorkspaceResetBankAccountModal from '@pages/workspace/WorkspaceResetBankAccountModal';
@@ -221,7 +221,7 @@ function VerifiedBankAccountFlowEntryPoint({
                     )}
                     {shouldShowContinueSetupButton === true ? (
                         <OfflineWithFeedback
-                            errors={errors}
+                            errors={getLatestError(errors)}
                             shouldShowErrorMessages
                             onClose={resetReimbursementAccount}
                         >