Skip to content

Fix "Page is not here" inside subscription #46126

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
blimpich merged 1 commit into from
Jul 24, 2024
Merged

Fix "Page is not here" inside subscription #46126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/pages/settings/InitialSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import useActiveCentralPaneRoute from '@hooks/useActiveCentralPaneRoute';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useSingleExecution from '@hooks/useSingleExecution';
import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useWaitForNavigation from '@hooks/useWaitForNavigation';
Expand Down Expand Up @@ -108,6 +109,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
const emojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';

const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
const subscriptionPlan = useSubscriptionPlan();

const [shouldShowSignoutConfirmModal, setShouldShowSignoutConfirmModal] = useState(false);

Expand Down Expand Up @@ -203,7 +205,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
},
];

if (privateSubscription) {
if (subscriptionPlan) {
items.splice(1, 0, {
translationKey: 'allSettingsScreen.subscription',
icon: Expensicons.CreditCard,
Expand All @@ -219,7 +221,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
sectionTranslationKey: 'common.workspaces',
items,
};
}, [policies, privateSubscription, styles.badgeSuccess, styles.workspaceSettingsSectionContainer, translate]);
}, [policies, privateSubscription?.errors, styles.badgeSuccess, styles.workspaceSettingsSectionContainer, subscriptionPlan, translate]);

/**
* Retuns a list of menu items data for general section
Expand Down