refact

packages/app/src/components/CustomNavigation/CustomNav.jsx

@@ -170,7 +170,7 @@ export const CustomNavTab = (props) => {
             );
           })}
         </Nav>
-        {emptyTrashButton && emptyTrashButton}
+        {emptyTrashButton}
       </div>
       <hr className="my-0 grw-nav-slide-hr border-none" style={{ width: `${sliderWidth}%`, marginLeft: `${sliderMarginLeft}%` }} />
       { !hideBorderBottom && <hr className="my-0 border-top-0 border-bottom" /> }

packages/app/src/components/PageDeleteModal.tsx

@@ -230,6 +230,23 @@ const PageDeleteModal: FC = () => {
     return <></>;
   };
 
+  const renderDeleteModaloptions = () => {
+    if (emptyTrash) {
+      return renderCompletelyDeleteAlert();
+    }
+
+    if (!isDeletable) {
+      return;
+    }
+
+    return (
+      <>
+        {renderDeleteRecursivelyForm()}
+        {!forceDeleteCompletelyMode && renderDeleteCompletelyForm()}
+      </>
+    );
+  };
+
   return (
     <Modal size="lg" isOpen={isOpened} toggle={closeDeleteModal} data-testid="page-delete-modal" className="grw-create-page">
       <ModalHeader tag="h4" toggle={closeDeleteModal} className={`bg-${deleteIconAndKey[deleteMode].color} text-light`}>
@@ -242,18 +259,7 @@ const PageDeleteModal: FC = () => {
           {/* Todo: change the way to show path on modal when too many pages are selected */}
           {renderPagePathsToDelete()}
         </div>
-        {(() => {
-          if (emptyTrash) {
-            renderCompletelyDeleteAlert();
-          }
-          else {
-            if (isDeletable) renderDeleteRecursivelyForm();
-            if (isDeletable && !forceDeleteCompletelyMode) renderDeleteCompletelyForm();
-          }
-        })()}
-        { isDeletable && !emptyTrash && renderDeleteRecursivelyForm()}
-        { isDeletable && !forceDeleteCompletelyMode && !emptyTrash && renderDeleteCompletelyForm() }
-        { emptyTrash && renderCompletelyDeleteAlert() }
+        {renderDeleteModaloptions()}
       </ModalBody>
       <ModalFooter>
         <ApiErrorMessageList errs={errs} />