refactor isDeleting

Author: jakubstec

src/pages/domain/Groups/DomainGroupDetailsPage.tsx

@@ -45,13 +45,10 @@ function DomainGroupDetailsPage({route}: DomainGroupDetailsPageProps) {
         selector: domainSecurityGroupSettingPendingActionSelector('deleteGroup', groupID),
     });
 
-    // Block access to a group being deleted, and avoid flashing the not-found page during RHP navigation
-    const isDeleting = !group || !!deleteGroupPendingAction;
-
     return (
         <DomainNotFoundPageWrapper
             domainAccountID={domainAccountID}
-            shouldBeBlocked={isDeleting}
+            shouldBeBlocked={!group || !!deleteGroupPendingAction}
             fullPageNotFoundViewProps={{
                 onBackButtonPress: () => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID)),
             }}

src/pages/domain/Groups/DomainGroupEditNamePage.tsx

@@ -39,9 +39,6 @@ function DomainGroupEditNamePage({route}: DomainGroupEditNamePageProps) {
         selector: domainSecurityGroupSettingPendingActionSelector('deleteGroup', groupID),
     });
 
-    // Block access to a group being deleted, and avoid flashing the not-found page during RHP navigation
-    const isDeleting = !group || !!deleteGroupPendingAction;
-
     const inputRef = useRef<AnimatedTextInputRef>(null);
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_DOMAIN_GROUP_NAME_FORM>): Errors => {
@@ -59,7 +56,7 @@ function DomainGroupEditNamePage({route}: DomainGroupEditNamePageProps) {
     return (
         <DomainNotFoundPageWrapper
             domainAccountID={domainAccountID}
-            shouldBeBlocked={isDeleting}
+            shouldBeBlocked={!group || !!deleteGroupPendingAction}
             fullPageNotFoundViewProps={{
                 onBackButtonPress: () => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID)),
             }}

src/pages/domain/Groups/DomainGroupPreferredWorkspacePage.tsx

@@ -44,9 +44,6 @@ function DomainGroupPreferredWorkspacePage({route}: DomainGroupPreferredWorkspac
         selector: domainSecurityGroupSettingPendingActionSelector('deleteGroup', groupID),
     });
 
-    // Block access to a group being deleted, and avoid flashing the not-found page during RHP navigation
-    const isDeleting = !group || !!deleteGroupPendingAction;
-
     const currentPolicyID = group?.restrictedPrimaryPolicyID;
 
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector(currentPolicyID)});
@@ -78,7 +75,7 @@ function DomainGroupPreferredWorkspacePage({route}: DomainGroupPreferredWorkspac
     return (
         <DomainNotFoundPageWrapper
             domainAccountID={domainAccountID}
-            shouldBeBlocked={isDeleting}
+            shouldBeBlocked={!group || !!deleteGroupPendingAction}
             fullPageNotFoundViewProps={{
                 onBackButtonPress: () => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID)),
             }}