diff --git a/src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx b/src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx index b52b859ab1f6..2fe6f0230fd1 100644 --- a/src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx +++ b/src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx @@ -54,15 +54,15 @@ function SearchTypeMenuPopover({queryJSON, searchName}: SearchTypeMenuNarrowProp const {singleExecution} = useSingleExecution(); const {windowHeight} = useWindowDimensions(); const {translate} = useLocalize(); - const {hash, policyID, groupBy} = queryJSON; + const {hash, groupBy} = queryJSON; const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch(); - const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); - const [session] = useOnyx(ONYXKEYS.SESSION); + const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); + const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false}); const personalDetails = usePersonalDetails(); - const [reports = {}] = useOnyx(ONYXKEYS.COLLECTION.REPORT); + const [reports = {}] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true}); const taxRates = getAllTaxRates(); - const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST); - const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST); + const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true}); + const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: true}); const allCards = useMemo(() => mergeCardListWithWorkspaceFeeds(workspaceCardFeeds ?? CONST.EMPTY_OBJECT, userCardList), [userCardList, workspaceCardFeeds]); const {unmodifiedPaddings} = useSafeAreaPaddings(); const {canUseLeftHandBar} = usePermissions(); @@ -102,7 +102,7 @@ function SearchTypeMenuPopover({queryJSON, searchName}: SearchTypeMenuNarrowProp (itemName: string, itemHash: number, itemQuery: string) => getOverflowMenuUtil(itemName, itemHash, itemQuery, showDeleteModal, true, closeMenu), [closeMenu, showDeleteModal], ); - const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES); + const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES, {canBeMissing: true}); const createSavedSearchMenuItem = useCallback( (item: SaveSearchItem, key: string, index: number) => { let savedSearchTitle = item.name; @@ -170,7 +170,7 @@ function SearchTypeMenuPopover({queryJSON, searchName}: SearchTypeMenuNarrowProp text: translate(item.translationPath), onSelected: singleExecution(() => { clearAllFilters(); - Navigation.navigate(item.getRoute(policyID)); + Navigation.navigate(item.getRoute()); }), isSelected, icon: item.icon, @@ -199,7 +199,7 @@ function SearchTypeMenuPopover({queryJSON, searchName}: SearchTypeMenuNarrowProp } return items; - }, [typeMenuItems, title, currentSavedSearch, activeItemIndex, translate, singleExecution, theme.iconSuccessFill, theme.icon, theme.border, policyID, closeMenu, shouldGroupByReports]); + }, [typeMenuItems, title, currentSavedSearch, activeItemIndex, translate, singleExecution, theme.iconSuccessFill, theme.icon, theme.border, closeMenu, shouldGroupByReports]); const allMenuItems = useMemo(() => { const items = []; diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index 57c1592b7c38..ff19ce69fec7 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -201,7 +201,7 @@ const typeFiltersKeys: Record s.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline).length > 0; const isFocused = useIsFocused(); @@ -61,12 +61,12 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) { shouldShowSavedSearchesMenuItemTitle && isFocused, ); const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch(); - const [session] = useOnyx(ONYXKEYS.SESSION); - const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); + const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false}); + const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); const personalDetails = usePersonalDetails(); - const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); - const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST); - const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST); + const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true}); + const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true}); + const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: true}); const allCards = useMemo(() => mergeCardListWithWorkspaceFeeds(workspaceCardFeeds ?? CONST.EMPTY_OBJECT, userCardList), [userCardList, workspaceCardFeeds]); const taxRates = getAllTaxRates(); const {clearSelectedTransactions} = useSearchContext(); @@ -214,7 +214,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) { const onPress = singleExecution(() => { clearAllFilters(); clearSelectedTransactions(); - Navigation.navigate(item.getRoute(queryJSON?.policyID)); + Navigation.navigate(item.getRoute()); }); return (