From 18534f3179b5d01ac4dcc2fd818a470d79ce8c8e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Mar 2022 11:08:30 +0100
Subject: [PATCH 01/72] add first form version send gdd per link, add locales,
 add extra submit button

---
 frontend/src/locales/de.json                  |  9 +++
 frontend/src/locales/en.json                  |  9 +++
 frontend/src/views/Pages/SendOverview.vue     |  4 ++
 .../SendOverview/GddSend/TransactionForm.vue  | 57 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 748bffe25..4fcde6f94 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -67,6 +67,7 @@
     "email": "E-Mail",
     "firstname": "Vorname",
     "from": "Von",
+    "generate_now": "jetzt generieren",
     "lastname": "Nachname",
     "memo": "Nachricht",
     "message": "Nachricht",
@@ -99,6 +100,14 @@
     },
     "your_amount": "Dein Betrag"
   },
+  "gdd_per_link": {
+    "header": "Gradidos verschenken per Link",
+    "sentence_1":"Wähle einen Betrag, aus welchen du per Link verschenken möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "sentence_2":"Der Link ist 14 Tage gültig!",
+    "sentence_3":"Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
+    "sentence_4":"Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
+    "sentence_5":"Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Der Restbetrag wird dir wieder zurückerstattet."
+  },
   "gdt": {
     "action": "Aktion",
     "calculation": "Berechnung der GradidoTransform",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 557c0a42c..d00a93c33 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -67,6 +67,7 @@
     "email": "Email",
     "firstname": "Firstname",
     "from": "from",
+    "generate_now": "Generate now",
     "lastname": "Lastname",
     "memo": "Message",
     "message": "Message",
@@ -98,6 +99,14 @@
       "usernmae-unique": "This username is already taken."
     },
     "your_amount": "Your amount"
+  },  
+  "gdd_per_link": {
+    "header": "Give away Gradidos by link",
+    "satz_1":"Select an amount that you would like to give away via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
+    "sentence_2":"The link is valid for 14 days!",
+    "sentence_3":"If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
+    "sentence_4":"Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",
+    "sentence_5":"The transience amount will be borne by you and will be added to your amount for the maximum validity. However, you will only be charged the amount as transience depending on how many days have passed until the link is redeemed. The remaining amount will be refunded to you."
   },
   "gdt": {
     "action": "Action",
diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue
index d247e1bbe..adb6e8a25 100644
--- a/frontend/src/views/Pages/SendOverview.vue
+++ b/frontend/src/views/Pages/SendOverview.vue
@@ -76,6 +76,10 @@ export default {
       this.transactionData = { ...data }
       this.currentTransactionStep = 1
     },
+    setTransactionPerLink(data) {
+      this.transactionData = { ...data }
+      this.currentTransactionStep = 1
+    },
     async sendTransaction() {
       this.loading = true
       this.error = false
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
index 0f5650543..724d59bf2 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
@@ -10,9 +10,47 @@
                  </div>
                  <br />
             -->
+            <b-row>
+              <b-col>
+                <b-form-radio v-model="selected" name="some-radios" value="send" size="lg">
+                  GDD versenden
+                </b-form-radio>
+              </b-col>
+              <b-col>
+                <b-form-radio v-model="selected" name="some-radios" value="gift" size="lg">
+                  GDD verschenken per Link
+                </b-form-radio>
+              </b-col>
+            </b-row>
+            <div class="mb-3 mt-3">({{ selected }})</div>
+
+            <b-alert class="mb-3 mt-3" v-show="selected === 'gift'" show variant="muted">
+              <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+              <p>
+                {{ $t('gdd_per_link.sentence_1') }}
+              </p>
+              <p>
+                -
+                <b>{{ $t('gdd_per_link.sentence_2') }}</b>
+              </p>
+              <p>
+                -
+                <b>{{ $t('gdd_per_link.sentence_3') }}</b>
+              </p>
+              <p>
+                -
+                <b>{{ $t('gdd_per_link.sentence_4') }}</b>
+              </p>
+
+              <hr />
+              <p class="mb-0">
+                {{ $t('gdd_per_link.sentence_5') }}
+              </p>
+            </b-alert>
 
             <div>
               <validation-provider
+                v-show="selected === 'send'"
                 name="Email"
                 :rules="{
                   required: true,
@@ -128,7 +166,7 @@
               </b-col>
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
-                  {{ $t('form.send_now') }}
+                  {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
                 </b-button>
               </b-col>
             </b-row>
@@ -165,11 +203,28 @@ export default {
         memo: '',
         amountValue: 0.0,
       },
+      selected: 'send',
     }
   },
   methods: {
     onSubmit() {
       this.normalizeAmount(true)
+      switch (this.selected) {
+        case 'send':
+          this.$emit('set-transaction', {
+            email: this.form.email,
+            amount: this.form.amountValue,
+            memo: this.form.memo,
+          })
+          break
+        case 'gift':
+          this.$emit('set-transaction-per-link', {
+            selected: this.selected,
+            amount: this.form.amountValue,
+            memo: this.form.memo,
+          })
+          break
+      }
       this.$emit('set-transaction', {
         email: this.form.email,
         amount: this.form.amountValue,

From 6cc6c3476a51e6f93e20b5765524ba9352b5d2d6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Mar 2022 13:22:47 +0100
Subject: [PATCH 02/72] seperate confirm send GDD per link, add function
 sendTransactionPerLink()

---
 frontend/src/views/Pages/SendOverview.vue     | 28 +++++++--
 .../GddSend/TransactionConfirmation.vue       | 60 +++++++++++++++++--
 .../SendOverview/GddSend/TransactionForm.vue  | 43 ++-----------
 3 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue
index adb6e8a25..6ce507f8d 100644
--- a/frontend/src/views/Pages/SendOverview.vue
+++ b/frontend/src/views/Pages/SendOverview.vue
@@ -9,11 +9,13 @@
           <transaction-confirmation
             :balance="balance"
             :transactions="transactions"
+            :selected="transactionData.selected"
             :email="transactionData.email"
             :amount="transactionData.amount"
             :memo="transactionData.memo"
             :loading="loading"
             @send-transaction="sendTransaction"
+            @send-transaction-per-link="sendTransactionPerLink"
             @on-reset="onReset"
           ></transaction-confirmation>
         </template>
@@ -34,7 +36,7 @@ import GddSend from './SendOverview/GddSend.vue'
 import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
 import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
 import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
-import { sendCoins } from '../../graphql/mutations.js'
+import { sendCoins, sendCoinsPerLink } from '../../graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
   email: '',
@@ -76,10 +78,6 @@ export default {
       this.transactionData = { ...data }
       this.currentTransactionStep = 1
     },
-    setTransactionPerLink(data) {
-      this.transactionData = { ...data }
-      this.currentTransactionStep = 1
-    },
     async sendTransaction() {
       this.loading = true
       this.error = false
@@ -99,6 +97,26 @@ export default {
       this.currentTransactionStep = 2
       this.loading = false
     },
+    async sendTransactionPerLink() {
+      alert('sendTransactionPerLink: TODO : lege sendCoinsPerLink als mutation an!')
+      this.loading = true
+      this.error = false
+      this.$apollo
+        .mutate({
+          mutation: sendCoinsPerLink,
+          variables: this.transactionData,
+        })
+        .then(() => {
+          this.error = false
+          this.$emit('update-balance', this.transactionData.amount)
+        })
+        .catch((err) => {
+          this.errorResult = err.message
+          this.error = true
+        })
+      this.currentTransactionStep = 2
+      this.loading = false
+    },
     onReset() {
       this.currentTransactionStep = 0
     },
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index 4acb95dcd..aa3b067e2 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -1,6 +1,16 @@
 <template>
   <div>
-    <b-row>
+    <b-row v-if="selected === 'gift'">
+      <b-alert class="mb-3 mt-3" show variant="muted">
+        <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+
+        <div>
+          Du verschenkst:
+          <h1>{{ $n(amount, 'decimal') }} GDD</h1>
+        </div>
+      </b-alert>
+    </b-row>
+    <b-row v-else>
       <b-col>
         <div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
         <b-list-group class="">
@@ -43,13 +53,24 @@
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
-        <b-col class="text-right borderbottom">
+        <b-col class="text-right">
           <strong>- {{ $n(amount, 'decimal') }}</strong>
         </b-col>
       </b-row>
+      <b-row class="pr-3">
+        <b-col class="text-right">
+          <strong>Vergänglichkeit für 14 Tage</strong>
+        </b-col>
+        <b-col class="text-right borderbottom">
+          <strong>- {{ $n(amount * 0.028, 'decimal') }}</strong>
+        </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, 'decimal') }}</b-col>
+        <b-col v-if="selected === 'gift'" class="text-right">
+          ~ {{ $n(balance - amount - amount * 0.028, 'decimal') }}
+        </b-col>
+        <b-col v-else class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
       </b-row>
     </b-container>
 
@@ -58,11 +79,39 @@
         <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
       </b-col>
       <b-col class="text-right">
-        <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
-          {{ $t('form.send_now') }}
+        <b-button
+          variant="success"
+          :disabled="loading"
+          @click="
+            selected === 'send' ? $emit('send-transaction') : $emit('send-transaction-per-link')
+          "
+        >
+          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
         </b-button>
       </b-col>
     </b-row>
+
+    <b-alert class="mt-3" show v-show="selected === 'gift'" variant="muted">
+      <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+
+      <p>
+        -
+        <b>{{ $t('gdd_per_link.sentence_2') }}</b>
+      </p>
+      <p>
+        -
+        <b>{{ $t('gdd_per_link.sentence_3') }}</b>
+      </p>
+      <p>
+        -
+        <b>{{ $t('gdd_per_link.sentence_4') }}</b>
+      </p>
+
+      <hr />
+      <p class="mb-0">
+        {{ $t('gdd_per_link.sentence_5') }}
+      </p>
+    </b-alert>
   </div>
 </template>
 <script>
@@ -74,6 +123,7 @@ export default {
     amount: { type: Number, default: 0 },
     memo: { type: String, default: '' },
     loading: { type: Boolean, default: false },
+    selected: { type: String, required: false },
     transactions: {
       default: () => [],
     },
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
index 724d59bf2..389257c10 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
@@ -22,30 +22,11 @@
                 </b-form-radio>
               </b-col>
             </b-row>
-            <div class="mb-3 mt-3">({{ selected }})</div>
-
-            <b-alert class="mb-3 mt-3" v-show="selected === 'gift'" show variant="muted">
+            <b-alert class="mt-3" v-show="selected === 'gift'" show variant="muted">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <p>
                 {{ $t('gdd_per_link.sentence_1') }}
               </p>
-              <p>
-                -
-                <b>{{ $t('gdd_per_link.sentence_2') }}</b>
-              </p>
-              <p>
-                -
-                <b>{{ $t('gdd_per_link.sentence_3') }}</b>
-              </p>
-              <p>
-                -
-                <b>{{ $t('gdd_per_link.sentence_4') }}</b>
-              </p>
-
-              <hr />
-              <p class="mb-0">
-                {{ $t('gdd_per_link.sentence_5') }}
-              </p>
             </b-alert>
 
             <div>
@@ -53,13 +34,13 @@
                 v-show="selected === 'send'"
                 name="Email"
                 :rules="{
-                  required: true,
+                  required: selected === 'send' ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
                 v-slot="{ errors }"
               >
-                <label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
+                <label class="input-1 mt-5" for="input-1">{{ $t('form.recipient') }}</label>
                 <b-input-group
                   id="input-group-1"
                   class="border border-default"
@@ -153,7 +134,6 @@
                 </b-col>
               </validation-provider>
             </div>
-
             <br />
             <div v-if="!!isBalanceDisabled" class="text-danger">
               {{ $t('form.no_gdd_available') }}
@@ -209,23 +189,8 @@ export default {
   methods: {
     onSubmit() {
       this.normalizeAmount(true)
-      switch (this.selected) {
-        case 'send':
-          this.$emit('set-transaction', {
-            email: this.form.email,
-            amount: this.form.amountValue,
-            memo: this.form.memo,
-          })
-          break
-        case 'gift':
-          this.$emit('set-transaction-per-link', {
-            selected: this.selected,
-            amount: this.form.amountValue,
-            memo: this.form.memo,
-          })
-          break
-      }
       this.$emit('set-transaction', {
+        selected: this.selected,
         email: this.form.email,
         amount: this.form.amountValue,
         memo: this.form.memo,

From d29207b4ffc29bf318e73949813d42e13521daed Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Mar 2022 13:24:30 +0100
Subject: [PATCH 03/72] yarn lint --fix, yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4fcde6f94..65bcbc0f6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -102,11 +102,11 @@
   },
   "gdd_per_link": {
     "header": "Gradidos verschenken per Link",
-    "sentence_1":"Wähle einen Betrag, aus welchen du per Link verschenken möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
-    "sentence_2":"Der Link ist 14 Tage gültig!",
-    "sentence_3":"Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
-    "sentence_4":"Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
-    "sentence_5":"Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Der Restbetrag wird dir wieder zurückerstattet."
+    "sentence_1": "Wähle einen Betrag, aus welchen du per Link verschenken möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "sentence_2": "Der Link ist 14 Tage gültig!",
+    "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
+    "sentence_4": "Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
+    "sentence_5": "Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Der Restbetrag wird dir wieder zurückerstattet."
   },
   "gdt": {
     "action": "Aktion",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d00a93c33..70f9548a5 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -99,14 +99,14 @@
       "usernmae-unique": "This username is already taken."
     },
     "your_amount": "Your amount"
-  },  
+  },
   "gdd_per_link": {
     "header": "Give away Gradidos by link",
-    "satz_1":"Select an amount that you would like to give away via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
-    "sentence_2":"The link is valid for 14 days!",
-    "sentence_3":"If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
-    "sentence_4":"Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",
-    "sentence_5":"The transience amount will be borne by you and will be added to your amount for the maximum validity. However, you will only be charged the amount as transience depending on how many days have passed until the link is redeemed. The remaining amount will be refunded to you."
+    "sentence_1": "Select an amount that you would like to give away via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
+    "sentence_2": "The link is valid for 14 days!",
+    "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
+    "sentence_4": "Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",
+    "sentence_5": "The transience amount will be borne by you and will be added to your amount for the maximum validity. However, you will only be charged the amount as transience depending on how many days have passed until the link is redeemed. The remaining amount will be refunded to you."
   },
   "gdt": {
     "action": "Action",

From dafe98efc6188ff93151a9a8349e3b31e7b60c8d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Mar 2022 14:47:56 +0100
Subject: [PATCH 04/72] change lacales verschenken to versenden

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 65bcbc0f6..d6314f414 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,8 +101,8 @@
     "your_amount": "Dein Betrag"
   },
   "gdd_per_link": {
-    "header": "Gradidos verschenken per Link",
-    "sentence_1": "Wähle einen Betrag, aus welchen du per Link verschenken möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "header": "Gradidos versenden per Link",
+    "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
     "sentence_4": "Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
index aa3b067e2..3fa59c93a 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
@@ -5,7 +5,7 @@
         <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
 
         <div>
-          Du verschenkst:
+          Du versendest per Link:
           <h1>{{ $n(amount, 'decimal') }} GDD</h1>
         </div>
       </b-alert>
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
index 389257c10..78527393d 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
@@ -18,7 +18,7 @@
               </b-col>
               <b-col>
                 <b-form-radio v-model="selected" name="some-radios" value="gift" size="lg">
-                  GDD verschenken per Link
+                  GDD versenden per Link
                 </b-form-radio>
               </b-col>
             </b-row>

From 41a2b975a4656178b32db54014c8a97afcb5bf47 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Mar 2022 14:49:26 +0100
Subject: [PATCH 05/72] change lacales in english give away to send

---
 frontend/src/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 70f9548a5..82cbe8cba 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -101,8 +101,8 @@
     "your_amount": "Your amount"
   },
   "gdd_per_link": {
-    "header": "Give away Gradidos by link",
-    "sentence_1": "Select an amount that you would like to give away via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
+    "header": "Send Gradidos by link",
+    "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
     "sentence_4": "Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",

From 8545ca1790e002a536d8f94af95a64a9a0ca3a25 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 08:23:03 +0100
Subject: [PATCH 06/72] yarn lint --fix

---
 frontend/src/pages/Send.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 92ede3c94..f284b7f0b 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -32,7 +32,6 @@
   </div>
 </template>
 <script>
-
 import GddSend from '@/components/GddSend.vue'
 import TransactionForm from '@/components/GddSend/TransactionForm.vue'
 import TransactionConfirmation from '@/components/GddSend/TransactionConfirmation.vue'

From a2550cae6a84924dfde6cd138cb8deae96f2f99f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 08:51:07 +0100
Subject: [PATCH 07/72] yarn test fixed, resolve date error with substring, add
 selected 'send' on submit test

---
 .../GddSend/TransactionForm.spec.js           |  1 +
 .../src/components/GddTransactionList.spec.js | 38 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index 25683e6df..cce6af3c9 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -225,6 +225,7 @@ describe('GddSend', () => {
                 email: 'someone@watches.tv',
                 amount: 87.23,
                 memo: 'Long enough',
+                selected: 'send',
               },
             ],
           ])
diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index b68d59958..fa485591f 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -95,13 +95,13 @@ describe('GddTransactionList', () => {
               typeId: 'DECAY',
               amount: '-0.16778637075575395772595',
               balance: '31.59320453982945549519405',
-              balanceDate: '2022-03-03T08:54:54.020Z',
+              balanceDate: '2022-03-03T08:54:54',
               memo: '',
               linkedUser: null,
               decay: {
                 decay: '-0.16778637075575395772595',
-                start: '2022-02-28T13:55:47.000Z',
-                end: '2022-03-03T08:54:54.020Z',
+                start: '2022-02-28T13:55:47',
+                end: '2022-03-03T08:54:54',
                 duration: 241147.02,
                 __typename: 'Decay',
               },
@@ -112,7 +112,7 @@ describe('GddTransactionList', () => {
               typeId: 'SEND',
               amount: '1',
               balance: '31.76099091058520945292',
-              balanceDate: '2022-02-28T13:55:47.000Z',
+              balanceDate: '2022-02-28T13:55:47',
               memo: 'adasd adada',
               linkedUser: {
                 firstName: 'Bibi',
@@ -121,8 +121,8 @@ describe('GddTransactionList', () => {
               },
               decay: {
                 decay: '-0.2038314055482643084',
-                start: '2022-02-25T07:29:26.000Z',
-                end: '2022-02-28T13:55:47.000Z',
+                start: '2022-02-25T07:29:26',
+                end: '2022-02-28T13:55:47',
                 duration: 282381,
                 __typename: 'Decay',
               },
@@ -133,7 +133,7 @@ describe('GddTransactionList', () => {
               typeId: 'CREATION',
               amount: '1000',
               balance: '32.96482231613347376132',
-              balanceDate: '2022-02-25T07:29:26.000Z',
+              balanceDate: '2022-02-25T07:29:26',
               memo: 'asd adada dad',
               linkedUser: {
                 firstName: 'Gradido',
@@ -142,8 +142,8 @@ describe('GddTransactionList', () => {
               },
               decay: {
                 decay: '-0.03517768386652623868',
-                start: '2022-02-23T10:55:30.000Z',
-                end: '2022-02-25T07:29:26.000Z',
+                start: '2022-02-23T10:55:30',
+                end: '2022-02-25T07:29:26',
                 duration: 160436,
                 __typename: 'Decay',
               },
@@ -154,7 +154,7 @@ describe('GddTransactionList', () => {
               typeId: 'RECEIVE',
               amount: '10',
               balance: '10',
-              balanceDate: '2022-02-23T10:55:30.000Z',
+              balanceDate: '2022-02-23T10:55:30',
               memo: 'asd adaaad adad addad ',
               linkedUser: {
                 firstName: 'Bibi',
@@ -263,9 +263,9 @@ describe('GddTransactionList', () => {
         })
 
         it('shows the date of the transaction', () => {
-          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Mon Feb 28 2022 13:55:47 GMT+0000 (Coordinated Universal Time)',
-          )
+          expect(
+            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
+          ).toContain('Mon Feb 28 2022 13:55:47')
         })
 
         it('shows the decay calculation', () => {
@@ -327,9 +327,9 @@ describe('GddTransactionList', () => {
         })
 
         it('shows the date of the transaction', () => {
-          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Wed Feb 23 2022 10:55:30 GMT+0000 (Coordinated Universal Time)',
-          )
+          expect(
+            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
+          ).toContain('Wed Feb 23 2022 10:55:30')
         })
       })
 
@@ -388,9 +388,9 @@ describe('GddTransactionList', () => {
         })
 
         it('shows the date of the transaction', () => {
-          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Wed Feb 23 2022 10:55:30 GMT+0000 (Coordinated Universal Time)',
-          )
+          expect(
+            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
+          ).toContain('Wed Feb 23 2022 10:55:30')
         })
 
         it('shows the decay calculation', () => {

From d0885554d6e2670d751dd2344cc0f1cb63eb62a3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 09:01:01 +0100
Subject: [PATCH 08/72] add locales for TransactionForm.vue

---
 frontend/src/components/GddSend/TransactionForm.vue | 4 ++--
 frontend/src/locales/de.json                        | 2 ++
 frontend/src/locales/en.json                        | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 78527393d..d931f5610 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -13,12 +13,12 @@
             <b-row>
               <b-col>
                 <b-form-radio v-model="selected" name="some-radios" value="send" size="lg">
-                  GDD versenden
+                  {{ $t('send_gdd') }}
                 </b-form-radio>
               </b-col>
               <b-col>
                 <b-form-radio v-model="selected" name="some-radios" value="gift" size="lg">
-                  GDD versenden per Link
+                  {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
             </b-row>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d6314f414..77fdf1f4a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -138,6 +138,8 @@
     "publisherId": "Publisher-Id"
   },
   "send": "Senden",
+  "send_gdd": "GDD versenden",
+  "send_per_link": "GDD versenden per Link",
   "settings": {
     "coinanimation": {
       "coinanimation": "Münzanimation",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 82cbe8cba..61cadd4d0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -138,6 +138,8 @@
     "publisherId": "PublisherID"
   },
   "send": "Send",
+  "send_gdd": "GDD send",
+  "send_per_link": "GDD send via link",
   "settings": {
     "coinanimation": {
       "coinanimation": "Coin animation",

From e1256eddf20b3e10b7d53a180fce26dd2e0a03cc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 11:04:49 +0100
Subject: [PATCH 09/72] test Data: selected in TransactionForm.spec.js

---
 .../GddSend/TransactionForm.spec.js           | 338 ++++++++++--------
 1 file changed, 179 insertions(+), 159 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index cce6af3c9..e97ae3292 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -55,181 +55,201 @@ describe('GddSend', () => {
       })
     })
 
-    describe('transaction form', () => {
-      beforeEach(() => {
-        wrapper.setProps({ balance: 100.0 })
-      })
-      describe('transaction form show because balance 100,0 GDD', () => {
-        it('has no warning message ', () => {
-          expect(wrapper.find('.text-danger').exists()).toBeFalsy()
-        })
-        it('has a reset button', () => {
-          expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe(
-            'reset',
-          )
-        })
-        it('has a submit button', () => {
-          expect(wrapper.find('.test-buttons').findAll('button').at(1).attributes('type')).toBe(
-            'submit',
-          )
+    describe('is selected: "send"', () => {
+      beforeEach(async () => {
+        await wrapper.setData({
+          selected: 'send',
         })
       })
 
-      describe('email field', () => {
-        it('has an input field of type email', () => {
-          expect(wrapper.find('#input-group-1').find('input').attributes('type')).toBe('email')
+      describe('transaction form', () => {
+        beforeEach(() => {
+          wrapper.setProps({ balance: 100.0 })
+        })
+        describe('transaction form show because balance 100,0 GDD', () => {
+          it('has no warning message ', () => {
+            expect(wrapper.find('.text-danger').exists()).toBeFalsy()
+          })
+          it('has a reset button', () => {
+            expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe(
+              'reset',
+            )
+          })
+          it('has a submit button', () => {
+            expect(wrapper.find('.test-buttons').findAll('button').at(1).attributes('type')).toBe(
+              'submit',
+            )
+          })
         })
 
-        it('has an envelope icon', () => {
-          expect(wrapper.find('#input-group-1').find('svg').attributes('aria-label')).toBe(
-            'envelope',
-          )
+        describe('email field', () => {
+          it('has an input field of type email', () => {
+            expect(wrapper.find('#input-group-1').find('input').attributes('type')).toBe('email')
+          })
+
+          it('has an envelope icon', () => {
+            expect(wrapper.find('#input-group-1').find('svg').attributes('aria-label')).toBe(
+              'envelope',
+            )
+          })
+
+          it('has a label form.receiver', () => {
+            expect(wrapper.find('label.input-1').text()).toBe('form.recipient')
+          })
+
+          it('has a placeholder "E-Mail"', () => {
+            expect(wrapper.find('#input-group-1').find('input').attributes('placeholder')).toBe(
+              'E-Mail',
+            )
+          })
+
+          it('flushes an error message when no valid email is given', async () => {
+            await wrapper.find('#input-group-1').find('input').setValue('a')
+            await flushPromises()
+            expect(wrapper.find('span.errors').text()).toBe('validations.messages.email')
+          })
+
+          it('trims the email after blur', async () => {
+            await wrapper.find('#input-group-1').find('input').setValue('  valid@email.com  ')
+            await wrapper.find('#input-group-1').find('input').trigger('blur')
+            await flushPromises()
+            expect(wrapper.vm.form.email).toBe('valid@email.com')
+          })
         })
 
-        it('has a label form.receiver', () => {
-          expect(wrapper.find('label.input-1').text()).toBe('form.recipient')
+        describe('amount field', () => {
+          it('has an input field of type text', () => {
+            expect(wrapper.find('#input-group-2').find('input').attributes('type')).toBe('text')
+          })
+
+          it('has an GDD text icon', () => {
+            expect(wrapper.find('#input-group-2').find('div.m-1').text()).toBe('GDD')
+          })
+
+          it('has a label form.amount', () => {
+            expect(wrapper.find('label.input-2').text()).toBe('form.amount')
+          })
+
+          it('has a placeholder "0.01"', () => {
+            expect(wrapper.find('#input-group-2').find('input').attributes('placeholder')).toBe(
+              '0.01',
+            )
+          })
+
+          it('does not update form amount when invalid', async () => {
+            await wrapper.find('#input-group-2').find('input').setValue('invalid')
+            await wrapper.find('#input-group-2').find('input').trigger('blur')
+            await flushPromises()
+            expect(wrapper.vm.form.amountValue).toBe(0)
+          })
+
+          it('flushes an error message when no valid amount is given', async () => {
+            await wrapper.find('#input-group-2').find('input').setValue('a')
+            await flushPromises()
+            expect(wrapper.find('span.errors').text()).toBe('form.validation.gddSendAmount')
+          })
+
+          it('flushes an error message when amount is too high', async () => {
+            await wrapper.find('#input-group-2').find('input').setValue('123.34')
+            await flushPromises()
+            expect(wrapper.find('span.errors').text()).toBe('form.validation.gddSendAmount')
+          })
+
+          it('flushes no errors when amount is valid', async () => {
+            await wrapper.find('#input-group-2').find('input').setValue('87.34')
+            await flushPromises()
+            expect(wrapper.find('span.errors').exists()).toBeFalsy()
+          })
         })
 
-        it('has a placeholder "E-Mail"', () => {
-          expect(wrapper.find('#input-group-1').find('input').attributes('placeholder')).toBe(
-            'E-Mail',
-          )
+        describe('message text box', () => {
+          it('has an textarea field', () => {
+            expect(wrapper.find('#input-group-3').find('textarea').exists()).toBeTruthy()
+          })
+
+          it('has an chat-right-text icon', () => {
+            expect(wrapper.find('#input-group-3').find('svg').attributes('aria-label')).toBe(
+              'chat right text',
+            )
+          })
+
+          it('has a label form.message', () => {
+            expect(wrapper.find('label.input-3').text()).toBe('form.message')
+          })
+
+          it('flushes an error message when memo is less than 5 characters', async () => {
+            await wrapper.find('#input-group-3').find('textarea').setValue('a')
+            await flushPromises()
+            expect(wrapper.find('span.errors').text()).toBe('validations.messages.min')
+          })
+
+          it('flushes no error message when memo is valid', async () => {
+            await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
+            await flushPromises()
+            expect(wrapper.find('span.errors').exists()).toBeFalsy()
+          })
         })
 
-        it('flushes an error message when no valid email is given', async () => {
-          await wrapper.find('#input-group-1').find('input').setValue('a')
-          await flushPromises()
-          expect(wrapper.find('span.errors').text()).toBe('validations.messages.email')
+        describe('cancel button', () => {
+          it('has a cancel button', () => {
+            expect(wrapper.find('button[type="reset"]').exists()).toBeTruthy()
+          })
+
+          it('has the text "form.cancel"', () => {
+            expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset')
+          })
+
+          it('clears all fields on click', async () => {
+            await wrapper.find('#input-group-1').find('input').setValue('someone@watches.tv')
+            await wrapper.find('#input-group-2').find('input').setValue('87.23')
+            await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
+            await flushPromises()
+            expect(wrapper.vm.form.email).toBe('someone@watches.tv')
+            expect(wrapper.vm.form.amount).toBe('87.23')
+            expect(wrapper.vm.form.memo).toBe('Long enough')
+            await wrapper.find('button[type="reset"]').trigger('click')
+            await flushPromises()
+            expect(wrapper.vm.form.email).toBe('')
+            expect(wrapper.vm.form.amount).toBe('')
+            expect(wrapper.vm.form.memo).toBe('')
+          })
         })
 
-        it('trims the email after blur', async () => {
-          await wrapper.find('#input-group-1').find('input').setValue('  valid@email.com  ')
-          await wrapper.find('#input-group-1').find('input').trigger('blur')
-          await flushPromises()
-          expect(wrapper.vm.form.email).toBe('valid@email.com')
+        describe('submit', () => {
+          beforeEach(async () => {
+            await wrapper.find('#input-group-1').find('input').setValue('someone@watches.tv')
+            await wrapper.find('#input-group-2').find('input').setValue('87.23')
+            await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
+            await wrapper.find('form').trigger('submit')
+            await flushPromises()
+          })
+
+          it('emits set-transaction', async () => {
+            expect(wrapper.emitted('set-transaction')).toBeTruthy()
+            expect(wrapper.emitted('set-transaction')).toEqual([
+              [
+                {
+                  email: 'someone@watches.tv',
+                  amount: 87.23,
+                  memo: 'Long enough',
+                  selected: 'send',
+                },
+              ],
+            ])
+          })
+        })
+      })
+    })
+
+    describe('is selected: "gift"', () => {
+      beforeEach(async () => {
+        await wrapper.setData({
+          selected: 'gift',
         })
       })
 
-      describe('amount field', () => {
-        it('has an input field of type text', () => {
-          expect(wrapper.find('#input-group-2').find('input').attributes('type')).toBe('text')
-        })
-
-        it('has an GDD text icon', () => {
-          expect(wrapper.find('#input-group-2').find('div.m-1').text()).toBe('GDD')
-        })
-
-        it('has a label form.amount', () => {
-          expect(wrapper.find('label.input-2').text()).toBe('form.amount')
-        })
-
-        it('has a placeholder "0.01"', () => {
-          expect(wrapper.find('#input-group-2').find('input').attributes('placeholder')).toBe(
-            '0.01',
-          )
-        })
-
-        it('does not update form amount when invalid', async () => {
-          await wrapper.find('#input-group-2').find('input').setValue('invalid')
-          await wrapper.find('#input-group-2').find('input').trigger('blur')
-          await flushPromises()
-          expect(wrapper.vm.form.amountValue).toBe(0)
-        })
-
-        it('flushes an error message when no valid amount is given', async () => {
-          await wrapper.find('#input-group-2').find('input').setValue('a')
-          await flushPromises()
-          expect(wrapper.find('span.errors').text()).toBe('form.validation.gddSendAmount')
-        })
-
-        it('flushes an error message when amount is too high', async () => {
-          await wrapper.find('#input-group-2').find('input').setValue('123.34')
-          await flushPromises()
-          expect(wrapper.find('span.errors').text()).toBe('form.validation.gddSendAmount')
-        })
-
-        it('flushes no errors when amount is valid', async () => {
-          await wrapper.find('#input-group-2').find('input').setValue('87.34')
-          await flushPromises()
-          expect(wrapper.find('span.errors').exists()).toBeFalsy()
-        })
-      })
-
-      describe('message text box', () => {
-        it('has an textarea field', () => {
-          expect(wrapper.find('#input-group-3').find('textarea').exists()).toBeTruthy()
-        })
-
-        it('has an chat-right-text icon', () => {
-          expect(wrapper.find('#input-group-3').find('svg').attributes('aria-label')).toBe(
-            'chat right text',
-          )
-        })
-
-        it('has a label form.message', () => {
-          expect(wrapper.find('label.input-3').text()).toBe('form.message')
-        })
-
-        it('flushes an error message when memo is less than 5 characters', async () => {
-          await wrapper.find('#input-group-3').find('textarea').setValue('a')
-          await flushPromises()
-          expect(wrapper.find('span.errors').text()).toBe('validations.messages.min')
-        })
-
-        it('flushes no error message when memo is valid', async () => {
-          await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
-          await flushPromises()
-          expect(wrapper.find('span.errors').exists()).toBeFalsy()
-        })
-      })
-
-      describe('cancel button', () => {
-        it('has a cancel button', () => {
-          expect(wrapper.find('button[type="reset"]').exists()).toBeTruthy()
-        })
-
-        it('has the text "form.cancel"', () => {
-          expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset')
-        })
-
-        it('clears all fields on click', async () => {
-          await wrapper.find('#input-group-1').find('input').setValue('someone@watches.tv')
-          await wrapper.find('#input-group-2').find('input').setValue('87.23')
-          await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
-          await flushPromises()
-          expect(wrapper.vm.form.email).toBe('someone@watches.tv')
-          expect(wrapper.vm.form.amount).toBe('87.23')
-          expect(wrapper.vm.form.memo).toBe('Long enough')
-          await wrapper.find('button[type="reset"]').trigger('click')
-          await flushPromises()
-          expect(wrapper.vm.form.email).toBe('')
-          expect(wrapper.vm.form.amount).toBe('')
-          expect(wrapper.vm.form.memo).toBe('')
-        })
-      })
-
-      describe('submit', () => {
-        beforeEach(async () => {
-          await wrapper.find('#input-group-1').find('input').setValue('someone@watches.tv')
-          await wrapper.find('#input-group-2').find('input').setValue('87.23')
-          await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
-          await wrapper.find('form').trigger('submit')
-          await flushPromises()
-        })
-
-        it('emits set-transaction', async () => {
-          expect(wrapper.emitted('set-transaction')).toBeTruthy()
-          expect(wrapper.emitted('set-transaction')).toEqual([
-            [
-              {
-                email: 'someone@watches.tv',
-                amount: 87.23,
-                memo: 'Long enough',
-                selected: 'send',
-              },
-            ],
-          ])
-        })
+      it('has no input field of id input-group-1', () => {
+        expect(wrapper.find('#input-group-1').isVisible()).toBeFalsy()
       })
     })
   })

From 6770f010e216876849753b200f27cb922b2d1aa3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 04:21:47 +0100
Subject: [PATCH 10/72] feat: Use Vue Filter for Amounts

---
 .../components/DecayInformations/DecayInformation-Short.vue | 2 +-
 .../src/components/Transactions/TransactionCreation.vue     | 2 +-
 frontend/src/components/Transactions/TransactionDecay.vue   | 3 +--
 frontend/src/components/Transactions/TransactionReceive.vue | 2 +-
 frontend/src/components/Transactions/TransactionSend.vue    | 3 +--
 frontend/src/filters/amount.js                              | 6 ++++++
 frontend/src/main.js                                        | 2 ++
 7 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/filters/amount.js

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 8dba700d5..990ded29b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span>− {{ decay ? $n(Number(decay.decay) * -1, 'decimal') : '' }}</span>
+    <span v-if="decay.decay">{{ decay.decay | amount}}</span>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 891d1dd28..f1247b961 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -25,7 +25,7 @@
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index ab5a0f561..d45681ed8 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(Number(amount) * -1, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 43159a059..3ba1f6a31 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -28,7 +28,7 @@
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index baaa346c5..438b8b08c 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(Number(amount) * -1, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
new file mode 100644
index 000000000..b8f9a79a0
--- /dev/null
+++ b/frontend/src/filters/amount.js
@@ -0,0 +1,6 @@
+import i18n from '@/i18n.js'
+
+export const amount = (value) => {
+  if (!value) return ''
+  return i18n.n(value.toString(), 'decimal').replace('-', '− ')
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index bcf80fbef..78f4098e4 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,6 +4,7 @@ import App from './App.vue'
 import i18n from './i18n.js'
 import { loadAllRules } from './validation-rules'
 import { toasters } from './mixins/toaster'
+import { amount } from './filters/amount'
 
 import 'regenerator-runtime'
 
@@ -20,6 +21,7 @@ Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 
 Vue.mixin(toasters)
+Vue.filter('amount', amount)
 
 loadAllRules(i18n)
 

From 690e8a817e31ed855a05b82a2ef0be52c1f72eea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 04:37:34 +0100
Subject: [PATCH 11/72] hack the i18n for tests

---
 .../DecayInformations/DecayInformation-Short.vue         | 2 +-
 frontend/src/components/GddTransactionList.spec.js       | 2 +-
 frontend/src/filters/amount.js                           | 9 +++++++--
 frontend/src/main.js                                     | 5 +++--
 frontend/test/testSetup.js                               | 7 ++++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 990ded29b..3bed4b9cc 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span v-if="decay.decay">{{ decay.decay | amount}}</span>
+    <span v-if="decay.decay">{{ decay.decay | amount }}</span>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index fa485591f..f8376fa7f 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -270,7 +270,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '− 0.20383140554826432',
+            '− 0.2038314055482643084',
           )
         })
       })
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index b8f9a79a0..9a056b2ee 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -1,6 +1,11 @@
-import i18n from '@/i18n.js'
+let i18n
 
-export const amount = (value) => {
+export const loadFilters = (_i18n) => {
+  i18n = _i18n
+  return { amount }
+}
+
+const amount = (value) => {
   if (!value) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 78f4098e4..85f5cc5ca 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,7 +4,7 @@ import App from './App.vue'
 import i18n from './i18n.js'
 import { loadAllRules } from './validation-rules'
 import { toasters } from './mixins/toaster'
-import { amount } from './filters/amount'
+import { loadFilters } from './filters/amount'
 
 import 'regenerator-runtime'
 
@@ -21,7 +21,8 @@ Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 
 Vue.mixin(toasters)
-Vue.filter('amount', amount)
+const filters = loadFilters(i18n)
+Vue.filter('amount', filters.amount)
 
 loadAllRules(i18n)
 
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 2e26db998..cec950813 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -17,7 +17,9 @@ import { focus } from 'vue-focus'
 
 import { loadAllRules } from '../src/validation-rules'
 
-import { toasters } from '../src/mixins/toaster'
+import { loadFilters } from '@/filters/amount'
+
+import { toasters } from '@/mixins/toaster'
 export const toastErrorSpy = jest.spyOn(toasters.methods, 'toastError')
 export const toastSuccessSpy = jest.spyOn(toasters.methods, 'toastSuccess')
 
@@ -53,6 +55,9 @@ global.localVue.directive('focus', focus)
 
 global.localVue.mixin(toasters)
 
+const filters = loadFilters(i18nMock)
+global.localVue.filter('amount', filters.amount)
+
 // Filter the warnings for portal vue
 // https://github.com/BeniRupp/bug_portal-vue-target-already-exists
 const consoleWarn = global.console.warn

From 53611ba51e94bfc16639e832c07948fd819a2510 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 05:15:58 +0100
Subject: [PATCH 12/72] GDD filter

---
 .../DecayInformation-Decay.vue                  |  6 +++---
 .../DecayInformation-DecayStartblock.vue        | 17 ++++-------------
 .../DecayInformations/DecayInformation-Long.vue | 17 ++++-------------
 .../Transactions/TransactionCreation.spec.js    |  1 -
 .../Transactions/TransactionCreation.vue        |  3 +--
 .../Transactions/TransactionDecay.spec.js       |  1 -
 .../Transactions/TransactionReceive.spec.js     |  1 -
 .../Transactions/TransactionReceive.vue         |  3 +--
 .../Transactions/TransactionSend.spec.js        |  1 -
 .../components/Transactions/TransactionSend.vue |  4 ++--
 frontend/src/filters/amount.js                  |  9 ++++++++-
 frontend/src/main.js                            |  1 +
 frontend/test/testSetup.js                      |  1 +
 13 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 0dc00a79a..80d45e242 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -13,9 +13,9 @@
       </b-col>
       <b-col cols="6">
         <div>
-          {{ $n(Number(balance) - Number(decay.decay), 'decimal') }}
-          GDD − {{ $n(Number(decay.decay) * -1, 'decimal') }} GDD =
-          <b>{{ $n(Number(balance), 'decimal') }} GDD</b>
+          {{ (Number(balance) - Number(decay.decay)) | GDD }}
+          {{ decay.decay | GDD }} =
+          <b>{{ balance | GDD }}</b>
         </div>
       </b-col>
     </b-row>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 678fc9f09..cf95cff1b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -21,7 +21,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
@@ -37,8 +37,7 @@
         <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">− {{ $n(amount * -1, 'decimal') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $n(amount, 'decimal') }}</div>
+        <div>{{ amount | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Decay-->
@@ -47,7 +46,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Total-->
@@ -56,15 +55,7 @@
         <div>{{ $t('decay.total') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">
-          <b>− {{ $n((Number(amount) + Number(decay.decay)) * -1, 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'RECEIVE'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'CREATION'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
+        <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index ac53b77b7..7fdf65f04 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -42,7 +42,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
@@ -58,8 +58,7 @@
         <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">− {{ $n(amount * -1, 'decimal') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $n(amount, 'decimal') }}</div>
+        <div>{{ amount | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Decay-->
@@ -68,7 +67,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Total-->
@@ -77,15 +76,7 @@
         <div>{{ $t('decay.total') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">
-          <b>− {{ $n((Number(amount) + Number(decay.decay)) * -1, 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'RECEIVE'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'CREATION'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
+        <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionCreation.spec.js b/frontend/src/components/Transactions/TransactionCreation.spec.js
index 62de8a9a2..e1ea9e0b0 100644
--- a/frontend/src/components/Transactions/TransactionCreation.spec.js
+++ b/frontend/src/components/Transactions/TransactionCreation.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index f1247b961..70cbc53cd 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionDecay.spec.js b/frontend/src/components/Transactions/TransactionDecay.spec.js
index 7b4b658a4..232e7f85a 100644
--- a/frontend/src/components/Transactions/TransactionDecay.spec.js
+++ b/frontend/src/components/Transactions/TransactionDecay.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionReceive.spec.js b/frontend/src/components/Transactions/TransactionReceive.spec.js
index 6643553f8..f5b27cf47 100644
--- a/frontend/src/components/Transactions/TransactionReceive.spec.js
+++ b/frontend/src/components/Transactions/TransactionReceive.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 3ba1f6a31..d12883adc 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -26,9 +26,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionSend.spec.js b/frontend/src/components/Transactions/TransactionSend.spec.js
index 40c93437c..632c0857a 100644
--- a/frontend/src/components/Transactions/TransactionSend.spec.js
+++ b/frontend/src/components/Transactions/TransactionSend.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 438b8b08c..88028d1f4 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -24,7 +24,7 @@
               <b-col cols="5">
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
@@ -78,7 +78,7 @@
       <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-before-startblock v-if="decay.start === null" />
         <decay-information-decay-startblock
-          v-else-if="true"
+          v-else-if="isStartBlock"
           :amount="amount"
           :decay="decay"
           :typeId="typeId"
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 9a056b2ee..328aebbb2 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -2,10 +2,17 @@ let i18n
 
 export const loadFilters = (_i18n) => {
   i18n = _i18n
-  return { amount }
+  return { amount, GDD }
 }
 
 const amount = (value) => {
   if (!value) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
+
+const GDD = (value) => {
+  if (!value) return ''
+  value = amount(value)
+  if (!value.match(/^− /)) value = '+ ' + value
+  return value + ' GDD'
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 85f5cc5ca..585b603cb 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -23,6 +23,7 @@ Vue.config.productionTip = false
 Vue.mixin(toasters)
 const filters = loadFilters(i18n)
 Vue.filter('amount', filters.amount)
+Vue.filter('GDD', filters.GDD)
 
 loadAllRules(i18n)
 
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index cec950813..0ceb5affd 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -57,6 +57,7 @@ global.localVue.mixin(toasters)
 
 const filters = loadFilters(i18nMock)
 global.localVue.filter('amount', filters.amount)
+global.localVue.filter('GDD', filters.GDD)
 
 // Filter the warnings for portal vue
 // https://github.com/BeniRupp/bug_portal-vue-target-already-exists

From 1bcabd26e8d621ec8baec3d7542a94c35b442a48 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 11:21:11 +0100
Subject: [PATCH 13/72] remove substring in tests, merge master

---
 .../src/components/GddTransactionList.spec.js | 58 +++++++++----------
 frontend/src/components/Menu/Navbar.spec.js   |  1 -
 frontend/src/components/Menu/Navbar.vue       |  2 +-
 frontend/src/components/Status.vue            |  2 +-
 frontend/src/filters/amount.js                |  3 +-
 5 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index f8376fa7f..fd94760b2 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -88,6 +88,7 @@ describe('GddTransactionList', () => {
 
     describe('with transactions', () => {
       beforeEach(async () => {
+        const decayStartBlock = new Date(2001, 8, 9)
         await wrapper.setProps({
           transactions: [
             {
@@ -103,9 +104,7 @@ describe('GddTransactionList', () => {
                 start: '2022-02-28T13:55:47',
                 end: '2022-03-03T08:54:54',
                 duration: 241147.02,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 9,
@@ -117,16 +116,13 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
-                __typename: 'User',
               },
               decay: {
                 decay: '-0.2038314055482643084',
                 start: '2022-02-25T07:29:26',
                 end: '2022-02-28T13:55:47',
                 duration: 282381,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 8,
@@ -138,16 +134,13 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Gradido',
                 lastName: 'Akademie',
-                __typename: 'User',
               },
               decay: {
                 decay: '-0.03517768386652623868',
                 start: '2022-02-23T10:55:30',
                 end: '2022-02-25T07:29:26',
                 duration: 160436,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 6,
@@ -159,24 +152,22 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
-                __typename: 'User',
               },
               decay: {
                 decay: '0',
                 start: null,
                 end: null,
                 duration: null,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
           ],
           count: 12,
+          decayStartBlock,
         })
       })
 
       it('renders 4 transactions', () => {
-        expect(wrapper.findAll('div.list-group-item')).toHaveLength(3)
+        expect(wrapper.findAll('div.list-group-item')).toHaveLength(4)
       })
 
       describe('decay transactions', () => {
@@ -238,11 +229,12 @@ describe('GddTransactionList', () => {
           expect(transaction.findAll('svg').at(1).classes()).toContain('text-danger')
         })
 
-        // it('has a minus operator', () => {
-        //   expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-        //     '-',
-        //   )
-        // })
+        // operators are renderd by GDD filter
+        it.skip('has a minus operator', () => {
+          expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
+            '-',
+          )
+        })
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
@@ -263,9 +255,9 @@ describe('GddTransactionList', () => {
         })
 
         it('shows the date of the transaction', () => {
-          expect(
-            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
-          ).toContain('Mon Feb 28 2022 13:55:47')
+          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
+            'Mon Feb 28 2022 13:55:47',
+          )
         })
 
         it('shows the decay calculation', () => {
@@ -293,7 +285,7 @@ describe('GddTransactionList', () => {
 
         it('has a bi-gift icon', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
-            'bi-arrow-right-circle',
+            'bi-gift',
             'gradido-global-color-accent',
             'm-mb-1',
             'font2em',
@@ -308,7 +300,8 @@ describe('GddTransactionList', () => {
           )
         })
 
-        it('has a plus operator', () => {
+        // operators are renderd by GDD filter
+        it.skip('has a plus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
             '+',
           )
@@ -316,27 +309,27 @@ describe('GddTransactionList', () => {
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
-            '10',
+            '1000',
           )
         })
 
         it('shows the name of the receiver', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
-            'Bibi Bloxberg',
+            'Gradido Akademie',
           )
         })
 
         it('shows the date of the transaction', () => {
-          expect(
-            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
-          ).toContain('Wed Feb 23 2022 10:55:30')
+          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
+            'Fri Feb 25 2022 07:29:26',
+          )
         })
       })
 
       describe('receive transactions', () => {
         let transaction
         beforeEach(() => {
-          transaction = wrapper.findAll('div.list-group-item').at(2)
+          transaction = wrapper.findAll('div.list-group-item').at(3)
         })
 
         it('has a bi-caret-down-square icon', () => {
@@ -363,7 +356,8 @@ describe('GddTransactionList', () => {
           ])
         })
 
-        it('has a plus operator', () => {
+        // operators are renderd by GDD filter
+        it.skip('has a plus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
             '+',
           )
@@ -388,9 +382,9 @@ describe('GddTransactionList', () => {
         })
 
         it('shows the date of the transaction', () => {
-          expect(
-            transaction.findAll('.gdd-transaction-list-item-date').at(0).text().substr(0, 24),
-          ).toContain('Wed Feb 23 2022 10:55:30')
+          expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
+            'Wed Feb 23 2022 10:55:30',
+          )
         })
 
         it('shows the decay calculation', () => {
diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 21b0e97df..49765e0b3 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -21,7 +21,6 @@ const mocks = {
       isAdmin: true,
     },
   },
-  $n: jest.fn((n) => n),
 }
 
 describe('Navbar', () => {
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 72d193e4c..63a131d9d 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -10,7 +10,7 @@
       </div>
 
       <b-navbar-nav class="ml-auto" is-nav>
-        <b-nav-item>{{ pending ? '—' : $n(balance, 'decimal') }} GDD</b-nav-item>
+        <b-nav-item>{{ pending ? '—' : balance | amount }} GDD</b-nav-item>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
           <small>
             {{ $store.state.firstName }} {{ $store.state.lastName }},
diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 92d00452d..3aec54c67 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
+      {{ pending || balance === null ? '—' : balance | amount }} {{ statusText }}
     </div>
   </div>
 </template>
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 328aebbb2..84d9388d3 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -6,12 +6,11 @@ export const loadFilters = (_i18n) => {
 }
 
 const amount = (value) => {
-  if (!value) return ''
+  if (!value && value !== 0) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
 
 const GDD = (value) => {
-  if (!value) return ''
   value = amount(value)
   if (!value.match(/^− /)) value = '+ ' + value
   return value + ' GDD'

From c219a357838fc9c16514987a63d45962688882c9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:26:23 +0100
Subject: [PATCH 14/72] do not use amount filter in status component

---
 frontend/src/components/Status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 3aec54c67..92d00452d 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? '—' : balance | amount }} {{ statusText }}
+      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
     </div>
   </div>
 </template>

From 18a17aca7a160f4532a685819b5080550f184e32 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:36:15 +0100
Subject: [PATCH 15/72] render decay with GDD

---
 frontend/src/components/Transactions/TransactionDecay.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index d45681ed8..101382c7c 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -24,7 +24,7 @@
               <b-col cols="5">
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>

From 94e26ced633d17123569713bdc27657a810f667c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:51:56 +0100
Subject: [PATCH 16/72] add tests for amount filters

---
 frontend/src/filters/amount.js      |  1 +
 frontend/src/filters/amount.test.js | 35 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 frontend/src/filters/amount.test.js

diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 84d9388d3..ded1cceb7 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -12,6 +12,7 @@ const amount = (value) => {
 
 const GDD = (value) => {
   value = amount(value)
+  if (value === '') return ''
   if (!value.match(/^− /)) value = '+ ' + value
   return value + ' GDD'
 }
diff --git a/frontend/src/filters/amount.test.js b/frontend/src/filters/amount.test.js
new file mode 100644
index 000000000..65b507985
--- /dev/null
+++ b/frontend/src/filters/amount.test.js
@@ -0,0 +1,35 @@
+import { loadFilters } from './amount'
+
+const i18nMock = {
+  n: jest.fn((n) => n),
+}
+
+const { amount, GDD } = loadFilters(i18nMock)
+
+describe('amount', () => {
+  it('returns empty string when called with null', () => {
+    expect(amount(null)).toBe('')
+  })
+
+  it('returns 0 when called with 0', () => {
+    expect(amount(0)).toBe('0')
+  })
+
+  it('returns a leading proper minus sign when called with negative value', () => {
+    expect(amount(-1)).toBe('− 1')
+  })
+})
+
+describe('GDD', () => {
+  it('returns empty string when called with null', () => {
+    expect(GDD(null)).toBe('')
+  })
+
+  it('returns "+ 0 GDD" when called with 0', () => {
+    expect(GDD(0)).toBe('+ 0 GDD')
+  })
+
+  it('returns a leading proper minus sign when called with negative value', () => {
+    expect(GDD(-1)).toBe('− 1 GDD')
+  })
+})

From fe10316d4777c804a30ff1a621b8c92d8c610cce Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:53:36 +0100
Subject: [PATCH 17/72] block for tests

---
 frontend/src/filters/amount.test.js | 46 +++++++++++++++--------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/frontend/src/filters/amount.test.js b/frontend/src/filters/amount.test.js
index 65b507985..7a30059d0 100644
--- a/frontend/src/filters/amount.test.js
+++ b/frontend/src/filters/amount.test.js
@@ -6,30 +6,32 @@ const i18nMock = {
 
 const { amount, GDD } = loadFilters(i18nMock)
 
-describe('amount', () => {
-  it('returns empty string when called with null', () => {
-    expect(amount(null)).toBe('')
+describe('amount filters', () => {
+  describe('amount', () => {
+    it('returns empty string when called with null', () => {
+      expect(amount(null)).toBe('')
+    })
+
+    it('returns 0 when called with 0', () => {
+      expect(amount(0)).toBe('0')
+    })
+
+    it('returns a leading proper minus sign when called with negative value', () => {
+      expect(amount(-1)).toBe('− 1')
+    })
   })
 
-  it('returns 0 when called with 0', () => {
-    expect(amount(0)).toBe('0')
-  })
+  describe('GDD', () => {
+    it('returns empty string when called with null', () => {
+      expect(GDD(null)).toBe('')
+    })
 
-  it('returns a leading proper minus sign when called with negative value', () => {
-    expect(amount(-1)).toBe('− 1')
-  })
-})
-
-describe('GDD', () => {
-  it('returns empty string when called with null', () => {
-    expect(GDD(null)).toBe('')
-  })
-
-  it('returns "+ 0 GDD" when called with 0', () => {
-    expect(GDD(0)).toBe('+ 0 GDD')
-  })
-
-  it('returns a leading proper minus sign when called with negative value', () => {
-    expect(GDD(-1)).toBe('− 1 GDD')
+    it('returns "+ 0 GDD" when called with 0', () => {
+      expect(GDD(0)).toBe('+ 0 GDD')
+    })
+
+    it('returns a leading proper minus sign when called with negative value', () => {
+      expect(GDD(-1)).toBe('− 1 GDD')
+    })
   })
 })

From ef6567843ca24b260e61b93be1c08c027cdb805e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:02:58 +0100
Subject: [PATCH 18/72] map transaction typeId to locales

---
 .../DecayInformations/DecayInformation-DecayStartblock.vue   | 5 +----
 .../components/DecayInformations/DecayInformation-Long.vue   | 5 +----
 frontend/src/locales/de.json                                 | 4 ++--
 frontend/src/locales/en.json                                 | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index cf95cff1b..9bde154ae 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -32,10 +32,7 @@
     </b-row>
     <!-- Type-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div v-if="typeId === 'SEND'">{{ $t('decay.sent') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
       <b-col cols="6">
         <div>{{ amount | GDD }}</div>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 7fdf65f04..34f579614 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -53,10 +53,7 @@
     </b-row>
     <!-- Type-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div v-if="typeId === 'SEND'">{{ $t('decay.sent') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
       <b-col cols="6">
         <div>{{ amount | GDD }}</div>
       </b-col>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 77fdf1f4a..21cfc44cb 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -37,9 +37,9 @@
     "months": "Monate",
     "noDecay": "Keine Vergänglichkeit",
     "past_time": "Vergangene Zeit",
-    "received": "Empfangen",
+    "receive": "Empfangen",
     "seconds": "Sekunden",
-    "sent": "Gesendet",
+    "send": "Gesendet",
     "since_introduction": "seit Einführung der Vergänglichkeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "toCommunity": "An die Gemeinschaft",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 61cadd4d0..3014570ad 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -37,9 +37,9 @@
     "months": "Months",
     "noDecay": "No Decay",
     "past_time": "Time passed",
-    "received": "Received",
+    "receive": "Received",
     "seconds": "Seconds",
-    "sent": "Sent",
+    "send": "Sent",
     "since_introduction": "Since the introduction of Decay",
     "Starting_block_decay": "Starting Block Decay",
     "toCommunity": "To the community",

From e4f2a2e055dbdd20afce856886cf615b846e64cc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:27:07 +0100
Subject: [PATCH 19/72] refactor display of time passed for decay

---
 .../DecayInformation-Long.vue                 | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 34f579614..fad50ddab 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -25,14 +25,7 @@
         <div>{{ $t('decay.past_time') }}</div>
       </b-col>
       <b-col cols="6">
-        <span v-if="duration">
-          <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
-          <span v-if="duration.months > 0">{{ duration.months }} {{ $t('decay.months') }},</span>
-          <span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
-          <span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
-          <span v-if="duration.minutes > 0">{{ duration.minutes }} {{ $t('decay.minutes') }},</span>
-          <span v-if="duration.seconds > 0">{{ duration.seconds }} {{ $t('decay.seconds') }}</span>
-        </span>
+        <span v-if="duration">{{ durationText }}</span>
       </b-col>
     </b-row>
 
@@ -92,6 +85,17 @@ export default {
     duration() {
       return this.$moment.duration(new Date(this.decay.end) - new Date(this.decay.start))._data
     },
+    durationText() {
+      const order = ['years', 'months', 'days', 'hours', 'minutes', 'seconds']
+      const result = []
+      order.forEach((timeSpan) => {
+        if (this.duration[timeSpan] > 0) {
+          const locale = this.$t(`decay.${timeSpan}`)
+          result.push(`${this.duration[timeSpan]} ${locale}`)
+        }
+      })
+      return result.join(', ')
+    },
   },
 }
 </script>

From a4c2ff33091696fd6aff6e86d39afa02e26f4062 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:35:34 +0100
Subject: [PATCH 20/72] remove unnecesesary divs

---
 .../DecayInformation-DecayStartblock.vue         | 16 ++++------------
 .../DecayInformations/DecayInformation-Long.vue  | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 9bde154ae..6f7e3f466 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -33,24 +33,16 @@
     <!-- Type-->
     <b-row>
       <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
-      <b-col cols="6">
-        <div>{{ amount | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ amount | GDD }}</b-col>
     </b-row>
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <!-- Total-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.total') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.total') }}</b-col>
       <b-col cols="6">
         <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index fad50ddab..6a0b6a1c1 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -34,9 +34,7 @@
       <b-col cols="6" class="text-right">
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
     <b-row>
@@ -47,18 +45,12 @@
     <!-- Type-->
     <b-row>
       <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
-      <b-col cols="6">
-        <div>{{ amount | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ amount | GDD }}</b-col>
     </b-row>
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <!-- Total-->
     <b-row>

From 5fb81a629c6e5211dd91d8eb372c364e1bbec163 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:37:28 +0100
Subject: [PATCH 21/72] less divs

---
 .../DecayInformation-DecayStartblock.vue                  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 6f7e3f466..2ee9ecc2c 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -17,12 +17,8 @@
 
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
     <b-row>

From ddaa1634a095c14c4a6fa54fd0a3dd1eed05c8ab Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 11:29:06 +0100
Subject: [PATCH 22/72] change i18n locales to en, change test date contain
 without text

---
 frontend/src/components/GddTransactionList.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index fd94760b2..b4d61c4a6 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -19,7 +19,7 @@ describe('GddTransactionList', () => {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
     $i18n: {
-      locale: () => 'de',
+      locale: () => 'en',
     },
   }
 
@@ -256,7 +256,7 @@ describe('GddTransactionList', () => {
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Mon Feb 28 2022 13:55:47',
+            'Mon Feb 28 2022 13:55:47 GMT+0000',
           )
         })
 
@@ -321,7 +321,7 @@ describe('GddTransactionList', () => {
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Fri Feb 25 2022 07:29:26',
+            'Fri Feb 25 2022 07:29:26 GMT+0000',
           )
         })
       })
@@ -383,7 +383,7 @@ describe('GddTransactionList', () => {
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Wed Feb 23 2022 10:55:30',
+            'Wed Feb 23 2022 10:55:30 GMT+0000',
           )
         })
 

From 441333209c81807241a1c12524629eaf2cdf7488 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 13:44:35 +0100
Subject: [PATCH 23/72] removed selected value gift, change gift to link

---
 frontend/src/components/GddSend/TransactionConfirmation.vue | 6 +++---
 frontend/src/components/GddSend/TransactionForm.spec.js     | 4 ++--
 frontend/src/components/GddSend/TransactionForm.vue         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
index 3fa59c93a..1867597e5 100644
--- a/frontend/src/components/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmation.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <b-row v-if="selected === 'gift'">
+    <b-row v-if="selected === 'link'">
       <b-alert class="mb-3 mt-3" show variant="muted">
         <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
 
@@ -67,7 +67,7 @@
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col v-if="selected === 'gift'" class="text-right">
+        <b-col v-if="selected === 'link'" class="text-right">
           ~ {{ $n(balance - amount - amount * 0.028, 'decimal') }}
         </b-col>
         <b-col v-else class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
@@ -91,7 +91,7 @@
       </b-col>
     </b-row>
 
-    <b-alert class="mt-3" show v-show="selected === 'gift'" variant="muted">
+    <b-alert class="mt-3" show v-show="selected === 'link'" variant="muted">
       <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
 
       <p>
diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index e97ae3292..0596ce4e2 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -241,10 +241,10 @@ describe('GddSend', () => {
       })
     })
 
-    describe('is selected: "gift"', () => {
+    describe('is selected: "link"', () => {
       beforeEach(async () => {
         await wrapper.setData({
-          selected: 'gift',
+          selected: 'link',
         })
       })
 
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index d931f5610..f338cc3a3 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -17,12 +17,12 @@
                 </b-form-radio>
               </b-col>
               <b-col>
-                <b-form-radio v-model="selected" name="some-radios" value="gift" size="lg">
+                <b-form-radio v-model="selected" name="some-radios" value="link" size="lg">
                   {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
             </b-row>
-            <b-alert class="mt-3" v-show="selected === 'gift'" show variant="muted">
+            <b-alert class="mt-3" v-show="selected === 'link'" show variant="muted">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <p>
                 {{ $t('gdd_per_link.sentence_1') }}

From 28fea1942da1e432b9fb3abe31602c9d7c7dc1bb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Mar 2022 15:42:10 +0100
Subject: [PATCH 24/72] test setChecked in TransactionForm,  test for
 TransactionConfirmation

---
 .../GddSend/TransactionConfirmation.spec.js   | 63 +++++++++++++++++++
 .../GddSend/TransactionConfirmation.vue       | 36 ++++-------
 .../GddSend/TransactionForm.spec.js           | 14 +++--
 .../components/GddSend/TransactionForm.vue    | 19 +-----
 frontend/src/pages/Send.vue                   | 24 +------
 5 files changed, 85 insertions(+), 71 deletions(-)
 create mode 100644 frontend/src/components/GddSend/TransactionConfirmation.spec.js

diff --git a/frontend/src/components/GddSend/TransactionConfirmation.spec.js b/frontend/src/components/GddSend/TransactionConfirmation.spec.js
new file mode 100644
index 000000000..af746b6ff
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionConfirmation.spec.js
@@ -0,0 +1,63 @@
+import { mount } from '@vue/test-utils'
+import TransactionConfirmation from './TransactionConfirmation'
+
+const localVue = global.localVue
+
+describe('GddSend confirm', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $i18n: {
+      locale: jest.fn(() => 'en'),
+    },
+    $n: jest.fn((n) => String(n)),
+  }
+
+  const propsData = {
+    balance: 1234,
+    email: 'user@example.org',
+    amount: 12.34,
+    memo: 'Pessimisten stehen im Regen, Optimisten duschen unter den Wolken.',
+    loading: false,
+    selected: 'send',
+  }
+
+  const Wrapper = () => {
+    return mount(TransactionConfirmation, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component div.transaction-confirm', () => {
+      expect(wrapper.find('div.transaction-confirm').exists()).toBeTruthy()
+    })
+
+    describe('has selected "send"', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          selected: 'send',
+        })
+      })
+
+      it('renders the component div.confirm-box-send', () => {
+        expect(wrapper.find('div.confirm-box-send').exists()).toBeTruthy()
+      })
+    })
+
+    describe('has selected "link"', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          selected: 'link',
+        })
+      })
+
+      it('renders the component div.confirm-box-link', () => {
+        expect(wrapper.findAll('div.confirm-box-link').at(0).exists()).toBeTruthy()
+      })
+    })
+  })
+})
diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
index 1867597e5..b3e873748 100644
--- a/frontend/src/components/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmation.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <b-row v-if="selected === 'link'">
+  <div class="transaction-confirm">
+    <b-row v-if="selected === 'link'" class="confirm-box-link">
       <b-alert class="mb-3 mt-3" show variant="muted">
         <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
 
@@ -10,7 +10,7 @@
         </div>
       </b-alert>
     </b-row>
-    <b-row v-else>
+    <b-row v-else class="confirm-box-send">
       <b-col>
         <div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
         <b-list-group class="">
@@ -79,19 +79,13 @@
         <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
       </b-col>
       <b-col class="text-right">
-        <b-button
-          variant="success"
-          :disabled="loading"
-          @click="
-            selected === 'send' ? $emit('send-transaction') : $emit('send-transaction-per-link')
-          "
-        >
+        <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
           {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
         </b-button>
       </b-col>
     </b-row>
 
-    <b-alert class="mt-3" show v-show="selected === 'link'" variant="muted">
+    <b-alert class="mt-3 confirm-box-link" show v-if="selected === 'link'" variant="muted">
       <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
 
       <p>
@@ -118,20 +112,12 @@
 export default {
   name: 'TransactionConfirmation',
   props: {
-    balance: { type: Number, default: 0 },
-    email: { type: String, default: '' },
-    amount: { type: Number, default: 0 },
-    memo: { type: String, default: '' },
-    loading: { type: Boolean, default: false },
-    selected: { type: String, required: false },
-    transactions: {
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      decay: this.transactions[0].balance,
-    }
+    balance: { type: Number, default: 0, required: true },
+    email: { type: String, default: '', required: false },
+    amount: { type: Number, default: 0, required: true },
+    memo: { type: String, default: '', required: true },
+    loading: { type: Boolean, default: false, required: true },
+    selected: { type: String, default: 'send', required: true },
   },
 }
 </script>
diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index 0596ce4e2..635b1f811 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -57,9 +57,10 @@ describe('GddSend', () => {
 
     describe('is selected: "send"', () => {
       beforeEach(async () => {
-        await wrapper.setData({
-          selected: 'send',
-        })
+        // await wrapper.setData({
+        //   selected: 'send',
+        // })
+        await wrapper.findAll('input[type="radio"]').at(0).setChecked()
       })
 
       describe('transaction form', () => {
@@ -243,9 +244,10 @@ describe('GddSend', () => {
 
     describe('is selected: "link"', () => {
       beforeEach(async () => {
-        await wrapper.setData({
-          selected: 'link',
-        })
+        // await wrapper.setData({
+        //   selected: 'link',
+        // })
+        await wrapper.findAll('input[type="radio"]').at(1).setChecked()
       })
 
       it('has no input field of id input-group-1', () => {
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index f338cc3a3..8e52ae345 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -2,22 +2,16 @@
   <b-row class="transaction-form">
     <b-col xl="12" md="12" class="p-0">
       <b-card class="p-0 m-0" style="background-color: #ebebeba3 !important">
-        <!-- -<QrCode @set-transaction="setTransaction"></QrCode> -->
         <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
           <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
-            <!-- <div>
-                 <qrcode-drop-zone id="input-0" v-model="form.img"></qrcode-drop-zone>
-                 </div>
-                 <br />
-            -->
             <b-row>
               <b-col>
-                <b-form-radio v-model="selected" name="some-radios" value="send" size="lg">
+                <b-form-radio v-model="selected" name="radios" value="send" size="lg">
                   {{ $t('send_gdd') }}
                 </b-form-radio>
               </b-col>
               <b-col>
-                <b-form-radio v-model="selected" name="some-radios" value="link" size="lg">
+                <b-form-radio v-model="selected" name="radios" value="link" size="lg">
                   {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
@@ -159,16 +153,12 @@
   </b-row>
 </template>
 <script>
-// import QrCode from './QrCode'
-// import { QrcodeDropZone } from 'vue-qrcode-reader'
 import { BIcon } from 'bootstrap-vue'
 
 export default {
   name: 'TransactionForm',
   components: {
     BIcon,
-    //    QrCode,
-    // QrcodeDropZone,
   },
   props: {
     balance: { type: Number, default: 0 },
@@ -202,11 +192,6 @@ export default {
       this.form.amount = ''
       this.form.memo = ''
     },
-    /*
-     setTransaction(data) {
-       this.form.email = data.email
-       this.form.amount = data.amount
-     }, */
     normalizeAmount(isValid) {
       this.amountFocused = false
       if (!isValid) return
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index f284b7f0b..84fd82b26 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -8,14 +8,12 @@
         <template #transaction-confirmation>
           <transaction-confirmation
             :balance="balance"
-            :transactions="transactions"
             :selected="transactionData.selected"
             :email="transactionData.email"
             :amount="transactionData.amount"
             :memo="transactionData.memo"
             :loading="loading"
             @send-transaction="sendTransaction"
-            @send-transaction-per-link="sendTransactionPerLink"
             @on-reset="onReset"
           ></transaction-confirmation>
         </template>
@@ -36,7 +34,7 @@ import GddSend from '@/components/GddSend.vue'
 import TransactionForm from '@/components/GddSend/TransactionForm.vue'
 import TransactionConfirmation from '@/components/GddSend/TransactionConfirmation.vue'
 import TransactionResult from '@/components/GddSend/TransactionResult.vue'
-import { sendCoins, sendCoinsPerLink } from '@/graphql/mutations.js'
+import { sendCoins } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
   email: '',
@@ -97,26 +95,6 @@ export default {
       this.currentTransactionStep = 2
       this.loading = false
     },
-    async sendTransactionPerLink() {
-      alert('sendTransactionPerLink: TODO : lege sendCoinsPerLink als mutation an!')
-      this.loading = true
-      this.error = false
-      this.$apollo
-        .mutate({
-          mutation: sendCoinsPerLink,
-          variables: this.transactionData,
-        })
-        .then(() => {
-          this.error = false
-          this.$emit('update-balance', this.transactionData.amount)
-        })
-        .catch((err) => {
-          this.errorResult = err.message
-          this.error = true
-        })
-      this.currentTransactionStep = 2
-      this.loading = false
-    },
     onReset() {
       this.currentTransactionStep = 0
     },

From 3c9b5ea63cb4dfa348b00027e4acf64ee068f69b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:15:04 +0100
Subject: [PATCH 25/72] Create query to getTransactionLinkInformation.

---
 backend/src/graphql/resolver/TransactionLinkResolver.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 3091465d5..2ed19fd5f 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -66,7 +66,8 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.QUERY_TRANSACTION_LINK])
   @Query(() => TransactionLink)
   async queryTransactionLink(@Arg('code') code: string): Promise<TransactionLink> {
-    const transactionLink = await dbTransactionLink.findOneOrFail({ code })
+    console.log(code)
+    const transactionLink = await dbTransactionLink.findOneOrFail({ code: code })
     const userRepository = getCustomRepository(UserRepository)
     const user = await userRepository.findOneOrFail({ id: transactionLink.userId })
     return new TransactionLink(transactionLink, new User(user))

From 281be67ceb2c5499aaa9306f66388aa080163e43 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:15:42 +0100
Subject: [PATCH 26/72] Add query to getTransactionInformation to the queries
 of the frontend.

---
 frontend/src/graphql/queries.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 94a5e59f3..457514d18 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -127,3 +127,20 @@ export const communities = gql`
     }
   }
 `
+
+export const queryTransactionLink = gql`
+  query($code: String!) {
+    queryTransactionLink(code: $code) {
+      amount
+      memo
+      createdAt
+      validUntil
+      user {
+        email
+        firstName
+        lastName
+        publisherId
+      }
+    }
+  }
+`

From d91310c7de8d831b9a0b41228caf7ffbf4f368fc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:16:26 +0100
Subject: [PATCH 27/72] WIP Implement the frontend to show the
 transactionLinkInformation.

---
 .../ShowTransactionLinkInformations.spec.js   |  1 +
 .../pages/ShowTransactionLinkInformations.vue | 56 +++++++++++++++++++
 frontend/src/routes/routes.js                 |  4 ++
 3 files changed, 61 insertions(+)
 create mode 100644 frontend/src/pages/ShowTransactionLinkInformations.spec.js
 create mode 100644 frontend/src/pages/ShowTransactionLinkInformations.vue

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -0,0 +1 @@
+
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
new file mode 100644
index 000000000..c56db14d6
--- /dev/null
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <!-- Header -->
+    <div class="header py-7 py-lg-8 pt-lg-9">
+      <b-container>
+        <div class="header-body text-center mb-7">
+          <p class="h1">
+            {{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }}
+            {{ $t('wants to send you') }} {{ displaySetup.amount | GDD }}
+          </p>
+          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <hr />
+          <b-button v-if="displaySetup.linkTo" :to="displaySetup.linkTo">
+            {{ $t(displaySetup.button) }}
+          </b-button>
+        </div>
+      </b-container>
+    </div>
+  </div>
+</template>
+<script>
+import { queryTransactionLink } from '@/graphql/queries'
+
+export default {
+  name: 'ShowTransactionLinkInformations',
+  data() {
+    return {
+      displaySetup: {},
+    }
+  },
+  methods: {
+    setTransactionLinkInformation() {
+      this.$apollo
+        .query({
+          query: queryTransactionLink,
+          variables: {
+            code: this.$route.params.code,
+          },
+        })
+        .then((result) => {
+          const {
+            data: { queryTransactionLink },
+          } = result
+          this.displaySetup = queryTransactionLink
+          this.$store.commit('publisherId', queryTransactionLink.user.publisherId)
+        })
+        .catch((error) => {
+          this.toastError(error)
+        })
+    },
+  },
+  created() {
+    this.setDisplaySetup()
+  },
+}
+</script>
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 3fc8dc766..ea7539190 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -82,6 +82,10 @@ const routes = [
     path: '/checkEmail/:optin',
     component: () => import('@/pages/ResetPassword.vue'),
   },
+  {
+    path: '/redeem/:code',
+    component: () => import('@/pages/ShowTransactionLinkInformations.vue'),
+  },
   { path: '*', component: NotFound },
 ]
 

From 665c30aa605a4bf5642a9dd97cc11a877631a496 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:38:00 +0100
Subject: [PATCH 28/72] Change the Send page so we send another mutation when
 the user sends a link than send gdds.

---
 frontend/src/pages/Send.vue | 41 +++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 84fd82b26..ac4c57ddc 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -77,21 +77,36 @@ export default {
       this.currentTransactionStep = 1
     },
     async sendTransaction() {
+      console.log('TESTETESTESTES')
       this.loading = true
       this.error = false
-      this.$apollo
-        .mutate({
-          mutation: sendCoins,
-          variables: this.transactionData,
-        })
-        .then(() => {
-          this.error = false
-          this.$emit('update-balance', this.transactionData.amount)
-        })
-        .catch((err) => {
-          this.errorResult = err.message
-          this.error = true
-        })
+      if (this.transactionData.selected === 'send') {
+        this.$apollo
+          .mutate({
+            mutation: sendCoins,
+            variables: this.transactionData,
+          })
+          .then(() => {
+            this.error = false
+            this.$emit('update-balance', this.transactionData.amount)
+          })
+          .catch((err) => {
+            this.errorResult = err.message
+            this.error = true
+          })
+      } else if (this.transactionData.selected === 'link') {
+        this.$apollo
+          .mutate({
+            mutation: createTransactionLink,
+            variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
+          })
+          .then((result) => {
+            console.log(result)
+          })
+          .catch((error) => {
+            this.toastError(error)
+          })
+      }
       this.currentTransactionStep = 2
       this.loading = false
     },

From d99dc6d20a680b444f9e55a3fa4266eabb79c0f0 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:53:56 +0100
Subject: [PATCH 29/72] Mutation to call generateLink written in frontend.

---
 frontend/src/graphql/mutations.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index c8f5455d7..d25f033a8 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -61,3 +61,19 @@ export const sendCoins = gql`
     sendCoins(email: $email, amount: $amount, memo: $memo)
   }
 `
+
+export const createTransactionLink = gql`
+  mutation($amount: Decimal!, $memo: String!) {
+    createTransactionLink(amount: $amount, memo: $memo) {
+      code
+      id
+      validUntil
+      user {
+        email
+      }
+      memo
+      createdAt
+      validUntil
+    }
+  }
+`

From 4ad5f60604c80efd7bd8b601afea054a32191066 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 9 Mar 2022 17:56:08 +0100
Subject: [PATCH 30/72] Call mutation in case where the prozess is put on send
 link.

---
 frontend/src/pages/Send.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index ac4c57ddc..56c31026c 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -34,7 +34,7 @@ import GddSend from '@/components/GddSend.vue'
 import TransactionForm from '@/components/GddSend/TransactionForm.vue'
 import TransactionConfirmation from '@/components/GddSend/TransactionConfirmation.vue'
 import TransactionResult from '@/components/GddSend/TransactionResult.vue'
-import { sendCoins } from '@/graphql/mutations.js'
+import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
   email: '',

From b97837d41517c91b5e36984af1e4b379e2827117 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Mar 2022 10:34:48 +0100
Subject: [PATCH 31/72] test data for displaySetup in
 ShowTransactionLinkInformations.vue

---
 .../pages/ShowTransactionLinkInformations.vue    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index c56db14d6..b3ddd287c 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -4,6 +4,7 @@
     <div class="header py-7 py-lg-8 pt-lg-9">
       <b-container>
         <div class="header-body text-center mb-7">
+          <div class="mb-5">resultDB : {{ resultDB }}</div>
           <p class="h1">
             {{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }}
             {{ $t('wants to send you') }} {{ displaySetup.amount | GDD }}
@@ -25,7 +26,16 @@ export default {
   name: 'ShowTransactionLinkInformations',
   data() {
     return {
-      displaySetup: {},
+      resultDB: {},
+      displaySetup: {
+        amount: '123456',
+        linkTo: '',
+        user: {
+          publisherId: 1,
+          firstName: 'testName',
+          lastName: 'testOgerly',
+        },
+      },
     }
   },
   methods: {
@@ -41,6 +51,7 @@ export default {
           const {
             data: { queryTransactionLink },
           } = result
+          this.resultDB = queryTransactionLink
           this.displaySetup = queryTransactionLink
           this.$store.commit('publisherId', queryTransactionLink.user.publisherId)
         })
@@ -50,7 +61,8 @@ export default {
     },
   },
   created() {
-    this.setDisplaySetup()
+    this.setTransactionLinkInformation()
+    this.displaySetup.linkTo = this.$route.params.code
   },
 }
 </script>

From cec79d462ff916cd1ca5970dfe4b428973a09941 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Mar 2022 10:50:01 +0100
Subject: [PATCH 32/72] add locales for transaction-link, add default datas for
 ShowTransactionLinkInformations

---
 frontend/src/locales/de.json                           | 5 +++++
 frontend/src/locales/en.json                           | 5 +++++
 frontend/src/pages/ShowTransactionLinkInformations.vue | 8 +++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 21cfc44cb..8b0cccf7f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,6 +46,11 @@
     "total": "Gesamt",
     "year": "Jahre"
   },
+  "transaction-link": {
+    "send_you":"sendet dir",
+    "subtitle":"subtitle",
+    "button":"einlösen"
+  },
   "error": {
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 3014570ad..1c7c2595d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -46,6 +46,11 @@
     "total": "Total",
     "year": "Years"
   },
+  "transaction-link": {
+    "send_you":"wants to send you",
+    "subtitle":"subtitle",
+    "button":"redeem"
+  },
   "error": {
     "change-password": "Error while changing password",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index b3ddd287c..2490aec99 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -7,12 +7,12 @@
           <div class="mb-5">resultDB : {{ resultDB }}</div>
           <p class="h1">
             {{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }}
-            {{ $t('wants to send you') }} {{ displaySetup.amount | GDD }}
+            {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </p>
-          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <p class="h4">{{ displaySetup.memo }}</p>
           <hr />
           <b-button v-if="displaySetup.linkTo" :to="displaySetup.linkTo">
-            {{ $t(displaySetup.button) }}
+            {{ $t('transaction-link.button') }}
           </b-button>
         </div>
       </b-container>
@@ -30,10 +30,12 @@ export default {
       displaySetup: {
         amount: '123456',
         linkTo: '',
+        memo: 'Test Memo, Test Memo von Ogerly, Test Memo von Ogerly für testuser',
         user: {
           publisherId: 1,
           firstName: 'testName',
           lastName: 'testOgerly',
+          email: 'test@example.de',
         },
       },
     }

From f4b5961c3852b20c299a8ee2d776f7d82002586a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Mar 2022 10:51:24 +0100
Subject: [PATCH 33/72] yarn lint --fix

---
 frontend/src/pages/Send.vue                                | 3 +--
 frontend/src/pages/ShowTransactionLinkInformations.spec.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 56c31026c..55fa013ca 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -77,7 +77,6 @@ export default {
       this.currentTransactionStep = 1
     },
     async sendTransaction() {
-      console.log('TESTETESTESTES')
       this.loading = true
       this.error = false
       if (this.transactionData.selected === 'send') {
@@ -101,7 +100,7 @@ export default {
             variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
           })
           .then((result) => {
-            console.log(result)
+            alert(result)
           })
           .catch((error) => {
             this.toastError(error)
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index 8b1378917..e69de29bb 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -1 +0,0 @@
-

From d24830bdb28b019aa38439d0c201e4f140f8dc27 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Mar 2022 10:51:44 +0100
Subject: [PATCH 34/72] yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8b0cccf7f..8a49c3016 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,11 +46,6 @@
     "total": "Gesamt",
     "year": "Jahre"
   },
-  "transaction-link": {
-    "send_you":"sendet dir",
-    "subtitle":"subtitle",
-    "button":"einlösen"
-  },
   "error": {
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
@@ -237,6 +232,11 @@
     "receiverNotFound": "Empfänger nicht gefunden",
     "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen"
   },
+  "transaction-link": {
+    "button": "einlösen",
+    "send_you": "sendet dir",
+    "subtitle": "subtitle"
+  },
   "transactions": "Transaktionen",
   "whitepaper": "Whitepaper"
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1c7c2595d..ca66bfe35 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -46,11 +46,6 @@
     "total": "Total",
     "year": "Years"
   },
-  "transaction-link": {
-    "send_you":"wants to send you",
-    "subtitle":"subtitle",
-    "button":"redeem"
-  },
   "error": {
     "change-password": "Error while changing password",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
@@ -237,6 +232,11 @@
     "receiverNotFound": "Recipient not found",
     "show_all": "View all <strong>{count}</strong> transactions."
   },
+  "transaction-link": {
+    "button": "redeem",
+    "send_you": "wants to send you",
+    "subtitle": "subtitle"
+  },
   "transactions": "Transactions",
   "whitepaper": "Whitepaper"
 }

From f1726675b723626a9ae2c8667f4f46f75bb64941 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 10 Mar 2022 12:59:08 +0100
Subject: [PATCH 35/72] Use method to call informations.

---
 frontend/src/pages/ShowTransactionLinkInformations.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index c56db14d6..ace86b9aa 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -50,7 +50,7 @@ export default {
     },
   },
   created() {
-    this.setDisplaySetup()
+    this.setTransactionLinkInformation()
   },
 }
 </script>

From 24dfa3a0e7367077bcb6fa3a1c2908337f31a88e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 14:59:29 +0100
Subject: [PATCH 36/72] test send.vue and
 ShowTransactionLinkInformations.spec.js, routes

---
 frontend/src/pages/Send.spec.js               | 45 ++++++++++++++-
 frontend/src/pages/Send.vue                   | 57 ++++++++++---------
 .../ShowTransactionLinkInformations.spec.js   | 52 +++++++++++++++++
 .../pages/ShowTransactionLinkInformations.vue | 28 ++++-----
 frontend/src/routes/router.test.js            |  2 +-
 5 files changed, 139 insertions(+), 45 deletions(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index c724d965f..3f9320403 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -44,12 +44,14 @@ describe('Send', () => {
       expect(wrapper.find('div.gdd-send').exists()).toBeTruthy()
     })
 
+    /* SEND */
     describe('transaction form', () => {
       beforeEach(async () => {
         wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
           email: 'user@example.org',
           amount: 23.45,
           memo: 'Make the best of it!',
+          selected: 'send',
         })
       })
       it('steps forward in the dialog', () => {
@@ -57,7 +59,7 @@ describe('Send', () => {
       })
     })
 
-    describe('confirm transaction', () => {
+    describe('confirm transaction if selected:send', () => {
       beforeEach(() => {
         wrapper.setData({
           currentTransactionStep: 1,
@@ -65,6 +67,7 @@ describe('Send', () => {
             email: 'user@example.org',
             amount: 23.45,
             memo: 'Make the best of it!',
+            selected: 'send',
           },
         })
       })
@@ -76,6 +79,7 @@ describe('Send', () => {
           email: 'user@example.org',
           amount: 23.45,
           memo: 'Make the best of it!',
+          selected: 'send',
         })
       })
 
@@ -94,6 +98,7 @@ describe('Send', () => {
                 email: 'user@example.org',
                 amount: 23.45,
                 memo: 'Make the best of it!',
+                selected: 'send',
               },
             }),
           )
@@ -131,5 +136,43 @@ describe('Send', () => {
         })
       })
     })
+
+    /* LINK */
+    describe('transaction form', () => {
+      beforeEach(async () => {
+        wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
+          amount: 23.45,
+          memo: 'Make the best of it!',
+          selected: 'link',
+        })
+      })
+      it('steps forward in the dialog', () => {
+        expect(wrapper.findComponent({ name: 'TransactionConfirmation' }).exists()).toBe(true)
+      })
+    })
+
+    describe('confirm transaction if selected:link', () => {
+      beforeEach(() => {
+        wrapper.setData({
+          currentTransactionStep: 1,
+          transactionData: {
+            amount: 23.45,
+            memo: 'Make the best of it!',
+            selected: 'link',
+          },
+        })
+      })
+
+      it('resets the transaction process when on-reset is emitted', async () => {
+        await wrapper.findComponent({ name: 'TransactionConfirmation' }).vm.$emit('on-reset')
+        expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBeTruthy()
+        expect(wrapper.vm.transactionData).toEqual({
+          email: '',
+          amount: 23.45,
+          memo: 'Make the best of it!',
+          selected: 'link',
+        })
+      })
+    })
   })
 })
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 55fa013ca..4ecdbf6eb 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -79,32 +79,37 @@ export default {
     async sendTransaction() {
       this.loading = true
       this.error = false
-      if (this.transactionData.selected === 'send') {
-        this.$apollo
-          .mutate({
-            mutation: sendCoins,
-            variables: this.transactionData,
-          })
-          .then(() => {
-            this.error = false
-            this.$emit('update-balance', this.transactionData.amount)
-          })
-          .catch((err) => {
-            this.errorResult = err.message
-            this.error = true
-          })
-      } else if (this.transactionData.selected === 'link') {
-        this.$apollo
-          .mutate({
-            mutation: createTransactionLink,
-            variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
-          })
-          .then((result) => {
-            alert(result)
-          })
-          .catch((error) => {
-            this.toastError(error)
-          })
+      switch (this.transactionData.selected) {
+        case 'send':
+          this.$apollo
+            .mutate({
+              mutation: sendCoins,
+              variables: this.transactionData,
+            })
+            .then(() => {
+              this.error = false
+              this.$emit('update-balance', this.transactionData.amount)
+            })
+            .catch((err) => {
+              this.errorResult = err.message
+              this.error = true
+            })
+          break
+        case 'link':
+          this.$apollo
+            .mutate({
+              mutation: createTransactionLink,
+              variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
+            })
+            .then((result) => {
+              alert(result)
+            })
+            .catch((error) => {
+              this.toastError(error)
+            })
+          break
+        default:
+          throw new Error(`undefined transactionData.selected : ${this.transactionData.selected}`)
       }
       this.currentTransactionStep = 2
       this.loading = false
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index e69de29bb..d3d9acb91 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -0,0 +1,52 @@
+import { mount } from '@vue/test-utils'
+import ShowTransactionLinkInformations from './ShowTransactionLinkInformations'
+
+const localVue = global.localVue
+
+const errorHandler = jest.fn()
+
+localVue.config.errorHandler = errorHandler
+
+const queryTransactionLink = jest.fn()
+queryTransactionLink.mockResolvedValue('success')
+
+const createMockObject = (code) => {
+  return {
+    localVue,
+    mocks: {
+      $t: jest.fn((t) => t),
+      $i18n: {
+        locale: () => 'en',
+      },
+      $store: {
+        // commit: stateCommitMock,
+      },
+      $apollo: {
+        query: queryTransactionLink,
+      },
+      $route: {
+        params: {
+          code,
+        },
+      },
+    },
+  }
+}
+
+describe('ShowTransactionLinkInformations', () => {
+  let wrapper
+
+  const Wrapper = (functionN) => {
+    return mount(ShowTransactionLinkInformations, functionN)
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject())
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.show-transaction-link-informations').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 385a8c921..050657d95 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,12 +1,11 @@
 <template>
-  <div>
+  <div class="show-transaction-link-informations">
     <!-- Header -->
     <div class="header py-7 py-lg-8 pt-lg-9">
       <b-container>
         <div class="header-body text-center mb-7">
-          <div class="mb-5">resultDB : {{ resultDB }}</div>
           <p class="h1">
-            {{ displaySetup.user.firstName }} {{ displaySetup.user.lastName }}
+            {{ username }}
             {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </p>
           <p class="h4">{{ displaySetup.memo }}</p>
@@ -26,16 +25,10 @@ export default {
   name: 'ShowTransactionLinkInformations',
   data() {
     return {
-      resultDB: {},
       displaySetup: {
-        amount: '123456',
-        linkTo: '',
-        memo: 'Test Memo, Test Memo von Ogerly, Test Memo von Ogerly für testuser',
         user: {
-          publisherId: 1,
-          firstName: 'testName',
-          lastName: 'testOgerly',
-          email: 'test@example.de',
+          firstName: '',
+          lastName: '',
         },
       },
     }
@@ -50,18 +43,19 @@ export default {
           },
         })
         .then((result) => {
-          const {
-            data: { queryTransactionLink },
-          } = result
-          this.resultDB = queryTransactionLink
-          this.displaySetup = queryTransactionLink
-          this.$store.commit('publisherId', queryTransactionLink.user.publisherId)
+          this.displaySetup = result.data.queryTransactionLink
+          this.$store.commit('publisherId', result.data.queryTransactionLink.user.publisherId)
         })
         .catch((error) => {
           this.toastError(error)
         })
     },
   },
+  computed: {
+    username() {
+      return this.displaySetup.user.firstName + ' ' + this.displaySetup.user.lastName
+    },
+  },
   created() {
     this.setTransactionLinkInformation()
   },
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 665848136..cfb2bdb0d 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -50,7 +50,7 @@ describe('router', () => {
       })
 
       it('has sixteen routes defined', () => {
-        expect(routes).toHaveLength(16)
+        expect(routes).toHaveLength(17)
       })
 
       describe('overview', () => {

From 35b9627300cb17a6fea0074f9eef2d819d5f6999 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 15:54:08 +0100
Subject: [PATCH 37/72] send commit for send per link

---
 .../components/GddSend/TransactionResult.vue  | 27 ++++++++++++++++++-
 frontend/src/pages/Send.vue                   |  5 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionResult.vue b/frontend/src/components/GddSend/TransactionResult.vue
index 64a6749bd..b92edcbf8 100644
--- a/frontend/src/components/GddSend/TransactionResult.vue
+++ b/frontend/src/components/GddSend/TransactionResult.vue
@@ -27,7 +27,25 @@
         </b-card>
       </b-col>
     </b-row>
-    <b-row v-if="!error">
+    <b-row v-if="linkResult.code">
+       <b-col>
+        <b-card class="p-0 gradido-custom-background">
+          <div class="p-4">
+            {{ $t('form.thx') }}
+            <hr />
+            Der Link wurde erstellt!
+            <br />
+            linkResult: {{ linkResult }}
+            <br />
+            <h2>http://localhost/redeem/{{ linkResult.code }}</h2>
+          </div>
+          <p class="text-center mt-3">
+            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+          </p>
+        </b-card>
+      </b-col>
+    </b-row>
+    <b-row v-if="!error && !linkResult.code">
       <b-col>
         <b-card class="p-0 gradido-custom-background">
           <div class="p-4">
@@ -47,6 +65,13 @@
 export default {
   name: 'TransactionResult',
   props: {
+    linkResult: {
+      type: Object,
+      required: false,
+      default() {
+        return {}
+      },
+    },
     error: { type: Boolean, default: false },
     errorResult: { type: String, default: '' },
   },
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 4ecdbf6eb..ef08cc7c9 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -19,6 +19,7 @@
         </template>
         <template #transaction-result>
           <transaction-result
+            :linkResult="linkResult"
             :error="error"
             :errorResult="errorResult"
             @on-reset="onReset"
@@ -57,6 +58,7 @@ export default {
       errorResult: '',
       currentTransactionStep: 0,
       loading: false,
+      linkResult: {},
     }
   },
   props: {
@@ -102,7 +104,8 @@ export default {
               variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
             })
             .then((result) => {
-              alert(result)
+              console.log(result.data.createTransactionLink)
+              this.linkResult = result.data.createTransactionLink
             })
             .catch((error) => {
               this.toastError(error)

From 2ecd654dd79b3407bffd364001f73ca80745a104 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 16:18:49 +0100
Subject: [PATCH 38/72] yarn lint --fix

---
 frontend/src/components/GddSend/TransactionResult.vue | 2 +-
 frontend/src/pages/Send.vue                           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionResult.vue b/frontend/src/components/GddSend/TransactionResult.vue
index b92edcbf8..efca688e1 100644
--- a/frontend/src/components/GddSend/TransactionResult.vue
+++ b/frontend/src/components/GddSend/TransactionResult.vue
@@ -28,7 +28,7 @@
       </b-col>
     </b-row>
     <b-row v-if="linkResult.code">
-       <b-col>
+      <b-col>
         <b-card class="p-0 gradido-custom-background">
           <div class="p-4">
             {{ $t('form.thx') }}
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index ef08cc7c9..2776a0978 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -104,7 +104,6 @@ export default {
               variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
             })
             .then((result) => {
-              console.log(result.data.createTransactionLink)
               this.linkResult = result.data.createTransactionLink
             })
             .catch((error) => {

From 7bba881b3a5eb3d2bb17d16e7e6605b1ad35aa20 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 20:11:15 +0100
Subject: [PATCH 39/72] frontendstyle for send per link fixed, add components
 ClipboardCopy.vue

---
 frontend/src/assets/scss/gradido.scss         | 10 +++--
 frontend/src/components/ClipboardCopy.vue     | 37 ++++++++++++++++++
 .../GddSend/TransactionConfirmation.vue       | 38 ++++---------------
 .../components/GddSend/TransactionForm.vue    | 10 ++---
 .../components/GddSend/TransactionResult.vue  | 15 ++++----
 frontend/src/locales/de.json                  |  4 ++
 frontend/src/locales/en.json                  |  4 ++
 7 files changed, 71 insertions(+), 47 deletions(-)
 create mode 100644 frontend/src/components/ClipboardCopy.vue

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index abb491206..e72fbb1c4 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -52,6 +52,7 @@
 // Bootstrap-vue (2.21.1) scss
 @import "~bootstrap-vue/src/index";
 
+
 .alert-success {
   color: #155724;
   background-color: #d4edda;
@@ -94,6 +95,11 @@
   border-color: #5e72e4;
 }
 
+.gradido-font-large {
+  font-size: large;
+  height: auto !important;
+}
+
 a,
 .copyright {
   color: #5a7b02;
@@ -201,10 +207,6 @@ a,
   background-color: #fff;
 }
 
-.gradido-font-large {
-  font-size: large;
-}
-
 .gradido-font-15rem {
   font-size: 1.5rem;
 }
diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
new file mode 100644
index 000000000..8e4caa706
--- /dev/null
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="clipboard-copy">
+    <b-input-group size="lg" class="mb-3" prepend="Link">
+      <b-form-input v-model="url" type="text" readonly></b-form-input>
+      <b-input-group-append>
+        <b-button size="sm" text="Button" variant="success" @click="CopyLink">
+          {{ $t('gdd_per_link.copy') }}
+        </b-button>
+      </b-input-group-append>
+    </b-input-group>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ClipboardCopy',
+  props: {
+    code: { type: String, required: true },
+  },
+  data() {
+    return {
+      url: `http://localhost/redeem/${this.code}`,
+    }
+  },
+  methods: {
+    CopyLink() {
+      navigator.clipboard
+        .writeText(this.url)
+        .then(() => {
+          this.toastSuccess(this.$t('gdd_per_link.link-copied'))
+        })
+        .catch((err) => {
+          this.toastError(`${this.$t('gdd_per_link.link-copied')}: ${err}`)
+        })
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
index b3e873748..da454518d 100644
--- a/frontend/src/components/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmation.vue
@@ -1,14 +1,12 @@
 <template>
   <div class="transaction-confirm">
     <b-row v-if="selected === 'link'" class="confirm-box-link">
-      <b-alert class="mb-3 mt-3" show variant="muted">
-        <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+      <b-col class="text-right mt-4 mb-3">
+        <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
 
-        <div>
-          Du versendest per Link:
-          <h1>{{ $n(amount, 'decimal') }} GDD</h1>
-        </div>
-      </b-alert>
+        <h1>{{ amount | GDD }}</h1>
+        <b class="mt-2">{{ memo }}</b>
+      </b-col>
     </b-row>
     <b-row v-else class="confirm-box-send">
       <b-col>
@@ -43,8 +41,8 @@
       </b-col>
     </b-row>
 
-    <b-container class="bv-example-row mt-3 gray-background p-2">
-      <p>{{ $t('advanced-calculation') }}</p>
+    <b-container class="bv-example-row mt-3 mb-3 gray-background p-2">
+      <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
       <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>
@@ -84,28 +82,6 @@
         </b-button>
       </b-col>
     </b-row>
-
-    <b-alert class="mt-3 confirm-box-link" show v-if="selected === 'link'" variant="muted">
-      <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
-
-      <p>
-        -
-        <b>{{ $t('gdd_per_link.sentence_2') }}</b>
-      </p>
-      <p>
-        -
-        <b>{{ $t('gdd_per_link.sentence_3') }}</b>
-      </p>
-      <p>
-        -
-        <b>{{ $t('gdd_per_link.sentence_4') }}</b>
-      </p>
-
-      <hr />
-      <p class="mb-0">
-        {{ $t('gdd_per_link.sentence_5') }}
-      </p>
-    </b-alert>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index f2ab489cb..1a1dd7198 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -16,12 +16,12 @@
                 </b-form-radio>
               </b-col>
             </b-row>
-            <b-alert class="mt-3" v-show="selected === 'link'" show variant="muted">
+            <div class="mt-4" v-show="selected === 'link'">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
-              <p>
+              <div>
                 {{ $t('gdd_per_link.sentence_1') }}
-              </p>
-            </b-alert>
+              </div>
+            </div>
 
             <div>
               <validation-provider
@@ -34,7 +34,7 @@
                 }"
                 v-slot="{ errors }"
               >
-                <label class="input-1 mt-5" for="input-1">{{ $t('form.recipient') }}</label>
+                <label class="input-1 mt-4" for="input-1">{{ $t('form.recipient') }}</label>
                 <b-input-group
                   id="input-group-1"
                   class="border border-default"
diff --git a/frontend/src/components/GddSend/TransactionResult.vue b/frontend/src/components/GddSend/TransactionResult.vue
index efca688e1..479ad7ae8 100644
--- a/frontend/src/components/GddSend/TransactionResult.vue
+++ b/frontend/src/components/GddSend/TransactionResult.vue
@@ -31,13 +31,8 @@
       <b-col>
         <b-card class="p-0 gradido-custom-background">
           <div class="p-4">
-            {{ $t('form.thx') }}
-            <hr />
-            Der Link wurde erstellt!
-            <br />
-            linkResult: {{ linkResult }}
-            <br />
-            <h2>http://localhost/redeem/{{ linkResult.code }}</h2>
+            <div class="h3 mb-5">{{ $t('gdd_per_link.created') }}</div>
+            <clipboard-copy :code="linkResult.code" />
           </div>
           <p class="text-center mt-3">
             <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
@@ -62,9 +57,15 @@
   </b-container>
 </template>
 <script>
+import ClipboardCopy from '../ClipboardCopy.vue'
+
 export default {
   name: 'TransactionResult',
+  components: {
+    ClipboardCopy,
+  },
   props: {
+    selected: { type: String },
     linkResult: {
       type: Object,
       required: false,
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8a49c3016..b784d6172 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,6 +101,10 @@
     "your_amount": "Dein Betrag"
   },
   "gdd_per_link": {
+    "created":"Der Link wurde erstellt!",
+    "copy":"kopieren",
+    "link-copied":"Link wurde in die Zwischenablage kopiert",
+    "dont-copied":"Could not copy text",
     "header": "Gradidos versenden per Link",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ca66bfe35..ed510f0e3 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -101,6 +101,10 @@
     "your_amount": "Your amount"
   },
   "gdd_per_link": {
+    "created":"Link Is Created!",
+    "copy":"copy",
+    "link-copied":"Link copied to clipboard",
+    "dont-copied":"Link kann nicht kopiert werden",
     "header": "Send Gradidos by link",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",

From 5e6e4f22e93dc47e3152973d79719b67755e9bdc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 20:12:18 +0100
Subject: [PATCH 40/72] yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b784d6172..e871a68a0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,11 +101,11 @@
     "your_amount": "Dein Betrag"
   },
   "gdd_per_link": {
-    "created":"Der Link wurde erstellt!",
-    "copy":"kopieren",
-    "link-copied":"Link wurde in die Zwischenablage kopiert",
-    "dont-copied":"Could not copy text",
+    "copy": "kopieren",
+    "created": "Der Link wurde erstellt!",
+    "dont-copied": "Could not copy text",
     "header": "Gradidos versenden per Link",
+    "link-copied": "Link wurde in die Zwischenablage kopiert",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ed510f0e3..8b144395d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -101,11 +101,11 @@
     "your_amount": "Your amount"
   },
   "gdd_per_link": {
-    "created":"Link Is Created!",
-    "copy":"copy",
-    "link-copied":"Link copied to clipboard",
-    "dont-copied":"Link kann nicht kopiert werden",
+    "copy": "copy",
+    "created": "Link Is Created!",
+    "dont-copied": "Link kann nicht kopiert werden",
     "header": "Send Gradidos by link",
+    "link-copied": "Link copied to clipboard",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",

From 63431418f62a0a67aa98ad0d5272bb6867504bc3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 20:29:03 +0100
Subject: [PATCH 41/72] yarn locales --fix

---
 frontend/src/components/ClipboardCopy.vue | 3 ++-
 frontend/src/locales/de.json              | 2 +-
 frontend/src/locales/en.json              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 8e4caa706..e5a93546d 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -19,6 +19,7 @@ export default {
   data() {
     return {
       url: `http://localhost/redeem/${this.code}`,
+      err: 'asdasdsd',
     }
   },
   methods: {
@@ -29,7 +30,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch((err) => {
-          this.toastError(`${this.$t('gdd_per_link.link-copied')}: ${err}`)
+          this.toastError(this.$t('gdd_per_link.not-copied', { err }))
         })
     },
   },
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e871a68a0..32696c41f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -103,9 +103,9 @@
   "gdd_per_link": {
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
-    "dont-copied": "Could not copy text",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
+    "not-copied": "Konnte den Link ncht kopieren: {err}",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8b144395d..2b76d660a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -103,9 +103,9 @@
   "gdd_per_link": {
     "copy": "copy",
     "created": "Link Is Created!",
-    "dont-copied": "Link kann nicht kopiert werden",
     "header": "Send Gradidos by link",
     "link-copied": "Link copied to clipboard",
+    "not-copied": "Could not copy link: {err}",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",

From e61543699397f8b788d1479eebad3ab190622fa6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 11 Mar 2022 20:30:40 +0100
Subject: [PATCH 42/72] remove unused data

---
 frontend/src/components/ClipboardCopy.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index e5a93546d..caf6ddbbc 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -19,7 +19,6 @@ export default {
   data() {
     return {
       url: `http://localhost/redeem/${this.code}`,
-      err: 'asdasdsd',
     }
   },
   methods: {

From 4721283b1d5ee3b8ccbfb9d662dfcbf7ac78614e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 13 Mar 2022 11:24:15 +0100
Subject: [PATCH 43/72] changed review

---
 frontend/src/assets/scss/gradido.scss         |  1 -
 frontend/src/components/ClipboardCopy.vue     |  2 +-
 .../GddSend/TransactionConfirmation.vue       | 20 +++++++++----------
 .../GddSend/TransactionForm.spec.js           |  2 +-
 frontend/src/locales/de.json                  |  3 +--
 frontend/src/locales/en.json                  |  3 +--
 .../ShowTransactionLinkInformations.spec.js   |  3 ---
 .../pages/ShowTransactionLinkInformations.vue |  7 +------
 frontend/src/routes/router.test.js            |  2 +-
 9 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index e72fbb1c4..53a296713 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -52,7 +52,6 @@
 // Bootstrap-vue (2.21.1) scss
 @import "~bootstrap-vue/src/index";
 
-
 .alert-success {
   color: #155724;
   background-color: #d4edda;
diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index caf6ddbbc..239eddfb7 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -18,7 +18,7 @@ export default {
   },
   data() {
     return {
-      url: `http://localhost/redeem/${this.code}`,
+      url: `${window.location.origin}/redeem/${this.code}`,
     }
   },
   methods: {
diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
index da454518d..71ecc88d7 100644
--- a/frontend/src/components/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmation.vue
@@ -26,7 +26,7 @@
               <div class="m-1 mt-2">GDD</div>
             </b-input-group-prepend>
 
-            <div class="p-3">{{ $n(amount, 'decimal') }}</div>
+            <div class="p-3">{{ amount | GDD }}</div>
           </b-input-group>
 
           <br />
@@ -45,14 +45,14 @@
       <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
       <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>
+        <b-col class="text-right">{{ balance | GDD }}</b-col>
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right">
-          <strong>- {{ $n(amount, 'decimal') }}</strong>
+          <strong>- {{ amount | GDD }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
@@ -60,7 +60,7 @@
           <strong>Vergänglichkeit für 14 Tage</strong>
         </b-col>
         <b-col class="text-right borderbottom">
-          <strong>- {{ $n(amount * 0.028, 'decimal') }}</strong>
+          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
@@ -88,12 +88,12 @@
 export default {
   name: 'TransactionConfirmation',
   props: {
-    balance: { type: Number, default: 0, required: true },
-    email: { type: String, default: '', required: false },
-    amount: { type: Number, default: 0, required: true },
-    memo: { type: String, default: '', required: true },
-    loading: { type: Boolean, default: false, required: true },
-    selected: { type: String, default: 'send', required: true },
+    balance: { type: Number, required: true },
+    email: { type: String, required: false, default: '' },
+    amount: { type: Number, required: true },
+    memo: { type: String, required: true },
+    loading: { type: Boolean, required: true },
+    selected: { type: String, required: true },
   },
 }
 </script>
diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index 635b1f811..49b2174e0 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -69,7 +69,7 @@ describe('GddSend', () => {
         })
         describe('transaction form show because balance 100,0 GDD', () => {
           it('has no warning message ', () => {
-            expect(wrapper.find('.text-danger').exists()).toBeFalsy()
+            expect(wrapper.find('.errors').exists()).toBeFalsy()
           })
           it('has a reset button', () => {
             expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe(
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 32696c41f..ac7187318 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -238,8 +238,7 @@
   },
   "transaction-link": {
     "button": "einlösen",
-    "send_you": "sendet dir",
-    "subtitle": "subtitle"
+    "send_you": "sendet dir"
   },
   "transactions": "Transaktionen",
   "whitepaper": "Whitepaper"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 2b76d660a..7ec2d5100 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -238,8 +238,7 @@
   },
   "transaction-link": {
     "button": "redeem",
-    "send_you": "wants to send you",
-    "subtitle": "subtitle"
+    "send_you": "wants to send you"
   },
   "transactions": "Transactions",
   "whitepaper": "Whitepaper"
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index d3d9acb91..e71d71d2d 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -18,9 +18,6 @@ const createMockObject = (code) => {
       $i18n: {
         locale: () => 'en',
       },
-      $store: {
-        // commit: stateCommitMock,
-      },
       $apollo: {
         query: queryTransactionLink,
       },
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 050657d95..d99ef29bb 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -5,7 +5,7 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <p class="h1">
-            {{ username }}
+            {{ displaySetup.user.firstName }}
             {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </p>
           <p class="h4">{{ displaySetup.memo }}</p>
@@ -51,11 +51,6 @@ export default {
         })
     },
   },
-  computed: {
-    username() {
-      return this.displaySetup.user.firstName + ' ' + this.displaySetup.user.lastName
-    },
-  },
   created() {
     this.setTransactionLinkInformation()
   },
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index cfb2bdb0d..4c454a9b4 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -49,7 +49,7 @@ describe('router', () => {
         expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' })
       })
 
-      it('has sixteen routes defined', () => {
+      it('has seventeen routes defined', () => {
         expect(routes).toHaveLength(17)
       })
 

From ca031ae17f1fddbd490c0a777a0c5e148a8d6b96 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:08:12 +0100
Subject: [PATCH 44/72] add component 
 src/components/GddSend/TransactionConfirmationSend.vue

---
 .../GddSend/TransactionConfirmationSend.vue   | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionConfirmationSend.vue

diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
new file mode 100644
index 000000000..f712713ac
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -0,0 +1,97 @@
+<template>
+  <div class="transaction-confirm-send">
+    <b-row class="confirm-box-send">
+      <b-col>
+        <div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
+        <b-list-group class="">
+          <label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
+          <b-input-group id="input-group-1" class="borderbottom" size="lg">
+            <b-input-group-prepend class="d-none d-md-block gray-background">
+              <b-icon icon="envelope" class="display-4 m-3"></b-icon>
+            </b-input-group-prepend>
+            <div class="p-3">{{ email }}</div>
+          </b-input-group>
+          <br />
+          <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
+          <b-input-group id="input-group-2" class="borderbottom" size="lg">
+            <b-input-group-prepend class="p-2 d-none d-md-block gray-background">
+              <div class="m-1 mt-2">GDD</div>
+            </b-input-group-prepend>
+
+            <div class="p-3">{{ amount | GDD }}</div>
+          </b-input-group>
+
+          <br />
+          <label class="input-3" for="input-3">{{ $t('form.message') }}</label>
+          <b-input-group id="input-group-3" class="borderbottom">
+            <b-input-group-prepend class="d-none d-md-block gray-background">
+              <b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
+            </b-input-group-prepend>
+            <div class="p-3">{{ memo ? memo : '-' }}</div>
+          </b-input-group>
+        </b-list-group>
+      </b-col>
+    </b-row>
+
+    <b-container class="bv-example-row mt-3 mb-3 gray-background p-2">
+      <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
+      <b-row class="pr-3">
+        <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
+        <b-col class="text-right">{{ balance | GDD }}</b-col>
+      </b-row>
+      <b-row class="pr-3">
+        <b-col class="text-right">
+          <strong>{{ $t('form.your_amount') }}</strong>
+        </b-col>
+        <b-col class="text-right">
+          <strong>- {{ amount | GDD }}</strong>
+        </b-col>
+      </b-row>
+      <b-row class="pr-3">
+        <b-col class="text-right">
+          <strong>Vergänglichkeit für 14 Tage</strong>
+        </b-col>
+        <b-col class="text-right borderbottom">
+          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
+        </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, 'decimal') }}</b-col>
+      </b-row>
+    </b-container>
+
+    <b-row class="mt-4">
+      <b-col>
+        <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
+      </b-col>
+      <b-col class="text-right">
+        <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
+          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+        </b-button>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TransactionConfirmationLink',
+  props: {
+    balance: { type: Number, required: true },
+    email: { type: String, required: false, default: '' },
+    amount: { type: Number, required: true },
+    memo: { type: String, required: true },
+    loading: { type: Boolean, required: true },
+    selected: { type: String, required: true },
+  },
+}
+</script>
+<style>
+.gray-background {
+  background-color: #ecebe6a3 !important;
+}
+.borderbottom {
+  border-bottom: 1px solid rgb(70, 65, 65);
+  border-bottom-style: double;
+}
+</style>

From 07f094560f64249a87993e6f64f46e05238d76fd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:08:49 +0100
Subject: [PATCH 45/72] add component TransactionConfirmationLink.vue

---
 .../GddSend/TransactionConfirmationLink.vue   | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionConfirmationLink.vue

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
new file mode 100644
index 000000000..f02b7a063
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="transaction-confirm-link">
+    <b-row class="confirm-box-link">
+      <b-col class="text-right mt-4 mb-3">
+        <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
+
+        <h1>{{ amount | GDD }}</h1>
+        <b class="mt-2">{{ memo }}</b>
+      </b-col>
+    </b-row>
+
+    <b-container class="bv-example-row mt-3 mb-3 gray-background p-2">
+      <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
+      <b-row class="pr-3">
+        <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
+        <b-col class="text-right">{{ balance | GDD }}</b-col>
+      </b-row>
+      <b-row class="pr-3">
+        <b-col class="text-right">
+          <strong>{{ $t('form.your_amount') }}</strong>
+        </b-col>
+        <b-col class="text-right">
+          <strong>- {{ amount | GDD }}</strong>
+        </b-col>
+      </b-row>
+      <b-row class="pr-3">
+        <b-col class="text-right">
+          <strong>Vergänglichkeit für 14 Tage</strong>
+        </b-col>
+        <b-col class="text-right borderbottom">
+          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
+        </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 - amount * 0.028, 'decimal') }}</b-col>
+      </b-row>
+    </b-container>
+
+    <b-row class="mt-4">
+      <b-col>
+        <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
+      </b-col>
+      <b-col class="text-right">
+        <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
+          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+        </b-button>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TransactionConfirmation',
+  props: {
+    balance: { type: Number, required: true },
+    email: { type: String, required: false, default: '' },
+    amount: { type: Number, required: true },
+    memo: { type: String, required: true },
+    loading: { type: Boolean, required: true },
+    selected: { type: String, required: true },
+  },
+}
+</script>
+<style>
+.gray-background {
+  background-color: #ecebe6a3 !important;
+}
+.borderbottom {
+  border-bottom: 1px solid rgb(70, 65, 65);
+  border-bottom-style: double;
+}
+</style>

From ef8fe45c23e78b5214766649235e3cc9191c4622 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:09:24 +0100
Subject: [PATCH 46/72] add component TransactionConfirmationSend.spec.js

---
 .../TransactionConfirmationSend.spec.js       | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionConfirmationSend.spec.js

diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
new file mode 100644
index 000000000..a0e334ae5
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
@@ -0,0 +1,51 @@
+import { mount } from '@vue/test-utils'
+import TransactionConfirmationSend from './TransactionConfirmationSend'
+
+const localVue = global.localVue
+
+describe('GddSend confirm', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $i18n: {
+      locale: jest.fn(() => 'en'),
+    },
+    $n: jest.fn((n) => String(n)),
+  }
+
+  const propsData = {
+    balance: 1234,
+    email: 'user@example.org',
+    amount: 12.34,
+    memo: 'Pessimisten stehen im Regen, Optimisten duschen unter den Wolken.',
+    loading: false,
+    selected: 'send',
+  }
+
+  const Wrapper = () => {
+    return mount(TransactionConfirmationSend, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component div.transaction-confirm-send', () => {
+      expect(wrapper.find('div.transaction-confirm-send').exists()).toBeTruthy()
+    })
+
+    describe('has selected "send"', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          selected: 'send',
+        })
+      })
+
+      it('renders the component div.confirm-box-send', () => {
+        expect(wrapper.find('div.confirm-box-send').exists()).toBeTruthy()
+      })
+    })
+  })
+})

From 114cd52bf9caa28365769805c8b036df1d278bbf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:09:55 +0100
Subject: [PATCH 47/72] add component TransactionConfirmationLink.spec.js

---
 .../TransactionConfirmationLink.spec.js       | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionConfirmationLink.spec.js

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js b/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
new file mode 100644
index 000000000..9aa74b574
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
@@ -0,0 +1,51 @@
+import { mount } from '@vue/test-utils'
+import TransactionConfirmationLink from './TransactionConfirmationLink'
+
+const localVue = global.localVue
+
+describe('GddSend confirm', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $i18n: {
+      locale: jest.fn(() => 'en'),
+    },
+    $n: jest.fn((n) => String(n)),
+  }
+
+  const propsData = {
+    balance: 1234,
+    email: 'user@example.org',
+    amount: 12.34,
+    memo: 'Pessimisten stehen im Regen, Optimisten duschen unter den Wolken.',
+    loading: false,
+    selected: 'send',
+  }
+
+  const Wrapper = () => {
+    return mount(TransactionConfirmationLink, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component div.transaction-confirm-link', () => {
+      expect(wrapper.find('div.transaction-confirm-link').exists()).toBeTruthy()
+    })
+
+    describe('has selected "link"', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          selected: 'link',
+        })
+      })
+
+      it('renders the component div.confirm-box-link', () => {
+        expect(wrapper.findAll('div.confirm-box-link').at(0).exists()).toBeTruthy()
+      })
+    })
+  })
+})

From fdcc0891db59ead7d88598841926638f83e722a2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:10:59 +0100
Subject: [PATCH 48/72] add component TransactionResultSendSuccess.vue

---
 .../GddSend/TransactionResultSendSuccess.vue  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionResultSendSuccess.vue

diff --git a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
new file mode 100644
index 000000000..7e4400025
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
@@ -0,0 +1,32 @@
+<template>
+  <b-container>
+    <b-row>
+      <b-col>
+        <b-card class="p-0 gradido-custom-background">
+          <div class="p-4">
+            {{ $t('form.thx') }}
+            <hr />
+            {{ $t('form.send_transaction_success') }}
+          </div>
+          <p class="text-center mt-3">
+            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+          </p>
+        </b-card>
+      </b-col>
+    </b-row>
+  </b-container>
+</template>
+<script>
+export default {
+  name: 'TransactionResultSend',
+  props: {
+    linkResult: {
+      type: Object,
+      required: false,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>

From d3107f229422b7d0bd063c4a2520eefb48ef52d0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:11:26 +0100
Subject: [PATCH 49/72] add component TransactionResultSendError.vue

---
 .../GddSend/TransactionResultSendError.vue    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionResultSendError.vue

diff --git a/frontend/src/components/GddSend/TransactionResultSendError.vue b/frontend/src/components/GddSend/TransactionResultSendError.vue
new file mode 100644
index 000000000..d3e589967
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionResultSendError.vue
@@ -0,0 +1,40 @@
+<template>
+  <b-container>
+    <b-row v-if="error">
+      <b-col>
+        <b-card class="p-0 gradido-custom-background">
+          <div class="p-4 gradido-font-15rem">
+            <div>{{ $t('form.sorry') }}</div>
+            <hr />
+
+            <div class="test-send_transaction_error">{{ $t('form.send_transaction_error') }}</div>
+
+            <hr />
+            <div class="test-receiver-not-found" v-if="errorResult === 'recipient not known'">
+              {{ $t('transaction.receiverNotFound') }}
+            </div>
+            <div
+              class="test-receiver-not-found"
+              v-if="errorResult === 'GraphQL error: The recipient account was deleted'"
+            >
+              {{ $t('transaction.receiverDeleted') }}
+            </div>
+            <div v-else>({{ errorResult }})</div>
+          </div>
+          <p class="text-center mt-3">
+            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+          </p>
+        </b-card>
+      </b-col>
+    </b-row>
+  </b-container>
+</template>
+<script>
+export default {
+  name: 'TransactionResultSend',
+  props: {
+    error: { type: Boolean, default: false },
+    errorResult: { type: String, default: '' },
+  },
+}
+</script>

From f15fe1d7cbb40c6db2fd3c0e63085d7052e61dbb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:11:53 +0100
Subject: [PATCH 50/72] add component TransactionResultLink.vue

---
 .../GddSend/TransactionResultLink.vue         | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 frontend/src/components/GddSend/TransactionResultLink.vue

diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
new file mode 100644
index 000000000..5170423bb
--- /dev/null
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -0,0 +1,36 @@
+<template>
+  <b-container>
+    <b-row>
+      <b-col>
+        <b-card class="p-0 gradido-custom-background">
+          <div class="p-4">
+            <div class="h3 mb-5">{{ $t('gdd_per_link.created') }}</div>
+            <clipboard-copy :code="linkResult.code" />
+          </div>
+          <p class="text-center mt-3">
+            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+          </p>
+        </b-card>
+      </b-col>
+    </b-row>
+  </b-container>
+</template>
+<script>
+import ClipboardCopy from '../ClipboardCopy.vue'
+
+export default {
+  name: 'TransactionResultLink',
+  components: {
+    ClipboardCopy,
+  },
+  props: {
+    linkResult: {
+      type: Object,
+      required: false,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>

From 15f8ed3ca04b3e77bda37ca7232d59be2cb93fd2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:13:30 +0100
Subject: [PATCH 51/72] yarn lint --fix

---
 frontend/src/components/GddSend.vue           |   9 +-
 .../GddSend/TransactionConfirmation.spec.js   |   2 +-
 .../GddSend/TransactionConfirmation.vue       | 108 ------------------
 .../components/GddSend/TransactionResult.vue  |  80 -------------
 frontend/src/pages/Send.vue                   |  64 +++++++++--
 5 files changed, 61 insertions(+), 202 deletions(-)
 delete mode 100644 frontend/src/components/GddSend/TransactionConfirmation.vue
 delete mode 100644 frontend/src/components/GddSend/TransactionResult.vue

diff --git a/frontend/src/components/GddSend.vue b/frontend/src/components/GddSend.vue
index cfab0899a..7896b6e85 100644
--- a/frontend/src/components/GddSend.vue
+++ b/frontend/src/components/GddSend.vue
@@ -8,7 +8,14 @@ export default {
   name: 'GddSend',
   data() {
     return {
-      transactionSteps: ['transaction-form', 'transaction-confirmation', 'transaction-result'],
+      transactionSteps: [
+        'transaction-form',
+        'transaction-confirmation-send',
+        'transaction-confirmation-link',
+        'transaction-result-send-success',
+        'transaction-result-send-error',
+        'transaction-result-link',
+      ],
     }
   },
   props: {
diff --git a/frontend/src/components/GddSend/TransactionConfirmation.spec.js b/frontend/src/components/GddSend/TransactionConfirmation.spec.js
index af746b6ff..95c478c73 100644
--- a/frontend/src/components/GddSend/TransactionConfirmation.spec.js
+++ b/frontend/src/components/GddSend/TransactionConfirmation.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import TransactionConfirmation from './TransactionConfirmation'
+import TransactionConfirmation from './TransactionConfirmationLink'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/components/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
deleted file mode 100644
index 71ecc88d7..000000000
--- a/frontend/src/components/GddSend/TransactionConfirmation.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <div class="transaction-confirm">
-    <b-row v-if="selected === 'link'" class="confirm-box-link">
-      <b-col class="text-right mt-4 mb-3">
-        <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
-
-        <h1>{{ amount | GDD }}</h1>
-        <b class="mt-2">{{ memo }}</b>
-      </b-col>
-    </b-row>
-    <b-row v-else class="confirm-box-send">
-      <b-col>
-        <div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
-        <b-list-group class="">
-          <label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
-          <b-input-group id="input-group-1" class="borderbottom" size="lg">
-            <b-input-group-prepend class="d-none d-md-block gray-background">
-              <b-icon icon="envelope" class="display-4 m-3"></b-icon>
-            </b-input-group-prepend>
-            <div class="p-3">{{ email }}</div>
-          </b-input-group>
-          <br />
-          <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
-          <b-input-group id="input-group-2" class="borderbottom" size="lg">
-            <b-input-group-prepend class="p-2 d-none d-md-block gray-background">
-              <div class="m-1 mt-2">GDD</div>
-            </b-input-group-prepend>
-
-            <div class="p-3">{{ amount | GDD }}</div>
-          </b-input-group>
-
-          <br />
-          <label class="input-3" for="input-3">{{ $t('form.message') }}</label>
-          <b-input-group id="input-group-3" class="borderbottom">
-            <b-input-group-prepend class="d-none d-md-block gray-background">
-              <b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
-            </b-input-group-prepend>
-            <div class="p-3">{{ memo ? memo : '-' }}</div>
-          </b-input-group>
-        </b-list-group>
-      </b-col>
-    </b-row>
-
-    <b-container class="bv-example-row mt-3 mb-3 gray-background p-2">
-      <div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
-      <b-row class="pr-3">
-        <b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
-        <b-col class="text-right">{{ balance | GDD }}</b-col>
-      </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">
-          <strong>{{ $t('form.your_amount') }}</strong>
-        </b-col>
-        <b-col class="text-right">
-          <strong>- {{ amount | GDD }}</strong>
-        </b-col>
-      </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">
-          <strong>Vergänglichkeit für 14 Tage</strong>
-        </b-col>
-        <b-col class="text-right borderbottom">
-          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
-        </b-col>
-      </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col v-if="selected === 'link'" class="text-right">
-          ~ {{ $n(balance - amount - amount * 0.028, 'decimal') }}
-        </b-col>
-        <b-col v-else class="text-right">~ {{ $n(balance - amount, 'decimal') }}</b-col>
-      </b-row>
-    </b-container>
-
-    <b-row class="mt-4">
-      <b-col>
-        <b-button @click="$emit('on-reset')">{{ $t('form.cancel') }}</b-button>
-      </b-col>
-      <b-col class="text-right">
-        <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
-          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
-        </b-button>
-      </b-col>
-    </b-row>
-  </div>
-</template>
-<script>
-export default {
-  name: 'TransactionConfirmation',
-  props: {
-    balance: { type: Number, required: true },
-    email: { type: String, required: false, default: '' },
-    amount: { type: Number, required: true },
-    memo: { type: String, required: true },
-    loading: { type: Boolean, required: true },
-    selected: { type: String, required: true },
-  },
-}
-</script>
-<style>
-.gray-background {
-  background-color: #ecebe6a3 !important;
-}
-.borderbottom {
-  border-bottom: 1px solid rgb(70, 65, 65);
-  border-bottom-style: double;
-}
-</style>
diff --git a/frontend/src/components/GddSend/TransactionResult.vue b/frontend/src/components/GddSend/TransactionResult.vue
deleted file mode 100644
index 479ad7ae8..000000000
--- a/frontend/src/components/GddSend/TransactionResult.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <b-container>
-    <b-row v-if="error">
-      <b-col>
-        <b-card class="p-0 gradido-custom-background">
-          <div class="p-4 gradido-font-15rem">
-            <div>{{ $t('form.sorry') }}</div>
-            <hr />
-
-            <div class="test-send_transaction_error">{{ $t('form.send_transaction_error') }}</div>
-
-            <hr />
-            <div class="test-receiver-not-found" v-if="errorResult === 'recipient not known'">
-              {{ $t('transaction.receiverNotFound') }}
-            </div>
-            <div
-              class="test-receiver-not-found"
-              v-if="errorResult === 'GraphQL error: The recipient account was deleted'"
-            >
-              {{ $t('transaction.receiverDeleted') }}
-            </div>
-            <div v-else>({{ errorResult }})</div>
-          </div>
-          <p class="text-center mt-3">
-            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
-          </p>
-        </b-card>
-      </b-col>
-    </b-row>
-    <b-row v-if="linkResult.code">
-      <b-col>
-        <b-card class="p-0 gradido-custom-background">
-          <div class="p-4">
-            <div class="h3 mb-5">{{ $t('gdd_per_link.created') }}</div>
-            <clipboard-copy :code="linkResult.code" />
-          </div>
-          <p class="text-center mt-3">
-            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
-          </p>
-        </b-card>
-      </b-col>
-    </b-row>
-    <b-row v-if="!error && !linkResult.code">
-      <b-col>
-        <b-card class="p-0 gradido-custom-background">
-          <div class="p-4">
-            {{ $t('form.thx') }}
-            <hr />
-            {{ $t('form.send_transaction_success') }}
-          </div>
-          <p class="text-center mt-3">
-            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
-          </p>
-        </b-card>
-      </b-col>
-    </b-row>
-  </b-container>
-</template>
-<script>
-import ClipboardCopy from '../ClipboardCopy.vue'
-
-export default {
-  name: 'TransactionResult',
-  components: {
-    ClipboardCopy,
-  },
-  props: {
-    selected: { type: String },
-    linkResult: {
-      type: Object,
-      required: false,
-      default() {
-        return {}
-      },
-    },
-    error: { type: Boolean, default: false },
-    errorResult: { type: String, default: '' },
-  },
-}
-</script>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 2776a0978..9314600c2 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -5,8 +5,8 @@
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
         </template>
-        <template #transaction-confirmation>
-          <transaction-confirmation
+        <template #transaction-confirmation-send>
+          <transaction-confirmation-send
             :balance="balance"
             :selected="transactionData.selected"
             :email="transactionData.email"
@@ -15,15 +15,40 @@
             :loading="loading"
             @send-transaction="sendTransaction"
             @on-reset="onReset"
-          ></transaction-confirmation>
+          ></transaction-confirmation-send>
         </template>
-        <template #transaction-result>
-          <transaction-result
+        <template #transaction-confirmation-link>
+          <transaction-confirmation-link
+            :balance="balance"
+            :selected="transactionData.selected"
+            :email="transactionData.email"
+            :amount="transactionData.amount"
+            :memo="transactionData.memo"
+            :loading="loading"
+            @send-transaction="sendTransaction"
+            @on-reset="onReset"
+          ></transaction-confirmation-link>
+        </template>
+        <template #transaction-result-send-success>
+          <transaction-result-send-success
+            :linkResult="linkResult"
+            @on-reset="onReset"
+          ></transaction-result-send-success>
+        </template>
+        <template #transaction-result-send-error>
+          <transaction-result-send-error
+            :error="error"
+            :errorResult="errorResult"
+            @on-reset="onReset"
+          ></transaction-result-send-error>
+        </template>
+        <template #transaction-result-link>
+          <transaction-result-link
             :linkResult="linkResult"
             :error="error"
             :errorResult="errorResult"
             @on-reset="onReset"
-          ></transaction-result>
+          ></transaction-result-link>
         </template>
       </gdd-send>
       <hr />
@@ -33,8 +58,11 @@
 <script>
 import GddSend from '@/components/GddSend.vue'
 import TransactionForm from '@/components/GddSend/TransactionForm.vue'
-import TransactionConfirmation from '@/components/GddSend/TransactionConfirmation.vue'
-import TransactionResult from '@/components/GddSend/TransactionResult.vue'
+import TransactionConfirmationSend from '@/components/GddSend/TransactionConfirmationSend.vue'
+import TransactionConfirmationLink from '@/components/GddSend/TransactionConfirmationLink.vue'
+import TransactionResultSendSuccess from '@/components/GddSend/TransactionResultSendSuccess.vue'
+import TransactionResultSendError from '@/components/GddSend/TransactionResultSendError.vue'
+import TransactionResultLink from '@/components/GddSend/TransactionResultLink.vue'
 import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
@@ -48,8 +76,11 @@ export default {
   components: {
     GddSend,
     TransactionForm,
-    TransactionConfirmation,
-    TransactionResult,
+    TransactionConfirmationSend,
+    TransactionConfirmationLink,
+    TransactionResultSendSuccess,
+    TransactionResultSendError,
+    TransactionResultLink,
   },
   data() {
     return {
@@ -76,7 +107,14 @@ export default {
   methods: {
     setTransaction(data) {
       this.transactionData = { ...data }
-      this.currentTransactionStep = 1
+      switch (data.selected) {
+        case 'send':
+          this.currentTransactionStep = 1
+          break
+        case 'link':
+          this.currentTransactionStep = 2
+          break
+      }
     },
     async sendTransaction() {
       this.loading = true
@@ -91,10 +129,12 @@ export default {
             .then(() => {
               this.error = false
               this.$emit('update-balance', this.transactionData.amount)
+              this.currentTransactionStep = 3
             })
             .catch((err) => {
               this.errorResult = err.message
               this.error = true
+              this.currentTransactionStep = 4
             })
           break
         case 'link':
@@ -105,6 +145,7 @@ export default {
             })
             .then((result) => {
               this.linkResult = result.data.createTransactionLink
+              this.currentTransactionStep = 5
             })
             .catch((error) => {
               this.toastError(error)
@@ -113,7 +154,6 @@ export default {
         default:
           throw new Error(`undefined transactionData.selected : ${this.transactionData.selected}`)
       }
-      this.currentTransactionStep = 2
       this.loading = false
     },
     onReset() {

From a46bdb69bc7b19db1f86b3319ca6a0356f490182 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 10:47:01 +0100
Subject: [PATCH 52/72] yarn test fixed

---
 .../GddSend/TransactionConfirmation.spec.js   | 63 -------------------
 .../GddSend/TransactionConfirmationLink.vue   |  2 +-
 .../GddSend/TransactionConfirmationSend.vue   |  2 +-
 frontend/src/pages/Send.spec.js               | 12 ++--
 4 files changed, 8 insertions(+), 71 deletions(-)
 delete mode 100644 frontend/src/components/GddSend/TransactionConfirmation.spec.js

diff --git a/frontend/src/components/GddSend/TransactionConfirmation.spec.js b/frontend/src/components/GddSend/TransactionConfirmation.spec.js
deleted file mode 100644
index 95c478c73..000000000
--- a/frontend/src/components/GddSend/TransactionConfirmation.spec.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { mount } from '@vue/test-utils'
-import TransactionConfirmation from './TransactionConfirmationLink'
-
-const localVue = global.localVue
-
-describe('GddSend confirm', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $i18n: {
-      locale: jest.fn(() => 'en'),
-    },
-    $n: jest.fn((n) => String(n)),
-  }
-
-  const propsData = {
-    balance: 1234,
-    email: 'user@example.org',
-    amount: 12.34,
-    memo: 'Pessimisten stehen im Regen, Optimisten duschen unter den Wolken.',
-    loading: false,
-    selected: 'send',
-  }
-
-  const Wrapper = () => {
-    return mount(TransactionConfirmation, { localVue, mocks, propsData })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('renders the component div.transaction-confirm', () => {
-      expect(wrapper.find('div.transaction-confirm').exists()).toBeTruthy()
-    })
-
-    describe('has selected "send"', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          selected: 'send',
-        })
-      })
-
-      it('renders the component div.confirm-box-send', () => {
-        expect(wrapper.find('div.confirm-box-send').exists()).toBeTruthy()
-      })
-    })
-
-    describe('has selected "link"', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          selected: 'link',
-        })
-      })
-
-      it('renders the component div.confirm-box-link', () => {
-        expect(wrapper.findAll('div.confirm-box-link').at(0).exists()).toBeTruthy()
-      })
-    })
-  })
-})
diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index f02b7a063..6b91b0a08 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -51,7 +51,7 @@
 </template>
 <script>
 export default {
-  name: 'TransactionConfirmation',
+  name: 'TransactionConfirmationLink',
   props: {
     balance: { type: Number, required: true },
     email: { type: String, required: false, default: '' },
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index f712713ac..f4ce6b080 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -75,7 +75,7 @@
 </template>
 <script>
 export default {
-  name: 'TransactionConfirmationLink',
+  name: 'TransactionConfirmationSend',
   props: {
     balance: { type: Number, required: true },
     email: { type: String, required: false, default: '' },
diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 3f9320403..167c7e6fb 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -55,7 +55,7 @@ describe('Send', () => {
         })
       })
       it('steps forward in the dialog', () => {
-        expect(wrapper.findComponent({ name: 'TransactionConfirmation' }).exists()).toBe(true)
+        expect(wrapper.findComponent({ name: 'TransactionConfirmationSend' }).exists()).toBe(true)
       })
     })
 
@@ -73,7 +73,7 @@ describe('Send', () => {
       })
 
       it('resets the transaction process when on-reset is emitted', async () => {
-        await wrapper.findComponent({ name: 'TransactionConfirmation' }).vm.$emit('on-reset')
+        await wrapper.findComponent({ name: 'TransactionConfirmationSend' }).vm.$emit('on-reset')
         expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBeTruthy()
         expect(wrapper.vm.transactionData).toEqual({
           email: 'user@example.org',
@@ -87,7 +87,7 @@ describe('Send', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
           await wrapper
-            .findComponent({ name: 'TransactionConfirmation' })
+            .findComponent({ name: 'TransactionConfirmationSend' })
             .vm.$emit('send-transaction')
         })
 
@@ -119,7 +119,7 @@ describe('Send', () => {
           jest.clearAllMocks()
           sendMock.mockRejectedValue({ message: 'recipient not known' })
           await wrapper
-            .findComponent({ name: 'TransactionConfirmation' })
+            .findComponent({ name: 'TransactionConfirmationSend' })
             .vm.$emit('send-transaction')
         })
 
@@ -147,7 +147,7 @@ describe('Send', () => {
         })
       })
       it('steps forward in the dialog', () => {
-        expect(wrapper.findComponent({ name: 'TransactionConfirmation' }).exists()).toBe(true)
+        expect(wrapper.findComponent({ name: 'TransactionConfirmationLink' }).exists()).toBe(true)
       })
     })
 
@@ -164,7 +164,7 @@ describe('Send', () => {
       })
 
       it('resets the transaction process when on-reset is emitted', async () => {
-        await wrapper.findComponent({ name: 'TransactionConfirmation' }).vm.$emit('on-reset')
+        await wrapper.findComponent({ name: 'TransactionConfirmationSend' }).vm.$emit('on-reset')
         expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBeTruthy()
         expect(wrapper.vm.transactionData).toEqual({
           email: '',

From 86e956f320a14239c358a43d59cb00d4f74ca697 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 11:04:14 +0100
Subject: [PATCH 53/72] change name for apollo mocks for tests

---
 frontend/src/pages/Send.spec.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 167c7e6fb..f6d962dfc 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -1,8 +1,11 @@
 import { mount } from '@vue/test-utils'
 import Send from './Send'
 
-const sendMock = jest.fn()
-sendMock.mockResolvedValue('success')
+const sendCoinsMock = jest.fn()
+sendCoinsMock.mockResolvedValue('success')
+
+const createTransactionLinkMock = jest.fn()
+createTransactionLinkMock.mockResolvedValue('success')
 
 const localVue = global.localVue
 
@@ -27,7 +30,7 @@ describe('Send', () => {
       },
     },
     $apollo: {
-      mutate: sendMock,
+      mutate: sendCoinsMock,
     },
   }
 
@@ -92,7 +95,7 @@ describe('Send', () => {
         })
 
         it('calls the API when send-transaction is emitted', async () => {
-          expect(sendMock).toBeCalledWith(
+          expect(sendCoinsMock).toBeCalledWith(
             expect.objectContaining({
               variables: {
                 email: 'user@example.org',
@@ -117,7 +120,7 @@ describe('Send', () => {
       describe('transaction is confirmed and server response is error', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          sendMock.mockRejectedValue({ message: 'recipient not known' })
+          sendCoinsMock.mockRejectedValue({ message: 'recipient not known' })
           await wrapper
             .findComponent({ name: 'TransactionConfirmationSend' })
             .vm.$emit('send-transaction')

From 7893a5d09c425b74d13e2dccfefe3aad81a4f3ad Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 11:17:26 +0100
Subject: [PATCH 54/72] test Send.spec.js, two apollo querys

---
 frontend/src/pages/Send.spec.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index f6d962dfc..24f29ee6b 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -1,11 +1,12 @@
 import { mount } from '@vue/test-utils'
 import Send from './Send'
+import { toastErrorSpy } from '../../test/testSetup'
 
 const sendCoinsMock = jest.fn()
 sendCoinsMock.mockResolvedValue('success')
 
 const createTransactionLinkMock = jest.fn()
-createTransactionLinkMock.mockResolvedValue('success')
+createTransactionLinkMock.mockResolvedValue('error')
 
 const localVue = global.localVue
 
@@ -154,6 +155,18 @@ describe('Send', () => {
       })
     })
 
+    describe('send apollo if transaction link with error', () => {
+      beforeEach(() => {
+        createTransactionLinkMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+        wrapper.find('button.btn-success').trigger('click')
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('unregister_mail.error')
+      })
+    })
+
     describe('confirm transaction if selected:link', () => {
       beforeEach(() => {
         wrapper.setData({

From f1ae41147ce848750f8a137d0c22fa12a58cac5d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 13:45:40 +0100
Subject: [PATCH 55/72] enum TRANSACTION_STEPS in GddSend.vue and send.vue

---
 frontend/src/components/GddSend.vue           | 29 ++++++++++---------
 .../GddSend/TransactionResultSendError.vue    |  2 +-
 frontend/src/pages/Send.vue                   | 28 +++++++++---------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/GddSend.vue b/frontend/src/components/GddSend.vue
index 7896b6e85..e0d7c6eba 100644
--- a/frontend/src/components/GddSend.vue
+++ b/frontend/src/components/GddSend.vue
@@ -1,25 +1,26 @@
 <template>
   <div class="gdd-send">
-    <slot :name="transactionSteps[currentTransactionStep]" />
+    <slot :name="currentTransactionStep" />
   </div>
 </template>
 <script>
+export const TRANSACTION_STEPS = {
+  transactionForm: 'transactionForm',
+  transactionConfirmationSend: 'transactionConfirmationSend',
+  transactionConfirmationLink: 'transactionConfirmationLink',
+  transactionResultSendSuccess: 'transactionResultSendSuccess',
+  transactionResultSendError: 'transactionResultSendError',
+  transactionResultLink: 'transactionResultLink',
+}
+
 export default {
   name: 'GddSend',
-  data() {
-    return {
-      transactionSteps: [
-        'transaction-form',
-        'transaction-confirmation-send',
-        'transaction-confirmation-link',
-        'transaction-result-send-success',
-        'transaction-result-send-error',
-        'transaction-result-link',
-      ],
-    }
-  },
   props: {
-    currentTransactionStep: { type: Number, default: 0 },
+    currentTransactionStep: {
+      type: String,
+      default: TRANSACTION_STEPS.transactionForm,
+      validator: (transactionStep) => TRANSACTION_STEPS[transactionStep] !== undefined,
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/GddSend/TransactionResultSendError.vue b/frontend/src/components/GddSend/TransactionResultSendError.vue
index d3e589967..ba6b4a238 100644
--- a/frontend/src/components/GddSend/TransactionResultSendError.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendError.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container>
-    <b-row v-if="error">
+    <b-row>
       <b-col>
         <b-card class="p-0 gradido-custom-background">
           <div class="p-4 gradido-font-15rem">
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 9314600c2..786624045 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -2,10 +2,10 @@
   <div>
     <b-container>
       <gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3 ml-2 mr-2">
-        <template #transaction-form>
+        <template #transactionForm>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
         </template>
-        <template #transaction-confirmation-send>
+        <template #transactionConfirmationSend>
           <transaction-confirmation-send
             :balance="balance"
             :selected="transactionData.selected"
@@ -17,7 +17,7 @@
             @on-reset="onReset"
           ></transaction-confirmation-send>
         </template>
-        <template #transaction-confirmation-link>
+        <template #transactionConfirmationLink>
           <transaction-confirmation-link
             :balance="balance"
             :selected="transactionData.selected"
@@ -29,20 +29,20 @@
             @on-reset="onReset"
           ></transaction-confirmation-link>
         </template>
-        <template #transaction-result-send-success>
+        <template #transactionResultSendSuccess>
           <transaction-result-send-success
             :linkResult="linkResult"
             @on-reset="onReset"
           ></transaction-result-send-success>
         </template>
-        <template #transaction-result-send-error>
+        <template #transactionResultSendError>
           <transaction-result-send-error
             :error="error"
             :errorResult="errorResult"
             @on-reset="onReset"
           ></transaction-result-send-error>
         </template>
-        <template #transaction-result-link>
+        <template #transactionResultLink>
           <transaction-result-link
             :linkResult="linkResult"
             :error="error"
@@ -56,7 +56,7 @@
   </div>
 </template>
 <script>
-import GddSend from '@/components/GddSend.vue'
+import GddSend, { TRANSACTION_STEPS } from '@/components/GddSend.vue'
 import TransactionForm from '@/components/GddSend/TransactionForm.vue'
 import TransactionConfirmationSend from '@/components/GddSend/TransactionConfirmationSend.vue'
 import TransactionConfirmationLink from '@/components/GddSend/TransactionConfirmationLink.vue'
@@ -87,7 +87,7 @@ export default {
       transactionData: { ...EMPTY_TRANSACTION_DATA },
       error: false,
       errorResult: '',
-      currentTransactionStep: 0,
+      currentTransactionStep: TRANSACTION_STEPS.transactionForm,
       loading: false,
       linkResult: {},
     }
@@ -109,10 +109,10 @@ export default {
       this.transactionData = { ...data }
       switch (data.selected) {
         case 'send':
-          this.currentTransactionStep = 1
+          this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationSend
           break
         case 'link':
-          this.currentTransactionStep = 2
+          this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationLink
           break
       }
     },
@@ -129,12 +129,12 @@ export default {
             .then(() => {
               this.error = false
               this.$emit('update-balance', this.transactionData.amount)
-              this.currentTransactionStep = 3
+              this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendSuccess
             })
             .catch((err) => {
               this.errorResult = err.message
               this.error = true
-              this.currentTransactionStep = 4
+              this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError
             })
           break
         case 'link':
@@ -145,7 +145,7 @@ export default {
             })
             .then((result) => {
               this.linkResult = result.data.createTransactionLink
-              this.currentTransactionStep = 5
+              this.currentTransactionStep = TRANSACTION_STEPS.transactionResultLink
             })
             .catch((error) => {
               this.toastError(error)
@@ -157,7 +157,7 @@ export default {
       this.loading = false
     },
     onReset() {
-      this.currentTransactionStep = 0
+      this.currentTransactionStep = TRANSACTION_STEPS.transactionForm
     },
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)

From dfc8aadce4e9edb8eeb50c1b8e35362be8055575 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 14:18:11 +0100
Subject: [PATCH 56/72] add enum SEND_TYPEP: send and link

---
 .../GddSend/TransactionConfirmationLink.vue    |  4 ++--
 .../GddSend/TransactionConfirmationSend.vue    | 12 ++----------
 .../src/components/GddSend/TransactionForm.vue | 18 +++++++++++-------
 frontend/src/pages/Send.vue                    | 13 +++++++++----
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 6b91b0a08..f357ea654 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -4,7 +4,7 @@
       <b-col class="text-right mt-4 mb-3">
         <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
 
-        <h1>{{ amount | GDD }}</h1>
+        <h1>− {{ $n(amount, 'decimal') }} GDD</h1>
         <b class="mt-2">{{ memo }}</b>
       </b-col>
     </b-row>
@@ -20,7 +20,7 @@
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right">
-          <strong>- {{ amount | GDD }}</strong>
+          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index f4ce6b080..0bfff3ddb 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -18,7 +18,7 @@
               <div class="m-1 mt-2">GDD</div>
             </b-input-group-prepend>
 
-            <div class="p-3">{{ amount | GDD }}</div>
+            <div class="p-3">− {{ $n(amount, 'decimal') }} GDD</div>
           </b-input-group>
 
           <br />
@@ -43,16 +43,8 @@
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
-        <b-col class="text-right">
-          <strong>- {{ amount | GDD }}</strong>
-        </b-col>
-      </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">
-          <strong>Vergänglichkeit für 14 Tage</strong>
-        </b-col>
         <b-col class="text-right borderbottom">
-          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
+          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 1a1dd7198..991e165ce 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -6,17 +6,17 @@
           <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
             <b-row>
               <b-col>
-                <b-form-radio v-model="selected" name="radios" value="send" size="lg">
+                <b-form-radio v-model="selected" name="radios" :value="sendTypes.send" size="lg">
                   {{ $t('send_gdd') }}
                 </b-form-radio>
               </b-col>
               <b-col>
-                <b-form-radio v-model="selected" name="radios" value="link" size="lg">
+                <b-form-radio v-model="selected" name="radios" :value="sendTypes.link" size="lg">
                   {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
             </b-row>
-            <div class="mt-4" v-show="selected === 'link'">
+            <div class="mt-4" v-show="selected === sendTypes.link">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <div>
                 {{ $t('gdd_per_link.sentence_1') }}
@@ -25,10 +25,10 @@
 
             <div>
               <validation-provider
-                v-show="selected === 'send'"
+                v-show="selected === sendTypes.send"
                 name="Email"
                 :rules="{
-                  required: selected === 'send' ? true : false,
+                  required: selected === sendTypes.send ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
@@ -137,7 +137,7 @@
               </b-col>
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
-                  {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+                  {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }}
                 </b-button>
               </b-col>
             </b-row>
@@ -151,6 +151,7 @@
 </template>
 <script>
 import { BIcon } from 'bootstrap-vue'
+import { SEND_TYPES } from '@/pages/Send.vue'
 
 export default {
   name: 'TransactionForm',
@@ -170,7 +171,7 @@ export default {
         memo: '',
         amountValue: 0.0,
       },
-      selected: 'send',
+      selected: SEND_TYPES.send,
     }
   },
   methods: {
@@ -204,6 +205,9 @@ export default {
     isBalanceDisabled() {
       return this.balance <= 0 ? 'disabled' : false
     },
+    sendTypes() {
+      return SEND_TYPES
+    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 786624045..e9cf3442f 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -71,6 +71,11 @@ const EMPTY_TRANSACTION_DATA = {
   memo: '',
 }
 
+export const SEND_TYPES = {
+  send: 'send',
+  link: 'link',
+}
+
 export default {
   name: 'Send',
   components: {
@@ -108,10 +113,10 @@ export default {
     setTransaction(data) {
       this.transactionData = { ...data }
       switch (data.selected) {
-        case 'send':
+        case SEND_TYPES.send:
           this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationSend
           break
-        case 'link':
+        case SEND_TYPES.link:
           this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationLink
           break
       }
@@ -120,7 +125,7 @@ export default {
       this.loading = true
       this.error = false
       switch (this.transactionData.selected) {
-        case 'send':
+        case SEND_TYPES.send:
           this.$apollo
             .mutate({
               mutation: sendCoins,
@@ -137,7 +142,7 @@ export default {
               this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError
             })
           break
-        case 'link':
+        case SEND_TYPES.link:
           this.$apollo
             .mutate({
               mutation: createTransactionLink,

From 0566cdb4f5ec963cc7b678981cdedff5a2e6de22 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 18:00:00 +0100
Subject: [PATCH 57/72] tests for Send.spec.js

---
 frontend/src/components/ClipboardCopy.vue     |   4 +-
 .../TransactionConfirmationLink.spec.js       |   1 -
 .../GddSend/TransactionConfirmationLink.vue   |   8 +-
 .../TransactionConfirmationSend.spec.js       |   1 -
 .../GddSend/TransactionConfirmationSend.vue   |   6 +-
 frontend/src/mixins/toaster.js                |   2 +-
 frontend/src/pages/Send.spec.js               | 152 +++++++++++++-----
 7 files changed, 119 insertions(+), 55 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 239eddfb7..b952dbd8c 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -28,8 +28,8 @@ export default {
         .then(() => {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
-        .catch((err) => {
-          this.toastError(this.$t('gdd_per_link.not-copied', { err }))
+        .catch(() => {
+          this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },
   },
diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js b/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
index 9aa74b574..a28c2d185 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
@@ -11,7 +11,6 @@ describe('GddSend confirm', () => {
     $i18n: {
       locale: jest.fn(() => 'en'),
     },
-    $n: jest.fn((n) => String(n)),
   }
 
   const propsData = {
diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index f357ea654..b8bc2700a 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -4,7 +4,7 @@
       <b-col class="text-right mt-4 mb-3">
         <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
 
-        <h1>− {{ $n(amount, 'decimal') }} GDD</h1>
+        <h1>{{ (amount * -1) | GDD }}</h1>
         <b class="mt-2">{{ memo }}</b>
       </b-col>
     </b-row>
@@ -20,7 +20,7 @@
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right">
-          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
+          <strong>{{ (amount * -1) | GDD }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
@@ -28,12 +28,12 @@
           <strong>Vergänglichkeit für 14 Tage</strong>
         </b-col>
         <b-col class="text-right borderbottom">
-          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
+          <strong>~ {{ (amount * 0.028 * -1) | GDD }}</strong>
         </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 - amount * 0.028, 'decimal') }}</b-col>
+        <b-col class="text-right">~ {{ (balance - amount - amount * 0.028) | GDD }}</b-col>
       </b-row>
     </b-container>
 
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
index a0e334ae5..38dd82866 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
@@ -11,7 +11,6 @@ describe('GddSend confirm', () => {
     $i18n: {
       locale: jest.fn(() => 'en'),
     },
-    $n: jest.fn((n) => String(n)),
   }
 
   const propsData = {
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index 0bfff3ddb..98cc3b4d8 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -18,7 +18,7 @@
               <div class="m-1 mt-2">GDD</div>
             </b-input-group-prepend>
 
-            <div class="p-3">− {{ $n(amount, 'decimal') }} GDD</div>
+            <div class="p-3">{{ (amount * -1) | GDD }}</div>
           </b-input-group>
 
           <br />
@@ -44,12 +44,12 @@
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right borderbottom">
-          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
+          <strong>{{ (amount * -1) | GDD }}</strong>
         </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, 'decimal') }}</b-col>
+        <b-col class="text-right">{{ (balance - amount) | GDD }}</b-col>
       </b-row>
     </b-container>
 
diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 4464a2cc9..68fd78ff9 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -13,7 +13,7 @@ export const toasters = {
       })
     },
     toast(message, options) {
-      message = message.replace(/^GraphQL error: /, '')
+      if (message.replace) message = message.replace(/^GraphQL error: /, '')
       this.$bvToast.toast(message, {
         autoHideDelay: 5000,
         appendToast: true,
diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 24f29ee6b..f7d53a511 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -1,12 +1,16 @@
 import { mount } from '@vue/test-utils'
 import Send from './Send'
-import { toastErrorSpy } from '../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
+import { TRANSACTION_STEPS } from '@/components/GddSend.vue'
+import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
 
-const sendCoinsMock = jest.fn()
-sendCoinsMock.mockResolvedValue('success')
+const apolloMutationMock = jest.fn()
+apolloMutationMock.mockResolvedValue('success')
 
-const createTransactionLinkMock = jest.fn()
-createTransactionLinkMock.mockResolvedValue('error')
+const navigatorClipboardMock = jest.fn()
+
+// const createTransactionLinkMock = jest.fn()
+// createTransactionLinkMock.mockRejectedValue({ message: 'OOPS' })
 
 const localVue = global.localVue
 
@@ -20,6 +24,7 @@ describe('Send', () => {
     GdtBalance: 1234.56,
     transactions: [{ balance: 0.1 }],
     pending: true,
+    currentTransactionStep: TRANSACTION_STEPS.transactionConfirmationSend,
   }
 
   const mocks = {
@@ -31,7 +36,7 @@ describe('Send', () => {
       },
     },
     $apollo: {
-      mutate: sendCoinsMock,
+      mutate: apolloMutationMock,
     },
   }
 
@@ -49,7 +54,7 @@ describe('Send', () => {
     })
 
     /* SEND */
-    describe('transaction form', () => {
+    describe('transaction form send', () => {
       beforeEach(async () => {
         wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
           email: 'user@example.org',
@@ -66,7 +71,7 @@ describe('Send', () => {
     describe('confirm transaction if selected:send', () => {
       beforeEach(() => {
         wrapper.setData({
-          currentTransactionStep: 1,
+          currentTransactionStep: TRANSACTION_STEPS.transactionConfirmationSend,
           transactionData: {
             email: 'user@example.org',
             amount: 23.45,
@@ -96,8 +101,9 @@ describe('Send', () => {
         })
 
         it('calls the API when send-transaction is emitted', async () => {
-          expect(sendCoinsMock).toBeCalledWith(
+          expect(apolloMutationMock).toBeCalledWith(
             expect.objectContaining({
+              mutation: sendCoins,
               variables: {
                 email: 'user@example.org',
                 amount: 23.45,
@@ -113,7 +119,7 @@ describe('Send', () => {
           expect(wrapper.emitted('update-balance')).toEqual([[23.45]])
         })
 
-        it('shows the succes page', () => {
+        it('shows the success page', () => {
           expect(wrapper.find('div.card-body').text()).toContain('form.send_transaction_success')
         })
       })
@@ -121,7 +127,7 @@ describe('Send', () => {
       describe('transaction is confirmed and server response is error', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          sendCoinsMock.mockRejectedValue({ message: 'recipient not known' })
+          apolloMutationMock.mockRejectedValue({ message: 'recipient not known' })
           await wrapper
             .findComponent({ name: 'TransactionConfirmationSend' })
             .vm.$emit('send-transaction')
@@ -142,51 +148,111 @@ describe('Send', () => {
     })
 
     /* LINK */
-    describe('transaction form', () => {
+
+    describe('transaction form link', () => {
       beforeEach(async () => {
-        wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
-          amount: 23.45,
-          memo: 'Make the best of it!',
+        apolloMutationMock.mockResolvedValue({
+          data: { createTransactionLink: { code: '0123456789' } },
+        })
+        await wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
+          amount: 56.78,
+          memo: 'Make the best of it link!',
           selected: 'link',
         })
       })
       it('steps forward in the dialog', () => {
         expect(wrapper.findComponent({ name: 'TransactionConfirmationLink' }).exists()).toBe(true)
       })
-    })
 
-    describe('send apollo if transaction link with error', () => {
-      beforeEach(() => {
-        createTransactionLinkMock.mockRejectedValue({ message: 'OUCH!' })
-        wrapper = Wrapper()
-        wrapper.find('button.btn-success').trigger('click')
-      })
+      describe('transaction is confirmed and server response is success', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper
+            .findComponent({ name: 'TransactionConfirmationLink' })
+            .vm.$emit('send-transaction')
+        })
 
-      it('toasts an error message', () => {
-        expect(toastErrorSpy).toBeCalledWith('unregister_mail.error')
-      })
-    })
+        it('calls the API when send-transaction is emitted', async () => {
+          expect(apolloMutationMock).toBeCalledWith(
+            expect.objectContaining({
+              mutation: createTransactionLink,
+              variables: {
+                amount: 56.78,
+                memo: 'Make the best of it link!',
+              },
+            }),
+          )
+        })
 
-    describe('confirm transaction if selected:link', () => {
-      beforeEach(() => {
-        wrapper.setData({
-          currentTransactionStep: 1,
-          transactionData: {
-            amount: 23.45,
-            memo: 'Make the best of it!',
-            selected: 'link',
-          },
+        it.skip('emits update-balance', () => {
+          expect(wrapper.emitted('update-balance')).toBeTruthy()
+          expect(wrapper.emitted('update-balance')).toEqual([[56.78]])
+        })
+
+        it('find components ClipBoard', () => {
+          expect(wrapper.findComponent({ name: 'ClipboardCopy' }).exists()).toBe(true)
+        })
+
+        it('shows the success message', () => {
+          expect(wrapper.find('div.card-body').text()).toContain('gdd_per_link.created')
+        })
+
+        it('shows the close button', () => {
+          expect(wrapper.find('div.card-body').text()).toContain('form.close')
+        })
+
+        describe('Copy link to Clipboard', () => {
+          const navigatorClipboard = navigator.clipboard
+          beforeAll(() => {
+            delete navigator.clipboard
+            navigator.clipboard = { writeText: navigatorClipboardMock }
+          })
+          afterAll(() => {
+            navigator.clipboard = navigatorClipboard
+          })
+
+          describe('copy with success', () => {
+            beforeEach(async () => {
+              navigatorClipboardMock.mockResolvedValue()
+              await wrapper.findAll('button').at(0).trigger('click')
+            })
+
+            it('toasts success message', () => {
+              expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
+            })
+          })
+
+          describe('copy with error', () => {
+            beforeEach(async () => {
+              navigatorClipboardMock.mockRejectedValue()
+              await wrapper.findAll('button').at(0).trigger('click')
+            })
+
+            it('toasts error message', () => {
+              expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
+            })
+          })
+        })
+
+        describe('close button click', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('button').at(1).trigger('click')
+          })
+
+          it('Shows the TransactionForm', () => {
+            expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBe(true)
+          })
         })
       })
 
-      it('resets the transaction process when on-reset is emitted', async () => {
-        await wrapper.findComponent({ name: 'TransactionConfirmationSend' }).vm.$emit('on-reset')
-        expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBeTruthy()
-        expect(wrapper.vm.transactionData).toEqual({
-          email: '',
-          amount: 23.45,
-          memo: 'Make the best of it!',
-          selected: 'link',
+      describe('send apollo if transaction link with error', () => {
+        beforeEach(() => {
+          apolloMutationMock.mockRejectedValue({ message: 'OUCH!' })
+          wrapper.find('button.btn-success').trigger('click')
+        })
+
+        it('toasts an error message', () => {
+          expect(toastErrorSpy).toBeCalledWith({ message: 'OUCH!' })
         })
       })
     })

From 2cf6160718ed31ba8c781dcb1ec7b970eec3fe5d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 21:13:50 +0100
Subject: [PATCH 58/72] unused selected remove, add locales

---
 .../src/components/GddSend/TransactionConfirmationLink.vue    | 4 ++--
 .../src/components/GddSend/TransactionConfirmationSend.vue    | 2 +-
 frontend/src/locales/de.json                                  | 1 +
 frontend/src/locales/en.json                                  | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index b8bc2700a..18eb0f25d 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -25,7 +25,7 @@
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">
-          <strong>Vergänglichkeit für 14 Tage</strong>
+          <strong>{{ $t('gdd_per_link.decay-14-day') }}</strong>
         </b-col>
         <b-col class="text-right borderbottom">
           <strong>~ {{ (amount * 0.028 * -1) | GDD }}</strong>
@@ -43,7 +43,7 @@
       </b-col>
       <b-col class="text-right">
         <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
-          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+          {{ $t('form.generate_now') }}
         </b-button>
       </b-col>
     </b-row>
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index 98cc3b4d8..e05d42269 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -59,7 +59,7 @@
       </b-col>
       <b-col class="text-right">
         <b-button variant="success" :disabled="loading" @click="$emit('send-transaction')">
-          {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+          {{ $t('form.send_now') }}
         </b-button>
       </b-col>
     </b-row>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ac7187318..f54797497 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -106,6 +106,7 @@
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "not-copied": "Konnte den Link ncht kopieren: {err}",
+    "decay-14-day":"Vergänglichkeit für 14 Tage",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 7ec2d5100..ace517614 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -106,6 +106,7 @@
     "header": "Send Gradidos by link",
     "link-copied": "Link copied to clipboard",
     "not-copied": "Could not copy link: {err}",
+    "decay-14-day":"Decay for 14 days",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",

From 4299f270e0c91eb57a52fcd5304417417bc6c0c8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 21:14:49 +0100
Subject: [PATCH 59/72] yarn locales --fix

---
 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 f54797497..4f85f876c 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -103,10 +103,10 @@
   "gdd_per_link": {
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
+    "decay-14-day": "Vergänglichkeit für 14 Tage",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "not-copied": "Konnte den Link ncht kopieren: {err}",
-    "decay-14-day":"Vergänglichkeit für 14 Tage",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ace517614..c183baf6b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -103,10 +103,10 @@
   "gdd_per_link": {
     "copy": "copy",
     "created": "Link Is Created!",
+    "decay-14-day": "Decay for 14 days",
     "header": "Send Gradidos by link",
     "link-copied": "Link copied to clipboard",
     "not-copied": "Could not copy link: {err}",
-    "decay-14-day":"Decay for 14 days",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",

From a1fdc62ea7330672ead45944fec8d8bd271eaad3 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:06:39 +0100
Subject: [PATCH 60/72] 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 c183baf6b..f97ee1d90 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -111,7 +111,7 @@
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
     "sentence_4": "Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",
-    "sentence_5": "The transience amount will be borne by you and will be added to your amount for the maximum validity. However, you will only be charged the amount as transience depending on how many days have passed until the link is redeemed. The remaining amount will be refunded to you."
+    "sentence_5": "The decay amount will be blocked for your account for the whole duration of the link. However, you will only be charged the amount of decay for the time which has actually passed until the link is redeemed. The remaining amount will then be available to your account again."
   },
   "gdt": {
     "action": "Action",

From 496aec4fb9c8d66ad8b2148ee52cdfd2bea780fe Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:07:04 +0100
Subject: [PATCH 61/72] Update frontend/src/pages/Send.spec.js

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 frontend/src/pages/Send.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index f7d53a511..90d91a48c 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -9,9 +9,6 @@ apolloMutationMock.mockResolvedValue('success')
 
 const navigatorClipboardMock = jest.fn()
 
-// const createTransactionLinkMock = jest.fn()
-// createTransactionLinkMock.mockRejectedValue({ message: 'OOPS' })
-
 const localVue = global.localVue
 
 // window.scrollTo = jest.fn()

From 32b22618147a61d84ec35058798d01d3ec3cc4c5 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:07:22 +0100
Subject: [PATCH 62/72] 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 4f85f876c..46666df26 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -106,7 +106,7 @@
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
-    "not-copied": "Konnte den Link ncht kopieren: {err}",
+    "not-copied": "Konnte den Link nicht kopieren: {err}",
     "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",

From e2bbb7bb38109b7867c8e762e3f3796de1ef383b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:07:32 +0100
Subject: [PATCH 63/72] 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 46666df26..580e2963d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -107,7 +107,7 @@
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "not-copied": "Konnte den Link nicht kopieren: {err}",
-    "sentence_1": "Wähle einen Betrag, aus welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
     "sentence_4": "Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",

From 9ee97c02bf67376951535227f1ee50aed420974a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:07:45 +0100
Subject: [PATCH 64/72] 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 580e2963d..1579be679 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -110,7 +110,7 @@
     "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
-    "sentence_4": "Wer den Link klick aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
+    "sentence_4": "Wer den Link aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
     "sentence_5": "Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Der Restbetrag wird dir wieder zurückerstattet."
   },
   "gdt": {

From a7aabc325c50a2157059f2fb3176965161281ca8 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:08:00 +0100
Subject: [PATCH 65/72] 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 1579be679..94b1e8eb0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -111,7 +111,7 @@
     "sentence_2": "Der Link ist 14 Tage gültig!",
     "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.",
     "sentence_4": "Wer den Link aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.",
-    "sentence_5": "Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Der Restbetrag wird dir wieder zurückerstattet."
+    "sentence_5": "Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Bis zum Einlösen wird die Vergänglichkeit für den gesamten Zeitraum der Gültigkeit vorgehalten."
   },
   "gdt": {
     "action": "Aktion",

From 1d9b4297dee897513f8da7be2aad9ee3916f8710 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:08:18 +0100
Subject: [PATCH 66/72] 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 f97ee1d90..0db361cfd 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -102,7 +102,7 @@
   },
   "gdd_per_link": {
     "copy": "copy",
-    "created": "Link Is Created!",
+    "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
     "header": "Send Gradidos by link",
     "link-copied": "Link copied to clipboard",

From 32602cbbeb1b37970631616ed2d9b657ebd28b06 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:08:30 +0100
Subject: [PATCH 67/72] 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 0db361cfd..837a17c74 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -104,7 +104,7 @@
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
-    "header": "Send Gradidos by link",
+    "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "not-copied": "Could not copy link: {err}",
     "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",

From 0191c398526b0b415d94df35ef4011d919410038 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:08:48 +0100
Subject: [PATCH 68/72] 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 837a17c74..f78f72cd9 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -107,7 +107,7 @@
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "not-copied": "Could not copy link: {err}",
-    "sentence_1": "Select an amount that you would like to send via a link. You can also enter a message. Click 'Generate now' to create a link that you can send.",
+    "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
     "sentence_4": "Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",

From 0fed52eda80d04d4a4a61ba1b15fe4605a3dd3cb Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:09:04 +0100
Subject: [PATCH 69/72] 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 f78f72cd9..ec0f35498 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -110,7 +110,7 @@
     "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
     "sentence_2": "The link is valid for 14 days!",
     "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
-    "sentence_4": "Whoever activates the link will receive the payment from your account. If you are not yet a member of Gradido, you will be guided through the registration process and will get the GDD amount credited to your account after registration / confirmation of your Gradido account.",
+    "sentence_4": "Whoever activates the link will receive the payment from your account. If the recipient is not yet a member of Gradido, he will be guided through the registration process and will get the GDD amount credited after registration / confirmation of the newly created Gradido account.",
     "sentence_5": "The decay amount will be blocked for your account for the whole duration of the link. However, you will only be charged the amount of decay for the time which has actually passed until the link is redeemed. The remaining amount will then be available to your account again."
   },
   "gdt": {

From bde3e3bff66aa65db2713f78e3d3ba3255fb0aba Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:09:23 +0100
Subject: [PATCH 70/72] 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 ec0f35498..685ca499f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -109,7 +109,7 @@
     "not-copied": "Could not copy link: {err}",
     "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
     "sentence_2": "The link is valid for 14 days!",
-    "sentence_3": "If the link is not called up within the 14-day period, it will be deleted automatically. The amount will then be credited to your account.",
+    "sentence_3": "If the link is not redeemed within the 14-day validity period, it will be invalidated automatically. The amount will then be available to your account again.",
     "sentence_4": "Whoever activates the link will receive the payment from your account. If the recipient is not yet a member of Gradido, he will be guided through the registration process and will get the GDD amount credited after registration / confirmation of the newly created Gradido account.",
     "sentence_5": "The decay amount will be blocked for your account for the whole duration of the link. However, you will only be charged the amount of decay for the time which has actually passed until the link is redeemed. The remaining amount will then be available to your account again."
   },

From f31ab4135406b7e5f281041c636849abdedf0bd3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 22:19:15 +0100
Subject: [PATCH 71/72] use SEND_TYPE for selected

---
 frontend/src/pages/Send.spec.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 90d91a48c..cc18bed59 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import Send from './Send'
+import Send, { SEND_TYPES } from './Send'
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 import { TRANSACTION_STEPS } from '@/components/GddSend.vue'
 import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
@@ -11,8 +11,6 @@ const navigatorClipboardMock = jest.fn()
 
 const localVue = global.localVue
 
-// window.scrollTo = jest.fn()
-
 describe('Send', () => {
   let wrapper
 
@@ -57,7 +55,7 @@ describe('Send', () => {
           email: 'user@example.org',
           amount: 23.45,
           memo: 'Make the best of it!',
-          selected: 'send',
+          selected: SEND_TYPES.send,
         })
       })
       it('steps forward in the dialog', () => {
@@ -65,7 +63,7 @@ describe('Send', () => {
       })
     })
 
-    describe('confirm transaction if selected:send', () => {
+    describe('confirm transaction if selected: SEND_TYPES.send', () => {
       beforeEach(() => {
         wrapper.setData({
           currentTransactionStep: TRANSACTION_STEPS.transactionConfirmationSend,
@@ -73,7 +71,7 @@ describe('Send', () => {
             email: 'user@example.org',
             amount: 23.45,
             memo: 'Make the best of it!',
-            selected: 'send',
+            selected: SEND_TYPES.send,
           },
         })
       })
@@ -85,7 +83,7 @@ describe('Send', () => {
           email: 'user@example.org',
           amount: 23.45,
           memo: 'Make the best of it!',
-          selected: 'send',
+          selected: SEND_TYPES.send,
         })
       })
 
@@ -105,7 +103,7 @@ describe('Send', () => {
                 email: 'user@example.org',
                 amount: 23.45,
                 memo: 'Make the best of it!',
-                selected: 'send',
+                selected: SEND_TYPES.send,
               },
             }),
           )
@@ -154,7 +152,7 @@ describe('Send', () => {
         await wrapper.findComponent({ name: 'TransactionForm' }).vm.$emit('set-transaction', {
           amount: 56.78,
           memo: 'Make the best of it link!',
-          selected: 'link',
+          selected: SEND_TYPES.link,
         })
       })
       it('steps forward in the dialog', () => {

From 0aef35c7b2e0b486ebd71626a3cbc1adc1ac9c5c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 22:34:17 +0100
Subject: [PATCH 72/72] review fixed

---
 .../components/GddSend/TransactionResultLink.vue | 11 ++++-------
 .../GddSend/TransactionResultSendSuccess.vue     |  9 ---------
 frontend/src/graphql/mutations.js                |  8 --------
 frontend/src/graphql/queries.js                  |  2 --
 frontend/src/pages/Send.vue                      | 16 ++++------------
 .../pages/ShowTransactionLinkInformations.vue    |  1 -
 6 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 5170423bb..66b5529d6 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -5,7 +5,7 @@
         <b-card class="p-0 gradido-custom-background">
           <div class="p-4">
             <div class="h3 mb-5">{{ $t('gdd_per_link.created') }}</div>
-            <clipboard-copy :code="linkResult.code" />
+            <clipboard-copy :code="code" />
           </div>
           <p class="text-center mt-3">
             <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
@@ -24,12 +24,9 @@ export default {
     ClipboardCopy,
   },
   props: {
-    linkResult: {
-      type: Object,
-      required: false,
-      default() {
-        return {}
-      },
+    code: {
+      type: String,
+      required: true,
     },
   },
 }
diff --git a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
index 7e4400025..74bb6963a 100644
--- a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
@@ -19,14 +19,5 @@
 <script>
 export default {
   name: 'TransactionResultSend',
-  props: {
-    linkResult: {
-      type: Object,
-      required: false,
-      default() {
-        return {}
-      },
-    },
-  },
 }
 </script>
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index d25f033a8..d4bf8c1da 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -66,14 +66,6 @@ export const createTransactionLink = gql`
   mutation($amount: Decimal!, $memo: String!) {
     createTransactionLink(amount: $amount, memo: $memo) {
       code
-      id
-      validUntil
-      user {
-        email
-      }
-      memo
-      createdAt
-      validUntil
     }
   }
 `
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 457514d18..4a7051bdf 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -136,9 +136,7 @@ export const queryTransactionLink = gql`
       createdAt
       validUntil
       user {
-        email
         firstName
-        lastName
         publisherId
       }
     }
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index e9cf3442f..89eb1bbe2 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -30,10 +30,7 @@
           ></transaction-confirmation-link>
         </template>
         <template #transactionResultSendSuccess>
-          <transaction-result-send-success
-            :linkResult="linkResult"
-            @on-reset="onReset"
-          ></transaction-result-send-success>
+          <transaction-result-send-success @on-reset="onReset"></transaction-result-send-success>
         </template>
         <template #transactionResultSendError>
           <transaction-result-send-error
@@ -43,12 +40,7 @@
           ></transaction-result-send-error>
         </template>
         <template #transactionResultLink>
-          <transaction-result-link
-            :linkResult="linkResult"
-            :error="error"
-            :errorResult="errorResult"
-            @on-reset="onReset"
-          ></transaction-result-link>
+          <transaction-result-link :code="code" @on-reset="onReset"></transaction-result-link>
         </template>
       </gdd-send>
       <hr />
@@ -94,7 +86,7 @@ export default {
       errorResult: '',
       currentTransactionStep: TRANSACTION_STEPS.transactionForm,
       loading: false,
-      linkResult: {},
+      code: null,
     }
   },
   props: {
@@ -149,7 +141,7 @@ export default {
               variables: { amount: this.transactionData.amount, memo: this.transactionData.memo },
             })
             .then((result) => {
-              this.linkResult = result.data.createTransactionLink
+              this.code = result.data.createTransactionLink.code
               this.currentTransactionStep = TRANSACTION_STEPS.transactionResultLink
             })
             .catch((error) => {
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index d99ef29bb..eb9e5a1e4 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -28,7 +28,6 @@ export default {
       displaySetup: {
         user: {
           firstName: '',
-          lastName: '',
         },
       },
     }