Skip to content

Using all WS cards instead of last selected one's in member's card details #68848

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
puneetlath merged 4 commits into from
Sep 12, 2025
Merged

Using all WS cards instead of last selected one's in member's card details #68848

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9b7d7a
use all workspaces cards instead of last selected one's in cards deta…
mukhrr Aug 19, 2025
9f42b54
run prettier
mukhrr Aug 22, 2025
729041d
fix: Reorder import statements in WorkspaceExpensifyCardDetailsPage f…
mukhrr Sep 3, 2025
11b0102
Merge branch 'Expensify:main' into fix/67491
mukhrr Sep 3, 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
19 changes: 12 additions & 7 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import useCardFeeds from '@hooks/useCardFeeds';
import useCurrencyForExpensifyCard from '@hooks/useCurrencyForExpensifyCard';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {filterInactiveCards, getTranslationKeyForLimitType, maskCard} from '@libs/CardUtils';
import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
import {getAllCardsForWorkspace, getTranslationKeyForLimitType, maskCard} from '@libs/CardUtils';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
Expand All @@ -45,6 +48,7 @@ type WorkspaceExpensifyCardDetailsPageProps = PlatformStackScreenProps<
function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetailsPageProps) {
const {policyID, cardID, backTo} = route.params;
const defaultFundID = useDefaultFundID(policyID);
const workspaceAccountID = useWorkspaceAccountID(policyID);

const [isDeactivateModalVisible, setIsDeactivateModalVisible] = useState(false);
const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false);
Expand All @@ -56,12 +60,13 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
const [isDeleted, setIsDeleted] = useState(false);

const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false});
const [cardsList, cardsListResult] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {
selector: filterInactiveCards,
canBeMissing: true,
});
const [cardFeeds] = useCardFeeds(policyID);
const expensifyCardSettings = useExpensifyCardFeeds(policyID);
const [allFeedsCards, allFeedsCardsResult] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: true});
const workspaceCards = getAllCardsForWorkspace(workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID, allFeedsCards, cardFeeds, expensifyCardSettings);

const isWorkspaceCardRhp = route.name === SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS;
const card = cardsList?.[cardID];
const card = workspaceCards?.[cardID];
const currency = useCurrencyForExpensifyCard({policyID});
const cardholder = personalDetails?.[card?.accountID ?? CONST.DEFAULT_NUMBER_ID];
const isVirtual = !!card?.nameValuePairs?.isVirtual;
Expand Down Expand Up @@ -95,7 +100,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
});
};

if (!card && !isLoadingOnyxValue(cardsListResult)) {
if (!card && !isLoadingOnyxValue(allFeedsCardsResult)) {
return <NotFoundPage />;
}

Expand Down
Loading