From 5cbf7e619ee8fbc9aad94a5ddcd31fe81c79f9b5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 11 Nov 2024 12:02:09 -0700
Subject: [PATCH 1/7] add rbr to button

---
 src/components/SelectionList/Search/ActionCell.tsx | 8 ++++++--
 src/libs/SearchUIUtils.ts                          | 4 ++++
 src/types/onyx/SearchResults.ts                    | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 55e2cf6f849d..50c24a138b0e 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -11,6 +11,7 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
+import Icon from '@components/Icon';
 
 const actionTranslationsMap: Record<SearchTransactionAction, TranslationPaths> = {
     view: 'common.view',
@@ -73,17 +74,20 @@ function ActionCell({
         );
     }
 
-    if (action === CONST.SEARCH.ACTION_TYPES.VIEW || shouldUseViewAction) {
+    if (action === CONST.SEARCH.ACTION_TYPES.VIEW || action === CONST.SEARCH.ACTION_TYPES.REVIEW || shouldUseViewAction) {
         const buttonInnerStyles = isSelected ? styles.buttonDefaultHovered : {};
         return isLargeScreenWidth ? (
             <Button
-                text={translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW])}
+                text={translate(actionTranslationsMap[action])}
                 onPress={goToItem}
                 small
                 style={[styles.w100]}
                 innerStyles={buttonInnerStyles}
                 link={isChildListItem}
                 shouldUseDefaultHover={!isChildListItem}
+                icon={!isChildListItem && action === CONST.SEARCH.ACTION_TYPES.REVIEW ? Expensicons.DotIndicator : undefined}
+                iconFill={theme.danger}
+                iconHoverFill={theme.dangerHover}
             />
         ) : null;
     }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 29537b9c8368..38b0d564e110 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -273,6 +273,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
+    if (report.hasError) {
+        return CONST.SEARCH.ACTION_TYPES.REVIEW;
+    }
+
     const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
 
     const invoiceReceiverPolicy =
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 56ae9cc62379..f92a2a395232 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -149,6 +149,9 @@ type SearchReport = {
 
     /** Whether the action is loading */
     isActionLoading?: boolean;
+
+    /** Whether the report has violations or errors */
+    hasError?: boolean;
 };
 
 /** Model of report action search result */

From 185b8d2908e34e2c9fa6b37480416a3e7b420361 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 11 Nov 2024 12:24:33 -0700
Subject: [PATCH 2/7] rm import

---
 src/components/SelectionList/Search/ActionCell.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 50c24a138b0e..7f6f66f97766 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -11,7 +11,6 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
-import Icon from '@components/Icon';
 
 const actionTranslationsMap: Record<SearchTransactionAction, TranslationPaths> = {
     view: 'common.view',

From 61872c2e279a2dd5258cfae395b08625ab345e41 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 27 Nov 2024 12:14:31 -0700
Subject: [PATCH 3/7] resolve more conflicts

---
 src/components/Search/SearchPageHeader.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 629de974e8bd..57e59c9a1751 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -25,14 +25,8 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {useSearchContext} from './SearchContext';
-<<<<<<< HEAD
-import SearchButton from './SearchRouter/SearchButton';
-import SearchRouterInput from './SearchRouter/SearchRouterInput';
-import type {PaymentData, SearchQueryJSON} from './types';
-=======
 import SearchPageHeaderInput from './SearchPageHeaderInput';
 import type {SearchQueryJSON} from './types';
->>>>>>> main
 
 type SearchPageHeaderProps = {queryJSON: SearchQueryJSON};
 

From b4c2d8f6c91fa69cbf1dec47736847465930e2e4 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 27 Nov 2024 12:15:52 -0700
Subject: [PATCH 4/7] more conflicts

---
 src/components/Search/SearchPageHeader.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 57e59c9a1751..c341c3d7b0e9 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -153,11 +153,7 @@ function SearchPageHeader({queryJSON}: SearchPageHeaderProps) {
                     return;
                 }
 
-<<<<<<< HEAD
                 const reportIDList = selectedReports?.filter((report) => !!report).map((report) => report.reportID) ?? [];
-=======
-                const reportIDList = selectedReports.filter((report): report is string => !!report) ?? [];
->>>>>>> main
                 SearchActions.exportSearchItemsToCSV(
                     {query: status, jsonQuery: JSON.stringify(queryJSON), reportIDList, transactionIDList: selectedTransactionsKeys, policyIDs: [activeWorkspaceID ?? '']},
                     () => {

From e0ca2494536f9127d1975057501d17860cfc9180 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 3 Dec 2024 14:19:25 -0700
Subject: [PATCH 5/7] handle failed request

---
 src/libs/SearchUIUtils.ts       |  2 +-
 src/libs/actions/Search.ts      | 30 ++++++++++++++----------------
 src/types/onyx/SearchResults.ts |  3 +++
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 055f251cb855..b55ccb9add67 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -265,7 +265,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    if (report.hasError) {
+    if (transaction?.hasError ?? report.hasError) {
         return CONST.SEARCH.ACTION_TYPES.REVIEW;
     }
 
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index bf481cffcf73..34c702e9891b 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -243,44 +243,42 @@ function holdMoneyRequestOnSearch(hash: number, transactionIDList: string[], com
 }
 
 function approveMoneyRequestOnSearch(hash: number, reportIDList: string[], transactionIDList?: string[]) {
-    const createActionLoadingData = (isLoading: boolean): OnyxUpdate[] => [
+    const createOnyxData = (update: Partial<SearchTransaction> | Partial<SearchReport>): OnyxUpdate[] => [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
             value: {
                 data: transactionIDList
-                    ? (Object.fromEntries(
-                          transactionIDList.map((transactionID) => [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {isActionLoading: isLoading}]),
-                      ) as Partial<SearchTransaction>)
-                    : (Object.fromEntries(reportIDList.map((reportID) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>),
+                    ? (Object.fromEntries(transactionIDList.map((transactionID) => [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, update])) as Partial<SearchTransaction>)
+                    : (Object.fromEntries(reportIDList.map((reportID) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, update])) as Partial<SearchReport>),
             },
         },
     ];
-    const optimisticData: OnyxUpdate[] = createActionLoadingData(true);
-    const finallyData: OnyxUpdate[] = createActionLoadingData(false);
+    const optimisticData: OnyxUpdate[] = createOnyxData({isActionLoading: true});
+    const failureData: OnyxUpdate[] = createOnyxData({hasError: true});
+    const finallyData: OnyxUpdate[] = createOnyxData({isActionLoading: false});
 
-    API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
+    API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, failureData, finallyData});
 }
 
 function payMoneyRequestOnSearch(hash: number, paymentData: PaymentData[], transactionIDList?: string[]) {
-    const createActionLoadingData = (isLoading: boolean): OnyxUpdate[] => [
+    const createOnyxData = (update: Partial<SearchTransaction> | Partial<SearchReport>): OnyxUpdate[] => [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
             value: {
                 data: transactionIDList
-                    ? (Object.fromEntries(
-                          transactionIDList.map((transactionID) => [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {isActionLoading: isLoading}]),
-                      ) as Partial<SearchTransaction>)
-                    : (Object.fromEntries(paymentData.map((item) => [`${ONYXKEYS.COLLECTION.REPORT}${item.reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>),
+                    ? (Object.fromEntries(transactionIDList.map((transactionID) => [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, update])) as Partial<SearchTransaction>)
+                    : (Object.fromEntries(paymentData.map((item) => [`${ONYXKEYS.COLLECTION.REPORT}${item.reportID}`, update])) as Partial<SearchReport>),
             },
         },
     ];
 
-    const optimisticData: OnyxUpdate[] = createActionLoadingData(true);
-    const finallyData: OnyxUpdate[] = createActionLoadingData(false);
+    const optimisticData: OnyxUpdate[] = createOnyxData({isActionLoading: true});
+    const failureData: OnyxUpdate[] = createOnyxData({hasError: true});
+    const finallyData: OnyxUpdate[] = createOnyxData({isActionLoading: false});
 
-    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentData: JSON.stringify(paymentData)}, {optimisticData, finallyData});
+    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentData: JSON.stringify(paymentData)}, {optimisticData, failureData, finallyData});
 }
 
 function unholdMoneyRequestOnSearch(hash: number, transactionIDList: string[]) {
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 9f4ef9c2e54a..aa93f53dc3bf 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -343,6 +343,9 @@ type SearchTransaction = {
 
     /** Whether the action is loading */
     isActionLoading?: boolean;
+
+    /** Whether the transaction has violations or errors */
+    hasError?: boolean;
 };
 
 /** Types of searchable transactions */

From d03e9b12b8b8628bb9111924f1d3b9b6851f41aa Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 3 Dec 2024 14:42:49 -0700
Subject: [PATCH 6/7] reorder buttons

---
 src/libs/SearchUIUtils.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index b55ccb9add67..41cb83e184af 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -257,6 +257,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
     const transaction = isTransaction ? data[key] : undefined;
     const report = isTransaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
 
+    if (transaction?.hasError || report.hasError) {
+        return CONST.SEARCH.ACTION_TYPES.REVIEW;
+    }
+
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
     }
@@ -265,10 +269,6 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    if (transaction?.hasError ?? report.hasError) {
-        return CONST.SEARCH.ACTION_TYPES.REVIEW;
-    }
-
     // We don't need to run the logic if this is not a transaction or iou/expense report, so let's shortcircuit the logic for performance reasons
     if (!ReportUtils.isMoneyRequestReport(report) || (isTransaction && !data[key].isFromOneTransactionReport)) {
         return CONST.SEARCH.ACTION_TYPES.VIEW;

From dbcdd25819d2aa482f1249ea9fa50759c1288790 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 3 Dec 2024 14:52:22 -0700
Subject: [PATCH 7/7] fix eslint

---
 src/libs/SearchUIUtils.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 41cb83e184af..39da9cd61882 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -257,6 +257,8 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
     const transaction = isTransaction ? data[key] : undefined;
     const report = isTransaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
 
+    // We need to check both options for a falsy value since the transaction might not have an error but the report associated with it might
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     if (transaction?.hasError || report.hasError) {
         return CONST.SEARCH.ACTION_TYPES.REVIEW;
     }