Fix loading screen info

codesandbox · Dec 20, 2017 · df66855 · df66855
1 parent 14cf290
commit df66855
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/app/src/sandbox/npm/fetch-dependencies.js b/packages/app/src/sandbox/npm/fetch-dependencies.js
@@ -142,7 +142,7 @@ export default async function fetchDependencies(npmDependencies: Dependencies) {
 
     try {
       const result = await getDependencies(npmDependencies);
-      setScreen({ type: 'loading', text: 'Transpiling...' });
+      setScreen({ type: 'loading', text: 'Transpiling Modules...' });
 
       return result;
     } catch (e) {

diff --git a/packages/app/src/sandbox/npm/index.js b/packages/app/src/sandbox/npm/index.js
@@ -36,8 +36,6 @@ export default async function loadDependencies(dependencies: NPMDependencies) {
 
       const data = await fetchDependencies(dependenciesWithoutTypings);
       manifest = data;
-
-      setScreen({ type: 'loading', text: 'Downloading Dependencies...' });
     }
   } else {
     manifest = null;

diff --git a/packages/app/src/sandbox/status-screen/index.js b/packages/app/src/sandbox/status-screen/index.js
@@ -22,7 +22,7 @@ function changeText(text: string) {
   }
 }
 
-function createOverlay(text: string) {
+function createOverlay() {
   return new Promise(resolve => {
     const iframe = document.createElement('iframe');
 
@@ -35,7 +35,9 @@ function createOverlay(text: string) {
       iframe.contentDocument.body.innerHTML = loadingHtml;
       iframeReference = iframe;
 
-      changeText(text);
+      if (currentScreen) {
+        changeText(currentScreen.text);
+      }
       resolve();
     };
 
@@ -59,7 +61,7 @@ export default function setScreen(screen: Screen) {
       // Give the illusion of faster loading by showing the loader screen later
       firstLoaded = setTimeout(() => {
         if (currentScreen) {
-          createOverlay(currentScreen.text);
+          createOverlay();
         }
       }, 600);
     } else {