[squash]: fix review comments

alphagov · Dec 3, 2024 · 3541d73 · 3541d73
1 parent 92351eb
commit 3541d73
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/app/models/GatewayAccount.class.js b/app/models/GatewayAccount.class.js
@@ -10,7 +10,7 @@ const { GatewayAccountCredential, CREDENTIAL_STATE } = require('@models/GatewayA
  * @property {string} analyticsId - Google analyticsId of the gateway account
  * @property {boolean} toggle3ds - whether 3DS is enabled or not on this gateway account
  * @property {[GatewayAccountCredential]} gatewayAccountCredentials - available credentials for gateway account
- * @property {GatewayAccountCredential} activeCredential - the active credential for the gateway account
+ * @property {GatewayAccountCredential} [activeCredential] - the active credential for the gateway account
  * @property {Object} rawResponse - raw 'gateway account' object
  */
 class GatewayAccount {

diff --git a/app/views/simplified-account/settings/worldpay-details/index.njk b/app/views/simplified-account/settings/worldpay-details/index.njk
@@ -32,11 +32,35 @@
       You need to link your Worldpay account to GOV.UK Pay.
     </p>
 
-    <ul class="govuk-task-list">
-      {% for task in tasks %}
-        {{ showTask(task) }}
-      {% endfor %}
-    </ul>
+    {% set taskList = [] %}
+    {% for task in tasks %}
+      {% set taskList = (taskList.push({
+        title: {
+          text: task.linkText
+        },
+        href: task.href,
+        status: {
+          tag: {
+            text: "Not yet started",
+            classes: "govuk-tag--blue"
+          }
+        } if task.complete == false else (
+          {
+            tag: {
+              text: "Completed",
+              classes: "govuk-tag--grey"
+            }
+          }
+        )
+      }), taskList) %}
+    {% endfor %}
+
+    {{ govukTaskList({
+      idPrefix: "worldpay-tasks",
+      items: taskList,
+      classes: "task-list"
+    }) }}
+
   {% endif %}
 
 {% endblock %}