Skip to content
Merged
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
16 changes: 10 additions & 6 deletions src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {useContext, useEffect, useMemo, useState} from 'react';
import {useFocusEffect} from '@react-navigation/native';
import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
Expand All @@ -13,7 +14,6 @@ import MenuItem from '@components/MenuItem';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import useBeforeRemove from '@hooks/useBeforeRemove';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useEnvironment from '@hooks/useEnvironment';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
Expand Down Expand Up @@ -128,10 +128,14 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {

const {cardsDetails, setCardsDetails, isCardDetailsLoading, cardsDetailsErrors} = useExpensifyCardContext();

// This resets card details when we exit the page.
useBeforeRemove(() => {
setCardsDetails((oldCardDetails) => ({...oldCardDetails, [cardID]: null}));
});
// Resets card details when navigating away from the page.
useFocusEffect(
useCallback(() => {
return () => {
setCardsDetails((oldCardDetails) => ({...oldCardDetails, [cardID]: null}));
};
}, [cardID, setCardsDetails]),
);
Comment thread
samranahm marked this conversation as resolved.

const {isAccountLocked, showLockedAccountModal} = useContext(LockedAccountContext);

Expand Down
Loading