Skip to content

Commit f00318d

Browse files
authored
Merge pull request Expensify#63883 from Expensify/arosiclair-remove-merge-accounts-beta
[No QA] Remove merge accounts beta
2 parents a8cd2fe + 7c7684c commit f00318d

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

src/CONST/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,6 @@ const CONST = {
635635
REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
636636
NETSUITE_USA_TAX: 'netsuiteUsaTax',
637637
PER_DIEM: 'newDotPerDiem',
638-
NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
639638
NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest',
640639
CUSTOM_RULES: 'customRules',
641640
GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND',

src/pages/settings/Security/SecuritySettingsPage.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import Text from '@components/Text';
2424
import TextLink from '@components/TextLink';
2525
import useLocalize from '@hooks/useLocalize';
2626
import useOnyx from '@hooks/useOnyx';
27-
import usePermissions from '@hooks/usePermissions';
2827
import useResponsiveLayout from '@hooks/useResponsiveLayout';
2928
import useThemeStyles from '@hooks/useThemeStyles';
3029
import useWaitForNavigation from '@hooks/useWaitForNavigation';
@@ -61,7 +60,6 @@ function SecuritySettingsPage() {
6160
const {shouldUseNarrowLayout} = useResponsiveLayout();
6261
const {windowWidth} = useWindowDimensions();
6362
const personalDetails = usePersonalDetails();
64-
const {isBetaEnabled} = usePermissions();
6563

6664
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
6765
const isUserValidated = account?.validated;
@@ -137,10 +135,7 @@ function SecuritySettingsPage() {
137135
Navigation.navigate(ROUTES.SETTINGS_2FA_ROOT.getRoute());
138136
},
139137
},
140-
];
141-
142-
if (isBetaEnabled(CONST.BETAS.NEWDOT_MERGE_ACCOUNTS)) {
143-
baseMenuItems.push({
138+
{
144139
translationKey: 'mergeAccountsPage.mergeAccount',
145140
icon: Expensicons.ArrowCollapse,
146141
action: () => {
@@ -154,8 +149,8 @@ function SecuritySettingsPage() {
154149
}
155150
Navigation.navigate(ROUTES.SETTINGS_MERGE_ACCOUNTS.route);
156151
},
157-
});
158-
}
152+
},
153+
];
159154

160155
if (isAccountLocked) {
161156
baseMenuItems.push({
@@ -196,7 +191,7 @@ function SecuritySettingsPage() {
196191
link: '',
197192
wrapperStyle: [styles.sectionMenuItemTopDescription],
198193
}));
199-
}, [translate, waitForNavigate, styles, isActingAsDelegate, showDelegateNoAccessModal, isBetaEnabled, isAccountLocked, showLockedAccountModal]);
194+
}, [translate, waitForNavigate, styles, isActingAsDelegate, showDelegateNoAccessModal, isAccountLocked, showLockedAccountModal]);
200195

201196
const delegateMenuItems: MenuItemProps[] = useMemo(
202197
() =>

0 commit comments

Comments
 (0)