From e412ce7d0a8f30d9be10b21200d262e8de27021b Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <BerkeleyTrue@users.noreply.github.com>
Date: Tue, 19 Dec 2017 09:41:09 -0800
Subject: [PATCH] Fix: storage files use challenge files as source (#16215)

* fix(files): CreateFiles shouldn't preserve previous state

* fix(Challenges): Use fileSpec when pulling from storage
---
 common/app/files/index.js                   | 2 +-
 common/app/routes/Challenges/utils/index.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/app/files/index.js b/common/app/files/index.js
index d6a65493ad..24a3b5ee01 100644
--- a/common/app/files/index.js
+++ b/common/app/files/index.js
@@ -45,7 +45,7 @@ export default addNS(
         return _.reduce(files, (files, file) => {
           files[file.key] = createPoly(file);
           return files;
-        }, { ...state });
+        }, {});
       }
     }
     return state;
diff --git a/common/app/routes/Challenges/utils/index.js b/common/app/routes/Challenges/utils/index.js
index a10c79a92c..abbe766115 100644
--- a/common/app/routes/Challenges/utils/index.js
+++ b/common/app/routes/Challenges/utils/index.js
@@ -81,10 +81,10 @@ export function challengeToFiles(challenge, files) {
   const previousWork = !!files;
   files = files || challenge.files || {};
   if (challenge.type === 'modern') {
-    return _.reduce(files, (files, file) => {
-      const challengeSpec = _.get(challenge, ['files', file.key]) || {};
-      files[file.key] = updateFileFromSpec(challengeSpec, file);
-      return files;
+    return _.reduce(challenge.files, (_files, fileSpec) => {
+      const file = _.get(files, fileSpec.key);
+      _files[fileSpec.key] = updateFileFromSpec(fileSpec, file);
+      return _files;
     }, {});
   }
   if (