diff --git a/packages/gafl-webapp-service/src/pages/contact/contact/contact.njk b/packages/gafl-webapp-service/src/pages/contact/contact/contact.njk index ea17d2ea84..4923f4040b 100644 --- a/packages/gafl-webapp-service/src/pages/contact/contact/contact.njk +++ b/packages/gafl-webapp-service/src/pages/contact/contact/contact.njk @@ -81,7 +81,9 @@
{{ mssgs.important_info_contact_input_mobile_note }}
- {{ data.licensee.mobilePhone }} + + {{ data.licensee.mobilePhone }} +
{% endset -%} diff --git a/packages/gafl-webapp-service/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk b/packages/gafl-webapp-service/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk index 35a35f6973..532e234a0e 100644 --- a/packages/gafl-webapp-service/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk +++ b/packages/gafl-webapp-service/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk @@ -21,9 +21,19 @@ {{ title }} -

- {{ contactInfo }} -

+ + {% if data.licensee.preferredMethodOfConfirmation == 'Email' %} +

+ {{ contactInfo }} +

+ {% else %} + +

+ {{ contactInfo }} +

+ + {% endif %} +

diff --git a/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/__snapshots__/route.spec.js.snap b/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/__snapshots__/route.spec.js.snap index 41aa9cbb81..90402d2a03 100644 --- a/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/__snapshots__/route.spec.js.snap +++ b/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/__snapshots__/route.spec.js.snap @@ -849,7 +849,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -934,7 +935,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -1039,7 +1041,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -1124,7 +1127,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -1649,7 +1653,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -1754,7 +1759,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -1839,7 +1845,8 @@ Array [ "text": Symbol(contact-summary-row-licence-conf), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -1924,7 +1931,8 @@ Array [ "text": Symbol(contact-summary-row-licence), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2029,7 +2037,8 @@ Array [ "text": Symbol(contact-summary-row-licence-conf), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2114,7 +2123,8 @@ Array [ "text": Symbol(contact-summary-row-licence), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2219,7 +2229,8 @@ Array [ "text": Symbol(contact-summary-row-licence-conf), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2239,7 +2250,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -2304,7 +2316,8 @@ Array [ "text": Symbol(contact-summary-row-licence), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2324,7 +2337,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -2409,7 +2423,8 @@ Array [ "text": Symbol(contact-summary-row-licence-conf), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2429,7 +2444,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { @@ -2494,7 +2510,8 @@ Array [ "text": Symbol(contact-summary-row-licence), }, "value": Object { - "text": "contact-summary-text-sngl01234567890", + "meta": "", + "text": "Text message-contact-summary-text-sngl01234567890", }, }, Object { @@ -2514,7 +2531,8 @@ Array [ "text": Symbol(contact-summary-row-contact), }, "value": Object { - "text": "contact-summary-text-plrl01234567890", + "meta": "", + "text": "Text messages-contact-summary-text-plrl01234567890", }, }, Object { diff --git a/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/route.spec.js b/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/route.spec.js index 813b713e6a..713ccd4015 100644 --- a/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/route.spec.js +++ b/packages/gafl-webapp-service/src/pages/summary/contact-summary/__tests__/route.spec.js @@ -62,8 +62,8 @@ const getMockCatalog = overrides => ({ contact_summary_row_contact: Symbol('contact-summary-row-contact'), contact_summary_row_licence_details: Symbol('contact-summary-row-licence-details'), contact_summary_row_newsletter: Symbol('contact-summary-row-newsletter'), - contact_summary_text_sngl: 'contact-summary-text-sngl', - contact_summary_text_plrl: 'contact-summary-text-plrl', + contact_summary_text_sngl: 'Text message-contact-summary-text-sngl', + contact_summary_text_plrl: 'Text messages-contact-summary-text-plrl', contact_summary_title: Symbol('contact-summary-title'), no: 'negative, Ghost Rider', yes: 'aye', @@ -169,7 +169,6 @@ describe('contact-summary > route', () => { const mssgCatalog = getMockCatalog({ [mssgKey]: mssg }) - console.log('mssgcat: ', mssgCatalog.yes) const samplePermission = getMockPermission({ preferredMethodOfNewsletter }) diff --git a/packages/gafl-webapp-service/src/pages/summary/contact-summary/route.js b/packages/gafl-webapp-service/src/pages/summary/contact-summary/route.js index 9ba642b7c2..1c201e0e43 100644 --- a/packages/gafl-webapp-service/src/pages/summary/contact-summary/route.js +++ b/packages/gafl-webapp-service/src/pages/summary/contact-summary/route.js @@ -70,7 +70,7 @@ class RowGenerator { _generateRow (label, text, rawHref, visuallyHiddenText, id) { const href = addLanguageCodeToUri(this.request, rawHref) - return { + const row = { key: { text: label }, @@ -90,6 +90,11 @@ class RowGenerator { } }) } + if (text.startsWith('Text message')) { + row.value.meta = '' + } + + return row } generateStandardRow (label, text, rawHref, visuallyHiddenText, id) {