Skip to content

[CP Staging] Put merge account behind beta #59803

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
arosiclair merged 3 commits into from
Apr 8, 2025
Merged

[CP Staging] Put merge account behind beta #59803

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df65904
put merge account behind beta
allroundexperts Apr 8, 2025
8569661
lint errors
allroundexperts Apr 8, 2025
1f4d2fe
lint errors
allroundexperts Apr 8, 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: 15 additions & 10 deletions src/pages/settings/Security/SecuritySettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Section from '@components/Section';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
import usePermissions from '@hooks/usePermissions';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import useWaitForNavigation from '@hooks/useWaitForNavigation';
Expand All @@ -49,6 +50,7 @@ function SecuritySettingsPage() {
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {windowWidth} = useWindowDimensions();
const personalDetails = usePersonalDetails();
const {canUseMergeAccounts} = usePermissions();

const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const delegateButtonRef = useRef<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -117,18 +119,21 @@ function SecuritySettingsPage() {
icon: Expensicons.Shield,
action: isActingAsDelegate ? showDelegateNoAccessMenu : waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute())),
},
{
];

if (canUseMergeAccounts) {
baseMenuItems.push({
translationKey: 'mergeAccountsPage.mergeAccount',
icon: Expensicons.ArrowCollapse,
action: waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_MERGE_ACCOUNTS.route)),
},
{
translationKey: 'closeAccountPage.closeAccount',
icon: Expensicons.ClosedSign,
action: isActingAsDelegate ? showDelegateNoAccessMenu : waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_CLOSE)),
},
];
action: isActingAsDelegate ? showDelegateNoAccessMenu : waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_MERGE_ACCOUNTS.route)),
});
}

baseMenuItems.push({
translationKey: 'closeAccountPage.closeAccount',
icon: Expensicons.ClosedSign,
action: isActingAsDelegate ? showDelegateNoAccessMenu : waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_CLOSE)),
});
return baseMenuItems.map((item) => ({
key: item.translationKey,
title: translate(item.translationKey as TranslationPaths),
Expand All @@ -138,7 +143,7 @@ function SecuritySettingsPage() {
link: '',
wrapperStyle: [styles.sectionMenuItemTopDescription],
}));
}, [translate, waitForNavigate, styles, isActingAsDelegate]);
}, [translate, waitForNavigate, styles, isActingAsDelegate, canUseMergeAccounts]);

const delegateMenuItems: MenuItemProps[] = useMemo(
() =>
Expand Down