From b8093a86a1f385862126fbbdc3c3a882d4228123 Mon Sep 17 00:00:00 2001 From: JanneJuhola Date: Wed, 11 Dec 2024 12:59:04 +0200 Subject: [PATCH 1/5] fix: Removed email promise text from application send confirmation --- frontend/benefit/applicant/public/locales/en/common.json | 2 +- frontend/benefit/applicant/public/locales/fi/common.json | 2 +- frontend/benefit/applicant/public/locales/sv/common.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/benefit/applicant/public/locales/en/common.json b/frontend/benefit/applicant/public/locales/en/common.json index e4722dc903..4452663f25 100644 --- a/frontend/benefit/applicant/public/locales/en/common.json +++ b/frontend/benefit/applicant/public/locales/en/common.json @@ -593,7 +593,7 @@ "notifications": { "applicationSubmitted": { "label": "The Helsinki benefit application has been submitted", - "message": "We have received your Helsinki benefit application with application number {{applicationNumber}}.\n\nNext, the application will be sent for processing. The designated contact person for the application will receive an email notification when it has been processed. You can follow the progress of your application in the Helsinki benefit service.\n\nIf you have questions about your application, you can use the Helsinki benefit e-service to send messages or send an email to helsinkilisa@hel.fi." + "message": "We have received your Helsinki benefit application with application number {{applicationNumber}}.\n\nNext, the application will be sent for processing. You can follow the progress of your application in the Helsinki benefit service.\n\nIf you have questions about your application, you can use the Helsinki benefit e-service to send messages or send an email to helsinkilisa@hel.fi." }, "applicationSaved": { "label": "Application saved", diff --git a/frontend/benefit/applicant/public/locales/fi/common.json b/frontend/benefit/applicant/public/locales/fi/common.json index 51c724d10d..2ee3a71c89 100644 --- a/frontend/benefit/applicant/public/locales/fi/common.json +++ b/frontend/benefit/applicant/public/locales/fi/common.json @@ -593,7 +593,7 @@ "notifications": { "applicationSubmitted": { "label": "Helsinki-lisä -hakemus on lähetetty", - "message": "Olemme vastaanottaneet Helsinki-lisä -hakemuksesi, jonka hakemusnumero on {{applicationNumber}}.\n\nSeuraavaksi hakemus siirtyy käsiteltäväksi. Saat ilmoituksen sähköpostiisi, kun hakemus on käsitelty. Voit seurata käsittelyn etenemistä Helsinki-lisän asiointipalvelussa.\n\nHakemukseen liittyvissä kysymyksissä voit lähettää viestejä Helsinki-lisän asiointipalvelussa tai lähettää sähköpostia osoitteeseen helsinkilisa@hel.fi." + "message": "Olemme vastaanottaneet Helsinki-lisä -hakemuksesi, jonka hakemusnumero on {{applicationNumber}}.\n\nSeuraavaksi hakemus siirtyy käsiteltäväksi. Voit seurata käsittelyn etenemistä Helsinki-lisän asiointipalvelussa.\n\nHakemukseen liittyvissä kysymyksissä voit lähettää viestejä Helsinki-lisän asiointipalvelussa tai lähettää sähköpostia osoitteeseen helsinkilisa@hel.fi." }, "applicationSaved": { "label": "Hakemus tallennettu", diff --git a/frontend/benefit/applicant/public/locales/sv/common.json b/frontend/benefit/applicant/public/locales/sv/common.json index dc43b67637..6b39aca85a 100644 --- a/frontend/benefit/applicant/public/locales/sv/common.json +++ b/frontend/benefit/applicant/public/locales/sv/common.json @@ -593,7 +593,7 @@ "notifications": { "applicationSubmitted": { "label": "Ansökan om Helsingforstillägget har skickats", - "message": "Vi har mottagit din ansökan om Helsingforstillägg med ansökningsnummer {{applicationNumber}}\n\nAnsökningen överförs till handläggning. Den kontaktperson som utsetts för ansökningen får ett meddelande per e-post när ansökningen har behandlats. Du kan följa upp med hur handläggningen framskrider i e-tjänsten för sysselsättning Helsingforstillägg.\n\nOm du har frågor om ansökningen, kan du skicka meddelanden i e-tjänsten för sysselsättning Helsingforstillägg eller skicka e-post till adressen helsinkilisa@hel.fi." + "message": "Vi har mottagit din ansökan om Helsingforstillägg med ansökningsnummer {{applicationNumber}}\n\nAnsökningen överförs till handläggning. Du kan följa upp med hur handläggningen framskrider i e-tjänsten för sysselsättning Helsingforstillägg.\n\nOm du har frågor om ansökningen, kan du skicka meddelanden i e-tjänsten för sysselsättning Helsingforstillägg eller skicka e-post till adressen helsinkilisa@hel.fi." }, "applicationSaved": { "label": "Applikationen sparas", From 38766b012cd5b41333d6d07d9a106fe692e27e50 Mon Sep 17 00:00:00 2001 From: JanneJuhola Date: Wed, 11 Dec 2024 13:36:04 +0200 Subject: [PATCH 2/5] fix: Added own text for application resubmission --- .../applicant/public/locales/en/common.json | 4 ++++ .../applicant/public/locales/fi/common.json | 4 ++++ .../applicant/public/locales/sv/common.json | 4 ++++ .../applications/pageContent/PageContent.tsx | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/frontend/benefit/applicant/public/locales/en/common.json b/frontend/benefit/applicant/public/locales/en/common.json index 4452663f25..4fb503e8fd 100644 --- a/frontend/benefit/applicant/public/locales/en/common.json +++ b/frontend/benefit/applicant/public/locales/en/common.json @@ -595,6 +595,10 @@ "label": "The Helsinki benefit application has been submitted", "message": "We have received your Helsinki benefit application with application number {{applicationNumber}}.\n\nNext, the application will be sent for processing. You can follow the progress of your application in the Helsinki benefit service.\n\nIf you have questions about your application, you can use the Helsinki benefit e-service to send messages or send an email to helsinkilisa@hel.fi." }, + "applicationReSubmitted": { + "label": "The modification to the Helsinki benefit application has been submitted", + "message": "We have received the modification to your Helsinki benefit application, with the application number {{applicationNumber}}." + }, "applicationSaved": { "label": "Application saved", "message": "Helsinki-benefit application {{applicationNumber}} {{applicantName}} has been saved." diff --git a/frontend/benefit/applicant/public/locales/fi/common.json b/frontend/benefit/applicant/public/locales/fi/common.json index 2ee3a71c89..fa447c9021 100644 --- a/frontend/benefit/applicant/public/locales/fi/common.json +++ b/frontend/benefit/applicant/public/locales/fi/common.json @@ -595,6 +595,10 @@ "label": "Helsinki-lisä -hakemus on lähetetty", "message": "Olemme vastaanottaneet Helsinki-lisä -hakemuksesi, jonka hakemusnumero on {{applicationNumber}}.\n\nSeuraavaksi hakemus siirtyy käsiteltäväksi. Voit seurata käsittelyn etenemistä Helsinki-lisän asiointipalvelussa.\n\nHakemukseen liittyvissä kysymyksissä voit lähettää viestejä Helsinki-lisän asiointipalvelussa tai lähettää sähköpostia osoitteeseen helsinkilisa@hel.fi." }, + "applicationReSubmitted": { + "label": "Helsinki-lisä -hakemuksen muutos on lähetetty", + "message": "Olemme vastaanottaneet muutoksen Helsinki-lisä hakemukseesi, jonka hakemusnumero on {{applicationNumber}}." + }, "applicationSaved": { "label": "Hakemus tallennettu", "message": "Helsinki-lisä hakemus {{applicationNumber}} {{applicantName}} on tallennettu." diff --git a/frontend/benefit/applicant/public/locales/sv/common.json b/frontend/benefit/applicant/public/locales/sv/common.json index 6b39aca85a..3cbb153ad7 100644 --- a/frontend/benefit/applicant/public/locales/sv/common.json +++ b/frontend/benefit/applicant/public/locales/sv/common.json @@ -595,6 +595,10 @@ "label": "Ansökan om Helsingforstillägget har skickats", "message": "Vi har mottagit din ansökan om Helsingforstillägg med ansökningsnummer {{applicationNumber}}\n\nAnsökningen överförs till handläggning. Du kan följa upp med hur handläggningen framskrider i e-tjänsten för sysselsättning Helsingforstillägg.\n\nOm du har frågor om ansökningen, kan du skicka meddelanden i e-tjänsten för sysselsättning Helsingforstillägg eller skicka e-post till adressen helsinkilisa@hel.fi." }, + "applicationReSubmitted": { + "label": " Ändringen av Helsingforstillägget ansökan har skickats.", + "message": "Vi har mottagit ändringen i din Helsingforstillägget med ansökningsnummer{{applicationNumber}}." + }, "applicationSaved": { "label": "Applikationen sparas", "message": "Helsingforstillägg applikationen {{applicationNumber}} {{applicantName}} sparas." diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx index 3208f6d32b..ac39750269 100644 --- a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx +++ b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx @@ -153,6 +153,19 @@ const PageContent: React.FC = () => { if (isSubmittedApplication) { return ( <> + application.status === && APPLICATION_STATUSES.INFO_REQUIRED ? ( + + ): { ), })} /> + {router.locale === SUPPORTED_LANGUAGES.FI && ( <$Hr /> From 4ba9b6fe28e0aecbe8b693bf98079c0c3007ac52 Mon Sep 17 00:00:00 2001 From: JanneJuhola Date: Thu, 12 Dec 2024 11:57:51 +0200 Subject: [PATCH 3/5] fix: Fixing failing test - both screens were shown --- .../src/components/applications/pageContent/PageContent.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx index ac39750269..5ca26f5e0b 100644 --- a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx +++ b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx @@ -166,7 +166,7 @@ const PageContent: React.FC = () => { })} /> ): - { ), })} /> + ) {router.locale === SUPPORTED_LANGUAGES.FI && ( From 151efdb7389e3e82d7c977456848c379f47a6039 Mon Sep 17 00:00:00 2001 From: JanneJuhola Date: Thu, 12 Dec 2024 15:00:13 +0200 Subject: [PATCH 4/5] fix: Adding {} -may help or not --- .../src/components/applications/pageContent/PageContent.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx index 5ca26f5e0b..32a3ae0ce9 100644 --- a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx +++ b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx @@ -153,7 +153,7 @@ const PageContent: React.FC = () => { if (isSubmittedApplication) { return ( <> - application.status === && APPLICATION_STATUSES.INFO_REQUIRED ? ( + {application.status === && APPLICATION_STATUSES.INFO_REQUIRED ? ( { })} /> ) + } {router.locale === SUPPORTED_LANGUAGES.FI && ( From d9caf2b8a43a33fb62a59ee923fce051d5c34b49 Mon Sep 17 00:00:00 2001 From: JanneJuhola Date: Fri, 13 Dec 2024 08:23:12 +0200 Subject: [PATCH 5/5] fix: Remove && --- .../src/components/applications/pageContent/PageContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx index 32a3ae0ce9..c2198264a7 100644 --- a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx +++ b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx @@ -153,7 +153,7 @@ const PageContent: React.FC = () => { if (isSubmittedApplication) { return ( <> - {application.status === && APPLICATION_STATUSES.INFO_REQUIRED ? ( + {application.status === APPLICATION_STATUSES.INFO_REQUIRED ? (