From 661f30bf37e2c9634130ab28f053151009bc987f Mon Sep 17 00:00:00 2001
From: cartja <carina@sunet.se>
Date: Wed, 4 Dec 2024 14:59:43 +0100
Subject: [PATCH] conflict about sunet, tou, test, translation

---
 src/components/Help.tsx                | 34 ++++++++++++++++++++------
 src/tests/signup/SignupMain-test.tsx   |  2 +-
 src/translation/extractedMessages.json | 12 +++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/components/Help.tsx b/src/components/Help.tsx
index 70718ddf0..5769f11e9 100644
--- a/src/components/Help.tsx
+++ b/src/components/Help.tsx
@@ -1276,7 +1276,7 @@ export function Help(): JSX.Element {
               <p>
                 <FormattedMessage
                   description="what are eduIDs terms of use - paragraph"
-                  defaultMessage={`These are the terms that are accepted by the user upon creating an eduID account. You may be asked to accept the terms again if you haven't used the service for a period of time.`}
+                  defaultMessage={`These terms are accepted by the user upon creating an eduID account. You may be asked to accept the terms again if you haven't used the service for a period of time.`}
                 />
               </p>
               <CommonToU version="2016-v1" />
@@ -1420,18 +1420,38 @@ export function Help(): JSX.Element {
             </article>
           </AccordionItemTemplate>
           <AccordionItemTemplate
-            uuid="help-tou"
-            title={<FormattedMessage description="about terms of use - handle" defaultMessage="Terms of use" />}
+            uuid="help-about-sunet"
+            title={<FormattedMessage description="about sunet - handle" defaultMessage="About SUNET" />}
             additionalInfo={null}
           >
             <article>
               <h4>
+                <FormattedMessage description="what is sunet - heading" defaultMessage="What is SUNET?" />
+              </h4>
+              <p>
                 <FormattedMessage
-                  description="what are eduIDs terms of use - heading"
-                  defaultMessage="What are eduIDs terms of use?"
+                  description="what is sunet - paragraph 1"
+                  defaultMessage={`eduID is a service provided by SUNET - the Swedish University Computer Network, 
+                  which is governed by the Swedish Research Council (Vetenskapsrådet). SUNET delivers data communication 
+                  networks and many other related services to public organisations and higher education and research institutions.`}
                 />
-              </h4>
-              <CommonToU version="2016-v1" />
+              </p>
+
+              <p>
+                <FormattedMessage
+                  description="what is sunet - paragraph 2"
+                  defaultMessage={`SUNET developed eduID to provide a secure common routine for managing identity in the 
+                  higher education community, with adequate authorization levels of confirmed accounts. 
+                  More information about SUNET is available at {sunet}.`}
+                  values={{
+                    sunet: (
+                      <a className="text-link" href="https://www.sunet.se" target="_blank">
+                        www.sunet.se
+                      </a>
+                    ),
+                  }}
+                />
+              </p>
             </article>
           </AccordionItemTemplate>
           <AccordionItemTemplate
diff --git a/src/tests/signup/SignupMain-test.tsx b/src/tests/signup/SignupMain-test.tsx
index 81e48f422..a24447685 100644
--- a/src/tests/signup/SignupMain-test.tsx
+++ b/src/tests/signup/SignupMain-test.tsx
@@ -317,7 +317,7 @@ async function testTermsOfUse({
   await screen.findByText(/^Register: Terms of use/);
 
   // specifically verify that the test-version ("1999-v1") of the ToU is displayed
-  if (state.tou.version === "1999-v1") {
+  if (state.tou.version === "2016-v1") {
     await screen.findByText(/This a test version of terms of use version/);
   }
 
diff --git a/src/translation/extractedMessages.json b/src/translation/extractedMessages.json
index 3e59ab5ed..e0aa99b65 100644
--- a/src/translation/extractedMessages.json
+++ b/src/translation/extractedMessages.json
@@ -609,6 +609,10 @@
     "developer_comment": "ToU second paragraph",
     "string": "attempts to gain access to network resources that they do not have the right"
   },
+  "EDXXCi": {
+    "developer_comment": "what are eduIDs terms of use - heading",
+    "string": "What are eduIDs terms of use?"
+  },
   "EGngEP": {
     "developer_comment": "how enhance eduid - heading",
     "string": "How can I enhance my eduID?"
@@ -915,6 +919,10 @@
     "developer_comment": "no error information message",
     "string": "There is no technical information available"
   },
+  "MuAdBa": {
+    "developer_comment": "about terms of use - handle",
+    "string": "Terms of use"
+  },
   "MuypUP": {
     "developer_comment": "generic error page",
     "string": "The issue has been reported to the team."
@@ -1995,6 +2003,10 @@
     "developer_comment": "Phones main title",
     "string": "Mobile phone numbers"
   },
+  "j7couZ": {
+    "developer_comment": "what are eduIDs terms of use - paragraph",
+    "string": "These terms are accepted by the user upon creating an eduID account. You may be asked to accept the terms again if you haven't used the service for a period of time."
+  },
   "j8RvSZ": {
     "developer_comment": "use freja - list definition",
     "string": "How to use Freja+ with eduID:"