Merge pull request Expensify#68545 from mkzie2/mkzie2-issue/67880

Copilot - 'Not So Fast' Modal still displayed after switch limited to full access

Author: Valforte

src/pages/settings/Security/CloseAccountPage.tsx

@@ -96,7 +96,7 @@ function CloseAccountPage() {
             includeSafeAreaPaddingBottom
             testID={CloseAccountPage.displayName}
         >
-            <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
+            <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.SUBMITTER]}>
                 <HeaderWithBackButton
                     title={translate('closeAccountPage.closeAccount')}
                     onBackButtonPress={() => Navigation.goBack()}

src/pages/settings/Security/SecuritySettingsPage.tsx

@@ -80,7 +80,7 @@ function SecuritySettingsPage() {
     });
 
     const {isAccountLocked, showLockedAccountModal} = useContext(LockedAccountContext);
-    const {isActingAsDelegate, showDelegateNoAccessModal} = useContext(DelegateNoAccessContext);
+    const {isDelegateAccessRestricted, showDelegateNoAccessModal} = useContext(DelegateNoAccessContext);
     const delegates = account?.delegatedAccess?.delegates ?? [];
     const delegators = account?.delegatedAccess?.delegators ?? [];
 
@@ -126,7 +126,7 @@ function SecuritySettingsPage() {
                 translationKey: 'twoFactorAuth.headerTitle',
                 icon: Expensicons.Shield,
                 action: () => {
-                    if (isActingAsDelegate) {
+                    if (isDelegateAccessRestricted) {
                         showDelegateNoAccessModal();
                         return;
                     }
@@ -141,7 +141,7 @@ function SecuritySettingsPage() {
                 translationKey: 'mergeAccountsPage.mergeAccount',
                 icon: Expensicons.ArrowCollapse,
                 action: () => {
-                    if (isActingAsDelegate) {
+                    if (isDelegateAccessRestricted) {
                         showDelegateNoAccessModal();
                         return;
                     }
@@ -179,7 +179,7 @@ function SecuritySettingsPage() {
             translationKey: 'closeAccountPage.closeAccount',
             icon: Expensicons.ClosedSign,
             action: () => {
-                if (isActingAsDelegate) {
+                if (isDelegateAccessRestricted) {
                     showDelegateNoAccessModal();
                     return;
                 }
@@ -200,7 +200,7 @@ function SecuritySettingsPage() {
             link: '',
             wrapperStyle: [styles.sectionMenuItemTopDescription],
         }));
-    }, [translate, waitForNavigate, styles, isActingAsDelegate, showDelegateNoAccessModal, isAccountLocked, showLockedAccountModal, privateSubscription, currentUserPersonalDetails]);
+    }, [translate, waitForNavigate, styles, isDelegateAccessRestricted, showDelegateNoAccessModal, isAccountLocked, showLockedAccountModal, privateSubscription, currentUserPersonalDetails]);
 
     const delegateMenuItems: MenuItemProps[] = useMemo(
         () =>
@@ -279,7 +279,7 @@ function SecuritySettingsPage() {
             text: translate('delegate.changeAccessLevel'),
             icon: Expensicons.Pencil,
             onPress: () => {
-                if (isActingAsDelegate) {
+                if (isDelegateAccessRestricted) {
                     modalClose(() => showDelegateNoAccessModal());
                     return;
                 }
@@ -297,7 +297,7 @@ function SecuritySettingsPage() {
             text: translate('delegate.removeCopilot'),
             icon: Expensicons.Trashcan,
             onPress: () => {
-                if (isActingAsDelegate) {
+                if (isDelegateAccessRestricted) {
                     modalClose(() => showDelegateNoAccessModal());
                     return;
                 }
@@ -377,7 +377,7 @@ function SecuritySettingsPage() {
                                             <MenuItemList menuItems={delegateMenuItems} />
                                         </>
                                     )}
-                                    {!isActingAsDelegate && (
+                                    {!isDelegateAccessRestricted && (
                                         <MenuItem
                                             title={translate('delegate.addCopilot')}
                                             icon={Expensicons.UserPlus}

src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthWrapper.tsx

@@ -1,7 +1,8 @@
-import React, {useMemo} from 'react';
+import React, {useContext, useMemo} from 'react';
 import type {ValueOf} from 'type-fest';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import {DelegateNoAccessContext} from '@components/DelegateNoAccessModalProvider';
 import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -44,7 +45,7 @@ function TwoFactorAuthWrapper({
     children,
 }: TwoFactorAuthWrapperProps) {
     const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
-    const isActingAsDelegate = !!account?.delegatedAccess?.delegate;
+    const {isDelegateAccessRestricted} = useContext(DelegateNoAccessContext);
 
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFound = useMemo(() => {
@@ -72,7 +73,7 @@ function TwoFactorAuthWrapper({
 
     const viewportOffsetTop = useViewportOffsetTop();
 
-    if (isActingAsDelegate) {
+    if (isDelegateAccessRestricted) {
         return (
             <ScreenWrapper
                 testID={TwoFactorAuthWrapper.displayName}