fix forking

Author: christianalfoni

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -68,6 +68,13 @@ export const npmDependencyRemoved: AsyncAction<{
 export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
   id: string;
 }>(async ({ state, actions, effects }, { id }) => {
+  // This happens when we fork. This can be avoided with state first routing
+  if (state.editor.isForkingSandbox) {
+    effects.vscode.openModule(state.editor.currentModule);
+    state.editor.isForkingSandbox = false;
+    return;
+  }
+
   await effects.vscode.closeAllTabs();
 
   state.editor.error = null;
@@ -76,11 +83,6 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
 
   newId = actions.editor.internal.ensureSandboxId(newId);
 
-  // This happens when we fork. This can be avoided with state first routing
-  if (state.editor.isForkingSandbox) {
-    return;
-  }
-
   const hasExistingSandbox = Boolean(state.editor.currentId);
 
   if (state.live.isLive) {

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

@@ -331,7 +331,6 @@ export const forkSandbox: AsyncAction<{
         state.editor.modulesByPath = fs;
       });
 
-      effects.vscode.openModule(state.editor.currentModule);
       effects.preview.executeCodeImmediately(true);
 
       // When not server we "piggyback" the existing Sandbox to avoid any rerenders and need
@@ -353,8 +352,6 @@ export const forkSandbox: AsyncAction<{
     console.error(error);
     effects.notificationToast.error('Sorry, unable to fork this sandbox');
   }
-
-  state.editor.isForkingSandbox = false;
 };
 
 export const setCurrentModule: AsyncAction<Module> = async (