From fd1cad05d5545ba307848e43dd08973045aab335 Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Mon, 10 Mar 2025 09:56:44 +0800 Subject: [PATCH] Deleting a saved search resets the currently opened search --- src/hooks/useDeleteSavedSearch.tsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx index f800dc4c8218..638ccb020a5d 100644 --- a/src/hooks/useDeleteSavedSearch.tsx +++ b/src/hooks/useDeleteSavedSearch.tsx @@ -1,5 +1,6 @@ import React, {useState} from 'react'; import ConfirmModal from '@components/ConfirmModal'; +import {useSearchContext} from '@components/Search/SearchContext'; import {clearAdvancedFilters, deleteSavedSearch} from '@libs/actions/Search'; import Navigation from '@libs/Navigation/Navigation'; import {buildCannedSearchQuery} from '@libs/SearchQueryUtils'; @@ -10,6 +11,7 @@ export default function useDeleteSavedSearch() { const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const [hashToDelete, setHashToDelete] = useState(0); const {translate} = useLocalize(); + const {currentSearchHash} = useSearchContext(); const showDeleteModal = (hash: number) => { setIsDeleteModalVisible(true); @@ -19,12 +21,15 @@ export default function useDeleteSavedSearch() { const handleDelete = () => { deleteSavedSearch(hashToDelete); setIsDeleteModalVisible(false); - clearAdvancedFilters(); - Navigation.navigate( - ROUTES.SEARCH_ROOT.getRoute({ - query: buildCannedSearchQuery(), - }), - ); + + if (hashToDelete === currentSearchHash) { + clearAdvancedFilters(); + Navigation.navigate( + ROUTES.SEARCH_ROOT.getRoute({ + query: buildCannedSearchQuery(), + }), + ); + } }; function DeleteConfirmModal() {