Merge pull request Expensify#56352 from FitseTLT/fix-back-navigation-…

…on-expensify-delegate-no-access fix - Expensify Card - Back button on Not so fast page closes RHP instead of returning to profile page
software-mansion-labs · Feb 12, 2025 · 5ddef34 · 5ddef34
2 parents 6000b2a + 55e2f56
commit 5ddef34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/components/DelegateNoAccessWrapper.tsx b/src/components/DelegateNoAccessWrapper.tsx
@@ -23,6 +23,7 @@ type DelegateNoAccessWrapperProps = {
     accessDeniedVariants?: AccessDeniedVariants[];
     shouldForceFullScreen?: boolean;
     children?: (() => React.ReactNode) | React.ReactNode;
+    onBackButtonPress?: () => void;
 };
 
 function isDelegate(account: OnyxEntry<Account>) {
@@ -35,7 +36,7 @@ function isSubmitter(account: OnyxEntry<Account>) {
     return isDelegateOnlySubmitter;
 }
 
-function DelegateNoAccessWrapper({accessDeniedVariants = [], shouldForceFullScreen, ...props}: DelegateNoAccessWrapperProps) {
+function DelegateNoAccessWrapper({accessDeniedVariants = [], shouldForceFullScreen, onBackButtonPress, ...props}: DelegateNoAccessWrapperProps) {
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const isPageAccessDenied = accessDeniedVariants.reduce((acc, variant) => {
         const accessDeniedFunction = DENIED_ACCESS_VARIANTS[variant];
@@ -49,6 +50,10 @@ function DelegateNoAccessWrapper({accessDeniedVariants = [], shouldForceFullScre
                 shouldShow
                 shouldForceFullScreen={shouldForceFullScreen}
                 onBackButtonPress={() => {
+                    if (onBackButtonPress) {
+                        onBackButtonPress();
+                        return;
+                    }
                     if (shouldUseNarrowLayout) {
                         Navigation.dismissModal();
                         return;

diff --git a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
@@ -3,6 +3,7 @@ import {useOnyx} from 'react-native-onyx';
 import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {startIssueNewCardFlow} from '@libs/actions/Card';
+import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -63,7 +64,10 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
                 includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
-                <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
+                <DelegateNoAccessWrapper
+                    accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}
+                    onBackButtonPress={() => Navigation.goBack(backTo)}
+                />
             </ScreenWrapper>
         );
     }