Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/pages/Search/SearchPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ function SearchPage({route}: SearchPageProps) {

const metadata = searchResults?.search;
const shouldShowOfflineIndicator = !!searchResults?.data;
const shouldShowFooter = !!metadata?.count;
const shouldShowFooter = !!metadata?.count || selectedTransactionsKeys.length > 0;

const offlineIndicatorStyle = useMemo(() => {
if (shouldShowFooter) {
Expand Down Expand Up @@ -699,11 +699,11 @@ function SearchPage({route}: SearchPageProps) {
}, []);

const footerData = useMemo(() => {
const shouldUseClientTotal = selectedTransactionsKeys.length > 0 && !areAllMatchingItemsSelected;

const currency = metadata?.currency;
const shouldUseClientTotal = !metadata?.count || (selectedTransactionsKeys.length > 0 && !areAllMatchingItemsSelected);
const selectedTransactionItems = Object.values(selectedTransactions);
const currency = metadata?.currency ?? selectedTransactionItems.at(0)?.convertedCurrency;
const count = shouldUseClientTotal ? selectedTransactionsKeys.length : metadata?.count;
const total = shouldUseClientTotal ? Object.values(selectedTransactions).reduce((acc, transaction) => acc - (transaction.convertedAmount ?? 0), 0) : metadata?.total;
const total = shouldUseClientTotal ? selectedTransactionItems.reduce((acc, transaction) => acc - (transaction.convertedAmount ?? 0), 0) : metadata?.total;

return {count, total, currency};
}, [areAllMatchingItemsSelected, metadata?.count, metadata?.currency, metadata?.total, selectedTransactions, selectedTransactionsKeys.length]);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Search/SearchPageNarrow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function SearchPageNarrow({
const {windowHeight} = useWindowDimensions();
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const {clearSelectedTransactions} = useSearchContext();
const {clearSelectedTransactions, selectedTransactions} = useSearchContext();
const [searchRouterListVisible, setSearchRouterListVisible] = useState(false);
const {isOffline} = useNetwork();
const currentSearchResultsKey = queryJSON?.hash ?? CONST.DEFAULT_NUMBER_ID;
Expand Down Expand Up @@ -166,7 +166,7 @@ function SearchPageNarrow({
);
}

const shouldShowFooter = !!metadata?.count;
const shouldShowFooter = !!metadata?.count || Object.keys(selectedTransactions).length > 0;
const isDataLoaded = isSearchDataLoaded(searchResults, queryJSON);
const shouldShowLoadingState = !isOffline && (!isDataLoaded || !!currentSearchResults?.search?.isLoading);

Expand Down
Loading