From f329330346161fd6a0efd5b0c1f66373f399f278 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 10 Dec 2021 23:24:04 +0530
Subject: [PATCH 1/3] fix(wkspace-popup-menu): Moved menuItems initialization
 to render

---
 src/pages/workspace/WorkspaceInitialPage.js | 69 +++++++++++----------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 2deed671e849..7eceae9356ac 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -38,12 +38,44 @@ class WorkspaceInitialPage extends React.Component {
     constructor(props) {
         super(props);
 
-        const policy = this.props.policy;
         this.openEditor = this.openEditor.bind(this);
         this.toggleDeleteModal = this.toggleDeleteModal.bind(this);
         this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this);
 
-        this.menuItems = [
+        this.state = {
+            isDeleteModalOpen: false,
+        };
+    }
+
+    /**
+     * Open Workspace Editor
+     */
+    openEditor() { Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id)); }
+
+    /**
+     * Toggle delete confirm modal visibility
+     * @param {Boolean} shouldOpen
+     */
+    toggleDeleteModal(shouldOpen) {
+        this.setState({isDeleteModalOpen: shouldOpen});
+    }
+
+    /**
+     * Call the delete policy and hide the modal
+     */
+    confirmDeleteAndHideModal() {
+        PolicyActions.deletePolicy(this.props.policy.id);
+        this.toggleDeleteModal(false);
+    }
+
+
+    render() {
+        const policy = this.props.policy;
+        if (_.isEmpty(policy)) {
+            return <FullScreenLoadingIndicator />;
+        }
+
+        const menuItems = [
             {
                 translationKey: 'workspace.common.settings',
                 icon: Expensicons.Gear,
@@ -94,37 +126,6 @@ class WorkspaceInitialPage extends React.Component {
             },
         ];
 
-        this.state = {
-            isDeleteModalOpen: false,
-        };
-    }
-
-    /**
-     * Open Workspace Editor
-     */
-    openEditor() { Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id)); }
-
-    /**
-     * Toggle delete confirm modal visibility
-     * @param {Boolean} shouldOpen
-     */
-    toggleDeleteModal(shouldOpen) {
-        this.setState({isDeleteModalOpen: shouldOpen});
-    }
-
-    /**
-     * Call the delete policy and hide the modal
-     */
-    confirmDeleteAndHideModal() {
-        PolicyActions.deletePolicy(this.props.policy.id);
-        this.toggleDeleteModal(false);
-    }
-
-
-    render() {
-        if (_.isEmpty(this.props.policy)) {
-            return <FullScreenLoadingIndicator />;
-        }
 
         return (
             <ScreenWrapper>
@@ -203,7 +204,7 @@ class WorkspaceInitialPage extends React.Component {
                                 )}
                             </View>
                         </View>
-                        {_.map(this.menuItems, (item) => {
+                        {_.map(menuItems, (item) => {
                             const shouldFocus = this.props.isSmallScreenWidth ? !this.props.isFocused && item.isActive : item.isActive;
                             return (
                                 <MenuItem

From e074e9dce66c613b9e2ad11b30ab94e69404dd93 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sat, 11 Dec 2021 00:39:23 +0530
Subject: [PATCH 2/3] fix(wkspace-popup-menu): Changed function body to
 multiline

---
 src/pages/workspace/WorkspaceInitialPage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 7eceae9356ac..dc6735a501fb 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -50,7 +50,9 @@ class WorkspaceInitialPage extends React.Component {
     /**
      * Open Workspace Editor
      */
-    openEditor() { Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id)); }
+    openEditor() {
+        Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id));
+    }
 
     /**
      * Toggle delete confirm modal visibility
@@ -126,7 +128,6 @@ class WorkspaceInitialPage extends React.Component {
             },
         ];
 
-
         return (
             <ScreenWrapper>
                 <HeaderWithCloseButton

From 96494c8e659ac9a85209dbb02cc61130f9d50d0c Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sat, 11 Dec 2021 00:50:50 +0530
Subject: [PATCH 3/3] fix(wkspace-popup-menu): Removed extra line

---
 src/pages/workspace/WorkspaceInitialPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index dc6735a501fb..22a11d841e7c 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -70,7 +70,6 @@ class WorkspaceInitialPage extends React.Component {
         this.toggleDeleteModal(false);
     }
 
-
     render() {
         const policy = this.props.policy;
         if (_.isEmpty(policy)) {