Skip to content

fix: cards filter with old ui #65235

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
MarioExpensify merged 2 commits into from
Jul 2, 2025
Merged

fix: cards filter with old ui #65235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3876e7e
fix: cards filter with old ui
linhvovan29546 Jul 1, 2025
f1ec9fe
Merge branch 'Expensify:main' into fix/64976-cards-filter-with-old-ui
linhvovan29546 Jul 1, 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
25 changes: 10 additions & 15 deletions src/components/SelectionList/Search/CardListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import {Str} from 'expensify-common';
import React, {useCallback} from 'react';
import {View} from 'react-native';
import Avatar from '@components/Avatar';
import Checkbox from '@components/Checkbox';
import Icon from '@components/Icon';
import {FallbackAvatar} from '@components/Icon/Expensicons';
import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
import SelectCircle from '@components/SelectCircle';
import BaseListItem from '@components/SelectionList/BaseListItem';
import type {BaseListItemProps, ListItem} from '@components/SelectionList/types';
import TextWithTooltip from '@components/TextWithTooltip';
Expand Down Expand Up @@ -50,7 +49,7 @@ function CardListItem<TItem extends ListItem>({

const ownersAvatar = {
source: item.cardOwnerPersonalDetails?.avatar ?? FallbackAvatar,
id: item.cardOwnerPersonalDetails?.accountID ?? -1,
id: item.cardOwnerPersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID,
type: CONST.ICON_TYPE_AVATAR,
name: item.cardOwnerPersonalDetails?.displayName ?? '',
fallbackIcon: item.cardOwnerPersonalDetails?.fallbackIcon,
Expand Down Expand Up @@ -85,7 +84,7 @@ function CardListItem<TItem extends ListItem>({
<View>
<UserDetailsTooltip
shouldRender={showTooltip}
accountID={Number(item.cardOwnerPersonalDetails?.accountID ?? -1)}
accountID={Number(item.cardOwnerPersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID)}
icon={ownersAvatar}
fallbackUserDetails={{
displayName: item.cardOwnerPersonalDetails?.displayName,
Expand Down Expand Up @@ -144,18 +143,14 @@ function CardListItem<TItem extends ListItem>({
</View>
</View>
{!!canSelectMultiple && !item.isDisabled && (
<PressableWithFeedback
onPress={handleCheckboxPress}
disabled={isDisabled}
role={CONST.ROLE.BUTTON}
<Checkbox
shouldSelectOnPressEnter
isChecked={item.isSelected ?? false}
accessibilityLabel={item.text ?? ''}
style={[styles.ml2, styles.optionSelectCircle]}
>
<SelectCircle
isChecked={item.isSelected ?? false}
selectCircleStyles={styles.ml0}
/>
</PressableWithFeedback>
onPress={handleCheckboxPress}
disabled={!!isDisabled}
style={styles.ml3}
Comment thread
linhvovan29546 marked this conversation as resolved.
/>
)}
</>
</BaseListItem>
Expand Down
23 changes: 12 additions & 11 deletions src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import {usePersonalDetails} from '@components/OnyxProvider';
import ScreenWrapper from '@components/ScreenWrapper';
import SearchFilterPageFooterButtons from '@components/Search/SearchFilterPageFooterButtons';
import SelectionList from '@components/SelectionList';
import CardListItem from '@components/SelectionList/Search/CardListItem';
import useDebouncedState from '@hooks/useDebouncedState';
Expand All @@ -25,10 +25,10 @@ function SearchFiltersCardPage() {
const {translate} = useLocalize();
const illustrations = useThemeIllustrations();

const [userCardList, userCardListMetadata] = useOnyx(ONYXKEYS.CARD_LIST);
const [workspaceCardFeeds, workspaceCardFeedsMetadata] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);
const [userCardList, userCardListMetadata] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});
const [workspaceCardFeeds, workspaceCardFeedsMetadata] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: true});
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
const [searchAdvancedFiltersForm, searchAdvancedFiltersFormMetadata] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
const [searchAdvancedFiltersForm, searchAdvancedFiltersFormMetadata] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
const personalDetails = usePersonalDetails();

const [selectedCards, setSelectedCards] = useState<string[]>([]);
Expand Down Expand Up @@ -147,17 +147,18 @@ function SearchFiltersCardPage() {

const headerMessage = debouncedSearchTerm.trim() && sections.every((section) => !section.data.length) ? translate('common.noResultsFound') : '';

const resetChanges = useCallback(() => {
setSelectedCards([]);
}, [setSelectedCards]);

const footerContent = useMemo(
() => (
<Button
success
text={translate('common.save')}
pressOnEnter
onPress={handleConfirmSelection}
large
<SearchFilterPageFooterButtons
applyChanges={handleConfirmSelection}
resetChanges={resetChanges}
/>
),
[translate, handleConfirmSelection],
[resetChanges, handleConfirmSelection],
);

return (
Expand Down
Loading