From 0a33b1edd921503a92f2fb35b3c8cab887c22f58 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Thu, 7 Nov 2024 23:24:44 +0100
Subject: [PATCH] Fix/ Add bank account button in invoice report remains after
 bank account is added

---
 .../report/AddBankAccountActionButton.tsx     | 48 +++++++++++++++++++
 .../home/report/ReportActionItemMessage.tsx   | 23 +--------
 2 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/home/report/AddBankAccountActionButton.tsx

diff --git a/src/pages/home/report/AddBankAccountActionButton.tsx b/src/pages/home/report/AddBankAccountActionButton.tsx
new file mode 100644
index 000000000000..fe6b8a8f0d27
--- /dev/null
+++ b/src/pages/home/report/AddBankAccountActionButton.tsx
@@ -0,0 +1,48 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+type AddBankAccountActionButtonProps = {
+    /** The ID of the report */
+    reportID: string;
+};
+
+function AddBankAccountActionButton({reportID}: AddBankAccountActionButtonProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [shouldShow, setShouldShow] = useState(false);
+    const [invoiceReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${invoiceReport?.policyID}`);
+
+    useEffect(() => {
+        setShouldShow(ReportUtils.hasMissingInvoiceBankAccount(reportID));
+    }, [reportID, policy]);
+
+    const openWorkspaceInvoicesPage = useCallback(() => {
+        if (!policy) {
+            return;
+        }
+        Navigation.navigate(ROUTES.WORKSPACE_INVOICES.getRoute(policy.id));
+    }, [policy]);
+
+    if (!shouldShow) {
+        return null;
+    }
+
+    return (
+        <Button
+            style={[styles.mt2, styles.alignSelfStart]}
+            success
+            text={translate('workspace.invoices.paymentMethods.addBankAccount')}
+            onPress={openWorkspaceInvoicesPage}
+        />
+    );
+}
+
+export default AddBankAccountActionButton;
diff --git a/src/pages/home/report/ReportActionItemMessage.tsx b/src/pages/home/report/ReportActionItemMessage.tsx
index da2f3dd151c8..5eb0ab21869e 100644
--- a/src/pages/home/report/ReportActionItemMessage.tsx
+++ b/src/pages/home/report/ReportActionItemMessage.tsx
@@ -3,17 +3,15 @@ import React from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
-import Button from '@components/Button';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {ReportAction} from '@src/types/onyx';
+import AddBankAccountActionButton from './AddBankAccountActionButton';
 import TextCommentFragment from './comment/TextCommentFragment';
 import ReportActionItemFragment from './ReportActionItemFragment';
 
@@ -121,29 +119,12 @@ function ReportActionItemMessage({action, displayAsGroup, reportID, style, isHid
         return shouldWrapInText ? <Text style={styles.ltr}>{reportActionItemFragments}</Text> : reportActionItemFragments;
     };
 
-    const openWorkspaceInvoicesPage = () => {
-        const policyID = ReportUtils.getReport(reportID)?.policyID;
-
-        if (!policyID) {
-            return;
-        }
-
-        Navigation.navigate(ROUTES.WORKSPACE_INVOICES.getRoute(policyID));
-    };
-
     return (
         <View style={[styles.chatItemMessage, style]}>
             {!isHidden ? (
                 <>
                     {renderReportActionItemFragments(isApprovedOrSubmittedReportAction)}
-                    {action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && ReportUtils.hasMissingInvoiceBankAccount(reportID) && (
-                        <Button
-                            style={[styles.mt2, styles.alignSelfStart]}
-                            success
-                            text={translate('workspace.invoices.paymentMethods.addBankAccount')}
-                            onPress={openWorkspaceInvoicesPage}
-                        />
-                    )}
+                    {action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && <AddBankAccountActionButton reportID={reportID} />}
                 </>
             ) : (
                 <Text style={[styles.textLabelSupporting, styles.lh20]}>{translate('moderation.flaggedContent')}</Text>