From 28064f813eb62804186255aa6e856d543ab8aed5 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 24 Jul 2024 23:33:18 +0800 Subject: [PATCH 1/2] clear the selection item when modal hides --- src/components/Search/SearchListWithHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Search/SearchListWithHeader.tsx b/src/components/Search/SearchListWithHeader.tsx index bd4b843bbd602..93440cb805900 100644 --- a/src/components/Search/SearchListWithHeader.tsx +++ b/src/components/Search/SearchListWithHeader.tsx @@ -75,7 +75,6 @@ function SearchListWithHeader( }; const handleOnCancelConfirmModal = () => { - setSelectedTransactionsToDelete([]); setDeleteExpensesConfirmModalVisible(false); }; @@ -213,6 +212,7 @@ function SearchListWithHeader( isVisible={deleteExpensesConfirmModalVisible} onConfirm={handleDeleteExpenses} onCancel={handleOnCancelConfirmModal} + onModalHide={() => setSelectedTransactionsToDelete([])} title={translate('iou.deleteExpense', {count: selectedTransactionsToDelete.length})} prompt={translate('iou.deleteConfirmation', {count: selectedTransactionsToDelete.length})} confirmText={translate('common.delete')} From f4fcc4762335731aaeee090f9ba45bfb0aa0aa89 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 1 Aug 2024 13:47:38 +0800 Subject: [PATCH 2/2] clear selected transaction when modal hides --- src/components/Search/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index c2d7b52fa3e96..f9581586525dd 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -115,7 +115,6 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) { }, [isSmallScreenWidth, selectedTransactions, selectionMode?.isEnabled]); const handleOnCancelConfirmModal = () => { - setSelectedTransactionsToDelete([]); setDeleteExpensesConfirmModalVisible(false); }; @@ -386,6 +385,7 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) { isVisible={deleteExpensesConfirmModalVisible} onConfirm={handleDeleteExpenses} onCancel={handleOnCancelConfirmModal} + onModalHide={() => setSelectedTransactionsToDelete([])} title={translate('iou.deleteExpense', {count: selectedTransactionsToDelete.length})} prompt={translate('iou.deleteConfirmation', {count: selectedTransactionsToDelete.length})} confirmText={translate('common.delete')}