Skip to content

Expensify Card > Settings - App back button does not work #60492

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
mountiny merged 4 commits into from
Apr 22, 2025
Merged

Expensify Card > Settings - App back button does not work #60492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a6196f
replace where to navigate
borys3kk Apr 18, 2025
11dbb8c
remove unnecessary Navigation.goBack
borys3kk Apr 18, 2025
0165aa1
fix useOnyx lint error
borys3kk Apr 18, 2025
6d64fa6
fix useOnyx wrong param
borys3kk Apr 18, 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
10 changes: 3 additions & 7 deletions src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import {getLastFourDigits} from '@libs/BankAccountUtils';
import goBackFromWorkspaceCentralScreen from '@libs/Navigation/helpers/goBackFromWorkspaceCentralScreen';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import Navigation from '@navigation/Navigation';
import type {SettingsNavigatorParamList} from '@navigation/types';
Expand All @@ -29,8 +28,8 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
const policyID = route.params?.policyID;
const defaultFundID = useDefaultFundID(policyID);

const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`);
const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: false});
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: false});

const paymentBankAccountID = cardSettings?.paymentBankAccountID;
const isMonthlySettlementAllowed = cardSettings?.isMonthlySettlementAllowed ?? false;
Expand All @@ -49,10 +48,7 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
enableEdgeToEdgeBottomSafeAreaPadding
shouldEnableMaxHeight
>
<HeaderWithBackButton
title={translate('workspace.common.settings')}
onBackButtonPress={() => goBackFromWorkspaceCentralScreen(policyID)}
/>
<HeaderWithBackButton title={translate('workspace.common.settings')} />
<ScrollView
contentContainerStyle={styles.flexGrow1}
addBottomSafeAreaPadding
Expand Down
11 changes: 6 additions & 5 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {clearDeletePaymentMethodError} from '@libs/actions/PaymentMethods';
import {sortCardsByCardholderName} from '@libs/CardUtils';
import goBackFromWorkspaceCentralScreen from '@libs/Navigation/helpers/goBackFromWorkspaceCentralScreen';
import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
import {getDescriptionForPolicyDomainCard} from '@libs/PolicyUtils';
import Navigation from '@navigation/Navigation';
Expand Down Expand Up @@ -54,14 +55,14 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
const policyID = route.params.policyID;
const policy = usePolicy(policyID);
const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`);
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${fundID}`);
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false});
const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`, {canBeMissing: true});
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${fundID}`, {canBeMissing: false});
const allExpensifyCardFeeds = useExpensifyCardFeeds(policyID);

const shouldShowSelector = Object.keys(allExpensifyCardFeeds ?? {}).length > 1;

const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate});
const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate, canBeMissing: false});
const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);

const shouldChangeLayout = isMediumScreenWidth || shouldUseNarrowLayout;
Expand Down Expand Up @@ -154,7 +155,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
shouldUseHeadlineHeader
title={translate('workspace.common.expensifyCard')}
shouldShowBackButton={shouldUseNarrowLayout}
onBackButtonPress={() => Navigation.goBack()}
onBackButtonPress={() => goBackFromWorkspaceCentralScreen(policyID)}
>
{!shouldShowSelector && !shouldUseNarrowLayout && isBankAccountVerified && getHeaderButtons()}
</HeaderWithBackButton>
Expand Down