add props spread for not found page

Expensify · Apr 29, 2024 · 8fc1426 · 8fc1426
1 parent dd27831
commit 8fc1426
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/src/pages/ErrorPage/NotFoundPage.tsx b/src/pages/ErrorPage/NotFoundPage.tsx
@@ -5,17 +5,17 @@ import ScreenWrapper from '@components/ScreenWrapper';
 
 type NotFoundPageProps = {
     onBackButtonPress?: () => void;
-} & Pick<FullPageNotFoundViewProps, 'subtitleKey' | 'onLinkPress'>;
+} & FullPageNotFoundViewProps;
 
 // eslint-disable-next-line rulesdir/no-negated-variables
-function NotFoundPage({onBackButtonPress, subtitleKey, onLinkPress}: NotFoundPageProps) {
+function NotFoundPage({onBackButtonPress, ...fullPageNotFoundViewProps}: NotFoundPageProps) {
     return (
         <ScreenWrapper testID={NotFoundPage.displayName}>
             <FullPageNotFoundView
                 shouldShow
                 onBackButtonPress={onBackButtonPress}
-                subtitleKey={subtitleKey}
-                onLinkPress={onLinkPress}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...fullPageNotFoundViewProps}
             />
         </ScreenWrapper>
     );

diff --git a/src/pages/workspace/AccessOrNotFoundWrapper.tsx b/src/pages/workspace/AccessOrNotFoundWrapper.tsx
@@ -43,29 +43,32 @@ type AccessOrNotFoundWrapperProps = AccessOrNotFoundWrapperOnyxProps & {
 
     /** The current feature name that the user tries to get access to */
     featureName?: PolicyFeatureName;
+
+    /** Props for customizing fallback pages */
+    fullPageNotFoundViewProps?: FullPageNotFoundViewProps;
 } & Pick<FullPageNotFoundViewProps, 'subtitleKey' | 'onLinkPress'>;
 
-type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'subtitleKey' | 'onLinkPress'> & {shouldShowFullScreenFallback: boolean};
+type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'fullPageNotFoundViewProps'> & {shouldShowFullScreenFallback: boolean};
 
-function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, subtitleKey, onLinkPress}: PageNotFoundFallbackProps) {
+function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageNotFoundViewProps}: PageNotFoundFallbackProps) {
     return shouldShowFullScreenFallback ? (
         <FullPageNotFoundView
             shouldShow
             onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
             shouldForceFullScreen
-            subtitleKey={subtitleKey}
-            onLinkPress={onLinkPress}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...fullPageNotFoundViewProps}
         />
     ) : (
         <NotFoundPage
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_PROFILE.getRoute(policyID))}
-            subtitleKey={subtitleKey}
-            onLinkPress={onLinkPress}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...fullPageNotFoundViewProps}
         />
     );
 }
 
-function AccessOrNotFoundWrapper({accessVariants = [], subtitleKey, onLinkPress, ...props}: AccessOrNotFoundWrapperProps) {
+function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps, ...props}: AccessOrNotFoundWrapperProps) {
     const {policy, policyID, featureName, isLoadingReportData} = props;
 
     const isPolicyIDInRoute = !!policyID?.length;
@@ -100,8 +103,7 @@ function AccessOrNotFoundWrapper({accessVariants = [], subtitleKey, onLinkPress,
             <PageNotFoundFallback
                 policyID={policyID}
                 shouldShowFullScreenFallback={!isFeatureEnabled}
-                subtitleKey={subtitleKey}
-                onLinkPress={onLinkPress}
+                fullPageNotFoundViewProps={fullPageNotFoundViewProps}
             />
         );
     }

diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -136,8 +136,7 @@ function WorkspaceInviteMessagePage({
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
-            subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
-            onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+            fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}}
         >
             <ScreenWrapper
                 includeSafeAreaPaddingBottom={false}

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -283,8 +283,7 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
-            subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
-            onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+            fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: PolicyUtils.goBackFromInvalidPolicy}}
         >
             <ScreenWrapper
                 shouldEnableMaxHeight

diff --git a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
@@ -75,8 +75,7 @@ function WorkspaceProfileCurrencyPage({currencyList = {}, policy}: WorkspaceProf
         <AccessOrNotFoundWrapper
             policyID={policy?.id ?? ''}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
-            onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
-            subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+            fullPageNotFoundViewProps={{onLinkPress: PolicyUtils.goBackFromInvalidPolicy, subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}}
         >
             <ScreenWrapper
                 includeSafeAreaPaddingBottom={false}