Skip to content

Commit 8942513

Browse files
authored
Merge pull request #45409 from software-mansion-labs/search-v2/search-results
[Search v2] [App] Create search results page
2 parents 3c9c7b0 + 6cffd47 commit 8942513

14 files changed

+257
-60
lines changed

assets/images/filters.svg

+6
Loading
Loading

src/components/Icon/Expensicons.ts

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg';
8282
import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg';
8383
import EyeDisabled from '@assets/images/eye-disabled.svg';
8484
import Eye from '@assets/images/eye.svg';
85+
import Filters from '@assets/images/filters.svg';
8586
import Flag from '@assets/images/flag.svg';
8687
import FlagLevelOne from '@assets/images/flag_level_01.svg';
8788
import FlagLevelTwo from '@assets/images/flag_level_02.svg';
@@ -373,5 +374,6 @@ export {
373374
CheckCircle,
374375
CheckmarkCircle,
375376
NetSuiteSquare,
377+
Filters,
376378
CalendarSolid,
377379
};

src/components/Icon/Illustrations.ts

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustrat
5656
import CreditCardEyes from '@assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg';
5757
import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg';
5858
import EmptyState from '@assets/images/simple-illustrations/simple-illustration__empty-state.svg';
59+
import Filters from '@assets/images/simple-illustrations/simple-illustration__filters.svg';
5960
import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg';
6061
import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg';
6162
import HandCard from '@assets/images/simple-illustrations/simple-illustration__handcard.svg';
@@ -210,4 +211,5 @@ export {
210211
FolderWithPapers,
211212
VirtualCard,
212213
Tire,
214+
Filters,
213215
};

src/components/Search/SearchListWithHeader.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ import * as SearchUtils from '@libs/SearchUtils';
1111
import CONST from '@src/CONST';
1212
import type {SearchDataTypes, SearchReport} from '@src/types/onyx/SearchResults';
1313
import SearchPageHeader from './SearchPageHeader';
14-
import type {SearchStatus, SelectedTransactionInfo, SelectedTransactions} from './types';
14+
import type {SearchQueryJSON, SelectedTransactionInfo, SelectedTransactions} from './types';
1515

1616
type SearchListWithHeaderProps = Omit<BaseSelectionListProps<ReportListItemType | TransactionListItemType>, 'onSelectAll' | 'onCheckboxPress' | 'sections'> & {
17-
status: SearchStatus;
17+
queryJSON: SearchQueryJSON;
1818
hash: number;
1919
data: TransactionListItemType[] | ReportListItemType[];
2020
searchType: SearchDataTypes;
21+
isCustomQuery: boolean;
2122
};
2223

2324
function mapTransactionItemToSelectedEntry(item: TransactionListItemType): [string, SelectedTransactionInfo] {
@@ -38,7 +39,7 @@ function mapToItemWithSelectionInfo(item: TransactionListItemType | ReportListIt
3839
};
3940
}
4041

41-
function SearchListWithHeader({ListItem, onSelectRow, status, hash, data, searchType, ...props}: SearchListWithHeaderProps, ref: ForwardedRef<SelectionListHandle>) {
42+
function SearchListWithHeader({ListItem, onSelectRow, queryJSON, hash, data, searchType, isCustomQuery, ...props}: SearchListWithHeaderProps, ref: ForwardedRef<SelectionListHandle>) {
4243
const {isSmallScreenWidth} = useWindowDimensions();
4344
const {translate} = useLocalize();
4445
const [selectedTransactions, setSelectedTransactions] = useState<SelectedTransactions>({});
@@ -148,10 +149,11 @@ function SearchListWithHeader({ListItem, onSelectRow, status, hash, data, search
148149
<SearchPageHeader
149150
selectedTransactions={selectedTransactions}
150151
clearSelectedItems={clearSelectedItems}
151-
status={status}
152+
queryJSON={queryJSON}
152153
hash={hash}
153154
onSelectDeleteOption={handleOnSelectDeleteOption}
154155
selectedReports={selectedReports}
156+
isCustomQuery={isCustomQuery}
155157
setOfflineModalOpen={() => setOfflineModalVisible(true)}
156158
setDownloadErrorModalOpen={() => setDownloadErrorModalVisible(true)}
157159
/>

0 commit comments

Comments
 (0)