fixes after c+

Author: narefyev91

src/pages/workspace/duplicate/WorkspaceDuplicateForm.tsx

@@ -63,9 +63,9 @@ function WorkspaceDuplicateForm({policyID}: WorkspaceDuplicateFormProps) {
 
     const onSubmit = useCallback(
         ({name, avatarFile}: {name?: string; avatarFile?: File | CustomRNImageManipulatorResult}) => {
-            const newPolicyID = generatePolicyID();
-            setDuplicateWorkspaceData({policyID: newPolicyID, name, file: avatarFile});
             if (policyID) {
+                const newPolicyID = generatePolicyID();
+                setDuplicateWorkspaceData({policyID: newPolicyID, name, file: avatarFile});
                 Navigation.navigate(ROUTES.WORKSPACE_DUPLICATE_SELECT_FEATURES.getRoute(policyID));
             }
         },

src/pages/workspace/duplicate/WorkspaceDuplicatePage.tsx

@@ -3,7 +3,9 @@ import React, {useEffect} from 'react';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
 import type {WorkspaceDuplicateNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import {clearDuplicateWorkspace} from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceDuplicateForm from './WorkspaceDuplicateForm';
 
@@ -14,13 +16,18 @@ function WorkspaceDuplicatePage() {
     useEffect(clearDuplicateWorkspace, []);
 
     return (
-        <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
-            shouldEnableMaxHeight
-            testID={WorkspaceDuplicatePage.displayName}
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
-            <WorkspaceDuplicateForm policyID={policyID} />
-        </ScreenWrapper>
+            <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldEnableMaxHeight
+                testID={WorkspaceDuplicatePage.displayName}
+            >
+                <WorkspaceDuplicateForm policyID={policyID} />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
     );
 }
 

src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx

@@ -164,7 +164,7 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
                 : undefined,
         ];
 
-        return result.filter((item): item is NonNullable<typeof item> => item !== undefined);
+        return result.filter((item): item is NonNullable<typeof item> => !!item);
     }, [
         policy,
         translate,

src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesPage.tsx

@@ -3,6 +3,8 @@ import React from 'react';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
 import type {WorkspaceDuplicateNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceDuplicateSelectFeaturesForm from './WorkspaceDuplicateSelectFeaturesForm';
 
@@ -11,13 +13,18 @@ function WorkspaceDuplicateSelectFeaturesPage() {
     const policyID = route?.params?.policyID;
 
     return (
-        <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
-            shouldEnableMaxHeight
-            testID={WorkspaceDuplicateSelectFeaturesPage.displayName}
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
-            <WorkspaceDuplicateSelectFeaturesForm policyID={policyID} />
-        </ScreenWrapper>
+            <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldEnableMaxHeight
+                testID={WorkspaceDuplicateSelectFeaturesPage.displayName}
+            >
+                <WorkspaceDuplicateSelectFeaturesForm policyID={policyID} />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
     );
 }