diff --git a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader/SearchPageHeader.tsx index f79717930266..cef3d9a8301a 100644 --- a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx +++ b/src/components/Search/SearchPageHeader/SearchPageHeader.tsx @@ -323,7 +323,7 @@ function SearchPageHeader({queryJSON, searchName, searchRouterListVisible, hideS }, [allCards, currencyList, hideProductTrainingTooltip, personalDetails, policyCategories, policyTagsLists, queryJSON, reports, taxRates]); const InputRightComponent = useMemo(() => { - return headerButtonsOptions.length > 0 ? ( + return headerButtonsOptions.length > 0 && (!shouldUseNarrowLayout || selectionMode?.isEnabled) ? ( null} shouldAlwaysShowDropdownMenu @@ -363,6 +363,8 @@ function SearchPageHeader({queryJSON, searchName, searchRouterListVisible, hideS styles.productTrainingTooltipWrapper, styles.searchAutocompleteInputResults, translate, + selectionMode, + shouldUseNarrowLayout, ]); if (shouldUseNarrowLayout && selectionMode?.isEnabled) { diff --git a/src/pages/Search/SearchPageNarrow.tsx b/src/pages/Search/SearchPageNarrow.tsx index 917b6daa5e32..0154ca4c0ccd 100644 --- a/src/pages/Search/SearchPageNarrow.tsx +++ b/src/pages/Search/SearchPageNarrow.tsx @@ -137,26 +137,30 @@ function SearchPageNarrow({queryJSON, policyID, searchName}: SearchPageBottomTab /> - - { - setSearchRouterListVisible(false); - }} - onSearchRouterFocus={() => { - topBarOffset.set(StyleUtils.searchHeaderDefaultOffset); - setSearchRouterListVisible(true); - }} - /> - {!searchRouterListVisible && ( - + + { - topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS})); + searchRouterListVisible={searchRouterListVisible} + hideSearchRouterList={() => { + setSearchRouterListVisible(false); + }} + onSearchRouterFocus={() => { + topBarOffset.set(StyleUtils.searchHeaderDefaultOffset); + setSearchRouterListVisible(true); }} /> - )} + + + {!searchRouterListVisible && ( + { + topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS})); + }} + /> + )} + diff --git a/src/styles/index.ts b/src/styles/index.ts index 5661e0eb40e4..927fd9252af0 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3768,7 +3768,7 @@ const styles = (theme: ThemeColors) => narrowSearchHeaderStyle: { paddingTop: 1, - flex: 1, + backgroundColor: theme.appBG, }, narrowSearchRouterInactiveStyle: {