Mark the workspace as created after navigating

Expensify · Apr 11, 2022 · 4f594d1 · 4f594d1
1 parent 54e91d1
commit 4f594d1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -120,7 +120,6 @@ function create(name = '') {
     let res = null;
     return API.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');
@@ -157,7 +156,10 @@ function navigateToPolicy(policyID) {
  * @param {String} [name]
  */
 function createAndNavigate(name = '') {
-    create(name).then(navigateToPolicy);
+    create(name).then(() => {
+        navigateToPolicy();
+        Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, false);
+    });
 }
 
 /**
@@ -228,6 +230,7 @@ function createAndGetPolicyList() {
         .then(() => {
             Navigation.dismissModal();
             navigateToPolicy(newPolicyID);
+            Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, false);
         });
 }
 
@@ -506,7 +509,6 @@ export {
     removeMembers,
     invite,
     isAdminOfFreePolicy,
-    create,
     uploadAvatar,
     update,
     setWorkspaceErrors,