Skip to content

Fix - Reports - Hamburger button is lighter than the exposed filter buttons below and Cancel button is showing when you are viewing results. #68590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 3 commits into from
Aug 18, 2025
Merged

Fix - Reports - Hamburger button is lighter than the exposed filter buttons below and Cancel button is showing when you are viewing results. #68590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47b0ae2
fix hamburger style
FitseTLT Aug 14, 2025
5ebd659
Merge branch 'main' into fix-search-hamburger-button-style
FitseTLT Aug 14, 2025
e7fd47d
Merge branch 'main' into fix-search-hamburger-button-style
FitseTLT Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import PopoverMenu from '@components/PopoverMenu';
import type {SearchQueryJSON} from '@components/Search/types';
import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
import useSearchTypeMenu from '@hooks/useSearchTypeMenu';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as Expensicons from '@src/components/Icon/Expensicons';

Expand All @@ -13,7 +12,6 @@ type SearchTypeMenuNarrowProps = {
};

function SearchTypeMenuPopover({queryJSON}: SearchTypeMenuNarrowProps) {
const theme = useTheme();
const styles = useThemeStyles();
const {isPopoverVisible, delayPopoverMenuFirstRender, openMenu, closeMenu, allMenuItems, DeleteConfirmModal, windowHeight} = useSearchTypeMenu(queryJSON);

Expand All @@ -23,7 +21,6 @@ function SearchTypeMenuPopover({queryJSON}: SearchTypeMenuNarrowProps) {
return (
<>
<Button
innerStyles={[{backgroundColor: theme.sidebarHover}]}
icon={Expensicons.Menu}
onPress={openMenu}
/>
Expand Down
12 changes: 4 additions & 8 deletions src/pages/Search/SearchPageNarrow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
import Navigation from '@libs/Navigation/Navigation';
import {buildCannedSearchQuery, isCannedSearchQuery} from '@libs/SearchQueryUtils';
import {buildCannedSearchQuery} from '@libs/SearchQueryUtils';
import {isSearchDataLoaded} from '@libs/SearchUIUtils';
import variables from '@styles/variables';
import {searchInServer} from '@userActions/Report';
Expand Down Expand Up @@ -106,14 +106,10 @@ function SearchPageNarrow({queryJSON, headerButtonsOptions, searchResults, isMob

const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery()}));

const shouldDisplayCancelSearch = shouldUseNarrowLayout && ((!!queryJSON && !isCannedSearchQuery(queryJSON)) || searchRouterListVisible);
const shouldDisplayCancelSearch = shouldUseNarrowLayout && searchRouterListVisible;
const cancelSearchCallback = useCallback(() => {
if (searchRouterListVisible) {
setSearchRouterListVisible(false);
return;
}
Navigation.goBack(ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery()}));
}, [searchRouterListVisible]);
setSearchRouterListVisible(false);
}, []);

const handleSearchAction = useCallback((value: SearchParams | string) => {
if (typeof value === 'string') {
Expand Down
Loading