From 66c1d8a9e8a25f931b4adfe0c3e0925e850479f8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:15:48 +0100
Subject: [PATCH 01/12] remove decay calculation in confirm send page

---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index dd5caf0f8..54ab06384 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -46,14 +46,9 @@
           <strong>- {{ $n(amount, 'decimal') }}</strong>
         </b-col>
       </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">{{ $t('decay.decay') }}</b-col>
-        <b-col class="text-right" style="border-bottom: double">- {{ $n(decay, 'decimal') }}</b-col>
-      </b-row>
-
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col class="text-right">~ {{ $n(balance - amount - decay, 'decimal') }}</b-col>
+        <b-col class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
       </b-row>
     </b-container>
 

From b5bc1a31bd777832b13403bc66ba9a7b164bb1e1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:28:09 +0100
Subject: [PATCH 02/12] Advance calculation text added

---
 .../views/Pages/SendOverview/GddSend/TransactionConfirmation.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 54ab06384..2bcabea8a 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -34,6 +34,7 @@
     </b-row>
 
     <b-container class="bv-example-row mt-3 gray-background p-2">
+      <p>Vorausberechnung - Calculation in advance</p>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
         <b-col class="text-right">{{ $n(balance, 'decimal') }}</b-col>

From d8b9062a92859b9166a4702638db73e416a0a052 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:31:10 +0100
Subject: [PATCH 03/12] add locales for advance-calculation

---
 frontend/src/locales/de.json | 1 +
 frontend/src/locales/en.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1af76e4df..eb91cfb5d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,5 +1,6 @@
 {
   "admin_area": "Adminbereich",
+  "advance-calculation":"Vorausberechnung ",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 71ce6f9ef..dbc1658e6 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,5 +1,6 @@
 {
   "admin_area": "Admin Area",
+  "advance-calculation":"Advance calculation",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",

From e239b51a8c8c865089800f2085167adb7998bcf8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:34:47 +0100
Subject: [PATCH 04/12] set locales for advance-calculation

---
 frontend/src/locales/de.json                                  | 2 +-
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index eb91cfb5d..ab68adf3b 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,6 +1,6 @@
 {
   "admin_area": "Adminbereich",
-  "advance-calculation":"Vorausberechnung ",
+  "advance-calculation":"Vorausberechnung",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 2bcabea8a..a5d88af05 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -34,7 +34,7 @@
     </b-row>
 
     <b-container class="bv-example-row mt-3 gray-background p-2">
-      <p>Vorausberechnung - Calculation in advance</p>
+      <p>{{ $t('advance-calculation') }}</p>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
         <b-col class="text-right">{{ $n(balance, 'decimal') }}</b-col>
@@ -49,7 +49,7 @@
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
+        <b-col class="text-right"> <strong>~ {{ $n(balance - amount, 'decimal') }} </strong></b-col>
       </b-row>
     </b-container>
 

From e1dc7ea272e981dae7398dac56fa3f7e62a25849 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:35:20 +0100
Subject: [PATCH 05/12] fix lint

---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index a5d88af05..422c34a76 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -49,7 +49,9 @@
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col class="text-right"> <strong>~ {{ $n(balance - amount, 'decimal') }} </strong></b-col>
+        <b-col class="text-right">
+          <strong>~ {{ $n(balance - amount, 'decimal') }}</strong>
+        </b-col>
       </b-row>
     </b-container>
 

From cca2de8fafa09a7dc73d7143cceea297e79137e4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:36:17 +0100
Subject: [PATCH 06/12] fix locales

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ab68adf3b..74df7ef8a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,6 +1,6 @@
 {
   "admin_area": "Adminbereich",
-  "advance-calculation":"Vorausberechnung",
+  "advance-calculation": "Vorausberechnung",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index dbc1658e6..4ff2ab7ad 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,6 +1,6 @@
 {
   "admin_area": "Admin Area",
-  "advance-calculation":"Advance calculation",
+  "advance-calculation": "Advance calculation",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",

From 9c8aa4d60ec180e4d220869245d1e9421c686603 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:40:26 +0100
Subject: [PATCH 07/12] add class border-bottom

---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 422c34a76..37ac66059 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -43,7 +43,7 @@
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
-        <b-col class="text-right">
+        <b-col class="text-right borderbottom">
           <strong>- {{ $n(amount, 'decimal') }}</strong>
         </b-col>
       </b-row>
@@ -93,5 +93,6 @@ export default {
 }
 .borderbottom {
   border-bottom: 1px solid rgb(70, 65, 65);
+  border-bottom-style: double;
 }
 </style>

From a67831b8adef5b24a95a83278d4dda0d8923dba2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:41:46 +0100
Subject: [PATCH 08/12] remove strong element on new_balance

---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 37ac66059..40b61c7e5 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -50,7 +50,7 @@
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
         <b-col class="text-right">
-          <strong>~ {{ $n(balance - amount, 'decimal') }}</strong>
+          ~ {{ $n(balance - amount, 'decimal') }}
         </b-col>
       </b-row>
     </b-container>

From dff51c6782c32496ccf70345dd07a80dbf48ae50 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Jan 2022 16:48:36 +0100
Subject: [PATCH 09/12] yarn lint --fix

---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 40b61c7e5..aa0567279 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -49,9 +49,7 @@
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col class="text-right">
-          ~ {{ $n(balance - amount, 'decimal') }}
-        </b-col>
+        <b-col class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
       </b-row>
     </b-container>
 

From 590d48783725a60a6a2a391aa6113d0e6d162e20 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:49:14 +0100
Subject: [PATCH 10/12] Update frontend/src/locales/en.json

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4ff2ab7ad..540b3ab01 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,6 +1,6 @@
 {
   "admin_area": "Admin Area",
-  "advance-calculation": "Advance calculation",
+  "advanced-calculation": "Advanced calculation",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",

From d0468f8c484b92cdc437036cdc4583c2a4bfec83 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:49:43 +0100
Subject: [PATCH 11/12] Update frontend/src/locales/de.json

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 74df7ef8a..2aad98e43 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,6 +1,6 @@
 {
   "admin_area": "Adminbereich",
-  "advance-calculation": "Vorausberechnung",
+  "advanced-calculation": "Vorausberechnung",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",

From c2557c1f8aa821f24fea85393acadedcb73135cb Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:49:57 +0100
Subject: [PATCH 12/12] Update
 frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 .../Pages/SendOverview/GddSend/TransactionConfirmation.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index aa0567279..4acb95dcd 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -34,7 +34,7 @@
     </b-row>
 
     <b-container class="bv-example-row mt-3 gray-background p-2">
-      <p>{{ $t('advance-calculation') }}</p>
+      <p>{{ $t('advanced-calculation') }}</p>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
         <b-col class="text-right">{{ $n(balance, 'decimal') }}</b-col>