AUT-1497: Solve merge conflict after rebase

govuk-one-login · Nov 14, 2023 · 3eafd41 · 3eafd41
1 parent e10c31c
commit 3eafd41
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 0 deletions.
diff --git a/src/components/contact-us/contact-us-controller.ts b/src/components/contact-us/contact-us-controller.ts
@@ -502,6 +502,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.accountNotFound.section2.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     anotherProblem: {
       issueDescription: req.t(
@@ -512,6 +516,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.anotherProblem.section2.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     authenticatorApp: {
       issueDescription: req.t(
@@ -522,6 +530,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.authenticatorApp.section2.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     emailSubscription: {
       issueDescription: req.t(
@@ -538,6 +550,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.forgottenPassword.section1.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     invalidSecurityCode: {
       moreDetailDescription: req.t(
@@ -548,6 +564,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.invalidSecurityCode.section1.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     noPhoneNumberAccess: {
       optionalDescription: req.t(
@@ -558,6 +578,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.noPhoneNumberAccess.section1.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     noSecurityCode: {
       moreDetailDescription: req.t(
@@ -568,6 +592,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.noSecurityCode.section1.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     signInPhoneNumberIssue: {
       issueDescription: req.t(
@@ -582,6 +610,10 @@ export function getQuestionsFromFormTypeForMessageBody(
         "pages.contactUsQuestions.signInPhoneNumberIssue.section3.header",
         { lng: "en" }
       ),
+      serviceTryingToUse: req.t(
+        "pages.contactUsQuestions.serviceTryingToUse.header",
+        { lng: "en" }
+      ),
     },
     signingInProblem: {
       issueDescription: req.t(

diff --git a/src/components/contact-us/questions/_account-creation-problem-questions.njk b/src/components/contact-us/questions/_account-creation-problem-questions.njk
@@ -39,6 +39,8 @@
     } if (errors['issueDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_account-not-found-questions.njk b/src/components/contact-us/questions/_account-not-found-questions.njk
@@ -65,6 +65,8 @@
     } if (errors['optionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_another-problem-questions.njk b/src/components/contact-us/questions/_another-problem-questions.njk
@@ -62,6 +62,8 @@
     } if (errors['additionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_authenticator-app-problem.njk b/src/components/contact-us/questions/_authenticator-app-problem.njk
@@ -62,6 +62,8 @@
     } if (errors['additionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_forgotten-password-questions.njk b/src/components/contact-us/questions/_forgotten-password-questions.njk
@@ -39,6 +39,8 @@
     } if (errors['optionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_invalid-security-code-questions.njk b/src/components/contact-us/questions/_invalid-security-code-questions.njk
@@ -42,6 +42,8 @@
     } if (errors['moreDetailDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_no-phone-number-access-questions.njk b/src/components/contact-us/questions/_no-phone-number-access-questions.njk
@@ -42,6 +42,8 @@
     } if (errors['optionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_no-security-code-questions.njk b/src/components/contact-us/questions/_no-security-code-questions.njk
@@ -42,6 +42,8 @@
     } if (errors['moreDetailDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_signing-in-problem-questions.njk b/src/components/contact-us/questions/_signing-in-problem-questions.njk
@@ -39,6 +39,8 @@
     } if (errors['issueDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"

diff --git a/src/components/contact-us/questions/_technical-error-questions.njk b/src/components/contact-us/questions/_technical-error-questions.njk
@@ -62,6 +62,8 @@
     } if (errors['additionalDescription'])
 }) }}
 
+{% include "contact-us/questions/_service-trying-to-use.njk" %}
+
 {{ govukWarningText({
     text:'pages.contactUsQuestions.personalInformation.paragraph1' | translateEnOnly,
     iconFallbackText: "Warning"