From 2f59fee0c29fbec40a9f4f35270551aef5758894 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Mon, 22 Jul 2024 18:54:16 +0200
Subject: [PATCH] fix(client): use source head/tail if challenge is saved
 (#55596)

---
 client/src/templates/Challenges/classic/show.tsx | 12 ++++++------
 client/src/templates/Challenges/redux/index.js   |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/src/templates/Challenges/classic/show.tsx b/client/src/templates/Challenges/classic/show.tsx
index fbe6ab908a0..8a6523eefe9 100644
--- a/client/src/templates/Challenges/classic/show.tsx
+++ b/client/src/templates/Challenges/classic/show.tsx
@@ -176,11 +176,11 @@ const defaultOutput = `
 */`;
 
 function ShowClassic({
-  challengeFiles: reduxChallengeFiles,
+  challengeFiles,
   data: {
     challengeNode: {
       challenge: {
-        challengeFiles,
+        challengeFiles: seedChallengeFiles,
         block,
         title,
         description,
@@ -363,7 +363,7 @@ function ShowClassic({
     });
 
     createFiles(
-      mergeChallengeFiles(challengeFiles, savedChallenge?.challengeFiles)
+      mergeChallengeFiles(seedChallengeFiles, savedChallenge?.challengeFiles)
     );
 
     initTests(tests);
@@ -416,9 +416,9 @@ function ShowClassic({
     isUsingKeyboardInTablist
   }: RenderEditorArgs) => {
     return (
-      reduxChallengeFiles && (
+      challengeFiles && (
         <MultifileEditor
-          challengeFiles={reduxChallengeFiles}
+          challengeFiles={challengeFiles}
           block={block}
           superBlock={superBlock}
           containerRef={containerRef}
@@ -482,7 +482,7 @@ function ShowClassic({
         )}
         {!isMobile && (
           <DesktopLayout
-            challengeFiles={reduxChallengeFiles}
+            challengeFiles={challengeFiles}
             challengeType={challengeType}
             editor={renderEditor({
               isMobileLayout: false,
diff --git a/client/src/templates/Challenges/redux/index.js b/client/src/templates/Challenges/redux/index.js
index baad5231580..4ea78bfdeb1 100644
--- a/client/src/templates/Challenges/redux/index.js
+++ b/client/src/templates/Challenges/redux/index.js
@@ -2,6 +2,7 @@ import { isEmpty } from 'lodash-es';
 import { handleActions } from 'redux-actions';
 
 import { getLines } from '../../../../../shared/utils/get-lines';
+import { mergeChallengeFiles } from '../classic/saved-challenges';
 import { getTargetEditor } from '../utils/get-target-editor';
 import { actionTypes, ns } from './action-types';
 import codeStorageEpic from './code-storage-epic';
@@ -110,7 +111,9 @@ export const reducer = handleActions(
     },
     [actionTypes.storedCodeFound]: (state, { payload }) => ({
       ...state,
-      challengeFiles: payload
+      challengeFiles: state.challengeFiles.length
+        ? mergeChallengeFiles(state.challengeFiles, payload)
+        : payload
     }),
     [actionTypes.initTests]: (state, { payload }) => ({
       ...state,