From e042faae929178c4208243a194a74f696c295b4d Mon Sep 17 00:00:00 2001
From: Vasyl Marchuk <public@vasylmarchuk.com>
Date: Sat, 21 Dec 2024 16:39:41 +0200
Subject: [PATCH 01/18] Strip "No newline at end of file" from diffs

---
 app/utils/parse-diff-as-document.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/utils/parse-diff-as-document.ts b/app/utils/parse-diff-as-document.ts
index ca9414026..5ad2b5737 100644
--- a/app/utils/parse-diff-as-document.ts
+++ b/app/utils/parse-diff-as-document.ts
@@ -5,6 +5,10 @@ export default function parseDiffAsDocument(diff: string = '') {
   const original = [];
 
   for (const line of diffLines) {
+    if (line === '\\ No newline at end of file') {
+      continue;
+    }
+
     if (line.startsWith('-')) {
       original.push(line.substring(1));
     } else if (line.startsWith('+')) {

From c51208331d9f8b2182e2d181ae7531e28380b8d2 Mon Sep 17 00:00:00 2001
From: Vasyl Marchuk <public@vasylmarchuk.com>
Date: Sun, 22 Dec 2024 16:32:12 +0200
Subject: [PATCH 02/18] Add a test for stripping "No newline at end of file"
 from diffs

---
 tests/unit/utils/parse-diff-as-document-test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/unit/utils/parse-diff-as-document-test.ts b/tests/unit/utils/parse-diff-as-document-test.ts
index 79dfed46b..345eaaab2 100644
--- a/tests/unit/utils/parse-diff-as-document-test.ts
+++ b/tests/unit/utils/parse-diff-as-document-test.ts
@@ -13,4 +13,10 @@ module('Unit | Utility | parse-diff-as-document', function () {
     assert.strictEqual(result.current, '', 'current document is an empty string');
     assert.strictEqual(result.original, '', 'original document is an empty string');
   });
+
+  test('it strips "\\ No newline at end of file" messages from the diff', async function (assert) {
+    const result = parseDiffAsDocument(' 1234\n\\ No newline at end of file\n+2345\n 6789\n-0123\n');
+    assert.strictEqual(result.current, '1234\n2345\n6789\n', 'current document is parsed correctly');
+    assert.strictEqual(result.original, '1234\n6789\n0123\n', 'original document is parsed correctly');
+  });
 });

From 129ec24fbd1cb33eb5af676406047823f14889f1 Mon Sep 17 00:00:00 2001
From: Vasyl Marchuk <public@vasylmarchuk.com>
Date: Thu, 26 Dec 2024 12:01:01 +0200
Subject: [PATCH 03/18] Add new CodeMirror option `@highlightNewlines` using a
 custom extension

---
 app/components/code-mirror.hbs                |  1 +
 app/components/code-mirror.ts                 |  6 ++
 app/controllers/demo/code-mirror.ts           |  3 +
 app/routes/demo/code-mirror.ts                |  1 +
 app/templates/demo/code-mirror.hbs            |  5 ++
 app/utils/code-mirror-highlight-newlines.ts   | 68 +++++++++++++++++++
 .../components/code-mirror-test.js            | 12 ++++
 7 files changed, 96 insertions(+)
 create mode 100644 app/utils/code-mirror-highlight-newlines.ts

diff --git a/app/components/code-mirror.hbs b/app/components/code-mirror.hbs
index 6591a281e..e243f23ef 100644
--- a/app/components/code-mirror.hbs
+++ b/app/components/code-mirror.hbs
@@ -11,6 +11,7 @@
   {{did-update this.optionDidChange "editable" @editable}}
   {{did-update this.optionDidChange "foldGutter" @foldGutter}}
   {{did-update this.optionDidChange "highlightActiveLine" @highlightActiveLine}}
+  {{did-update this.optionDidChange "highlightNewlines" @highlightNewlines}}
   {{did-update this.optionDidChange "highlightSelectionMatches" @highlightSelectionMatches}}
   {{did-update this.optionDidChange "highlightSpecialChars" @highlightSpecialChars}}
   {{did-update this.optionDidChange "highlightTrailingWhitespace" @highlightTrailingWhitespace}}
diff --git a/app/components/code-mirror.ts b/app/components/code-mirror.ts
index d0d9652ab..41112dfb3 100644
--- a/app/components/code-mirror.ts
+++ b/app/components/code-mirror.ts
@@ -36,6 +36,7 @@ import {
 } from '@codemirror/language';
 import { languages } from '@codemirror/language-data';
 import { markdown } from '@codemirror/lang-markdown';
+import { highlightNewlines } from 'codecrafters-frontend/utils/code-mirror-highlight-newlines';
 
 function generateHTMLElement(src: string): HTMLElement {
   const div = document.createElement('div');
@@ -65,6 +66,7 @@ const OPTION_HANDLERS: { [key: string]: OptionHandler } = {
   dropCursor: ({ dropCursor: enabled }) => (enabled ? [dropCursor()] : []),
   editable: ({ editable }) => [EditorView.editable.of(!!editable)],
   highlightActiveLine: ({ highlightActiveLine: enabled }) => (enabled ? [highlightActiveLine(), highlightActiveLineGutter()] : []),
+  highlightNewlines: ({ highlightNewlines: enabled }) => (enabled ? [highlightNewlines()] : []),
   highlightSelectionMatches: ({ highlightSelectionMatches: enabled }) => (enabled ? [highlightSelectionMatches()] : []),
   highlightSpecialChars: ({ highlightSpecialChars: enabled }) => (enabled ? [highlightSpecialChars()] : []),
   highlightTrailingWhitespace: ({ highlightTrailingWhitespace: enabled }) => (enabled ? [highlightTrailingWhitespace()] : []),
@@ -228,6 +230,10 @@ export interface Signature {
        * Enable inline highlighting of changes in the diff
        */
       highlightChanges?: boolean;
+      /**
+       * Enable highlighting of new line symbols
+       */
+      highlightNewlines?: boolean;
       /**
        * Enable highlighting of current selection matches in the document
        */
diff --git a/app/controllers/demo/code-mirror.ts b/app/controllers/demo/code-mirror.ts
index 7ac788457..10b4b981f 100644
--- a/app/controllers/demo/code-mirror.ts
+++ b/app/controllers/demo/code-mirror.ts
@@ -43,6 +43,7 @@ const OPTION_DEFAULTS = {
   foldGutter: true,
   highlightActiveLine: true,
   highlightChanges: false,
+  highlightNewlines: false,
   highlightSelectionMatches: true,
   highlightSpecialChars: true,
   highlightTrailingWhitespace: true,
@@ -97,6 +98,7 @@ export default class DemoCodeMirrorController extends Controller {
     'foldGutter',
     'highlightActiveLine',
     'highlightChanges',
+    'highlightNewlines',
     'highlightSelectionMatches',
     'highlightSpecialChars',
     'highlightTrailingWhitespace',
@@ -147,6 +149,7 @@ export default class DemoCodeMirrorController extends Controller {
   @tracked foldGutter = OPTION_DEFAULTS.foldGutter;
   @tracked highlightActiveLine = OPTION_DEFAULTS.highlightActiveLine;
   @tracked highlightChanges = OPTION_DEFAULTS.highlightChanges;
+  @tracked highlightNewlines = OPTION_DEFAULTS.highlightNewlines;
   @tracked highlightSelectionMatches = OPTION_DEFAULTS.highlightSelectionMatches;
   @tracked highlightSpecialChars = OPTION_DEFAULTS.highlightSpecialChars;
   @tracked highlightTrailingWhitespace = OPTION_DEFAULTS.highlightTrailingWhitespace;
diff --git a/app/routes/demo/code-mirror.ts b/app/routes/demo/code-mirror.ts
index 3d7d99e6e..76caf6fa7 100644
--- a/app/routes/demo/code-mirror.ts
+++ b/app/routes/demo/code-mirror.ts
@@ -15,6 +15,7 @@ const QUERY_PARAMS = [
   'foldGutter',
   'highlightActiveLine',
   'highlightChanges',
+  'highlightNewlines',
   'highlightSelectionMatches',
   'highlightSpecialChars',
   'highlightTrailingWhitespace',
diff --git a/app/templates/demo/code-mirror.hbs b/app/templates/demo/code-mirror.hbs
index a0045a64a..5696def42 100644
--- a/app/templates/demo/code-mirror.hbs
+++ b/app/templates/demo/code-mirror.hbs
@@ -260,6 +260,10 @@
       <Input @type="checkbox" @checked={{this.highlightTrailingWhitespace}} />
       <span class="ml-2">highlightTrailingWhitespace</span>
     </label>
+    <label class="{{labelClasses}}" title="Enable highlighting of new line symbols">
+      <Input @type="checkbox" @checked={{this.highlightNewlines}} />
+      <span class="ml-2">highlightNewlines</span>
+    </label>
     <label class="{{labelClasses}}" title="Enable inline highlighting of changes in the diff">
       <Input @type="checkbox" @checked={{this.highlightChanges}} disabled={{not this.originalDocument}} />
       <span class="ml-2 {{unless this.originalDocument 'text-gray-300'}}">highlightChanges</span>
@@ -328,6 +332,7 @@
   @foldGutter={{this.foldGutter}}
   @highlightActiveLine={{this.highlightActiveLine}}
   @highlightChanges={{this.highlightChanges}}
+  @highlightNewlines={{this.highlightNewlines}}
   @highlightSelectionMatches={{this.highlightSelectionMatches}}
   @highlightSpecialChars={{this.highlightSpecialChars}}
   @highlightTrailingWhitespace={{this.highlightTrailingWhitespace}}
diff --git a/app/utils/code-mirror-highlight-newlines.ts b/app/utils/code-mirror-highlight-newlines.ts
new file mode 100644
index 000000000..e3f51e620
--- /dev/null
+++ b/app/utils/code-mirror-highlight-newlines.ts
@@ -0,0 +1,68 @@
+import { EditorView, type DecorationSet, type ViewUpdate } from '@codemirror/view';
+import { Decoration, ViewPlugin, WidgetType } from '@codemirror/view';
+
+class NewlineWidget extends WidgetType {
+  toDOM() {
+    const span = document.createElement('span');
+    span.className = 'cm-newline';
+    span.textContent = '↵';
+
+    return span;
+  }
+}
+
+const baseTheme = EditorView.baseTheme({
+  '.cm-newline': {
+    color: 'currentColor',
+    pointerEvents: 'none',
+    opacity: '0.5',
+    '&:not(:only-of-type)': {
+      paddingLeft: '5px',
+    },
+  },
+});
+
+function highlightNewlines() {
+  return [
+    ViewPlugin.fromClass(
+      class {
+        decorations: DecorationSet;
+        constructor(view: EditorView) {
+          this.decorations = this.getDecorations(view);
+        }
+
+        getDecorations(view: EditorView) {
+          const widgets = [];
+
+          for (const { from, to } of view.visibleRanges) {
+            for (let pos = from; pos <= to; ) {
+              const line = view.state.doc.lineAt(pos);
+
+              if (line.length === 0) {
+                widgets.push(Decoration.widget({ widget: new NewlineWidget(), side: 1 }).range(pos));
+              } else {
+                widgets.push(Decoration.widget({ widget: new NewlineWidget(), side: 1 }).range(line.to));
+              }
+
+              pos = line.to + 1;
+            }
+          }
+
+          return Decoration.set(widgets, true);
+        }
+
+        update(update: ViewUpdate) {
+          if (update.docChanged || update.viewportChanged) {
+            this.decorations = this.getDecorations(update.view);
+          }
+        }
+      },
+      {
+        decorations: (v) => v.decorations,
+      },
+    ),
+    baseTheme,
+  ];
+}
+
+export { highlightNewlines };
diff --git a/tests/integration/components/code-mirror-test.js b/tests/integration/components/code-mirror-test.js
index ded674a35..711006555 100644
--- a/tests/integration/components/code-mirror-test.js
+++ b/tests/integration/components/code-mirror-test.js
@@ -218,6 +218,18 @@ module('Integration | Component | code-mirror', function (hooks) {
       skip('it does something useful with the editor');
     });
 
+    module('highlightNewlines', function () {
+      test("it doesn't break the editor when passed", async function (assert) {
+        this.set('highlightNewlines', true);
+        await render(hbs`<CodeMirror @highlightNewlines={{this.highlightNewlines}} />`);
+        assert.ok(codeMirror.hasRendered);
+        this.set('highlightNewlines', false);
+        assert.ok(codeMirror.hasRendered);
+      });
+
+      skip('it does something useful with the editor');
+    });
+
     module('highlightSelectionMatches', function () {
       test("it doesn't break the editor when passed", async function (assert) {
         this.set('highlightSelectionMatches', true);

From 4c3ef4a94182f7f7ef00a0ee7a49439422b9aa44 Mon Sep 17 00:00:00 2001
From: Vasyl Marchuk <public@vasylmarchuk.com>
Date: Thu, 26 Dec 2024 12:54:50 +0200
Subject: [PATCH 04/18] Update `@codemirror/view` from `6.26.3` to `6.36.1`

---
 package-lock.json | 26 ++++++++++++++++++--------
 package.json      |  1 +
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 945939369..b83871523 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,6 +34,7 @@
         "@codecov/webpack-plugin": "^1.6.0",
         "@codemirror/language-data": "^6.5.0",
         "@codemirror/merge": "^6.7.4",
+        "@codemirror/view": "^6.36.1",
         "@ember/optional-features": "^2.2.0",
         "@ember/render-modifiers": "^2.0.4",
         "@ember/string": "^3.1.1",
@@ -2668,18 +2669,21 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
-      "dev": true
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
+      "dev": true,
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz",
-      "integrity": "sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==",
+      "version": "6.36.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.1.tgz",
+      "integrity": "sha512-miD1nyT4m4uopZaDdO2uXU/LLHliKNYL9kB1C1wJHrunHLm/rpkb5QVSokqgw9hFqEZakrdlb/VGWX8aYZTslQ==",
       "dev": true,
       "dependencies": {
-        "@codemirror/state": "^6.4.0",
+        "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -7314,6 +7318,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "dev": true
+    },
     "node_modules/@miragejs/pretender-node-polyfill": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz",
diff --git a/package.json b/package.json
index bc4ccee6d..e39018b0d 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "@codecov/webpack-plugin": "^1.6.0",
     "@codemirror/language-data": "^6.5.0",
     "@codemirror/merge": "^6.7.4",
+    "@codemirror/view": "^6.36.1",
     "@ember/optional-features": "^2.2.0",
     "@ember/render-modifiers": "^2.0.4",
     "@ember/string": "^3.1.1",

From d797d7f7325fc9846ca20af2c13d8b26ca80dcfc Mon Sep 17 00:00:00 2001
From: Vasyl Marchuk <public@vasylmarchuk.com>
Date: Thu, 26 Dec 2024 15:23:28 +0200
Subject: [PATCH 05/18] Better method of targeting newlines in empty lines

---
 app/utils/code-mirror-highlight-newlines.ts | 30 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/utils/code-mirror-highlight-newlines.ts b/app/utils/code-mirror-highlight-newlines.ts
index e3f51e620..fe64bd94d 100644
--- a/app/utils/code-mirror-highlight-newlines.ts
+++ b/app/utils/code-mirror-highlight-newlines.ts
@@ -1,11 +1,27 @@
-import { EditorView, type DecorationSet, type ViewUpdate } from '@codemirror/view';
-import { Decoration, ViewPlugin, WidgetType } from '@codemirror/view';
+import type { Line } from '@codemirror/state';
+import type { DecorationSet, ViewUpdate } from '@codemirror/view';
+import { Decoration, EditorView, ViewPlugin, WidgetType } from '@codemirror/view';
 
 class NewlineWidget extends WidgetType {
+  line: Line;
+  markerSymbol: string;
+
+  constructor({ line, markerSymbol = '↵' }: { line: Line; markerSymbol?: string }) {
+    super();
+    this.line = line;
+    this.markerSymbol = markerSymbol;
+  }
+
   toDOM() {
     const span = document.createElement('span');
+
+    span.textContent = this.markerSymbol;
+
     span.className = 'cm-newline';
-    span.textContent = '↵';
+
+    if (this.line.length === 0) {
+      span.className += ' cm-newline-empty';
+    }
 
     return span;
   }
@@ -16,8 +32,8 @@ const baseTheme = EditorView.baseTheme({
     color: 'currentColor',
     pointerEvents: 'none',
     opacity: '0.5',
-    '&:not(:only-of-type)': {
-      paddingLeft: '5px',
+    '&:not(.cm-newline-empty)': {
+      paddingLeft: '3px',
     },
   },
 });
@@ -39,9 +55,9 @@ function highlightNewlines() {
               const line = view.state.doc.lineAt(pos);
 
               if (line.length === 0) {
-                widgets.push(Decoration.widget({ widget: new NewlineWidget(), side: 1 }).range(pos));
+                widgets.push(Decoration.widget({ widget: new NewlineWidget({ line }), side: 1 }).range(pos));
               } else {
-                widgets.push(Decoration.widget({ widget: new NewlineWidget(), side: 1 }).range(line.to));
+                widgets.push(Decoration.widget({ widget: new NewlineWidget({ line }), side: 1 }).range(line.to));
               }
 
               pos = line.to + 1;

From b3f420049f3a2763d959ed66c50b65b015d4d64f Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Fri, 27 Dec 2024 08:11:36 +0800
Subject: [PATCH 06/18] feat: Add option to show all steps at once in
 first-stage tutorial card [percy]

---
 .../first-stage-tutorial-card.hbs             | 170 ++++++++++++++----
 .../first-stage-tutorial-card.ts              |  15 ++
 app/services/feature-flags.js                 |   8 +-
 app/templates/course/stage/instructions.hbs   |   7 +-
 4 files changed, 161 insertions(+), 39 deletions(-)

diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
index c9b5661b4..ef5ea86f4 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
@@ -1,42 +1,144 @@
-<CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
-  <:content>
-    <div class="prose dark:prose-invert mb-5">
-      <p>
-        Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
-        submit your changes.
-      </p>
-    </div>
-
-    <ExpandableStepList @steps={{this.steps}} @onManualStepComplete={{this.handleStepCompletedManually}} class="scroll-mt-32" as |stepList|>
-      {{#if (eq stepList.expandedStep.id "navigate-to-file")}}
-        <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
-          @repository={{@repository}}
-          @courseStage={{@courseStage}}
-          @isComplete={{this.navigateToFileStepIsComplete}}
-        />
-      {{else if (eq stepList.expandedStep.id "uncomment-code")}}
+{{#if this.shouldShowAllStepsAtOnceForStage1}}
+  <CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
+    <:content>
+      <div class="prose dark:prose-invert mb-5">
+        <p>
+          Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
+          submit your changes.
+        </p>
+      </div>
+
+      <div class="prose dark:prose-invert mb-3">
+        <div class="inline-flex items-center gap-1">
+          {{#if this.hasPassedTests}}
+            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
+          {{else}}
+            <b class="text-teal-600">Step 1:</b>
+          {{/if}}
+          Open a file
+        </div>
+      </div>
+      <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
+        @repository={{@repository}}
+        @courseStage={{@courseStage}}
+        @isComplete={{this.navigateToFileStepIsComplete}}
+      />
+
+      <div class="prose dark:prose-invert mt-6 mb-3 pt-4 border-t dark:border-white/5">
+        <div class="inline-flex items-center gap-1">
+          {{#if this.hasPassedTests}}
+            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
+          {{else}}
+            <b class="text-teal-600">Step 2:</b>
+          {{/if}}
+          Uncomment code
+        </div>
+      </div>
+      <div class="max-w-2xl">
         <CoursePage::CourseStageStep::FirstStageTutorialCard::UncommentCodeStep
           @repository={{@repository}}
           @courseStage={{@courseStage}}
           @isComplete={{this.uncommentCodeStepIsComplete}}
         />
-      {{else if (eq stepList.expandedStep.id "submit-code")}}
-        <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.submitCodeStepIsComplete}} />
-      {{/if}}
-    </ExpandableStepList>
-
-    {{! After step 2, step 3 already contains a note on Tests Failed, so we can hide this !}}
-    {{#unless this.uncommentCodeStepIsComplete}}
-      <div class="prose dark:prose-invert prose-sm prose-compact mt-5">
+      </div>
+
+      <div class="prose dark:prose-invert mt-8 mb-3 pt-4 border-t dark:border-white/5">
+        <div class="inline-flex items-center gap-1">
+          {{#if this.hasPassedTests}}
+            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
+          {{else}}
+            <b class="text-teal-600">Step 3:</b>
+          {{/if}}
+          Submit changes
+        </div>
+      </div>
+      <div class="prose dark:prose-invert mb-3">
         <p>
-          {{svg-jar "information-circle" class="w-5 h-5 mb-1 inline-flex text-sky-500"}}
-          <b>Note:</b>
-          After your first Git push, you should see
-          <code class="font-semibold text-red-700 dark:text-red-300 bg-red-100 dark:bg-red-900/30 border border-red-200 dark:border-red-800/40">Tests
-            failed</code>
-          in the bar below this card. This is expected! Complete the steps above to pass the tests.
+          Save your changes and run the following commands to submit your changes:
+        </p>
+      </div>
+
+      <CopyableTerminalCommand @commands={{array 'git commit -am "[any message]"' "git push origin master"}} class="mb-3" />
+
+      <div class="prose dark:prose-invert">
+        <p class={{if this.hasPassedTests "line-through"}}>
+          Once you run the commands above, the
+          <code class="font-semibold text-red-700 bg-red-100 border border-red-200">Tests failed</code>
+          message below should be changed to
+          <code class="font-semibold text-green-700 bg-green-100 border border-green-200">Tests passed</code>.
         </p>
+
+        {{#if this.hasPassedTests}}
+          <p>
+            🎉
+            <b class="text-teal-500 ml-1">Tests passed!</b>
+          </p>
+        {{else}}
+          <div class="prose dark:prose-invert prose-sm prose-compact mt-6">
+            <p>Need help?</p>
+            <ul>
+              <li>
+                <a
+                  href="https://forum.codecrafters.io/new-topic?category=Challenges&tags=challenge%3A{{this.currentCourse.slug}}&title=%5B{{this.currentCourse.shortName}}%5D%20How%20to%20pass%20the%20first%20stage%3F&body=Checklist%3A%0A%0A1.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20uncommented%20the%20code.%0A2.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20saved%20the%20changes.%0A3.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20run%20the%20git%20commands%3A%0A%0A%60%60%60%0Agit%20commit%20-am%20%22%5Bseeking%20help%20on%20forum%5D%22%0Agit%20push%20origin%20master%0A%60%60%60%0A%0A---%0A%0AHere%E2%80%99s%20a%20screenshot%20showing%20the%20output%20from%20running%20the%20Git%20commands%3A%0A%0A%5BAttach%20screenshot%20here%5D%0A%0A%5BShare%20other%20details%20here%5D"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  Post your issue</a>
+                on the forum —
+                <img
+                  alt="avatar"
+                  src="https://avatars.githubusercontent.com/u/1450947"
+                  class="inline-block ml-1 mr-1.5 my-0 -translate-y-px overflow-hidden rounded-full size-4 filter drop-shadow-sm ring-1 ring-white dark:ring-white/5 shadow"
+                />Andy usually replies within 6 hours.
+              </li>
+            </ul>
+          </div>
+        {{/if}}
       </div>
-    {{/unless}}
-  </:content>
-</CoursePage::InstructionsCard>
\ No newline at end of file
+    </:content>
+  </CoursePage::InstructionsCard>
+{{else}}
+  <CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
+    <:content>
+      <div class="prose dark:prose-invert mb-5">
+        <p>
+          Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
+          submit your changes.
+        </p>
+      </div>
+
+      <ExpandableStepList @steps={{this.steps}} @onManualStepComplete={{this.handleStepCompletedManually}} class="scroll-mt-32" as |stepList|>
+        {{#if (eq stepList.expandedStep.id "navigate-to-file")}}
+          <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
+            @repository={{@repository}}
+            @courseStage={{@courseStage}}
+            @isComplete={{this.navigateToFileStepIsComplete}}
+          />
+        {{else if (eq stepList.expandedStep.id "uncomment-code")}}
+          <CoursePage::CourseStageStep::FirstStageTutorialCard::UncommentCodeStep
+            @repository={{@repository}}
+            @courseStage={{@courseStage}}
+            @isComplete={{this.uncommentCodeStepIsComplete}}
+          />
+        {{else if (eq stepList.expandedStep.id "submit-code")}}
+          <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.submitCodeStepIsComplete}} />
+        {{/if}}
+      </ExpandableStepList>
+
+      {{! After step 2, step 3 already contains a note on Tests Failed, so we can hide this !}}
+      {{#unless this.uncommentCodeStepIsComplete}}
+        <div class="prose dark:prose-invert prose-sm prose-compact mt-5">
+          <p>
+            {{svg-jar "information-circle" class="w-5 h-5 mb-1 inline-flex text-sky-500"}}
+            <b>Note:</b>
+            After your first Git push, you should see
+            <code
+              class="font-semibold text-red-700 dark:text-red-300 bg-red-100 dark:bg-red-900/30 border border-red-200 dark:border-red-800/40"
+            >Tests failed</code>
+            in the bar below this card. This is expected! Complete the steps above to pass the tests.
+          </p>
+        </div>
+      {{/unless}}
+    </:content>
+  </CoursePage::InstructionsCard>
+{{/if}}
\ No newline at end of file
diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
index 22329a74e..36e9c6be7 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
@@ -6,14 +6,17 @@ import Store from '@ember-data/store';
 import type CourseStageModel from 'codecrafters-frontend/models/course-stage';
 import type RepositoryModel from 'codecrafters-frontend/models/repository';
 import type { Step } from 'codecrafters-frontend/components/expandable-step-list';
+import type CourseStageStep from 'codecrafters-frontend/utils/course-page-step-list/course-stage-step';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+
 interface Signature {
   Element: HTMLDivElement;
 
   Args: {
     repository: RepositoryModel;
     courseStage: CourseStageModel;
+    currentStep: CourseStageStep;
   };
 }
 
@@ -70,6 +73,14 @@ export default class FirstStageTutorialCardComponent extends Component<Signature
   @service declare featureFlags: FeatureFlagsService;
   @service declare store: Store;
 
+  get currentCourse() {
+    return this.args.courseStage.course;
+  }
+
+  get hasPassedTests() {
+    return this.args.currentStep.testsStatus === 'passed' || this.args.currentStep.status === 'complete';
+  }
+
   get navigateToFileStepIsComplete() {
     return this.navigateToFileStepWasMarkedAsComplete || this.uncommentCodeStepIsComplete;
   }
@@ -78,6 +89,10 @@ export default class FirstStageTutorialCardComponent extends Component<Signature
     return this.coursePageState.manuallyCompletedStepIdsInFirstStageInstructions.includes('navigate-to-file');
   }
 
+  get shouldShowAllStepsAtOnceForStage1() {
+    return this.featureFlags.canSeeAllStepsAtOnceForStage1;
+  }
+
   get steps() {
     return [
       new NavigateToFileStep(this.args.repository, this.navigateToFileStepIsComplete),
diff --git a/app/services/feature-flags.js b/app/services/feature-flags.js
index c3dd77615..a7aee0541 100644
--- a/app/services/feature-flags.js
+++ b/app/services/feature-flags.js
@@ -10,6 +10,10 @@ export default class FeatureFlagsService extends Service {
     this.notifiedFeatureFlags = new Set();
   }
 
+  get canSeeAllStepsAtOnceForStage1() {
+    return this.currentUser?.isStaff || this.getFeatureFlagValue('can-see-all-steps-at-once-for-stage-1') === 'test';
+  }
+
   get canSeeConceptsIndex() {
     return this.currentUser && (this.currentUser.isStaff || this.currentUser.isConceptAuthor);
   }
@@ -18,10 +22,6 @@ export default class FeatureFlagsService extends Service {
     return this.currentUser?.isStaff || this.getFeatureFlagValue('can-see-short-instructions-for-stage-2') === 'test';
   }
 
-  get canSeeTweaksForStage1() {
-    return this.currentUser?.isStaff || this.getFeatureFlagValue('can-see-tweaks-for-stage-1') === 'test';
-  }
-
   get currentUser() {
     return this.authenticator.currentUser;
   }
diff --git a/app/templates/course/stage/instructions.hbs b/app/templates/course/stage/instructions.hbs
index b34a1f916..e30178ba5 100644
--- a/app/templates/course/stage/instructions.hbs
+++ b/app/templates/course/stage/instructions.hbs
@@ -33,7 +33,12 @@
     {{/if}}
 
     {{#if @model.courseStage.isFirst}}
-      <CoursePage::CourseStageStep::FirstStageTutorialCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mb-6" />
+      <CoursePage::CourseStageStep::FirstStageTutorialCard
+        @repository={{@model.activeRepository}}
+        @courseStage={{@model.courseStage}}
+        @currentStep={{this.currentStep}}
+        class="mb-6"
+      />
     {{/if}}
 
     {{#if @model.courseStage.isSecond}}

From bade66bf4d4042e42c461e52c751ab4cf1d51b7a Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:41:34 +0800
Subject: [PATCH 07/18] chore: Remove unnecessary code duplication and improve
 forum link in first stage tutorial card and instructions page

---
 .../first-stage-tutorial-card.hbs             | 48 ++-----------------
 .../first-stage-tutorial-card.ts              |  4 --
 app/controllers/course/stage/instructions.ts  |  8 ++++
 app/templates/course/stage/instructions.hbs   | 20 ++++++++
 4 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
index ef5ea86f4..3a55b1c6b 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
@@ -21,7 +21,7 @@
       <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
         @repository={{@repository}}
         @courseStage={{@courseStage}}
-        @isComplete={{this.navigateToFileStepIsComplete}}
+        @isComplete={{false}}
       />
 
       <div class="prose dark:prose-invert mt-6 mb-3 pt-4 border-t dark:border-white/5">
@@ -38,7 +38,7 @@
         <CoursePage::CourseStageStep::FirstStageTutorialCard::UncommentCodeStep
           @repository={{@repository}}
           @courseStage={{@courseStage}}
-          @isComplete={{this.uncommentCodeStepIsComplete}}
+          @isComplete={{false}}
         />
       </div>
 
@@ -52,49 +52,7 @@
           Submit changes
         </div>
       </div>
-      <div class="prose dark:prose-invert mb-3">
-        <p>
-          Save your changes and run the following commands to submit your changes:
-        </p>
-      </div>
-
-      <CopyableTerminalCommand @commands={{array 'git commit -am "[any message]"' "git push origin master"}} class="mb-3" />
-
-      <div class="prose dark:prose-invert">
-        <p class={{if this.hasPassedTests "line-through"}}>
-          Once you run the commands above, the
-          <code class="font-semibold text-red-700 bg-red-100 border border-red-200">Tests failed</code>
-          message below should be changed to
-          <code class="font-semibold text-green-700 bg-green-100 border border-green-200">Tests passed</code>.
-        </p>
-
-        {{#if this.hasPassedTests}}
-          <p>
-            🎉
-            <b class="text-teal-500 ml-1">Tests passed!</b>
-          </p>
-        {{else}}
-          <div class="prose dark:prose-invert prose-sm prose-compact mt-6">
-            <p>Need help?</p>
-            <ul>
-              <li>
-                <a
-                  href="https://forum.codecrafters.io/new-topic?category=Challenges&tags=challenge%3A{{this.currentCourse.slug}}&title=%5B{{this.currentCourse.shortName}}%5D%20How%20to%20pass%20the%20first%20stage%3F&body=Checklist%3A%0A%0A1.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20uncommented%20the%20code.%0A2.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20saved%20the%20changes.%0A3.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20run%20the%20git%20commands%3A%0A%0A%60%60%60%0Agit%20commit%20-am%20%22%5Bseeking%20help%20on%20forum%5D%22%0Agit%20push%20origin%20master%0A%60%60%60%0A%0A---%0A%0AHere%E2%80%99s%20a%20screenshot%20showing%20the%20output%20from%20running%20the%20Git%20commands%3A%0A%0A%5BAttach%20screenshot%20here%5D%0A%0A%5BShare%20other%20details%20here%5D"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  Post your issue</a>
-                on the forum —
-                <img
-                  alt="avatar"
-                  src="https://avatars.githubusercontent.com/u/1450947"
-                  class="inline-block ml-1 mr-1.5 my-0 -translate-y-px overflow-hidden rounded-full size-4 filter drop-shadow-sm ring-1 ring-white dark:ring-white/5 shadow"
-                />Andy usually replies within 6 hours.
-              </li>
-            </ul>
-          </div>
-        {{/if}}
-      </div>
+      <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.hasPassedTests}} />
     </:content>
   </CoursePage::InstructionsCard>
 {{else}}
diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
index 36e9c6be7..a583b1968 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
@@ -73,10 +73,6 @@ export default class FirstStageTutorialCardComponent extends Component<Signature
   @service declare featureFlags: FeatureFlagsService;
   @service declare store: Store;
 
-  get currentCourse() {
-    return this.args.courseStage.course;
-  }
-
   get hasPassedTests() {
     return this.args.currentStep.testsStatus === 'passed' || this.args.currentStep.status === 'complete';
   }
diff --git a/app/controllers/course/stage/instructions.ts b/app/controllers/course/stage/instructions.ts
index 132665df7..66fc9b46e 100644
--- a/app/controllers/course/stage/instructions.ts
+++ b/app/controllers/course/stage/instructions.ts
@@ -31,6 +31,10 @@ export default class CourseStageInstructionsController extends Controller {
     });
   }
 
+  get currentCourse() {
+    return this.model.courseStage.course;
+  }
+
   get currentStep(): CourseStageStep {
     return this.coursePageState.currentStep as CourseStageStep;
   }
@@ -51,6 +55,10 @@ export default class CourseStageInstructionsController extends Controller {
     return !this.currentStep.courseStage.isFirst && this.currentStep.status === 'complete';
   }
 
+  get shouldShowNeedHelpForumLink() {
+    return this.model.courseStage.isFirst && this.currentStep.testsStatus !== 'passed' && this.currentStep.status !== 'complete';
+  }
+
   get shouldShowPrerequisites() {
     return !!this.prerequisiteInstructionsMarkdown;
   }
diff --git a/app/templates/course/stage/instructions.hbs b/app/templates/course/stage/instructions.hbs
index e30178ba5..7e059d230 100644
--- a/app/templates/course/stage/instructions.hbs
+++ b/app/templates/course/stage/instructions.hbs
@@ -83,6 +83,26 @@
       </div>
     {{/if}}
 
+    {{#if this.shouldShowNeedHelpForumLink}}
+      <div class="prose dark:prose-invert prose-sm prose-compact ml-4 mb-10">
+        <p>
+          Need help?
+          <a
+            href="https://forum.codecrafters.io/new-topic?category=Challenges&tags=challenge%3A{{this.currentCourse.slug}}&title=%5B{{this.currentCourse.shortName}}%5D%20How%20to%20pass%20the%20first%20stage%3F&body=Checklist%3A%0A%0A1.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20uncommented%20the%20code.%0A2.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20saved%20the%20changes.%0A3.%20%E2%9C%85%20or%20%E2%9D%8C%3A%20I%27ve%20run%20the%20git%20commands%3A%0A%0A%60%60%60%0Agit%20commit%20-am%20%22%5Bseeking%20help%20on%20forum%5D%22%0Agit%20push%20origin%20master%0A%60%60%60%0A%0A---%0A%0AHere%E2%80%99s%20a%20screenshot%20showing%20the%20output%20from%20running%20the%20Git%20commands%3A%0A%0A%5BAttach%20screenshot%20here%5D%0A%0A%5BShare%20other%20details%20here%5D"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Post your issue</a>
+          on the forum —
+          <img
+            alt="avatar"
+            src="https://avatars.githubusercontent.com/u/1450947"
+            class="inline-block ml-1 mr-1.5 my-0 -translate-y-px overflow-hidden rounded-full size-4 filter drop-shadow-sm ring-1 ring-white dark:ring-white/5 shadow"
+          />Andy usually replies within 6 hours.
+        </p>
+      </div>
+    {{/if}}
+
     {{! TODO: Remove this temporary card  }}
     {{#if (and @model.courseStage.isSecond (eq @model.courseStage.course.slug "shell"))}}
       <div class="my-10 mx-6 flex items-start gap-4">

From ef4374090e19324fb5bbee7b2e2acf1bd44eb804 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 13:15:15 +0000
Subject: [PATCH 08/18] chore(deps-dev): bump @embroider/webpack in the
 embroider group

Bumps the embroider group with 1 update: [@embroider/webpack](https://github.com/embroider-build/embroider/tree/HEAD/packages/webpack).


Updates `@embroider/webpack` from 4.0.8 to 4.0.9
- [Release notes](https://github.com/embroider-build/embroider/releases)
- [Changelog](https://github.com/embroider-build/embroider/blob/main/CHANGELOG.md)
- [Commits](https://github.com/embroider-build/embroider/commits/HEAD/packages/webpack)

---
updated-dependencies:
- dependency-name: "@embroider/webpack"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: embroider
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 945939369..b92a72502 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "@embroider/compat": "^3.7.1",
         "@embroider/core": "^3.4.16",
         "@embroider/router": "^2.1.8",
-        "@embroider/webpack": "^4.0.8",
+        "@embroider/webpack": "^4.0.9",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "@glint/core": "^1.5.0",
@@ -5369,9 +5369,9 @@
       }
     },
     "node_modules/@embroider/webpack": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-4.0.8.tgz",
-      "integrity": "sha512-5i1v6+eH1gMHOqtaCzkFX6JPekmapN1+Clacxu+lxiv/piufuJV6bkugyPxIqqGBWjF8bOQA12ncM9BgpLae8A==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-4.0.9.tgz",
+      "integrity": "sha512-4pRnY6fC8sdGrhD+Tk8ilblmHbwzlsy1BrA0r1dYGd23TpmGOgrit/CIv3C2ffRQ4EaiZh1XYO0KDVNTMYUFAw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.14.5",
@@ -5401,7 +5401,7 @@
         "node": "12.* || 14.* || >= 16"
       },
       "peerDependencies": {
-        "@embroider/core": "^3.4.19",
+        "@embroider/core": "^3.4.20",
         "webpack": "^5.0.0"
       }
     },
diff --git a/package.json b/package.json
index bc4ccee6d..2c2444c74 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@embroider/compat": "^3.7.1",
     "@embroider/core": "^3.4.16",
     "@embroider/router": "^2.1.8",
-    "@embroider/webpack": "^4.0.8",
+    "@embroider/webpack": "^4.0.9",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/core": "^1.5.0",

From 21f5b17d94deae4388b7b5c12e1f9148ac4d118a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 13:15:22 +0000
Subject: [PATCH 09/18] chore(deps-dev): bump the shikijs group across 1
 directory with 3 updates

Bumps the shikijs group with 2 updates in the / directory: [@shikijs/rehype](https://github.com/shikijs/shiki/tree/HEAD/packages/rehype) and [@shikijs/transformers](https://github.com/shikijs/shiki/tree/HEAD/packages/transformers).


Updates `@shikijs/rehype` from 1.24.2 to 1.24.4
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.24.4/packages/rehype)

Updates `@shikijs/transformers` from 1.24.2 to 1.24.4
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.24.4/packages/transformers)

Updates `shiki` from 1.24.2 to 1.24.4
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.24.4/packages/shiki)

---
updated-dependencies:
- dependency-name: "@shikijs/rehype"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: shikijs
- dependency-name: "@shikijs/transformers"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: shikijs
- dependency-name: shiki
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: shikijs
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 117 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 945939369..6cdffdd15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,8 +53,8 @@
         "@percy/ember": "^4.0.0",
         "@sentry/ember": "^8.36.0",
         "@sentry/webpack-plugin": "^2.22.7",
-        "@shikijs/rehype": "^1.24.2",
-        "@shikijs/transformers": "^1.24.2",
+        "@shikijs/rehype": "^1.24.4",
+        "@shikijs/transformers": "^1.24.4",
         "@tsconfig/ember": "^3.0.8",
         "@types/canvas-confetti": "^1.9.0",
         "@types/dompurify": "^3.2.0",
@@ -8684,77 +8684,77 @@
       }
     },
     "node_modules/@shikijs/core": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.2.tgz",
-      "integrity": "sha512-BpbNUSKIwbKrRRA+BQj0BEWSw+8kOPKDJevWeSE/xIqGX7K0xrCZQ9kK0nnEQyrzsUoka1l81ZtJ2mGaCA32HQ==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.4.tgz",
+      "integrity": "sha512-jjLsld+xEEGYlxAXDyGwWsKJ1sw5Pc1pnp4ai2ORpjx2UX08YYTC0NNqQYO1PaghYaR+PvgMOGuvzw2he9sk0Q==",
       "dev": true,
       "dependencies": {
-        "@shikijs/engine-javascript": "1.24.2",
-        "@shikijs/engine-oniguruma": "1.24.2",
-        "@shikijs/types": "1.24.2",
-        "@shikijs/vscode-textmate": "^9.3.0",
+        "@shikijs/engine-javascript": "1.24.4",
+        "@shikijs/engine-oniguruma": "1.24.4",
+        "@shikijs/types": "1.24.4",
+        "@shikijs/vscode-textmate": "^9.3.1",
         "@types/hast": "^3.0.4",
-        "hast-util-to-html": "^9.0.3"
+        "hast-util-to-html": "^9.0.4"
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.2.tgz",
-      "integrity": "sha512-EqsmYBJdLEwEiO4H+oExz34a5GhhnVp+jH9Q/XjPjmBPc6TE/x4/gD0X3i0EbkKKNqXYHHJTJUpOLRQNkEzS9Q==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.4.tgz",
+      "integrity": "sha512-TClaQOLvo9WEMJv6GoUsykQ6QdynuKszuORFWCke8qvi6PeLm7FcD9+7y45UenysxEWYpDL5KJaVXTngTE+2BA==",
       "dev": true,
       "dependencies": {
-        "@shikijs/types": "1.24.2",
-        "@shikijs/vscode-textmate": "^9.3.0",
-        "oniguruma-to-es": "0.7.0"
+        "@shikijs/types": "1.24.4",
+        "@shikijs/vscode-textmate": "^9.3.1",
+        "oniguruma-to-es": "0.8.1"
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.2.tgz",
-      "integrity": "sha512-ZN6k//aDNWRJs1uKB12pturKHh7GejKugowOFGAuG7TxDRLod1Bd5JhpOikOiFqPmKjKEPtEA6mRCf7q3ulDyQ==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.4.tgz",
+      "integrity": "sha512-Do2ry6flp2HWdvpj2XOwwa0ljZBRy15HKZITzPcNIBOGSeprnA8gOooA/bLsSPuy8aJBa+Q/r34dMmC3KNL/zw==",
       "dev": true,
       "dependencies": {
-        "@shikijs/types": "1.24.2",
-        "@shikijs/vscode-textmate": "^9.3.0"
+        "@shikijs/types": "1.24.4",
+        "@shikijs/vscode-textmate": "^9.3.1"
       }
     },
     "node_modules/@shikijs/rehype": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-1.24.2.tgz",
-      "integrity": "sha512-G4Ks9y2FKwiIrRMIi3GGauyar2F05Ww9e4fbbzE/n2hTBGIcZ2e6KGlBNkDwNvVOGyyAsCpwHQFBMYgd30ZQ3Q==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-1.24.4.tgz",
+      "integrity": "sha512-NbGOGGB0+j/cdv7TKQXNCbuqSjiwmbb2bqjaCD6jPhjAtVo/9KEtpIR7QQQP0ZvcDNuHQHtntrfQnysa6kJ41Q==",
       "dev": true,
       "dependencies": {
-        "@shikijs/types": "1.24.2",
+        "@shikijs/types": "1.24.4",
         "@types/hast": "^3.0.4",
         "hast-util-to-string": "^3.0.1",
-        "shiki": "1.24.2",
+        "shiki": "1.24.4",
         "unified": "^11.0.5",
         "unist-util-visit": "^5.0.0"
       }
     },
     "node_modules/@shikijs/transformers": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.24.2.tgz",
-      "integrity": "sha512-cIwn8YSwO3bsWKJ+pezcXY1Vq0BVwvuLes1TZSC5+Awi6Tsfqhf3vBahOIqZK1rraMKOti2VEAEF/95oXMig1w==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.24.4.tgz",
+      "integrity": "sha512-0jq5p9WLB7ToM/O7RWfxuIwirTJbIQsUR06jxdG3h3CEuO5m7ik8GnDsxwHhyIEfgJSZczSnVUZWFrNKy5It6g==",
       "dev": true,
       "dependencies": {
-        "shiki": "1.24.2"
+        "shiki": "1.24.4"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.2.tgz",
-      "integrity": "sha512-bdeWZiDtajGLG9BudI0AHet0b6e7FbR0EsE4jpGaI0YwHm/XJunI9+3uZnzFtX65gsyJ6ngCIWUfA4NWRPnBkQ==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.4.tgz",
+      "integrity": "sha512-0r0XU7Eaow0PuDxuWC1bVqmWCgm3XqizIaT7SM42K03vc69LGooT0U8ccSR44xP/hGlNx4FKhtYpV+BU6aaKAA==",
       "dev": true,
       "dependencies": {
-        "@shikijs/vscode-textmate": "^9.3.0",
+        "@shikijs/vscode-textmate": "^9.3.1",
         "@types/hast": "^3.0.4"
       }
     },
     "node_modules/@shikijs/vscode-textmate": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.0.tgz",
-      "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
+      "integrity": "sha512-79QfK1393x9Ho60QFyLti+QfdJzRQCVLFb97kOIV7Eo9vQU/roINgk7m24uv0a7AUvN//RDH36FLjjK48v0s9g==",
       "dev": true
     },
     "node_modules/@simple-dom/document": {
@@ -35191,9 +35191,9 @@
       }
     },
     "node_modules/hast-util-to-html": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz",
-      "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.4.tgz",
+      "integrity": "sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^3.0.0",
@@ -39106,14 +39106,14 @@
       }
     },
     "node_modules/oniguruma-to-es": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.7.0.tgz",
-      "integrity": "sha512-HRaRh09cE0gRS3+wi2zxekB+I5L8C/gN60S+vb11eADHUaB/q4u8wGGOX3GvwvitG8ixaeycZfeoyruKQzUgNg==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.8.1.tgz",
+      "integrity": "sha512-dekySTEvCxCj0IgKcA2uUCO/e4ArsqpucDPcX26w9ajx+DvMWLc5eZeJaRQkd7oC/+rwif5gnT900tA34uN9Zw==",
       "dev": true,
       "dependencies": {
         "emoji-regex-xs": "^1.0.0",
         "regex": "^5.0.2",
-        "regex-recursion": "^4.3.0"
+        "regex-recursion": "^5.0.0"
       }
     },
     "node_modules/open": {
@@ -41289,9 +41289,9 @@
       }
     },
     "node_modules/regex": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/regex/-/regex-5.0.2.tgz",
-      "integrity": "sha512-/pczGbKIQgfTMRV0XjABvc5RzLqQmwqxLHdQao2RTXPk+pmTXB2P0IaUHYdYyk412YLwUIkaeMd5T+RzVgTqnQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.1.tgz",
+      "integrity": "sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==",
       "dev": true,
       "dependencies": {
         "regex-utilities": "^2.3.0"
@@ -41311,11 +41311,12 @@
       }
     },
     "node_modules/regex-recursion": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-4.3.0.tgz",
-      "integrity": "sha512-5LcLnizwjcQ2ALfOj95MjcatxyqF5RPySx9yT+PaXu3Gox2vyAtLDjHB8NTJLtMGkvyau6nI3CfpwFCjPUIs/A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.1.1.tgz",
+      "integrity": "sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==",
       "dev": true,
       "dependencies": {
+        "regex": "^5.1.1",
         "regex-utilities": "^2.3.0"
       }
     },
@@ -42458,16 +42459,16 @@
       "dev": true
     },
     "node_modules/shiki": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.2.tgz",
-      "integrity": "sha512-TR1fi6mkRrzW+SKT5G6uKuc32Dj2EEa7Kj0k8kGqiBINb+C1TiflVOiT9ta6GqOJtC4fraxO5SLUaKBcSY38Fg==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.4.tgz",
+      "integrity": "sha512-aVGSFAOAr1v26Hh/+GBIsRVDWJ583XYV7CuNURKRWh9gpGv4OdbisZGq96B9arMYTZhTQkmRF5BrShOSTvNqhw==",
       "dev": true,
       "dependencies": {
-        "@shikijs/core": "1.24.2",
-        "@shikijs/engine-javascript": "1.24.2",
-        "@shikijs/engine-oniguruma": "1.24.2",
-        "@shikijs/types": "1.24.2",
-        "@shikijs/vscode-textmate": "^9.3.0",
+        "@shikijs/core": "1.24.4",
+        "@shikijs/engine-javascript": "1.24.4",
+        "@shikijs/engine-oniguruma": "1.24.4",
+        "@shikijs/types": "1.24.4",
+        "@shikijs/vscode-textmate": "^9.3.1",
         "@types/hast": "^3.0.4"
       }
     },
diff --git a/package.json b/package.json
index bc4ccee6d..ed034342c 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
     "@percy/ember": "^4.0.0",
     "@sentry/ember": "^8.36.0",
     "@sentry/webpack-plugin": "^2.22.7",
-    "@shikijs/rehype": "^1.24.2",
-    "@shikijs/transformers": "^1.24.2",
+    "@shikijs/rehype": "^1.24.4",
+    "@shikijs/transformers": "^1.24.4",
     "@tsconfig/ember": "^3.0.8",
     "@types/canvas-confetti": "^1.9.0",
     "@types/dompurify": "^3.2.0",

From 4071e9d314e9b9f4a78914a66d349e38dd32eebf Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Sat, 28 Dec 2024 05:40:45 +0800
Subject: [PATCH 10/18] feat(stage): rename `shouldShowNeedHelpForumLink` to
 `shouldShowStage1ForumLinkCTA` and update its logic

Updated the name of the `shouldShowNeedHelpForumLink` property to `shouldShowStage1ForumLinkCTA` and modified its logic to align with its new name.
---
 app/controllers/course/stage/instructions.ts | 8 ++++----
 app/templates/course/stage/instructions.hbs  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/course/stage/instructions.ts b/app/controllers/course/stage/instructions.ts
index 66fc9b46e..7d1e881e0 100644
--- a/app/controllers/course/stage/instructions.ts
+++ b/app/controllers/course/stage/instructions.ts
@@ -55,14 +55,14 @@ export default class CourseStageInstructionsController extends Controller {
     return !this.currentStep.courseStage.isFirst && this.currentStep.status === 'complete';
   }
 
-  get shouldShowNeedHelpForumLink() {
-    return this.model.courseStage.isFirst && this.currentStep.testsStatus !== 'passed' && this.currentStep.status !== 'complete';
-  }
-
   get shouldShowPrerequisites() {
     return !!this.prerequisiteInstructionsMarkdown;
   }
 
+  get shouldShowStage1ForumLinkCTA() {
+    return this.model.courseStage.isFirst && this.currentStep.testsStatus !== 'passed' && this.currentStep.status !== 'complete';
+  }
+
   get shouldShowTestRunnerCard() {
     return this.isCurrentStage && this.currentStep.status !== 'complete';
   }
diff --git a/app/templates/course/stage/instructions.hbs b/app/templates/course/stage/instructions.hbs
index 7e059d230..a3c59938b 100644
--- a/app/templates/course/stage/instructions.hbs
+++ b/app/templates/course/stage/instructions.hbs
@@ -83,7 +83,7 @@
       </div>
     {{/if}}
 
-    {{#if this.shouldShowNeedHelpForumLink}}
+    {{#if this.shouldShowStage1ForumLinkCTA}}
       <div class="prose dark:prose-invert prose-sm prose-compact ml-4 mb-10">
         <p>
           Need help?

From de6a0437fa0fdb2e54d754c9f9e60c4e68bfc07e Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Sat, 28 Dec 2024 12:25:04 +0800
Subject: [PATCH 11/18] refactor: Update temporary card to CTA in
 instructions.hbs

---
 app/templates/course/stage/instructions.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/course/stage/instructions.hbs b/app/templates/course/stage/instructions.hbs
index a3c59938b..9a73835cd 100644
--- a/app/templates/course/stage/instructions.hbs
+++ b/app/templates/course/stage/instructions.hbs
@@ -103,7 +103,7 @@
       </div>
     {{/if}}
 
-    {{! TODO: Remove this temporary card  }}
+    {{! TODO: Remove this temporary CTA  }}
     {{#if (and @model.courseStage.isSecond (eq @model.courseStage.course.slug "shell"))}}
       <div class="my-10 mx-6 flex items-start gap-4">
         <img
@@ -112,9 +112,9 @@
           class="shrink-0 overflow-hidden rounded-full size-8 filter drop-shadow-sm ring-1 ring-white dark:ring-white/5 shadow"
         />
         <div class="prose prose-compact dark:prose-invert text-sm">
-          <h4 class="text-base text-gray-600 dark:text-gray-300">Hi there! I'm Andy 👋</h4>
+          <h4 class="text-base text-gray-600 dark:text-gray-300">Help us improve!</h4>
           <p>
-            I'm working on improving our stage 2 experience.
+            Hi there! I'm Andy, and I'm working on improving the stage 2 experience.
           </p>
           <p>
             If you find anything confusing here, mind letting me know on

From cdee2f517cdfe7126fb8cbaf1aada925de36e911 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:31:29 +0000
Subject: [PATCH 12/18] fix: update lifetime plan price change date to January
 15

Co-Authored-By: Paul Kuruvilla <rohitpaulk@gmail.com>
---
 app/templates/pay.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/pay.hbs b/app/templates/pay.hbs
index 404c7722a..60850f31e 100644
--- a/app/templates/pay.hbs
+++ b/app/templates/pay.hbs
@@ -59,8 +59,8 @@
         @regionalDiscount={{if this.shouldApplyRegionalDiscount @model.regionalDiscount}}
         @shouldShowAmortizedMonthlyPrice={{false}}
         @title="Lifetime access"
-        @temporaryNoticeText="Price increases on Jan 1"
-        @temporaryNoticeTooltipText="The price for the lifetime plan will increase from $990 to $1,490 on January 1, 2025."
+        @temporaryNoticeText="Price increases on Jan 15"
+        @temporaryNoticeTooltipText="The price for the lifetime plan will increase from $990 to $1,490 on January 15, 2025."
         data-test-lifetime-pricing-card
       />
     </div>
@@ -90,4 +90,4 @@
       @onClose={{fn (mut this.configureCheckoutSessionModalIsOpen) false}}
     />
   </ModalBackdrop>
-{{/if}}
\ No newline at end of file
+{{/if}}

From 855cd97147e06c9adfb3ddfdf6c4d6b5a6d01c7f Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:36:36 +0000
Subject: [PATCH 13/18] style: fix prettier formatting in pay.hbs

Co-Authored-By: Paul Kuruvilla <rohitpaulk@gmail.com>
---
 app/templates/pay.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/pay.hbs b/app/templates/pay.hbs
index 60850f31e..bced1bacd 100644
--- a/app/templates/pay.hbs
+++ b/app/templates/pay.hbs
@@ -90,4 +90,4 @@
       @onClose={{fn (mut this.configureCheckoutSessionModalIsOpen) false}}
     />
   </ModalBackdrop>
-{{/if}}
+{{/if}}
\ No newline at end of file

From bd36fa681916a94f2a789d5c82f061a4c2a41f81 Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:59:58 +0800
Subject: [PATCH 14/18] fix: Add repo query param to start-track-button
 component

Updated the start-track-button component to include a 'repo' query param when transitioning to the course route if the user is not anonymous. This change allows for better handling of repository information in the transition.
---
 app/components/track-page/start-track-button.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/track-page/start-track-button.ts b/app/components/track-page/start-track-button.ts
index 4984d30ca..c2bc42b64 100644
--- a/app/components/track-page/start-track-button.ts
+++ b/app/components/track-page/start-track-button.ts
@@ -30,7 +30,7 @@ export default class CourseOverviewStartTrackButtonComponent extends Component<S
     if (this.currentUserIsAnonymous) {
       this.authenticator.initiateLogin(null);
     } else {
-      this.router.transitionTo('course', this.args.courses[0]!.slug, { queryParams: { track: this.args.language.slug } });
+      this.router.transitionTo('course', this.args.courses[0]!.slug, { queryParams: { repo: null, track: this.args.language.slug } });
     }
   }
 }

From 1d0c32afb03a50324fafbcfece729321468030a5 Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:37:20 +0800
Subject: [PATCH 15/18] Add test [percy]

---
 .../track-page/start-track-button.hbs         |  2 +-
 .../acceptance/track-page/start-track-test.js | 63 +++++++++++++++++++
 tests/pages/track-page.js                     |  2 +
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/acceptance/track-page/start-track-test.js

diff --git a/app/components/track-page/start-track-button.hbs b/app/components/track-page/start-track-button.hbs
index 2d941b868..efc21c4d5 100644
--- a/app/components/track-page/start-track-button.hbs
+++ b/app/components/track-page/start-track-button.hbs
@@ -1,4 +1,4 @@
-<PrimaryButton class="mr-2 flex items-center" data-test-start-track-button {{on "click" this.handleClicked}} @size="large" ...attributes>
+<PrimaryButton class="mr-2 flex items-center" data-test-primary-start-track-button {{on "click" this.handleClicked}} @size="large" ...attributes>
   {{#if this.currentUserIsAnonymous}}
     {{svg-jar "github" class="fill-current w-5 transform transition-all mr-2"}}
   {{/if}}
diff --git a/tests/acceptance/track-page/start-track-test.js b/tests/acceptance/track-page/start-track-test.js
new file mode 100644
index 000000000..0c485e1a5
--- /dev/null
+++ b/tests/acceptance/track-page/start-track-test.js
@@ -0,0 +1,63 @@
+import testScenario from 'codecrafters-frontend/mirage/scenarios/test';
+import trackPage from 'codecrafters-frontend/tests/pages/track-page';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'codecrafters-frontend/tests/helpers';
+import { signIn } from 'codecrafters-frontend/tests/support/authentication-helpers';
+import { currentURL, visit } from '@ember/test-helpers';
+
+module('Acceptance | track-page | start-track', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('it display the start-track-button for anonymous user', async function (assert) {
+    testScenario(this.server);
+
+    await visit('/tracks/go');
+    assert.ok(trackPage.hasStartTrackButton, 'start track button should be visible for anonymous users');
+  });
+
+  test('it display the start-track-button for logged-in user who has not started course in the track', async function (assert) {
+    testScenario(this.server);
+    signIn(this.owner, this.server);
+
+    await visit('/tracks/go');
+    assert.ok(trackPage.hasStartTrackButton, 'start track button should be visible for users without course progress');
+  });
+
+  test('it does not display the start-track-button for logged-in user who has started course in the track', async function (assert) {
+    testScenario(this.server);
+    signIn(this.owner, this.server);
+
+    let currentUser = this.server.schema.users.first();
+    let git = this.server.schema.courses.findBy({ slug: 'git' });
+    let go = this.server.schema.languages.findBy({ slug: 'go' });
+    this.server.create('repository', 'withFirstStageCompleted', {
+      course: git,
+      language: go,
+      user: currentUser,
+    });
+
+    await visit('/tracks/go');
+    assert.notOk(trackPage.hasStartTrackButton, 'start track button should not be visible for users with course progress');
+  });
+
+  test('it starts track for logged-in user who has started course in a different track', async function (assert) {
+    testScenario(this.server);
+    signIn(this.owner, this.server);
+
+    let currentUser = this.server.schema.users.first();
+    let grep = this.server.schema.courses.findBy({ slug: 'grep' });
+    let python = this.server.schema.languages.findBy({ slug: 'python' });
+    this.server.create('repository', 'withFirstStageCompleted', {
+      course: grep,
+      language: python,
+      user: currentUser,
+    });
+
+    await visit('/tracks/go');
+    assert.ok(trackPage.hasStartTrackButton, 'start track button is visible');
+
+    await trackPage.clickOnStartTrackButton();
+    assert.ok(currentURL().includes('track=go'), 'started course page should have `track` query param in URL');
+    assert.notOk(currentURL().includes('repo='), 'started course page should not have `repo` query param in URL');
+  });
+});
diff --git a/tests/pages/track-page.js b/tests/pages/track-page.js
index 1f84f3cd3..566e6d2f8 100644
--- a/tests/pages/track-page.js
+++ b/tests/pages/track-page.js
@@ -13,7 +13,9 @@ export default createPage({
   },
 
   clickOnResumeTrackButton: clickable('[data-test-resume-track-button]'),
+  clickOnStartTrackButton: clickable('[data-test-primary-start-track-button]'),
   hasResumeTrackButton: isVisible('[data-test-resume-track-button]'),
+  hasStartTrackButton: isVisible('[data-test-primary-start-track-button]'),
 
   header: {
     descriptionText: text('[data-test-track-header-description]'),

From e3f880569331eec2f33520f82e850777a043893e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:14:30 +0000
Subject: [PATCH 16/18] chore(deps-dev): bump @percy/cli from 1.30.3 to 1.30.6

Bumps [@percy/cli](https://github.com/percy/cli/tree/HEAD/packages/cli) from 1.30.3 to 1.30.6.
- [Release notes](https://github.com/percy/cli/releases)
- [Commits](https://github.com/percy/cli/commits/v1.30.6/packages/cli)

---
updated-dependencies:
- dependency-name: "@percy/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 166 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6846e24b9..7cbcdf916 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "@glint/environment-ember-loose": "^1.5.0",
         "@glint/environment-ember-template-imports": "^1.5.0",
         "@glint/template": "^1.2.1",
-        "@percy/cli": "^1.30.3",
+        "@percy/cli": "^1.30.6",
         "@percy/ember": "^4.0.0",
         "@sentry/ember": "^8.36.0",
         "@sentry/webpack-plugin": "^2.22.7",
@@ -7572,20 +7572,20 @@
       }
     },
     "node_modules/@percy/cli": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli/-/cli-1.30.3.tgz",
-      "integrity": "sha512-oKuqacqtIJkA70lMB7Q5UeWGxGEMTGqWcf54vHsKrTgBAoK5sI0IOMhXwtJNYZrvZdZVSrY39VHKU2cQBcxhaA==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli/-/cli-1.30.6.tgz",
+      "integrity": "sha512-bR6niEywRPMXe3Koadk9ryQtCYP62LOTVQddi8I6STlOy8iEUsD2GMa8Sw4oU9hvD250Im0zpe5jP08BwrSfnw==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-app": "1.30.3",
-        "@percy/cli-build": "1.30.3",
-        "@percy/cli-command": "1.30.3",
-        "@percy/cli-config": "1.30.3",
-        "@percy/cli-exec": "1.30.3",
-        "@percy/cli-snapshot": "1.30.3",
-        "@percy/cli-upload": "1.30.3",
-        "@percy/client": "1.30.3",
-        "@percy/logger": "1.30.3"
+        "@percy/cli-app": "1.30.6",
+        "@percy/cli-build": "1.30.6",
+        "@percy/cli-command": "1.30.6",
+        "@percy/cli-config": "1.30.6",
+        "@percy/cli-exec": "1.30.6",
+        "@percy/cli-snapshot": "1.30.6",
+        "@percy/cli-upload": "1.30.6",
+        "@percy/client": "1.30.6",
+        "@percy/logger": "1.30.6"
       },
       "bin": {
         "percy": "bin/run.cjs"
@@ -7595,39 +7595,39 @@
       }
     },
     "node_modules/@percy/cli-app": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-app/-/cli-app-1.30.3.tgz",
-      "integrity": "sha512-aZE7jGbBFXGJkLj3yf1VfF2mjUAPOB+pZLmnHSpDLenNYcof6RhbyRdkdsSuSz9HQEE6Q3n4Ae20nCEss6LvOQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-app/-/cli-app-1.30.6.tgz",
+      "integrity": "sha512-IjsWqXcjjXBPErU87Zrvui2k8nogz6trXVUpiGVkPGlFXeGjQXzB95wUECRDqvDTRRrisW1p/XVJi62dUAOX2A==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3",
-        "@percy/cli-exec": "1.30.3"
+        "@percy/cli-command": "1.30.6",
+        "@percy/cli-exec": "1.30.6"
       },
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/cli-build": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-build/-/cli-build-1.30.3.tgz",
-      "integrity": "sha512-XLE5PjaQQ+FbBBq1OD8AULqr8lMsl6PO9cvzCIAsnht/4BlimzPpZ3IkTf7XHylpqsvXHJ3T7MoZvci9p/dyPg==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-build/-/cli-build-1.30.6.tgz",
+      "integrity": "sha512-8MxuqrjIn2pxuGOVm2V1XkVNrC88a2Xog6qC9omqf69LQfFB5hR1+s40M/MC/9oM8MJFRsNJJ5PUDRHOwgM02Q==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3"
+        "@percy/cli-command": "1.30.6"
       },
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/cli-command": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-command/-/cli-command-1.30.3.tgz",
-      "integrity": "sha512-HSvxXZZt3Igum/nyxV/utDu/MQNn6zFHiHLgYxElkCr/cyBVzgCnFbWbCeSNhPAum6fVpgOH4l0NLku+SX35xw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-command/-/cli-command-1.30.6.tgz",
+      "integrity": "sha512-k+/5GTXcbPfgKV6N7yqqt2E3OwQYJl/+fXQZSy7LAfNMR9X0w26ah2ErznyaCsLTPeDyurAJ7SPIOXHsq28uRA==",
       "dev": true,
       "dependencies": {
-        "@percy/config": "1.30.3",
-        "@percy/core": "1.30.3",
-        "@percy/logger": "1.30.3"
+        "@percy/config": "1.30.6",
+        "@percy/core": "1.30.6",
+        "@percy/logger": "1.30.6"
       },
       "bin": {
         "percy-cli-readme": "bin/readme.js"
@@ -7637,25 +7637,25 @@
       }
     },
     "node_modules/@percy/cli-config": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-config/-/cli-config-1.30.3.tgz",
-      "integrity": "sha512-D2W+GJFejnXXfm5vyKq5CoLuHP5c2foheJ12dEu9d/IKePhblPLWd53bKZvHzD1LC9nk6DocKa4AAVQ+4JJV0w==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-config/-/cli-config-1.30.6.tgz",
+      "integrity": "sha512-hKsadKRizSxe+SuuDItDZV0qd32FNpfUYHhpA1gxkAhAtgZy4d1bINmKgrB6I55cSD1yYZgRGXI1e2+NI5q5ig==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3"
+        "@percy/cli-command": "1.30.6"
       },
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/cli-exec": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-exec/-/cli-exec-1.30.3.tgz",
-      "integrity": "sha512-Wp3dIbqF3M9f+CkiZcOEZPkCGGKtWytbs4eJ0PcxGFQG6gH9Dv/BeTncCy23zNjvwlgzAxlMvxuoHcVf7RkkpA==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-exec/-/cli-exec-1.30.6.tgz",
+      "integrity": "sha512-N/vdTi5NJWT7AqQt8XgheGgB+vByZtX/WkpG5/a0WsJltOIYJKM0ZZIaUxZsUtXwgustdrEFchlAin/87aasvg==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3",
-        "@percy/logger": "1.30.3",
+        "@percy/cli-command": "1.30.6",
+        "@percy/logger": "1.30.6",
         "cross-spawn": "^7.0.3",
         "which": "^2.0.2"
       },
@@ -7664,12 +7664,12 @@
       }
     },
     "node_modules/@percy/cli-snapshot": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-snapshot/-/cli-snapshot-1.30.3.tgz",
-      "integrity": "sha512-y2GySH5YQZUbF9yoCPEzDclnJBMDBuUSKnOkauIsHn7fBpi61Dl1BaWv5OJbllGzkJ8yZnMjaJic/ydSBXl3FQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-snapshot/-/cli-snapshot-1.30.6.tgz",
+      "integrity": "sha512-D5qYBLVXBmIYloVfCGfIwYBg3vUXWaTA0dne0aEvIVWBN7QRKncFTHeehGe4CXal9tceFbJyx7yJCu3XXP10hg==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3",
+        "@percy/cli-command": "1.30.6",
         "yaml": "^2.0.0"
       },
       "engines": {
@@ -7677,12 +7677,12 @@
       }
     },
     "node_modules/@percy/cli-upload": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/cli-upload/-/cli-upload-1.30.3.tgz",
-      "integrity": "sha512-pQEueqDhBqWAS9z/ZvBrL7RX8Fxev5MY11vlbrrTZI0qLaN7J6Vkqz6j33JcZAAYOP6hHfsBg5iy2qGYDbgk+Q==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/cli-upload/-/cli-upload-1.30.6.tgz",
+      "integrity": "sha512-5buyO7tljBOeCKARLegoxT8NvtiZs/kIXt63d7BRVTfJKa7rn/2Xw0Y/DVseGixHFryZ6C//osvE50nHifcKYw==",
       "dev": true,
       "dependencies": {
-        "@percy/cli-command": "1.30.3",
+        "@percy/cli-command": "1.30.6",
         "fast-glob": "^3.2.11",
         "image-size": "^1.0.0"
       },
@@ -7691,13 +7691,13 @@
       }
     },
     "node_modules/@percy/client": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.30.3.tgz",
-      "integrity": "sha512-2gepzFyAGiyFjQ33RTkO7RMfgnnCB5Fo7Cc6lU7WbJB4CyLF9+khl0Cgd48d1flLOZDhFdItGuLiwcnpkvDNcw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/client/-/client-1.30.6.tgz",
+      "integrity": "sha512-iHcYK4djy/WA3ZqIVcgOmuOtDeMiGDmJZ0DlDG38HMmAPgXHSThNXNz9bnXb2OSJFxXVRdlAE8DoqFK5FnwNsg==",
       "dev": true,
       "dependencies": {
-        "@percy/env": "1.30.3",
-        "@percy/logger": "1.30.3",
+        "@percy/env": "1.30.6",
+        "@percy/logger": "1.30.6",
         "pako": "^2.1.0"
       },
       "engines": {
@@ -7711,12 +7711,12 @@
       "dev": true
     },
     "node_modules/@percy/config": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.30.3.tgz",
-      "integrity": "sha512-i+k6H1PsKma0b61347sIW9bEY9/qe1xx/yEIc+bE3oEydjfEDp4IDt9ZBhkeRPYpko67QQ9y9kzGT2v8PYkuxw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/config/-/config-1.30.6.tgz",
+      "integrity": "sha512-qYUu4TVLJgtG/RIwa/AM+d3f1xH4D3uSvCoWUhX4y5rK5QDZ0UqWEvDOD6CJDn8i1xXi4ZY/JB7HKYKUTHeppQ==",
       "dev": true,
       "dependencies": {
-        "@percy/logger": "1.30.3",
+        "@percy/logger": "1.30.6",
         "ajv": "^8.6.2",
         "cosmiconfig": "^8.0.0",
         "yaml": "^2.0.0"
@@ -7726,17 +7726,17 @@
       }
     },
     "node_modules/@percy/core": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.30.3.tgz",
-      "integrity": "sha512-ty9Hj1Dr0f6FrHdJIU0e7jCnSfDW/iSF6B6X4jC7ovXw9tbEK/0vt/Q7VZaQiDjmo3tU7gl5DAzsqf8gGVgemg==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/core/-/core-1.30.6.tgz",
+      "integrity": "sha512-G0ULd3pHz8s4RajxUGTWGx8Ngl+jhOjIPNxOBtKh0ywgAnbvUWNWLKYvs9QinZcoPGfWgwc5+1btbeJxTAVGQg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@percy/client": "1.30.3",
-        "@percy/config": "1.30.3",
-        "@percy/dom": "1.30.3",
-        "@percy/logger": "1.30.3",
-        "@percy/webdriver-utils": "1.30.3",
+        "@percy/client": "1.30.6",
+        "@percy/config": "1.30.6",
+        "@percy/dom": "1.30.6",
+        "@percy/logger": "1.30.6",
+        "@percy/webdriver-utils": "1.30.6",
         "content-disposition": "^0.5.4",
         "cross-spawn": "^7.0.3",
         "extract-zip": "^2.0.1",
@@ -7781,9 +7781,9 @@
       }
     },
     "node_modules/@percy/dom": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.30.3.tgz",
-      "integrity": "sha512-bqHx66hwpzNihlTe2y9nu8FxHKfBmzKqcrxPa8ItMx8dFglWqEzjA9phrgSeFRs5yjrMUO6MuPtuj5reHrmoqQ==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/dom/-/dom-1.30.6.tgz",
+      "integrity": "sha512-pMlzYYJfgVdNYbw1iJIQZxXzszL3EmIrbGvvpkred3RciJ4T3/pFlqiLiPS7TTUovMFFgRjTR1gLOH1eeWyM5A==",
       "dev": true
     },
     "node_modules/@percy/ember": {
@@ -8118,43 +8118,43 @@
       }
     },
     "node_modules/@percy/env": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.30.3.tgz",
-      "integrity": "sha512-42Cx2Z+KJtP+8HOR5rCyQGWT3Swdcz54pXJtBWrmockc/5zLXCqfqG8LN/JHWukNiH2kSiwn1BArWWRbGtqMxw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/env/-/env-1.30.6.tgz",
+      "integrity": "sha512-GU3ZcyiCUM3KiRmcpa5fpOIkuHBUonvBhNeg1jErZFEZFQDNm238SFnKQFEJIYCX96W5Q9qqXMwjApj7qBpiWg==",
       "dev": true,
       "dependencies": {
-        "@percy/logger": "1.30.3"
+        "@percy/logger": "1.30.6"
       },
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/logger": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.30.3.tgz",
-      "integrity": "sha512-AR3ygLmaGz0fpo1RoMt99jDpM8SOlSq/4sGFXSLfbbE4QCMGx4FsfuPRFdG2RpXKQnQN9Wjyi2F4woRAxiJNvg==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/logger/-/logger-1.30.6.tgz",
+      "integrity": "sha512-HDhAIjjqOlpAIqClu+fvuWSA2cvxh3aMHtKN3gRdRMppHCvyyfmVbKd1PoLPV7Z0SQzZkyaBMAjiRXWMPksLig==",
       "dev": true,
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/sdk-utils": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.30.3.tgz",
-      "integrity": "sha512-mMWeWMKtAaJdx+Wcpi5EEQZfWDFV0aOzT6+tNFL/ze7wskM4NF9RXIt0W86wyOSs25XB+kgY9+TuTc/yrR7Jew==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/sdk-utils/-/sdk-utils-1.30.6.tgz",
+      "integrity": "sha512-LSayDfxAaXJaSv5SIDKMf7EjDl+k4kufYO88YQwc9+9Yr58qqrPFon11x0PvJdA2IDGBo1G6QbvpLUO0Vem2FQ==",
       "dev": true,
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@percy/webdriver-utils": {
-      "version": "1.30.3",
-      "resolved": "https://registry.npmjs.org/@percy/webdriver-utils/-/webdriver-utils-1.30.3.tgz",
-      "integrity": "sha512-v43jZ0+zeR/eo2fbjMfOcTO0qjgDndrB8cKgwLVd+jJZpGj08nQQJOZYZ87Wrd0s4mDv8PFi5h6Dyt+x8KfjRw==",
+      "version": "1.30.6",
+      "resolved": "https://registry.npmjs.org/@percy/webdriver-utils/-/webdriver-utils-1.30.6.tgz",
+      "integrity": "sha512-B1M9HWP3ZEM5CuDSMUx+68mrrKm9/JjJ0KO/OLztRh+v7TOsgOWpHMHalurwEIfoNf/olduQ4/Vv9TPrTSj72Q==",
       "dev": true,
       "dependencies": {
-        "@percy/config": "1.30.3",
-        "@percy/sdk-utils": "1.30.3"
+        "@percy/config": "1.30.6",
+        "@percy/sdk-utils": "1.30.6"
       },
       "engines": {
         "node": ">=14"
@@ -35624,9 +35624,9 @@
       }
     },
     "node_modules/image-size": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.1.1.tgz",
-      "integrity": "sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
+      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
       "dev": true,
       "dependencies": {
         "queue": "6.0.2"
diff --git a/package.json b/package.json
index 2fdb4f2f0..ce8c08db1 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
     "@glint/template": "^1.2.1",
-    "@percy/cli": "^1.30.3",
+    "@percy/cli": "^1.30.6",
     "@percy/ember": "^4.0.0",
     "@sentry/ember": "^8.36.0",
     "@sentry/webpack-plugin": "^2.22.7",

From 284f008851053b4f526fe219a5c5641c8b384a2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 19:30:36 +0000
Subject: [PATCH 17/18] chore(deps-dev): bump webpack from 5.96.1 to 5.97.1

Bumps [webpack](https://github.com/webpack/webpack) from 5.96.1 to 5.97.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.96.1...v5.97.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 168 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7cbcdf916..c530e5d86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -184,7 +184,7 @@
         "tailwindcss": "^3.4.16",
         "tracked-built-ins": "^3.3.0",
         "typescript": "^5.6.3",
-        "webpack": "^5.96.1",
+        "webpack": "^5.97.1",
         "webpack-bundle-analyzer": "^4.10.2"
       },
       "engines": {
@@ -9891,31 +9891,31 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-code-frame": {
@@ -9988,111 +9988,111 @@
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-parser": {
@@ -10139,12 +10139,12 @@
       "dev": true
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -46799,16 +46799,16 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.96.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.14.0",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
diff --git a/package.json b/package.json
index ce8c08db1..c25153db8 100644
--- a/package.json
+++ b/package.json
@@ -190,7 +190,7 @@
     "tailwindcss": "^3.4.16",
     "tracked-built-ins": "^3.3.0",
     "typescript": "^5.6.3",
-    "webpack": "^5.96.1",
+    "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "engines": {

From f2672a7879407ea1558b7f26546c9360552e6111 Mon Sep 17 00:00:00 2001
From: Andy Li <1450947+andy1li@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:00:40 +0800
Subject: [PATCH 18/18] refactor: Remove the feature flag for showing all steps
 at once for first stage tutorial card

---
 .../first-stage-tutorial-card.hbs             | 126 +++++-------------
 .../first-stage-tutorial-card.ts              |   4 -
 app/services/feature-flags.js                 |   4 -
 3 files changed, 33 insertions(+), 101 deletions(-)

diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
index 3a55b1c6b..c9b5661b4 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.hbs
@@ -1,102 +1,42 @@
-{{#if this.shouldShowAllStepsAtOnceForStage1}}
-  <CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
-    <:content>
-      <div class="prose dark:prose-invert mb-5">
-        <p>
-          Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
-          submit your changes.
-        </p>
-      </div>
+<CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
+  <:content>
+    <div class="prose dark:prose-invert mb-5">
+      <p>
+        Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
+        submit your changes.
+      </p>
+    </div>
 
-      <div class="prose dark:prose-invert mb-3">
-        <div class="inline-flex items-center gap-1">
-          {{#if this.hasPassedTests}}
-            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
-          {{else}}
-            <b class="text-teal-600">Step 1:</b>
-          {{/if}}
-          Open a file
-        </div>
-      </div>
-      <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
-        @repository={{@repository}}
-        @courseStage={{@courseStage}}
-        @isComplete={{false}}
-      />
-
-      <div class="prose dark:prose-invert mt-6 mb-3 pt-4 border-t dark:border-white/5">
-        <div class="inline-flex items-center gap-1">
-          {{#if this.hasPassedTests}}
-            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
-          {{else}}
-            <b class="text-teal-600">Step 2:</b>
-          {{/if}}
-          Uncomment code
-        </div>
-      </div>
-      <div class="max-w-2xl">
+    <ExpandableStepList @steps={{this.steps}} @onManualStepComplete={{this.handleStepCompletedManually}} class="scroll-mt-32" as |stepList|>
+      {{#if (eq stepList.expandedStep.id "navigate-to-file")}}
+        <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
+          @repository={{@repository}}
+          @courseStage={{@courseStage}}
+          @isComplete={{this.navigateToFileStepIsComplete}}
+        />
+      {{else if (eq stepList.expandedStep.id "uncomment-code")}}
         <CoursePage::CourseStageStep::FirstStageTutorialCard::UncommentCodeStep
           @repository={{@repository}}
           @courseStage={{@courseStage}}
-          @isComplete={{false}}
+          @isComplete={{this.uncommentCodeStepIsComplete}}
         />
-      </div>
+      {{else if (eq stepList.expandedStep.id "submit-code")}}
+        <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.submitCodeStepIsComplete}} />
+      {{/if}}
+    </ExpandableStepList>
 
-      <div class="prose dark:prose-invert mt-8 mb-3 pt-4 border-t dark:border-white/5">
-        <div class="inline-flex items-center gap-1">
-          {{#if this.hasPassedTests}}
-            {{svg-jar "check-circle" class="w-6 h-6 text-teal-500 inline-flex mb-0.5"}}
-          {{else}}
-            <b class="text-teal-600">Step 3:</b>
-          {{/if}}
-          Submit changes
-        </div>
-      </div>
-      <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.hasPassedTests}} />
-    </:content>
-  </CoursePage::InstructionsCard>
-{{else}}
-  <CoursePage::InstructionsCard @title="How to pass this stage" id="first-stage-tutorial-card" ...attributes>
-    <:content>
-      <div class="prose dark:prose-invert mb-5">
+    {{! After step 2, step 3 already contains a note on Tests Failed, so we can hide this !}}
+    {{#unless this.uncommentCodeStepIsComplete}}
+      <div class="prose dark:prose-invert prose-sm prose-compact mt-5">
         <p>
-          Since this is the first stage, we've included some commented code to help you get started. To pass this stage, simply uncomment the code and
-          submit your changes.
+          {{svg-jar "information-circle" class="w-5 h-5 mb-1 inline-flex text-sky-500"}}
+          <b>Note:</b>
+          After your first Git push, you should see
+          <code class="font-semibold text-red-700 dark:text-red-300 bg-red-100 dark:bg-red-900/30 border border-red-200 dark:border-red-800/40">Tests
+            failed</code>
+          in the bar below this card. This is expected! Complete the steps above to pass the tests.
         </p>
       </div>
-
-      <ExpandableStepList @steps={{this.steps}} @onManualStepComplete={{this.handleStepCompletedManually}} class="scroll-mt-32" as |stepList|>
-        {{#if (eq stepList.expandedStep.id "navigate-to-file")}}
-          <CoursePage::CourseStageStep::FirstStageTutorialCard::NavigateToFileStep
-            @repository={{@repository}}
-            @courseStage={{@courseStage}}
-            @isComplete={{this.navigateToFileStepIsComplete}}
-          />
-        {{else if (eq stepList.expandedStep.id "uncomment-code")}}
-          <CoursePage::CourseStageStep::FirstStageTutorialCard::UncommentCodeStep
-            @repository={{@repository}}
-            @courseStage={{@courseStage}}
-            @isComplete={{this.uncommentCodeStepIsComplete}}
-          />
-        {{else if (eq stepList.expandedStep.id "submit-code")}}
-          <CoursePage::CourseStageStep::FirstStageTutorialCard::SubmitCodeStep @isComplete={{this.submitCodeStepIsComplete}} />
-        {{/if}}
-      </ExpandableStepList>
-
-      {{! After step 2, step 3 already contains a note on Tests Failed, so we can hide this !}}
-      {{#unless this.uncommentCodeStepIsComplete}}
-        <div class="prose dark:prose-invert prose-sm prose-compact mt-5">
-          <p>
-            {{svg-jar "information-circle" class="w-5 h-5 mb-1 inline-flex text-sky-500"}}
-            <b>Note:</b>
-            After your first Git push, you should see
-            <code
-              class="font-semibold text-red-700 dark:text-red-300 bg-red-100 dark:bg-red-900/30 border border-red-200 dark:border-red-800/40"
-            >Tests failed</code>
-            in the bar below this card. This is expected! Complete the steps above to pass the tests.
-          </p>
-        </div>
-      {{/unless}}
-    </:content>
-  </CoursePage::InstructionsCard>
-{{/if}}
\ No newline at end of file
+    {{/unless}}
+  </:content>
+</CoursePage::InstructionsCard>
\ No newline at end of file
diff --git a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
index a583b1968..651c3cb6e 100644
--- a/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
+++ b/app/components/course-page/course-stage-step/first-stage-tutorial-card.ts
@@ -85,10 +85,6 @@ export default class FirstStageTutorialCardComponent extends Component<Signature
     return this.coursePageState.manuallyCompletedStepIdsInFirstStageInstructions.includes('navigate-to-file');
   }
 
-  get shouldShowAllStepsAtOnceForStage1() {
-    return this.featureFlags.canSeeAllStepsAtOnceForStage1;
-  }
-
   get steps() {
     return [
       new NavigateToFileStep(this.args.repository, this.navigateToFileStepIsComplete),
diff --git a/app/services/feature-flags.js b/app/services/feature-flags.js
index a7aee0541..405762f5d 100644
--- a/app/services/feature-flags.js
+++ b/app/services/feature-flags.js
@@ -10,10 +10,6 @@ export default class FeatureFlagsService extends Service {
     this.notifiedFeatureFlags = new Set();
   }
 
-  get canSeeAllStepsAtOnceForStage1() {
-    return this.currentUser?.isStaff || this.getFeatureFlagValue('can-see-all-steps-at-once-for-stage-1') === 'test';
-  }
-
   get canSeeConceptsIndex() {
     return this.currentUser && (this.currentUser.isStaff || this.currentUser.isConceptAuthor);
   }