Merge pull request #10600 from Expensify/alberto-removeKey

Remove the usage of IS_CREATING_WORKSPACE
Expensify · Aug 29, 2022 · 28c6f43 · 28c6f43
2 parents d9b01d4 + fd09841
commit 28c6f43
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 16 deletions.
diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
@@ -15,9 +15,6 @@ export default {
     // Boolean flag set whenever the sidebar has loaded
     IS_SIDEBAR_LOADED: 'isSidebarLoaded',
 
-    // Boolean flag set when workspace is being created
-    IS_CREATING_WORKSPACE: 'isCreatingWorkspace',
-
     // Note: These are Persisted Requests - not all requests in the main queue as the key name might lead one to believe
     PERSISTED_REQUESTS: 'networkRequestQueue',
 

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -112,11 +112,9 @@ function updateAllPolicies(policyCollection) {
  * @returns {Promise}
  */
 function create(name = '') {
-    Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, true);
     let res = null;
     return DeprecatedAPI.Policy_Create({type: CONST.POLICY.TYPE.FREE, policyName: name})
         .then((response) => {
-            Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, false);
             if (response.jsonCode !== 200) {
                 // Show the user feedback
                 const errorMessage = Localize.translateLocal('workspace.new.genericFailureMessage');

diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js
@@ -163,7 +163,7 @@ class BaseSidebarScreen extends Component {
                                         onSelected: () => Navigation.navigate(ROUTES.IOU_BILL),
                                     },
                                 ] : []),
-                                ...(!this.props.isCreatingWorkspace && !Policy.isAdminOfFreePolicy(this.props.allPolicies) ? [
+                                ...(!Policy.isAdminOfFreePolicy(this.props.allPolicies) ? [
                                     {
                                         icon: Expensicons.NewWorkspace,
                                         iconWidth: 46,

diff --git a/src/pages/home/sidebar/SidebarScreen/index.js b/src/pages/home/sidebar/SidebarScreen/index.js
@@ -50,8 +50,5 @@ export default compose(
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        isCreatingWorkspace: {
-            key: ONYXKEYS.IS_CREATING_WORKSPACE,
-        },
     }),
 )(SidebarScreen);
diff --git a/src/pages/home/sidebar/SidebarScreen/index.native.js b/src/pages/home/sidebar/SidebarScreen/index.native.js
@@ -26,8 +26,5 @@ export default compose(
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        isCreatingWorkspace: {
-            key: ONYXKEYS.IS_CREATING_WORKSPACE,
-        },
     }),
 )(SidebarScreen);
diff --git a/src/pages/home/sidebar/SidebarScreen/sidebarPropTypes.js b/src/pages/home/sidebar/SidebarScreen/sidebarPropTypes.js
@@ -13,16 +13,12 @@ const sidebarPropTypes = {
     /* Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
-    /* Is workspace is being created by the user? */
-    isCreatingWorkspace: PropTypes.bool,
-
     ...windowDimensionsPropTypes,
 
     ...withLocalizePropTypes,
 };
 
 const sidebarDefaultProps = {
-    isCreatingWorkspace: false,
     allPolicies: {},
     betas: [],
 };