From 258874dd86d4eb5f0a68f21015f5389c026e5fa3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 3 Jul 2023 11:52:45 +0200
Subject: [PATCH] changes incorporated

---
 frontend/src/components/Inputs/InputUsername.vue  | 2 +-
 frontend/src/components/UserSettings/UserName.vue | 8 ++++++--
 frontend/src/locales/de.json                      | 1 +
 frontend/src/locales/en.json                      | 3 ++-
 frontend/src/pages/Settings.vue                   | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Inputs/InputUsername.vue b/frontend/src/components/Inputs/InputUsername.vue
index 4354d0c1d..e19b1ea91 100644
--- a/frontend/src/components/Inputs/InputUsername.vue
+++ b/frontend/src/components/Inputs/InputUsername.vue
@@ -9,7 +9,7 @@
       vid="username"
       v-slot="{ errors, valid, validated, ariaInput, ariaMsg }"
     >
-      <b-form-group :label="$t('form.username')">
+      <b-form-group :label="$t('form.username')" :description="$t('settings.usernameInfo')">
         <b-input-group>
           <b-form-input
             v-model="currentValue"
diff --git a/frontend/src/components/UserSettings/UserName.vue b/frontend/src/components/UserSettings/UserName.vue
index bb9576237..25b6d9fd6 100644
--- a/frontend/src/components/UserSettings/UserName.vue
+++ b/frontend/src/components/UserSettings/UserName.vue
@@ -2,13 +2,17 @@
   <div id="username_form">
     <div v-if="$store.state.username">
       <label>{{ $t('form.username') }}</label>
-      <b-input-group class="mb-3" data-test="username-input-group">
+      <b-form-group
+        class="mb-3"
+        data-test="username-input-group"
+        :description="$t('settings.emailInfo')"
+      >
         <b-form-input
           v-model="username"
           readonly
           data-test="username-input-readonly"
         ></b-form-input>
-      </b-input-group>
+      </b-form-group>
     </div>
     <div v-else>
       <validation-observer ref="usernameObserver" v-slot="{ handleSubmit, invalid }">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 215898046..40b24332e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -292,6 +292,7 @@
     "warningText": "Bist du noch da?"
   },
   "settings": {
+    "usernameInfo": "Kann nach dem speichern nicht mehr geändert werden!",
     "emailInfo": "Kann aktuell noch nicht geändert werden.",
     "hideAmountGDD": "Dein GDD Betrag ist versteckt.",
     "hideAmountGDT": "Dein GDT Betrag ist versteckt.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index df87bbccf..c2cc0d35c 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -292,7 +292,8 @@
     "warningText": "Are you still there?"
   },
   "settings": {
-    "emailInfo": "NCannot be changed at this time.",
+    "usernameInfo": "Cannot be changed after saving!",
+    "emailInfo": "Cannot be changed at this time.",
     "hideAmountGDD": "Your GDD amount is hidden.",
     "hideAmountGDT": "Your GDT amount is hidden.",
     "info": "Transactions can now be made by username or email address.",
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index c1377c97b..1530e5e97 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="card bg-white gradido-border-radius appBoxShadow p-4 mt--3">
     <div class="h2">{{ $t('PersonalDetails') }}</div>
-    <div class="m-4 text-small">
+    <div class="my-4 text-small">
       {{ $t('settings.info') }}
     </div>
 
@@ -58,7 +58,7 @@
     </b-row>
 
     <hr />
-    <div class="h3 mt-5">{{ $t('form.password') }}</div>
+    <div class="mt-5">{{ $t('form.password') }}</div>
     <user-password />
     <hr />
     <b-row class="mb-5">