From 8b60a419c50d6ff0c288143988d939cd297a2e10 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 22 Mar 2022 08:53:53 +0000
Subject: [PATCH 1/3] Update sso footer copyright year

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 synapse/res/templates/sso_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/res/templates/sso_footer.html b/synapse/res/templates/sso_footer.html
index 588a3d508d6f..b46e0d83fe13 100644
--- a/synapse/res/templates/sso_footer.html
+++ b/synapse/res/templates/sso_footer.html
@@ -15,5 +15,5 @@
               </g>
           </g>
       </svg>
-      <p>An open network for secure, decentralized communication.<br>© 2021 The Matrix.org Foundation C.I.C.</p>
+      <p>An open network for secure, decentralized communication.<br>© 2022 The Matrix.org Foundation C.I.C.</p>
 </footer>
\ No newline at end of file

From 224e577bd58b9ce1d653c565dd656facade42692 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 22 Mar 2022 09:22:19 +0000
Subject: [PATCH 2/3] Tweak copy for sso account details template

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 synapse/res/templates/sso_auth_account_details.html | 8 ++++----
 synapse/res/templates/sso_auth_account_details.js   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synapse/res/templates/sso_auth_account_details.html b/synapse/res/templates/sso_auth_account_details.html
index b231aace01e6..1ba850369a32 100644
--- a/synapse/res/templates/sso_auth_account_details.html
+++ b/synapse/res/templates/sso_auth_account_details.html
@@ -130,13 +130,13 @@
   </head>
   <body>
     <header>
-      <h1>Choose your account name</h1>
-      <p>This is required to create your account on {{ server_name }}, and you can't change this later.</p>
+      <h1>Create your account</h1>
+      <p>This is required. Continue to create your account on {{ server_name }}. You can't change this later.</p>
     </header>
     <main>
       <form method="post" class="form__input" id="form">
         <div class="username_input" id="username_input">
-          <label for="field-username">Username</label>
+          <label for="field-username">Username (required)</label>
           <div class="prefix">@</div>
           <input type="text" name="username" id="field-username" value="{{ user_attributes.localpart }}" autofocus>
           <div class="postfix">:{{ server_name }}</div>
@@ -145,7 +145,7 @@ <h1>Choose your account name</h1>
         <input type="submit" value="Continue" class="primary-button">
         {% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %}
         <section class="idp-pick-details">
-          <h2>{% if idp.idp_icon %}<img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>{% endif %}Information from {{ idp.idp_name }}</h2>
+          <h2>{% if idp.idp_icon %}<img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>{% endif %}Optional data from {{ idp.idp_name }}</h2>
           {% if user_attributes.avatar_url %}
           <label class="idp-detail idp-avatar" for="idp-avatar">
             <div class="check-row">
diff --git a/synapse/res/templates/sso_auth_account_details.js b/synapse/res/templates/sso_auth_account_details.js
index 3c45df9078f2..82438519a219 100644
--- a/synapse/res/templates/sso_auth_account_details.js
+++ b/synapse/res/templates/sso_auth_account_details.js
@@ -62,7 +62,7 @@ function validateUsername(username) {
     usernameField.parentElement.classList.remove("invalid");
     usernameOutput.classList.remove("error");
     if (!username) {
-        return reportError("Please provide a username");
+        return reportError("This is required. Please provide a username");
     }
     if (username.length > 255) {
         return reportError("Too long, please choose something shorter");

From 67b2ce9016882c0a20f0a6013578716de23b10f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 22 Mar 2022 09:25:30 +0000
Subject: [PATCH 3/3] Add newsfragment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 changelog.d/12265.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12265.misc

diff --git a/changelog.d/12265.misc b/changelog.d/12265.misc
new file mode 100644
index 000000000000..4213f5855592
--- /dev/null
+++ b/changelog.d/12265.misc
@@ -0,0 +1 @@
+Tweak copy for default sso account details template to better adhere to mobile app store guidelines.
\ No newline at end of file
