From 386279a1cb39efcb396324f6e23ca88f16730f0c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 13:12:43 +0100
Subject: [PATCH 01/64] show tranaction link information page

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

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index eb9e5a1e4..583da31f8 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,21 +1,33 @@
 <template>
   <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">
-          <p class="h1">
+    <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
+    <b-container class="pt-5">
+      <div>
+        <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+          <h1>
             {{ displaySetup.user.firstName }}
             {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
-          </p>
-          <p class="h4">{{ displaySetup.memo }}</p>
-          <hr />
-          <b-button v-if="displaySetup.linkTo" :to="displaySetup.linkTo">
-            {{ $t('transaction-link.button') }}
-          </b-button>
-        </div>
-      </b-container>
-    </div>
+          </h1>
+        </b-jumbotron>
+      </div>
+
+      <div>
+        <b-jumbotron>
+          <div class="mb-6"><h2>Einlösen</h2></div>
+
+          <b-row>
+            <b-col col sm="12" md="6">
+              <p>Du hast noch kein Gradido Konto</p>
+              <b-button variant="primary" to="/register">Registriere ein neues Konto</b-button>
+            </b-col>
+            <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
+              <p>Du hast einen Gradido Konto</p>
+              <b-button variant="info" to="/login">Log dich ein</b-button>
+            </b-col>
+          </b-row>
+        </b-jumbotron>
+      </div>
+    </b-container>
   </div>
 </template>
 <script>
@@ -25,6 +37,7 @@ export default {
   name: 'ShowTransactionLinkInformations',
   data() {
     return {
+      img: '/img/brand/green.png',
       displaySetup: {
         user: {
           firstName: '',

From b7825ea72bad0568ed98137736da3400097bcb2a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 14:07:02 +0100
Subject: [PATCH 02/64] add memo to show transaction information

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

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 583da31f8..f497cd869 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -8,6 +8,7 @@
             {{ displaySetup.user.firstName }}
             {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
           </h1>
+          <b>{{ displaySetup.memo }}</b>
         </b-jumbotron>
       </div>
 

From d046dbc7a6b46be4eb42197d5215b500c3f5feba Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 14:20:53 +0100
Subject: [PATCH 03/64] add locales for transaction link information

---
 frontend/src/locales/de.json                       |  7 ++++++-
 frontend/src/locales/en.json                       |  7 ++++++-
 .../src/pages/ShowTransactionLinkInformations.vue  | 14 +++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1790af454..ea912e0a8 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,7 +101,12 @@
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
     "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.",
+    "redeem":"Einlösen",
+    "no-account":"Du hast noch kein Gradido Konto",
+    "to-register":"Registriere ein neues Konto",
+    "has-account":"Du hast einen Gradido Konto",
+    "to-login":"Log dich ein"
   },
   "gdt": {
     "calculation": "Berechnung der GradidoTransform",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d39aea683..258ff021d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -101,7 +101,12 @@
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
     "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_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.",
+    "redeem": "Redeem",
+    "no-account": "You don't have a Gradido account yet",
+    "to-register": "Register a new account",
+    "has-account": "You have a Gradido account",
+    "to-login": "Log in"
   },
   "gdt": {
     "calculation": "Calculation of GradidoTransform",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index f497cd869..c8017ab41 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -14,16 +14,20 @@
 
       <div>
         <b-jumbotron>
-          <div class="mb-6"><h2>Einlösen</h2></div>
+          <div class="mb-6">
+            <h2>{{ $t('gdd_per_link.redeem') }}</h2>
+          </div>
 
           <b-row>
             <b-col col sm="12" md="6">
-              <p>Du hast noch kein Gradido Konto</p>
-              <b-button variant="primary" to="/register">Registriere ein neues Konto</b-button>
+              <p>{{ $t('gdd_per_link.no-account') }}</p>
+              <b-button variant="primary" to="/register">
+                {{ $t('gdd_per_link.to-register') }}
+              </b-button>
             </b-col>
             <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
-              <p>Du hast einen Gradido Konto</p>
-              <b-button variant="info" to="/login">Log dich ein</b-button>
+              <p>{{ $t('gdd_per_link.has-account') }}</p>
+              <b-button variant="info" to="/login">{{ $t('gdd_per_link.to-login') }}</b-button>
             </b-col>
           </b-row>
         </b-jumbotron>

From 5dc1d1e67cb01d4cc81e161ce8b3574e83b3a02d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 08:31:32 +0100
Subject: [PATCH 04/64] add id to query queryTransactionLink, add locales for
 redeem amount, check auth

---
 frontend/src/graphql/queries.js               |  2 ++
 frontend/src/locales/de.json                  |  1 +
 frontend/src/locales/en.json                  |  1 +
 .../pages/ShowTransactionLinkInformations.vue | 35 ++++++++++++++++++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 141dc8651..503489e86 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -132,6 +132,7 @@ export const communities = gql`
 export const queryTransactionLink = gql`
   query($code: String!) {
     queryTransactionLink(code: $code) {
+      id
       amount
       memo
       createdAt
@@ -139,6 +140,7 @@ export const queryTransactionLink = gql`
       user {
         firstName
         publisherId
+        id
       }
     }
   }
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c410c7b2b..9313f3f30 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -107,6 +107,7 @@
     "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.",
     "redeem":"Einlösen",
+    "redeem-text":"Willst du den Betrag jetzt einlösen?",
     "no-account":"Du hast noch kein Gradido Konto",
     "to-register":"Registriere ein neues Konto",
     "has-account":"Du hast einen Gradido Konto",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index b2994b76b..1280f61a5 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -107,6 +107,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.",
     "redeem": "Redeem",
+    "redeem-text":"Do you want to redeem the amount now?",
     "no-account": "You don't have a Gradido account yet",
     "to-register": "Register a new account",
     "has-account": "You have a Gradido account",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index c8017ab41..d81efefe5 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -2,6 +2,7 @@
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="pt-5">
+      displaySetup : {{displaySetup}} 
       <div>
         <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
           <h1>
@@ -12,7 +13,19 @@
         </b-jumbotron>
       </div>
 
-      <div>
+      <div v-if="$store.state.token">
+        <b-jumbotron>
+          <div class="mb-3 text-center">
+             
+            
+              <b-button variant="primary" to="/register" size="lg">
+                {{ $t('gdd_per_link.redeem') }}
+              </b-button>
+          </div>
+        </b-jumbotron>
+      </div>
+
+      <div v-else>
         <b-jumbotron>
           <div class="mb-6">
             <h2>{{ $t('gdd_per_link.redeem') }}</h2>
@@ -67,9 +80,29 @@ export default {
           this.toastError(error)
         })
     },
+    redeemLink() {
+      this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
+        if (value)
+          await this.$apollo
+            .mutate({
+              mutation: deleteTransactionLink,
+              variables: {
+                id: this.id,
+              },
+            })
+            .then(() => {
+              this.toastSuccess(this.$t('gdd_per_link.deleted'))
+              this.$emit('reset-transaction-link-list')
+            })
+            .catch((err) => {
+              this.toastError(err.message)
+            })
+      })
+    },
   },
   created() {
     this.setTransactionLinkInformation()
+    console.log(this)
   },
 }
 </script>

From ddc036dd3410f418fc3218b87ace0efdd434b119 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 08:34:44 +0100
Subject: [PATCH 05/64] add @/graphql/mutations redeemTransactionLink, add
 function redeemLink

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

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index d81efefe5..c70ac6f3a 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -50,6 +50,7 @@
 </template>
 <script>
 import { queryTransactionLink } from '@/graphql/queries'
+import { redeemTransactionLink } from '@/graphql/mutations'
 
 export default {
   name: 'ShowTransactionLinkInformations',
@@ -85,7 +86,7 @@ export default {
         if (value)
           await this.$apollo
             .mutate({
-              mutation: deleteTransactionLink,
+              mutation: redeemTransactionLink,
               variables: {
                 id: this.id,
               },

From 6be14e83b737c2a69487fbb2e299b20c4303ba54 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 09:05:01 +0100
Subject: [PATCH 06/64] add no redeem - You can't redeem your own link!

---
 frontend/src/graphql/queries.js               |  2 +-
 frontend/src/locales/de.json                  |  1 +
 frontend/src/locales/en.json                  |  1 +
 .../pages/ShowTransactionLinkInformations.vue | 20 +++++++++++++------
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 503489e86..a6005d5c8 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -140,7 +140,7 @@ export const queryTransactionLink = gql`
       user {
         firstName
         publisherId
-        id
+        email
       }
     }
   }
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 9313f3f30..d3bf16157 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -108,6 +108,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.",
     "redeem":"Einlösen",
     "redeem-text":"Willst du den Betrag jetzt einlösen?",
+    "no-redeem":"Du kannst deinen eigenen Link nicht einlösen!",
     "no-account":"Du hast noch kein Gradido Konto",
     "to-register":"Registriere ein neues Konto",
     "has-account":"Du hast einen Gradido Konto",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1280f61a5..844d9a5f2 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -108,6 +108,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.",
     "redeem": "Redeem",
     "redeem-text":"Do you want to redeem the amount now?",
+    "no-redeem":"You can't redeem your own link!",
     "no-account": "You don't have a Gradido account yet",
     "to-register": "Register a new account",
     "has-account": "You have a Gradido account",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index c70ac6f3a..67db48ab3 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -2,7 +2,10 @@
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="pt-5">
-      displaySetup : {{displaySetup}} 
+      <!-- store: {{ $store.state }}
+      <hr />
+      displaySetup : {{ displaySetup }}
+      -->
       <div>
         <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
           <h1>
@@ -16,11 +19,10 @@
       <div v-if="$store.state.token">
         <b-jumbotron>
           <div class="mb-3 text-center">
-             
-            
-              <b-button variant="primary" to="/register" size="lg">
-                {{ $t('gdd_per_link.redeem') }}
-              </b-button>
+            <b-button :disabled="disabled" variant="primary" @click="redeemLink" size="lg">
+              {{ $t('gdd_per_link.redeem') }}
+            </b-button>
+            <div v-if="disabled" class="mt-3"><small>{{ $t('gdd_per_link.no-redeem') }}</small></div>
           </div>
         </b-jumbotron>
       </div>
@@ -101,6 +103,12 @@ export default {
       })
     },
   },
+  computed: {
+    disabled() {
+      return this.displaySetup.user.email === this.$store.state.email ? true : false
+      
+    },
+  },
   created() {
     this.setTransactionLinkInformation()
     console.log(this)

From e1f67df7944d4f7959c782bf87b276e6bd937eac Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 09:34:11 +0100
Subject: [PATCH 07/64] add redeem modal and start function redeemLink()

---
 frontend/src/graphql/mutations.js             |  6 +++++
 frontend/src/locales/de.json                  |  1 +
 frontend/src/locales/en.json                  |  1 +
 .../pages/ShowTransactionLinkInformations.vue | 24 +++++++++----------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 89721f02b..8db6dc079 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -75,3 +75,9 @@ export const deleteTransactionLink = gql`
     deleteTransactionLink(id: $id)
   }
 `
+
+export const redeemTransactionLink = gql`
+  mutation($id: Float!) {
+    redeemTransactionLink(id: $id)
+  }
+`
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d3bf16157..13df1c3da 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -104,6 +104,7 @@
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
+    "link-overview":"Linkübersicht",
     "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.",
     "redeem":"Einlösen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 844d9a5f2..a2315f021 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -104,6 +104,7 @@
     "link-copied": "Link copied to clipboard",
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
+    "link-overview":"Link overview",
     "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.",
     "redeem": "Redeem",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 67db48ab3..e855f2f2c 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -2,10 +2,6 @@
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="pt-5">
-      <!-- store: {{ $store.state }}
-      <hr />
-      displaySetup : {{ displaySetup }}
-      -->
       <div>
         <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
           <h1>
@@ -22,7 +18,12 @@
             <b-button :disabled="disabled" variant="primary" @click="redeemLink" size="lg">
               {{ $t('gdd_per_link.redeem') }}
             </b-button>
-            <div v-if="disabled" class="mt-3"><small>{{ $t('gdd_per_link.no-redeem') }}</small></div>
+            <div v-if="disabled" class="mt-3">
+              {{ $t('gdd_per_link.no-redeem') }}
+              <a to="/transactions" href="#!">
+                <b>{{ $t('gdd_per_link.link-overview') }}</b>
+              </a>
+            </div>
           </div>
         </b-jumbotron>
       </div>
@@ -90,12 +91,13 @@ export default {
             .mutate({
               mutation: redeemTransactionLink,
               variables: {
-                id: this.id,
+                id: this.displaySetup.id,
               },
             })
-            .then(() => {
-              this.toastSuccess(this.$t('gdd_per_link.deleted'))
-              this.$emit('reset-transaction-link-list')
+            .then((result) => {
+              alert(result.data.redeemTransactionLink)
+              // this.toastSuccess(this.$t('gdd_per_link.deleted'))
+              // this.$emit('reset-transaction-link-list')
             })
             .catch((err) => {
               this.toastError(err.message)
@@ -105,13 +107,11 @@ export default {
   },
   computed: {
     disabled() {
-      return this.displaySetup.user.email === this.$store.state.email ? true : false
-      
+      return this.displaySetup.user.email === this.$store.state.email
     },
   },
   created() {
     this.setTransactionLinkInformation()
-    console.log(this)
   },
 }
 </script>

From 37d7c9bf5381104618d44142d4794efee565be8e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:15:52 +0100
Subject: [PATCH 08/64] add show textbox for deleted link and redeemed link

---
 frontend/src/graphql/queries.js               |  2 +
 frontend/src/locales/de.json                  |  3 ++
 frontend/src/locales/en.json                  |  3 ++
 .../pages/ShowTransactionLinkInformations.vue | 47 +++++++++++++++++--
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index a6005d5c8..bd1955555 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -137,6 +137,8 @@ export const queryTransactionLink = gql`
       memo
       createdAt
       validUntil
+      redeemedAt
+      deletedAt
       user {
         firstName
         publisherId
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 13df1c3da..590858f53 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -105,6 +105,9 @@
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
     "link-overview":"Linkübersicht",
+    "link-invalid":"Der Link ist nicht mehr gültig.",
+    "link-deleted":"Der Link wurde gelöscht.",
+    "redeemed":"Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
     "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.",
     "redeem":"Einlösen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a2315f021..15dc65cfa 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -105,6 +105,9 @@
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
     "link-overview":"Link overview",
+    "link-invalid":"The link is no longer valid.",
+    "link-deleted":"The link has been deleted.",
+    "redeemed":"Successfully redeemed! Your account has been credited with {n} GDD.",
     "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.",
     "redeem": "Redeem",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index e855f2f2c..33bc50f43 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,8 +1,45 @@
 <template>
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
-    <b-container class="pt-5">
+    <b-container v-if="displaySetup.redeemedAt" class="pt-5">
+      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+        <div class="text-center">
+          <h1>
+            {{ $t('gdd_per_link.link-invalid') }}
+          </h1>
+        </div>
+      </b-jumbotron>
+      <div class="text-center">
+        <b-button to="/overview">{{ $t('back') }}</b-button>
+      </div>
+    </b-container>
+    <b-container v-else-if="displaySetup.deletedAt" class="pt-5">
+      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+        <div class="text-center">
+          <h1>
+            {{ $t('gdd_per_link.link-deleted') }}
+          </h1>
+        </div>
+      </b-jumbotron>
+      <div class="text-center">
+        <b-button to="/overview">{{ $t('back') }}</b-button>
+      </div>
+    </b-container>
+    <b-container v-else-if="redeemed" class="pt-5">
+      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+        <div class="text-center">
+          <h1>
+            {{ $t('gdd_per_link.redeemed', { n: displaySetup.amount }) }}
+          </h1>
+        </div>
+      </b-jumbotron>
+      <div class="text-center">
+        <b-button to="/overview">{{ $t('back') }}</b-button>
+      </div>
+    </b-container>
+    <b-container v-else class="pt-5">
       <div>
+        <div></div>
         <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
           <h1>
             {{ displaySetup.user.firstName }}
@@ -11,7 +48,6 @@
           <b>{{ displaySetup.memo }}</b>
         </b-jumbotron>
       </div>
-
       <div v-if="$store.state.token">
         <b-jumbotron>
           <div class="mb-3 text-center">
@@ -64,7 +100,9 @@ export default {
         user: {
           firstName: '',
         },
+        deletedAt: null,
       },
+      redeemed: null,
     }
   },
   methods: {
@@ -80,8 +118,8 @@ export default {
           this.displaySetup = result.data.queryTransactionLink
           this.$store.commit('publisherId', result.data.queryTransactionLink.user.publisherId)
         })
-        .catch((error) => {
-          this.toastError(error)
+        .catch(() => {
+          this.displaySetup.deletedAt = true
         })
     },
     redeemLink() {
@@ -95,6 +133,7 @@ export default {
               },
             })
             .then((result) => {
+              if (result) this.redeemed = true
               alert(result.data.redeemTransactionLink)
               // this.toastSuccess(this.$t('gdd_per_link.deleted'))
               // this.$emit('reset-transaction-link-list')

From 74d6096255e4f95a13c27de8002bbdbf09501bc0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:17:42 +0100
Subject: [PATCH 09/64] delete unused keys from locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 590858f53..ef808440d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -104,19 +104,19 @@
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
-    "link-overview":"Linkübersicht",
-    "link-invalid":"Der Link ist nicht mehr gültig.",
-    "link-deleted":"Der Link wurde gelöscht.",
-    "redeemed":"Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
+    "link-overview": "Linkübersicht",
+    "link-invalid": "Der Link ist nicht mehr gültig.",
+    "link-deleted": "Der Link wurde gelöscht.",
+    "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
     "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.",
-    "redeem":"Einlösen",
-    "redeem-text":"Willst du den Betrag jetzt einlösen?",
-    "no-redeem":"Du kannst deinen eigenen Link nicht einlösen!",
-    "no-account":"Du hast noch kein Gradido Konto",
-    "to-register":"Registriere ein neues Konto",
-    "has-account":"Du hast einen Gradido Konto",
-    "to-login":"Log dich ein"
+    "redeem": "Einlösen",
+    "redeem-text": "Willst du den Betrag jetzt einlösen?",
+    "no-redeem": "Du kannst deinen eigenen Link nicht einlösen!",
+    "no-account": "Du hast noch kein Gradido Konto",
+    "to-register": "Registriere ein neues Konto",
+    "has-account": "Du hast einen Gradido Konto",
+    "to-login": "Log dich ein"
   },
   "gdt": {
     "calculation": "Berechnung der GradidoTransform",
@@ -246,7 +246,6 @@
     "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen"
   },
   "transaction-link": {
-    "button": "einlösen",
     "send_you": "sendet dir"
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 15dc65cfa..230e7eb41 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -104,15 +104,15 @@
     "link-copied": "Link copied to clipboard",
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
-    "link-overview":"Link overview",
-    "link-invalid":"The link is no longer valid.",
-    "link-deleted":"The link has been deleted.",
-    "redeemed":"Successfully redeemed! Your account has been credited with {n} GDD.",
+    "link-overview": "Link overview",
+    "link-invalid": "The link is no longer valid.",
+    "link-deleted": "The link has been deleted.",
+    "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "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.",
     "redeem": "Redeem",
-    "redeem-text":"Do you want to redeem the amount now?",
-    "no-redeem":"You can't redeem your own link!",
+    "redeem-text": "Do you want to redeem the amount now?",
+    "no-redeem": "You can't redeem your own link!",
     "no-account": "You don't have a Gradido account yet",
     "to-register": "Register a new account",
     "has-account": "You have a Gradido account",
@@ -246,7 +246,6 @@
     "show_all": "View all <strong>{count}</strong> transactions."
   },
   "transaction-link": {
-    "button": "redeem",
     "send_you": "wants to send you"
   }
 }

From 63d9e9ab947adb89ce52afc52ec765bd2e625686 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:18:30 +0100
Subject: [PATCH 10/64] yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ef808440d..8052294f6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -100,23 +100,23 @@
     "delete-the-link": "Den Link löschen?",
     "deleted": "Der Link wurde gelöscht!",
     "expired": "Abgelaufen",
+    "has-account": "Du hast einen Gradido Konto",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
+    "link-deleted": "Der Link wurde gelöscht.",
+    "link-invalid": "Der Link ist nicht mehr gültig.",
+    "link-overview": "Linkübersicht",
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
-    "link-overview": "Linkübersicht",
-    "link-invalid": "Der Link ist nicht mehr gültig.",
-    "link-deleted": "Der Link wurde gelöscht.",
-    "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
+    "no-account": "Du hast noch kein Gradido Konto",
+    "no-redeem": "Du kannst deinen eigenen Link nicht einlösen!",
     "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.",
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
-    "no-redeem": "Du kannst deinen eigenen Link nicht einlösen!",
-    "no-account": "Du hast noch kein Gradido Konto",
-    "to-register": "Registriere ein neues Konto",
-    "has-account": "Du hast einen Gradido Konto",
-    "to-login": "Log dich ein"
+    "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
+    "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.",
+    "to-login": "Log dich ein",
+    "to-register": "Registriere ein neues Konto"
   },
   "gdt": {
     "calculation": "Berechnung der GradidoTransform",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 230e7eb41..d3d4e7fef 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -100,23 +100,23 @@
     "delete-the-link": "Delete the link?",
     "deleted": "The link was deleted!",
     "expired": "Expired",
+    "has-account": "You have a Gradido account",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
+    "link-deleted": "The link has been deleted.",
+    "link-invalid": "The link is no longer valid.",
+    "link-overview": "Link overview",
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
-    "link-overview": "Link overview",
-    "link-invalid": "The link is no longer valid.",
-    "link-deleted": "The link has been deleted.",
-    "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
+    "no-account": "You don't have a Gradido account yet",
+    "no-redeem": "You can't redeem your own link!",
     "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.",
     "redeem": "Redeem",
     "redeem-text": "Do you want to redeem the amount now?",
-    "no-redeem": "You can't redeem your own link!",
-    "no-account": "You don't have a Gradido account yet",
-    "to-register": "Register a new account",
-    "has-account": "You have a Gradido account",
-    "to-login": "Log in"
+    "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
+    "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.",
+    "to-login": "Log in",
+    "to-register": "Register a new account"
   },
   "gdt": {
     "calculation": "Calculation of GradidoTransform",

From be387400ca410b476f4872389ab9eaf2f3df5195 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:28:34 +0100
Subject: [PATCH 11/64] add store state email to tests in
 ShowTransactionLinkInformations

---
 frontend/src/pages/ShowTransactionLinkInformations.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index e71d71d2d..41ab38db4 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -18,6 +18,11 @@ const createMockObject = (code) => {
       $i18n: {
         locale: () => 'en',
       },
+      $store: {
+        state: {
+          email: 'bibi@bloxberg.de',
+        },
+      },
       $apollo: {
         query: queryTransactionLink,
       },

From 78637f50c5ca0a3b03881e77402dc7c61e56f91e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:29:46 +0100
Subject: [PATCH 12/64] add store state email to tests in
 ShowTransactionLinkInformations

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

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 33bc50f43..e878b27a9 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -116,7 +116,6 @@ export default {
         })
         .then((result) => {
           this.displaySetup = result.data.queryTransactionLink
-          this.$store.commit('publisherId', result.data.queryTransactionLink.user.publisherId)
         })
         .catch(() => {
           this.displaySetup.deletedAt = true

From 5feeb17230550c137331ad733bdaa0983d95295f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 11:31:25 +0100
Subject: [PATCH 13/64] deleted  unused code

---
 frontend/src/pages/ShowTransactionLinkInformations.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index e878b27a9..794ea716b 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -133,9 +133,6 @@ export default {
             })
             .then((result) => {
               if (result) this.redeemed = true
-              alert(result.data.redeemTransactionLink)
-              // this.toastSuccess(this.$t('gdd_per_link.deleted'))
-              // this.$emit('reset-transaction-link-list')
             })
             .catch((err) => {
               this.toastError(err.message)

From 0629909c9f742f3d020a3a29772ff0c7a7e275f2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:12:45 +0100
Subject: [PATCH 14/64] change file name to TransactionListItem

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

diff --git a/frontend/src/components/TransactionListItem.vue b/frontend/src/components/TransactionListItem.vue
index f2f7f3e90..e39345d5e 100644
--- a/frontend/src/components/TransactionListItem.vue
+++ b/frontend/src/components/TransactionListItem.vue
@@ -5,7 +5,7 @@
 </template>
 <script>
 export default {
-  name: 'TransactionList',
+  name: 'TransactionListItem',
   props: {
     typeId: {
       type: String,

From 302b2705ca051cc5547e1a27a0e3405f2ce41b75 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:13:36 +0100
Subject: [PATCH 15/64] tests for ShowTransactionLinkInformations.vue

---
 .../ShowTransactionLinkInformations.spec.js   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index 41ab38db4..f3afc1fe8 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -1,5 +1,8 @@
 import { mount } from '@vue/test-utils'
 import ShowTransactionLinkInformations from './ShowTransactionLinkInformations'
+import { queryTransactionLink } from '@/graphql/queries'
+import { redeemTransactionLink } from '@/graphql/mutations'
+import { wrap } from 'regenerator-runtime'
 
 const localVue = global.localVue
 
@@ -7,8 +10,18 @@ const errorHandler = jest.fn()
 
 localVue.config.errorHandler = errorHandler
 
-const queryTransactionLink = jest.fn()
-queryTransactionLink.mockResolvedValue('success')
+const apolloQueryMock = jest.fn()
+apolloQueryMock.mockResolvedValue({
+  id: 92,
+  amount: '22',
+  memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+  createdAt: '2022-03-17T16:10:28.000Z',
+  validUntil: '2022-03-31T16:10:28.000Z',
+  redeemedAt: '2022-03-18T10:08:43.000Z',
+  deletedAt: null,
+  user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
+  __typename: 'TransactionLink',
+})
 
 const createMockObject = (code) => {
   return {
@@ -24,11 +37,11 @@ const createMockObject = (code) => {
         },
       },
       $apollo: {
-        query: queryTransactionLink,
+        query: apolloQueryMock,
       },
       $route: {
         params: {
-          code,
+          code: 'c0000c0000c0000',
         },
       },
     },
@@ -50,5 +63,18 @@ describe('ShowTransactionLinkInformations', () => {
     it('renders the component', () => {
       expect(wrapper.find('div.show-transaction-link-informations').exists()).toBeTruthy()
     })
+
+    it('calls the queryTransactionLink query', () => {
+      expect(apolloQueryMock).toBeCalledWith({
+        query: queryTransactionLink,
+        variables: {
+          code: 'c0000c0000c0000',
+        },
+      })
+    })
+
+    it('has link one information link data', () => {
+      expect(apolloQueryMock.mockResolvedValue).toHaveLength(1)
+    })
   })
 })

From 26ec3f51bb7c8cafe458f79f58de0996178d8201 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:15:19 +0100
Subject: [PATCH 16/64] add slot system for transaction link information items

---
 .../TransactionLinkInformationItem.vue           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 frontend/src/components/TransactionLinkInformationItem.vue

diff --git a/frontend/src/components/TransactionLinkInformationItem.vue b/frontend/src/components/TransactionLinkInformationItem.vue
new file mode 100644
index 000000000..da17435a9
--- /dev/null
+++ b/frontend/src/components/TransactionLinkInformationItem.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <slot :name="type"></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TransactionLinkInformationItem',
+  props: {
+    type: {
+      type: String,
+      required: true,
+    },
+  },
+}
+</script>

From 07508266def431c77c02bea7308ba259daffba4d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:17:20 +0100
Subject: [PATCH 17/64] add components RedeemedTextBox, RedeemLoggedOut,
 RedeemSelfCreator, RedeemSelfCreator

---
 .../LinkInformatins/RedeemLoggedOut.vue       | 40 +++++++++++++++++++
 .../LinkInformatins/RedeemSelfCreator.vue     | 32 +++++++++++++++
 .../LinkInformatins/RedeemValid.vue           | 29 ++++++++++++++
 .../LinkInformatins/RedeemedTextBox.vue       | 21 ++++++++++
 4 files changed, 122 insertions(+)
 create mode 100644 frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
 create mode 100644 frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
 create mode 100644 frontend/src/components/LinkInformatins/RedeemValid.vue
 create mode 100644 frontend/src/components/LinkInformatins/RedeemedTextBox.vue

diff --git a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
new file mode 100644
index 000000000..72f05130f
--- /dev/null
+++ b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="redeem-logged-out">
+    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+      <h1>
+        {{ user.firstName }}
+        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
+      </h1>
+      <b>{{ memo }}</b>
+    </b-jumbotron>
+
+    <b-jumbotron>
+      <div class="mb-6">
+        <h2>{{ $t('gdd_per_link.redeem') }}</h2>
+      </div>
+
+      <b-row>
+        <b-col col sm="12" md="6">
+          <p>{{ $t('gdd_per_link.no-account') }}</p>
+          <b-button variant="primary" to="/register">
+            {{ $t('gdd_per_link.to-register') }}
+          </b-button>
+        </b-col>
+        <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
+          <p>{{ $t('gdd_per_link.has-account') }}</p>
+          <b-button variant="info" to="/login">{{ $t('gdd_per_link.to-login') }}</b-button>
+        </b-col>
+      </b-row>
+    </b-jumbotron>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RedeemLoggedOut',
+  props: {
+    user: { type: Object, required: true },
+    amount: { type: String, required: true },
+    memo: { type: String, required: true, default: '' },
+  },
+}
+</script>
diff --git a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
new file mode 100644
index 000000000..ce0f268d5
--- /dev/null
+++ b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="redeem-self-creator">
+    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+      <h1>
+        {{ user.firstName }}
+        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
+      </h1>
+      <b>{{ memo }}</b>
+    </b-jumbotron>
+
+    <b-jumbotron>
+      <div class="mb-3 text-center">
+        <div class="mt-3">
+          {{ $t('gdd_per_link.no-redeem') }}
+          <a to="/transactions" href="#!">
+            <b>{{ $t('gdd_per_link.link-overview') }}</b>
+          </a>
+        </div>
+      </div>
+    </b-jumbotron>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RedeemSelfCreator',
+  props: {
+    user: { type: Object, required: true },
+    amount: { type: String, required: true },
+    memo: { type: String, required: true, default: '' },
+  },
+}
+</script>
diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformatins/RedeemValid.vue
new file mode 100644
index 000000000..5f5b7311a
--- /dev/null
+++ b/frontend/src/components/LinkInformatins/RedeemValid.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="redeem-valid">
+    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+      <h1>
+        {{ user.firstName }}
+        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
+      </h1>
+      <b>{{ memo }}</b>
+    </b-jumbotron>
+
+    <b-jumbotron>
+      <div class="mb-3 text-center">
+        <b-button variant="primary" @click="$emit('redeem-link')" size="lg">
+          {{ $t('gdd_per_link.redeem') }}
+        </b-button>
+      </div>
+    </b-jumbotron>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RedeemValid',
+  props: {
+    user: { type: Object, required: false },
+    amount: { type: String, required: false },
+    memo: { type: String, required: false, default: '' },
+  },
+}
+</script>
diff --git a/frontend/src/components/LinkInformatins/RedeemedTextBox.vue b/frontend/src/components/LinkInformatins/RedeemedTextBox.vue
new file mode 100644
index 000000000..13e3cbae5
--- /dev/null
+++ b/frontend/src/components/LinkInformatins/RedeemedTextBox.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="redeemed-text-box">
+    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+      <h1>
+        {{ text }}
+      </h1>
+    </b-jumbotron>
+
+    <div class="text-center">
+      <b-button to="/overview">{{ $t('back') }}</b-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RedeemedTextBox',
+  props: {
+    text: { type: String, required: true },
+  },
+}
+</script>

From 13afe6bbbc38682ad8cef1c30c185a6a4ad4c44e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:18:22 +0100
Subject: [PATCH 18/64] add locales for transaction link info

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8052294f6..9b4851f17 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -103,8 +103,8 @@
     "has-account": "Du hast einen Gradido Konto",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
-    "link-deleted": "Der Link wurde gelöscht.",
-    "link-invalid": "Der Link ist nicht mehr gültig.",
+    "link-deleted": "Der Link wurde am {date} von {user} gelöscht.",
+    "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
     "link-overview": "Linkübersicht",
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
@@ -114,6 +114,7 @@
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
+    "redeemed-at": "Der Link wurde bereits am {date} eingelöst",
     "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.",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d3d4e7fef..6aa13e60d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -104,7 +104,7 @@
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "link-deleted": "The link has been deleted.",
-    "link-invalid": "The link is no longer valid.",
+    "link-invalid": "The link is no longer valid. \n The validity expired on {date}.",
     "link-overview": "Link overview",
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",

From 3945a358fb0f4840031514c4e13f272b1b779d73 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:19:14 +0100
Subject: [PATCH 19/64] add slots for transaction link informations and logic

---
 .../pages/ShowTransactionLinkInformations.vue | 166 +++++++++---------
 1 file changed, 81 insertions(+), 85 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 794ea716b..91c6eeb66 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,98 +1,40 @@
 <template>
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
-    <b-container v-if="displaySetup.redeemedAt" class="pt-5">
-      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
-        <div class="text-center">
-          <h1>
-            {{ $t('gdd_per_link.link-invalid') }}
-          </h1>
-        </div>
-      </b-jumbotron>
-      <div class="text-center">
-        <b-button to="/overview">{{ $t('back') }}</b-button>
-      </div>
-    </b-container>
-    <b-container v-else-if="displaySetup.deletedAt" class="pt-5">
-      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
-        <div class="text-center">
-          <h1>
-            {{ $t('gdd_per_link.link-deleted') }}
-          </h1>
-        </div>
-      </b-jumbotron>
-      <div class="text-center">
-        <b-button to="/overview">{{ $t('back') }}</b-button>
-      </div>
-    </b-container>
-    <b-container v-else-if="redeemed" class="pt-5">
-      <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
-        <div class="text-center">
-          <h1>
-            {{ $t('gdd_per_link.redeemed', { n: displaySetup.amount }) }}
-          </h1>
-        </div>
-      </b-jumbotron>
-      <div class="text-center">
-        <b-button to="/overview">{{ $t('back') }}</b-button>
-      </div>
-    </b-container>
-    <b-container v-else class="pt-5">
-      <div>
-        <div></div>
-        <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
-          <h1>
-            {{ displaySetup.user.firstName }}
-            {{ $t('transaction-link.send_you') }} {{ displaySetup.amount | GDD }}
-          </h1>
-          <b>{{ displaySetup.memo }}</b>
-        </b-jumbotron>
-      </div>
-      <div v-if="$store.state.token">
-        <b-jumbotron>
-          <div class="mb-3 text-center">
-            <b-button :disabled="disabled" variant="primary" @click="redeemLink" size="lg">
-              {{ $t('gdd_per_link.redeem') }}
-            </b-button>
-            <div v-if="disabled" class="mt-3">
-              {{ $t('gdd_per_link.no-redeem') }}
-              <a to="/transactions" href="#!">
-                <b>{{ $t('gdd_per_link.link-overview') }}</b>
-              </a>
-            </div>
-          </div>
-        </b-jumbotron>
-      </div>
+    {{ displaySetup }}
+    <hr />
+    <b-container>
+      <transaction-link-information-item :type="itemType">
+        <template #X1><redeem-logged-out v-bind="displaySetup" /></template>
 
-      <div v-else>
-        <b-jumbotron>
-          <div class="mb-6">
-            <h2>{{ $t('gdd_per_link.redeem') }}</h2>
-          </div>
+        <template #X2><redeem-self-creator v-bind="displaySetup" /></template>
 
-          <b-row>
-            <b-col col sm="12" md="6">
-              <p>{{ $t('gdd_per_link.no-account') }}</p>
-              <b-button variant="primary" to="/register">
-                {{ $t('gdd_per_link.to-register') }}
-              </b-button>
-            </b-col>
-            <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
-              <p>{{ $t('gdd_per_link.has-account') }}</p>
-              <b-button variant="info" to="/login">{{ $t('gdd_per_link.to-login') }}</b-button>
-            </b-col>
-          </b-row>
-        </b-jumbotron>
-      </div>
+        <template #X3><redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" /></template>
+
+        <template #X4><redeemed-text-box :text="redeemedBoxText" /></template>
+      </transaction-link-information-item>
     </b-container>
   </div>
 </template>
 <script>
+import TransactionLinkInformationItem from '@/components/TransactionLinkInformationItem'
+import RedeemLoggedOut from '@/components/LinkInformatins/RedeemLoggedOut'
+import RedeemSelfCreator from '@/components/LinkInformatins/RedeemSelfCreator'
+import RedeemValid from '@/components/LinkInformatins/RedeemValid'
+import RedeemedTextBox from '@/components/LinkInformatins/RedeemedTextBox'
+
 import { queryTransactionLink } from '@/graphql/queries'
 import { redeemTransactionLink } from '@/graphql/mutations'
 
 export default {
   name: 'ShowTransactionLinkInformations',
+  components: {
+    TransactionLinkInformationItem,
+    RedeemLoggedOut,
+    RedeemSelfCreator,
+    RedeemValid,
+    RedeemedTextBox,
+  },
   data() {
     return {
       img: '/img/brand/green.png',
@@ -102,7 +44,6 @@ export default {
         },
         deletedAt: null,
       },
-      redeemed: null,
     }
   },
   methods: {
@@ -118,6 +59,7 @@ export default {
           this.displaySetup = result.data.queryTransactionLink
         })
         .catch(() => {
+          this.itemType = 'X4'
           this.displaySetup.deletedAt = true
         })
     },
@@ -132,17 +74,71 @@ export default {
               },
             })
             .then((result) => {
-              if (result) this.redeemed = true
+              this.toastSuccess(
+                this.$t('gdd_per_link.redeemed', {
+                  n: this.displaySetup.amount,
+                }),
+              )
+              this.$router.push('/overview')
             })
             .catch((err) => {
               this.toastError(err.message)
+               this.$router.push('/overview')
             })
       })
     },
   },
   computed: {
-    disabled() {
-      return this.displaySetup.user.email === this.$store.state.email
+    itemType() {
+      // logged out
+      // link wurde gelöscht: am, von
+      if (this.displaySetup.deletedAt) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
+          date: this.displaySetup.deletedAt,
+          user: this.displaySetup.firstName,
+        })
+        return 'X4'
+      } else {
+        // link ist abgelaufen, nicht gelöscht
+        if (new Date(this.displaySetup.validUntil) < new Date()) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
+            date: this.displaySetup.validUntil,
+          })
+          return 'X4'
+        }
+
+        // der link wurde eingelöst, nicht gelöscht
+        if (this.displaySetup.redeemedAt) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
+            date: this.displaySetup.redeemedAt,
+          })
+          return 'X4'
+        }
+      }
+
+      if (!this.$store.state.token) {
+        return 'X1'
+      } else {
+        // logged in, nicht berechtigt einzulösen, eigener link
+        if (this.$store.state.email === this.displaySetup.user.email) {
+          return 'X2'
+        }
+
+        // logged in und berechtigt einzulösen
+        if (
+          this.$store.state.email !== this.displaySetup.user.email &&
+          !this.displaySetup.redeemedAt &&
+          !this.displaySetup.deletedAt
+        ) {
+          return 'X3'
+        }
+      }
+
+      
+      return ''
     },
   },
   created() {

From 668d4f05e0402bf392dd4c9bf2f11724a15d700a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:25:12 +0100
Subject: [PATCH 20/64] yarn locales && lint --fix

---
 frontend/src/locales/de.json                               | 2 +-
 frontend/src/locales/en.json                               | 3 ++-
 frontend/src/pages/ShowTransactionLinkInformations.spec.js | 2 --
 frontend/src/pages/ShowTransactionLinkInformations.vue     | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 9b4851f17..60fa9162c 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -114,7 +114,7 @@
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
-    "redeemed-at": "Der Link wurde bereits am {date} eingelöst",
+    "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
     "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.",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6aa13e60d..717b1d7b0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -104,7 +104,7 @@
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "link-deleted": "The link has been deleted.",
-    "link-invalid": "The link is no longer valid. \n The validity expired on {date}.",
+    "link-expired": "The link is no longer valid. The validity expired on {date}.",
     "link-overview": "Link overview",
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
@@ -114,6 +114,7 @@
     "redeem": "Redeem",
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
+    "redeemed-at": "The link was already redeemed on {date}.",
     "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.",
     "to-login": "Log in",
     "to-register": "Register a new account"
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index f3afc1fe8..73de19f80 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -1,8 +1,6 @@
 import { mount } from '@vue/test-utils'
 import ShowTransactionLinkInformations from './ShowTransactionLinkInformations'
 import { queryTransactionLink } from '@/graphql/queries'
-import { redeemTransactionLink } from '@/graphql/mutations'
-import { wrap } from 'regenerator-runtime'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 91c6eeb66..8e0aa236f 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -83,7 +83,7 @@ export default {
             })
             .catch((err) => {
               this.toastError(err.message)
-               this.$router.push('/overview')
+              this.$router.push('/overview')
             })
       })
     },
@@ -137,7 +137,6 @@ export default {
         }
       }
 
-      
       return ''
     },
   },

From 18a650c95aa4899e18d08b1ecaa53fb62b99922f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:38:57 +0100
Subject: [PATCH 21/64] change tests for
 ShowTransactionLinkInformations.spec.js

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

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 8e0aa236f..cfb715c40 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -39,6 +39,8 @@ export default {
     return {
       img: '/img/brand/green.png',
       displaySetup: {
+        amount: '123.45',
+        memo: '',
         user: {
           firstName: '',
         },

From f25ab05ec05b37933472bc04b18c8933e7b88c66 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:46:04 +0100
Subject: [PATCH 22/64] change bg-variant to muted, border-variant to info

---
 frontend/src/components/LinkInformatins/RedeemLoggedOut.vue | 2 +-
 frontend/src/components/LinkInformatins/RedeemValid.vue     | 2 +-
 frontend/src/components/LinkInformatins/RedeemedTextBox.vue | 2 +-
 frontend/src/pages/ShowTransactionLinkInformations.vue      | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
index 72f05130f..09f337cdd 100644
--- a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-logged-out">
-    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
         {{ user.firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformatins/RedeemValid.vue
index 5f5b7311a..f17fb2c56 100644
--- a/frontend/src/components/LinkInformatins/RedeemValid.vue
+++ b/frontend/src/components/LinkInformatins/RedeemValid.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-valid">
-    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
         {{ user.firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
diff --git a/frontend/src/components/LinkInformatins/RedeemedTextBox.vue b/frontend/src/components/LinkInformatins/RedeemedTextBox.vue
index 13e3cbae5..4a33668af 100644
--- a/frontend/src/components/LinkInformatins/RedeemedTextBox.vue
+++ b/frontend/src/components/LinkInformatins/RedeemedTextBox.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeemed-text-box">
-    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
         {{ text }}
       </h1>
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index cfb715c40..2fd369cdd 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
-    {{ displaySetup }}
-    <hr />
     <b-container>
       <transaction-link-information-item :type="itemType">
         <template #X1><redeem-logged-out v-bind="displaySetup" /></template>

From 1d8f94671f4a2f035e4a9e7cd19ba8728842b644 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 19:47:22 +0100
Subject: [PATCH 23/64] change container margin top to 4

---
 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 2fd369cdd..cb16f4b25 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
-    <b-container>
+    <b-container class="mt-4">
       <transaction-link-information-item :type="itemType">
         <template #X1><redeem-logged-out v-bind="displaySetup" /></template>
 

From cc77a0122f371b0fe992276067e3c81419fd87bc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 20:21:59 +0100
Subject: [PATCH 24/64] test 100% for NotFoundPage.spec.js

---
 frontend/src/pages/NotFoundPage.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/NotFoundPage.vue b/frontend/src/pages/NotFoundPage.vue
index f01f76044..1dce50e16 100755
--- a/frontend/src/pages/NotFoundPage.vue
+++ b/frontend/src/pages/NotFoundPage.vue
@@ -4,7 +4,7 @@
     <div class="header py-1 py-lg-1 pt-lg-3">
       <b-container>
         <div class="header-body text-center mb-3">
-          <a href="#!" @click="goback">
+          <a href="#!" v-on:click="$router.go(-1)">
             <div class="container">
               <div class="row">
                 <div class="col-sm-12 col-md-12 mt-5 mb-5">
@@ -1186,7 +1186,7 @@
       </b-container>
     </div>
     <div class="text-center">
-      <b-button class="test-back" variant="light" @click="goback">
+      <b-button class="test-back" variant="light" v-on:click="$router.go(-1)">
         {{ $t('back') }}
       </b-button>
     </div>
@@ -1218,11 +1218,6 @@ export default {
       },
     }
   },
-  methods: {
-    goback() {
-      this.$router.go(-1)
-    },
-  },
 }
 </script>
 <style>

From 7a117d224fe7fe39253d1ea4e0be7ba3e0886adf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Mar 2022 20:27:32 +0100
Subject: [PATCH 25/64] test 100% for src/routes/router.test.js

---
 frontend/src/routes/router.test.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 4c454a9b4..1a966fdc6 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -182,6 +182,13 @@ describe('router', () => {
         })
       })
 
+      describe('redeem', () => {
+        it('loads the "ShowTransactionLinkInformations" page', async () => {
+          const component = await routes.find((r) => r.path === '/redeem/:code').component()
+          expect(component.default.name).toBe('ShowTransactionLinkInformations')
+        })
+      })
+
       describe('not found page', () => {
         it('renders the "NotFound" page', async () => {
           expect(routes.find((r) => r.path === '*').component).toEqual(NotFound)

From 8038f1bf9b2c2da708ddcf77abe8c9bcad027590 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sat, 19 Mar 2022 12:29:43 +0100
Subject: [PATCH 26/64] include deleted links

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

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index ea55fe3b9..59cf5fe59 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -96,7 +96,7 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.QUERY_TRANSACTION_LINK])
   @Query(() => TransactionLink)
   async queryTransactionLink(@Arg('code') code: string): Promise<TransactionLink> {
-    const transactionLink = await dbTransactionLink.findOneOrFail({ code })
+    const transactionLink = await dbTransactionLink.findOneOrFail({ code }, { withDeleted: true })
     const user = await dbUser.findOneOrFail({ id: transactionLink.userId })
     let redeemedBy: User | null = null
     if (transactionLink && transactionLink.redeemedBy) {

From 7f6b7482b0db9167da4fb2343ee1d4bf70754ec2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sat, 19 Mar 2022 12:35:34 +0100
Subject: [PATCH 27/64] Int as arg type for ID

---
 .../src/graphql/resolver/TransactionLinkResolver.ts  | 12 +++++++++---
 frontend/src/graphql/mutations.js                    |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 59cf5fe59..d6c0937d6 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query } from 'type-graphql'
+import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
 import { TransactionLink } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
@@ -70,7 +70,10 @@ export class TransactionLinkResolver {
 
   @Authorized([RIGHTS.DELETE_TRANSACTION_LINK])
   @Mutation(() => Boolean)
-  async deleteTransactionLink(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
+  async deleteTransactionLink(
+    @Arg('id', () => Int) id: number,
+    @Ctx() context: any,
+  ): Promise<boolean> {
     const { user } = context
 
     const transactionLink = await dbTransactionLink.findOne({ id })
@@ -131,7 +134,10 @@ export class TransactionLinkResolver {
 
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
-  async redeemTransactionLink(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
+  async redeemTransactionLink(
+    @Arg('id', () => Int) id: number,
+    @Ctx() context: any,
+  ): Promise<boolean> {
     const { user } = context
     const transactionLink = await dbTransactionLink.findOneOrFail({ id })
     const linkedUser = await dbUser.findOneOrFail({ id: transactionLink.userId })
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index a6835ba6b..a7188bd50 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -73,13 +73,13 @@ export const createTransactionLink = gql`
 `
 
 export const deleteTransactionLink = gql`
-  mutation($id: Float!) {
+  mutation($id: Int!) {
     deleteTransactionLink(id: $id)
   }
 `
 
 export const redeemTransactionLink = gql`
-  mutation($id: Float!) {
+  mutation($id: Int!) {
     redeemTransactionLink(id: $id)
   }
 `

From ec5151c42cadaab78395bd05afa5843e9f768755 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 09:12:55 +0100
Subject: [PATCH 28/64] change color link information box

---
 .../LinkInformatins/RedeemSelfCreator.vue     |  2 +-
 .../LinkInformatins/RedeemValid.vue           |  3 +-
 .../ShowTransactionLinkInformations.spec.js   | 26 ++++++-----
 .../pages/ShowTransactionLinkInformations.vue | 45 +++++++++++--------
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
index ce0f268d5..9b8405ad6 100644
--- a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
+++ b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-self-creator">
-    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
         {{ user.firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformatins/RedeemValid.vue
index f17fb2c56..9d0b9e037 100644
--- a/frontend/src/components/LinkInformatins/RedeemValid.vue
+++ b/frontend/src/components/LinkInformatins/RedeemValid.vue
@@ -10,7 +10,7 @@
 
     <b-jumbotron>
       <div class="mb-3 text-center">
-        <b-button variant="primary" @click="$emit('redeem-link')" size="lg">
+        <b-button variant="primary" @click="$emit('redeem-link', id, amount)" size="lg">
           {{ $t('gdd_per_link.redeem') }}
         </b-button>
       </div>
@@ -21,6 +21,7 @@
 export default {
   name: 'RedeemValid',
   props: {
+    id: { type: Number, required: false },
     user: { type: Object, required: false },
     amount: { type: String, required: false },
     memo: { type: String, required: false, default: '' },
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index 73de19f80..e5b112f2a 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -5,20 +5,26 @@ import { queryTransactionLink } from '@/graphql/queries'
 const localVue = global.localVue
 
 const errorHandler = jest.fn()
+const apolloQueryMock = jest.fn()
 
 localVue.config.errorHandler = errorHandler
 
-const apolloQueryMock = jest.fn()
 apolloQueryMock.mockResolvedValue({
-  id: 92,
-  amount: '22',
-  memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
-  createdAt: '2022-03-17T16:10:28.000Z',
-  validUntil: '2022-03-31T16:10:28.000Z',
-  redeemedAt: '2022-03-18T10:08:43.000Z',
-  deletedAt: null,
-  user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
-  __typename: 'TransactionLink',
+  data: {
+    listTransactionLinks: [
+      {
+        id: 92,
+        amount: '22',
+        memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+        createdAt: '2022-03-17T16:10:28.000Z',
+        validUntil: '2022-03-31T16:10:28.000Z',
+        redeemedAt: '2022-03-18T10:08:43.000Z',
+        deletedAt: null,
+        user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
+        __typename: 'TransactionLink',
+      },
+    ],
+  },
 })
 
 const createMockObject = (code) => {
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index cb16f4b25..7c55bbc03 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -3,13 +3,21 @@
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="mt-4">
       <transaction-link-information-item :type="itemType">
-        <template #X1><redeem-logged-out v-bind="displaySetup" /></template>
+        <template #X1>
+          <redeem-logged-out v-bind="displaySetup" />
+        </template>
 
-        <template #X2><redeem-self-creator v-bind="displaySetup" /></template>
+        <template #X2>
+          <redeem-self-creator v-bind="displaySetup" />
+        </template>
 
-        <template #X3><redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" /></template>
+        <template #X3>
+          <redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" />
+        </template>
 
-        <template #X4><redeemed-text-box :text="redeemedBoxText" /></template>
+        <template #X4>
+          <redeemed-text-box :text="redeemedBoxText" />
+        </template>
       </transaction-link-information-item>
     </b-container>
   </div>
@@ -20,7 +28,6 @@ import RedeemLoggedOut from '@/components/LinkInformatins/RedeemLoggedOut'
 import RedeemSelfCreator from '@/components/LinkInformatins/RedeemSelfCreator'
 import RedeemValid from '@/components/LinkInformatins/RedeemValid'
 import RedeemedTextBox from '@/components/LinkInformatins/RedeemedTextBox'
-
 import { queryTransactionLink } from '@/graphql/queries'
 import { redeemTransactionLink } from '@/graphql/mutations'
 
@@ -38,9 +45,9 @@ export default {
       img: '/img/brand/green.png',
       displaySetup: {
         amount: '123.45',
-        memo: '',
+        memo: 'memo',
         user: {
-          firstName: '',
+          firstName: 'Bibi',
         },
         deletedAt: null,
       },
@@ -63,20 +70,20 @@ export default {
           this.displaySetup.deletedAt = true
         })
     },
-    redeemLink() {
+    redeemLink(id, amount) {
       this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
         if (value)
           await this.$apollo
             .mutate({
               mutation: redeemTransactionLink,
               variables: {
-                id: this.displaySetup.id,
+                id: id,
               },
             })
-            .then((result) => {
+            .then(() => {
               this.toastSuccess(
                 this.$t('gdd_per_link.redeemed', {
-                  n: this.displaySetup.amount,
+                  n: amount,
                 }),
               )
               this.$router.push('/overview')
@@ -98,15 +105,15 @@ export default {
           date: this.displaySetup.deletedAt,
           user: this.displaySetup.firstName,
         })
-        return 'X4'
+        return `X4`
       } else {
         // link ist abgelaufen, nicht gelöscht
-        if (new Date(this.displaySetup.validUntil) < new Date()) {
+        if (new Date(this.displaySetup.validUntil) > new Date()) {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
             date: this.displaySetup.validUntil,
           })
-          return 'X4'
+          return `X4`
         }
 
         // der link wurde eingelöst, nicht gelöscht
@@ -115,16 +122,16 @@ export default {
           this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
             date: this.displaySetup.redeemedAt,
           })
-          return 'X4'
+          return `X4`
         }
       }
 
       if (!this.$store.state.token) {
-        return 'X1'
+        return `X1`
       } else {
         // logged in, nicht berechtigt einzulösen, eigener link
         if (this.$store.state.email === this.displaySetup.user.email) {
-          return 'X2'
+          return `X2`
         }
 
         // logged in und berechtigt einzulösen
@@ -133,11 +140,11 @@ export default {
           !this.displaySetup.redeemedAt &&
           !this.displaySetup.deletedAt
         ) {
-          return 'X3'
+          return `X3`
         }
       }
 
-      return ''
+      return `X`
     },
   },
   created() {

From 7da8b4812be5b5520384af6e487b5541da7f01e4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 09:29:14 +0100
Subject: [PATCH 29/64] change displaySetup to linkData

---
 frontend/src/pages/ShowTransactionLinkInformations.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 7c55bbc03..adb556d62 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -103,12 +103,12 @@ export default {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
         this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
           date: this.displaySetup.deletedAt,
-          user: this.displaySetup.firstName,
+          user: this.displaySetup.user.firstName,
         })
         return `X4`
       } else {
         // link ist abgelaufen, nicht gelöscht
-        if (new Date(this.displaySetup.validUntil) > new Date()) {
+        if (new Date(this.displaySetup.validUntil) < new Date()) {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
             date: this.displaySetup.validUntil,

From 4e013ce9beed65730c8348eec9e5573a08b3b8bb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 09:31:02 +0100
Subject: [PATCH 30/64] change data linkData in all files

---
 .../pages/ShowTransactionLinkInformations.vue | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index adb556d62..0126fd847 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -4,15 +4,15 @@
     <b-container class="mt-4">
       <transaction-link-information-item :type="itemType">
         <template #X1>
-          <redeem-logged-out v-bind="displaySetup" />
+          <redeem-logged-out v-bind="linkData" />
         </template>
 
         <template #X2>
-          <redeem-self-creator v-bind="displaySetup" />
+          <redeem-self-creator v-bind="linkData" />
         </template>
 
         <template #X3>
-          <redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" />
+          <redeem-valid v-bind="linkData" @redeem-link="redeemLink" />
         </template>
 
         <template #X4>
@@ -43,7 +43,7 @@ export default {
   data() {
     return {
       img: '/img/brand/green.png',
-      displaySetup: {
+      linkData: {
         amount: '123.45',
         memo: 'memo',
         user: {
@@ -63,11 +63,11 @@ export default {
           },
         })
         .then((result) => {
-          this.displaySetup = result.data.queryTransactionLink
+          this.linkData = result.data.queryTransactionLink
         })
         .catch(() => {
           this.itemType = 'X4'
-          this.displaySetup.deletedAt = true
+          this.linkData.deletedAt = true
         })
     },
     redeemLink(id, amount) {
@@ -99,28 +99,28 @@ export default {
     itemType() {
       // logged out
       // link wurde gelöscht: am, von
-      if (this.displaySetup.deletedAt) {
+      if (this.linkData.deletedAt) {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
         this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
-          date: this.displaySetup.deletedAt,
-          user: this.displaySetup.user.firstName,
+          date: this.linkData.deletedAt,
+          user: this.linkData.user.firstName,
         })
         return `X4`
       } else {
         // link ist abgelaufen, nicht gelöscht
-        if (new Date(this.displaySetup.validUntil) < new Date()) {
+        if (new Date(this.linkData.validUntil) < new Date()) {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
-            date: this.displaySetup.validUntil,
+            date: this.linkData.validUntil,
           })
           return `X4`
         }
 
         // der link wurde eingelöst, nicht gelöscht
-        if (this.displaySetup.redeemedAt) {
+        if (this.linkData.redeemedAt) {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
-            date: this.displaySetup.redeemedAt,
+            date: this.linkData.redeemedAt,
           })
           return `X4`
         }
@@ -130,15 +130,15 @@ export default {
         return `X1`
       } else {
         // logged in, nicht berechtigt einzulösen, eigener link
-        if (this.$store.state.email === this.displaySetup.user.email) {
+        if (this.$store.state.email === this.linkData.user.email) {
           return `X2`
         }
 
         // logged in und berechtigt einzulösen
         if (
-          this.$store.state.email !== this.displaySetup.user.email &&
-          !this.displaySetup.redeemedAt &&
-          !this.displaySetup.deletedAt
+          this.$store.state.email !== this.linkData.user.email &&
+          !this.linkData.redeemedAt &&
+          !this.linkData.deletedAt
         ) {
           return `X3`
         }

From 1315ab4fa0cea9042a6d0e626a34ffd71942804a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:25:18 +0100
Subject: [PATCH 31/64] change parameter id from Int to String

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

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index d6c0937d6..b00b8f44e 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -135,11 +135,11 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async redeemTransactionLink(
-    @Arg('id', () => Int) id: number,
+    @Arg('id', () => String) id: string,
     @Ctx() context: any,
   ): Promise<boolean> {
     const { user } = context
-    const transactionLink = await dbTransactionLink.findOneOrFail({ id })
+    const transactionLink = await dbTransactionLink.findOneOrFail({ code: id })
     const linkedUser = await dbUser.findOneOrFail({ id: transactionLink.userId })
 
     const now = new Date()

From 980d3ee52798f5179728fbf4002d665c0f23cde7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:26:22 +0100
Subject: [PATCH 32/64] change parameter id to code

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

diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index a7188bd50..ee400891c 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -79,7 +79,7 @@ export const deleteTransactionLink = gql`
 `
 
 export const redeemTransactionLink = gql`
-  mutation($id: Int!) {
-    redeemTransactionLink(id: $id)
+  mutation($code: String!) {
+    redeemTransactionLink(id: $code)
   }
 `

From 56954273920f38e02f4edcccd2c02e0d222699fa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:30:02 +0100
Subject: [PATCH 33/64] add optional parameter code to login and register

---
 frontend/src/routes/routes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index ea7539190..982091b4d 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -39,11 +39,11 @@ const routes = [
     },
   },
   {
-    path: '/login',
+    path: '/login/:code?',
     component: () => import('@/pages/Login.vue'),
   },
   {
-    path: '/register',
+    path: '/register/:code?',
     component: () => import('@/pages/Register.vue'),
   },
   {

From 283a9d751bcc43cd53af66cec6dbd7613973eaa0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:33:15 +0100
Subject: [PATCH 34/64] change variable id to code

---
 frontend/src/pages/ShowTransactionLinkInformations.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index 0126fd847..4af974920 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -70,14 +70,14 @@ export default {
           this.linkData.deletedAt = true
         })
     },
-    redeemLink(id, amount) {
+    redeemLink(amount) {
       this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
         if (value)
           await this.$apollo
             .mutate({
               mutation: redeemTransactionLink,
               variables: {
-                id: id,
+                code: this.$route.params.code,
               },
             })
             .then(() => {

From d3352ff0bf48f9fd2b92f53ff3004d53bdca5e53 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:34:41 +0100
Subject: [PATCH 35/64] add successfully-redeemed

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 60fa9162c..ae3352c3a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -114,6 +114,7 @@
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
+    "successfully-redeemed": "Erfolgreich eingelöst!",
     "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
     "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.",
     "to-login": "Log dich ein",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 717b1d7b0..83ae65c65 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -115,6 +115,7 @@
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "redeemed-at": "The link was already redeemed on {date}.",
+    "successfully-redeemed": "Successfully redeemed!",
     "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.",
     "to-login": "Log in",
     "to-register": "Register a new account"

From 0132d95cf82cc2d6231cd39258b3e44ce05912e8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:36:16 +0100
Subject: [PATCH 36/64] remove props id and delete id from emit

---
 frontend/src/components/LinkInformatins/RedeemValid.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformatins/RedeemValid.vue
index 9d0b9e037..10b9200c8 100644
--- a/frontend/src/components/LinkInformatins/RedeemValid.vue
+++ b/frontend/src/components/LinkInformatins/RedeemValid.vue
@@ -10,7 +10,7 @@
 
     <b-jumbotron>
       <div class="mb-3 text-center">
-        <b-button variant="primary" @click="$emit('redeem-link', id, amount)" size="lg">
+        <b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
           {{ $t('gdd_per_link.redeem') }}
         </b-button>
       </div>
@@ -21,7 +21,6 @@
 export default {
   name: 'RedeemValid',
   props: {
-    id: { type: Number, required: false },
     user: { type: Object, required: false },
     amount: { type: String, required: false },
     memo: { type: String, required: false, default: '' },

From 7996bc8e5c10a2dd87a9d7d169c211b597d4116f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:37:53 +0100
Subject: [PATCH 37/64] add computed parameters for register and login (add
 code)

---
 .../components/LinkInformatins/RedeemLoggedOut.vue  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
index 09f337cdd..d059dfc10 100644
--- a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
@@ -7,7 +7,6 @@
       </h1>
       <b>{{ memo }}</b>
     </b-jumbotron>
-
     <b-jumbotron>
       <div class="mb-6">
         <h2>{{ $t('gdd_per_link.redeem') }}</h2>
@@ -16,13 +15,13 @@
       <b-row>
         <b-col col sm="12" md="6">
           <p>{{ $t('gdd_per_link.no-account') }}</p>
-          <b-button variant="primary" to="/register">
+          <b-button variant="primary" :to="register">
             {{ $t('gdd_per_link.to-register') }}
           </b-button>
         </b-col>
         <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
           <p>{{ $t('gdd_per_link.has-account') }}</p>
-          <b-button variant="info" to="/login">{{ $t('gdd_per_link.to-login') }}</b-button>
+          <b-button variant="info" :to="login">{{ $t('gdd_per_link.to-login') }}</b-button>
         </b-col>
       </b-row>
     </b-jumbotron>
@@ -36,5 +35,13 @@ export default {
     amount: { type: String, required: true },
     memo: { type: String, required: true, default: '' },
   },
+  computed: {
+    login() {
+      return '/login/' + this.$route.params.code
+    },
+    register() {
+      return '/register/' + this.$route.params.code
+    },
+  },
 }
 </script>

From 6829d7eeac634f3ab725d739705bc18739950a07 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:40:11 +0100
Subject: [PATCH 38/64] add method redeemLink, add text that shows the code in
 the formular

---
 frontend/src/pages/Login.vue | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 9d33678f5..5c3e52521 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -42,6 +42,10 @@
               </validation-observer>
             </b-card-body>
           </b-card>
+          <div v-if="$route.params.code" class="mt-2 mb-2">
+            {{ $t('gdd_per_link.redeem') + ':' }}
+            <b>{{ $route.params.code }}</b>
+          </div>
           <b-row class="mt-3">
             <b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
               <router-link to="/forgot-password" class="mt-3">
@@ -64,6 +68,7 @@ import InputPassword from '@/components/Inputs/InputPassword'
 import InputEmail from '@/components/Inputs/InputEmail'
 import { login } from '@/graphql/queries'
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
+import { redeemTransactionLink } from '@/graphql/mutations'
 
 export default {
   name: 'Login',
@@ -101,7 +106,12 @@ export default {
             data: { login },
           } = result
           this.$store.dispatch('login', login)
+          if (this.$route.params.code) {
+            this.redeemLink(this.$route.params.code)
+          }
+
           this.$router.push('/overview')
+
           loader.hide()
         })
         .catch((error) => {
@@ -114,6 +124,21 @@ export default {
           loader.hide()
         })
     },
+    redeemLink(code) {
+      this.$apollo
+        .mutate({
+          mutation: redeemTransactionLink,
+          variables: {
+            code: code,
+          },
+        })
+        .then(() => {
+          this.toastSuccess(this.$t('gdd_per_link.successfully-redeemed'))
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
   },
 }
 </script>

From 3f76db7f2114719eeb50f85509d368bcad0d5e63 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 11:42:16 +0100
Subject: [PATCH 39/64] add method redeemLink, add text that shows the code in
 the formular

---
 frontend/src/pages/Login.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 5c3e52521..590a56f74 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -109,9 +109,7 @@ export default {
           if (this.$route.params.code) {
             this.redeemLink(this.$route.params.code)
           }
-
           this.$router.push('/overview')
-
           loader.hide()
         })
         .catch((error) => {

From d90284a269f4e857ac6be471d9996b20a79c5c8a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 13:39:11 +0100
Subject: [PATCH 40/64] add store.state and store.commit redeemCode, add
 store.commit in register

---
 frontend/src/pages/Register.vue | 41 ++++++++++++++++++++++++++++++---
 frontend/src/store/store.js     |  5 ++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 609182765..5638159b8 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -118,12 +118,37 @@
                       {{ messageError }}
                     </span>
                   </b-alert>
-                  <b-row v-b-toggle:my-collapse class="text-muted shadow-sm p-3 publisherCollaps">
+                  <b-row v-if="$route.params.code">
+                    <b-col>
+                      <label>{{ $t('gdd_per_link.redeem') }}</label>
+                      <div class="mt-2 mb-2">
+                        <b-input-group class="shadow-sm p-2 bg-white rounded">
+                          <b-input-group-prepend is-text>
+                            <b-icon icon="link45deg"></b-icon>
+                          </b-input-group-prepend>
+                          <b-form-input
+                            readonly
+                            id="redeem-code"
+                            type="text"
+                            v-model="redeemCode"
+                            @input="commitStoreRedeemCode(redeemCode)"
+                          ></b-form-input>
+                        </b-input-group>
+                      </div>
+                    </b-col>
+                  </b-row>
+
+                  <b-row
+                    v-else
+                    v-b-toggle:my-collapse
+                    class="text-muted shadow-sm p-3 publisherCollaps"
+                  >
                     <b-col>{{ $t('publisher.publisherId') }} {{ $store.state.publisherId }}</b-col>
                     <b-col class="text-right">
                       <b-icon icon="chevron-down" aria-hidden="true"></b-icon>
                     </b-col>
                   </b-row>
+
                   <b-row>
                     <b-col>
                       <b-collapse id="my-collapse" class="">
@@ -136,7 +161,7 @@
                             type="text"
                             placeholder="Publisher ID"
                             v-model="publisherId"
-                            @input="commitStore(publisherId)"
+                            @input="commitStorePublisherId(publisherId)"
                           ></b-form-input>
                         </b-input-group>
                         <div
@@ -210,6 +235,7 @@ export default {
       messageError: '',
       register: true,
       publisherId: this.$store.state.publisherId,
+      redeemCode: this.$store.state.redeemCode,
     }
   },
   methods: {
@@ -220,9 +246,12 @@ export default {
     getValidationState({ dirty, validated, valid = null }) {
       return dirty || validated ? valid : null
     },
-    commitStore(val) {
+    commitStorePublisherId(val) {
       this.$store.commit('publisherId', val)
     },
+    commitStoreRedeemCode(val) {
+      this.$store.commit('redeemCode', val)
+    },
     async onSubmit() {
       this.$apollo
         .mutate({
@@ -233,6 +262,7 @@ export default {
             lastName: this.form.lastname,
             language: this.language,
             publisherId: this.$store.state.publisherId,
+            redeemCode: this.$store.state.redeemCode,
           },
         })
         .then(() => {
@@ -267,5 +297,10 @@ export default {
       return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language)
     },
   },
+  created() {
+    if (this.$route.params.code) {
+      this.commitStoreRedeemCode(this.$route.params.code)
+    }
+  },
 }
 </script>
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 458c8c8de..fb74624fb 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -47,6 +47,9 @@ export const mutations = {
   hasElopage: (state, hasElopage) => {
     state.hasElopage = hasElopage
   },
+  redeemCode: (state, redeemCode) => {
+    state.redeemCode = redeemCode
+  },
 }
 
 export const actions = {
@@ -73,6 +76,7 @@ export const actions = {
     commit('hasElopage', false)
     commit('publisherId', null)
     commit('isAdmin', false)
+    commit('redeemCode', null)
     localStorage.clear()
   },
 }
@@ -102,6 +106,7 @@ try {
       },
       hasElopage: false,
       publisherId: null,
+      redeemCode: null,
     },
     getters: {},
     // Syncronous mutation of the state

From e9357198c0b4eb3651199781056aebf500b99e95 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sun, 20 Mar 2022 18:58:20 +0100
Subject: [PATCH 41/64] change parameter name to code

---
 backend/src/graphql/resolver/TransactionLinkResolver.ts | 4 ++--
 frontend/src/graphql/mutations.js                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index b00b8f44e..9c8685f1d 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -135,11 +135,11 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async redeemTransactionLink(
-    @Arg('id', () => String) id: string,
+    @Arg('code', () => String) id: string,
     @Ctx() context: any,
   ): Promise<boolean> {
     const { user } = context
-    const transactionLink = await dbTransactionLink.findOneOrFail({ code: id })
+    const transactionLink = await dbTransactionLink.findOneOrFail({ code })
     const linkedUser = await dbUser.findOneOrFail({ id: transactionLink.userId })
 
     const now = new Date()
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index ee400891c..d3a177866 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -80,6 +80,6 @@ export const deleteTransactionLink = gql`
 
 export const redeemTransactionLink = gql`
   mutation($code: String!) {
-    redeemTransactionLink(id: $code)
+    redeemTransactionLink(code: $code)
   }
 `

From 384fd12b63295bcbb10c36247f3c53ee425dd09d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sun, 20 Mar 2022 19:00:36 +0100
Subject: [PATCH 42/64] change parameter name to code

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

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 9c8685f1d..646a7c296 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -135,7 +135,7 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async redeemTransactionLink(
-    @Arg('code', () => String) id: string,
+    @Arg('code', () => String) code: string,
     @Ctx() context: any,
   ): Promise<boolean> {
     const { user } = context

From 3a2d7acd291ba7b5542c1bfdca91b1896af10955 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 08:08:48 +0100
Subject: [PATCH 43/64] Update frontend/src/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.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 ae3352c3a..ccf130cd0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -100,7 +100,7 @@
     "delete-the-link": "Den Link löschen?",
     "deleted": "Der Link wurde gelöscht!",
     "expired": "Abgelaufen",
-    "has-account": "Du hast einen Gradido Konto",
+    "has-account": "Du hast ein Gradido Konto",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "link-deleted": "Der Link wurde am {date} von {user} gelöscht.",

From 99575cc2f53186980823c5c2d1caa2cba5248f05 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 08:13:34 +0100
Subject: [PATCH 44/64] Update
 frontend/src/pages/ShowTransactionLinkInformations.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 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 4af974920..9551af052 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -24,7 +24,7 @@
 </template>
 <script>
 import TransactionLinkInformationItem from '@/components/TransactionLinkInformationItem'
-import RedeemLoggedOut from '@/components/LinkInformatins/RedeemLoggedOut'
+import RedeemLoggedOut from '@/components/LinkInformations/RedeemLoggedOut'
 import RedeemSelfCreator from '@/components/LinkInformatins/RedeemSelfCreator'
 import RedeemValid from '@/components/LinkInformatins/RedeemValid'
 import RedeemedTextBox from '@/components/LinkInformatins/RedeemedTextBox'

From a14f98e4ee87a59bc4b9ae5eef371bd8ff110e87 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 20:14:34 +0100
Subject: [PATCH 45/64] test frontend/src/store/store.test.js ok

---
 frontend/src/store/store.test.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index ea40d9474..29a703e8f 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -26,6 +26,7 @@ const {
   isAdmin,
   community,
   hasElopage,
+  redeemCode,
 } = mutations
 const { login, logout } = actions
 
@@ -141,6 +142,14 @@ describe('Vuex store', () => {
         hasElopage(state, true)
         expect(state.hasElopage).toBeTruthy()
       })
+
+      describe('redeemCode', () => {
+        it('sets the state of token', () => {
+          const state = { redeemCode: null }
+          redeemCode(state, 'a0000b0000c0000')
+          expect(state.redeemCode).toEqual('a0000b0000c0000')
+        })
+      })
     })
   })
 
@@ -219,7 +228,7 @@ describe('Vuex store', () => {
 
       it('calls nine commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(9)
+        expect(commit).toHaveBeenCalledTimes(10)
       })
 
       it('commits token', () => {

From 9c668f3934d16f4b9cb4cff6bd8ede13c83aecc5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 08:18:20 +0100
Subject: [PATCH 46/64] changed review from moriz

---
 frontend/src/locales/de.json                               | 2 +-
 frontend/src/locales/en.json                               | 2 +-
 ...ionLinkInformations.spec.js => TransactionLink.spec.js} | 7 +++----
 ...TransactionLinkInformations.vue => TransactionLink.vue} | 3 +--
 frontend/src/routes/router.test.js                         | 4 ++--
 frontend/src/routes/routes.js                              | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename frontend/src/pages/{ShowTransactionLinkInformations.spec.js => TransactionLink.spec.js} (88%)
 rename frontend/src/pages/{ShowTransactionLinkInformations.vue => TransactionLink.vue} (98%)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ccf130cd0..03d8a0fe6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -103,7 +103,7 @@
     "has-account": "Du hast ein Gradido Konto",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
-    "link-deleted": "Der Link wurde am {date} von {user} gelöscht.",
+    "link-deleted": "Der Link wurde am {date} gelöscht.",
     "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
     "link-overview": "Linkübersicht",
     "links_count": "Aktive Links",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 83ae65c65..26c8db9a2 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -103,7 +103,7 @@
     "has-account": "You have a Gradido account",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
-    "link-deleted": "The link has been deleted.",
+    "link-deleted": "The link was deleted on {date}.",
     "link-expired": "The link is no longer valid. The validity expired on {date}.",
     "link-overview": "Link overview",
     "links_count": "Active links",
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/TransactionLink.spec.js
similarity index 88%
rename from frontend/src/pages/ShowTransactionLinkInformations.spec.js
rename to frontend/src/pages/TransactionLink.spec.js
index e5b112f2a..f31812a10 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import ShowTransactionLinkInformations from './ShowTransactionLinkInformations'
+import TransactionLink from './TransactionLink'
 import { queryTransactionLink } from '@/graphql/queries'
 
 const localVue = global.localVue
@@ -21,7 +21,6 @@ apolloQueryMock.mockResolvedValue({
         redeemedAt: '2022-03-18T10:08:43.000Z',
         deletedAt: null,
         user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
-        __typename: 'TransactionLink',
       },
     ],
   },
@@ -52,11 +51,11 @@ const createMockObject = (code) => {
   }
 }
 
-describe('ShowTransactionLinkInformations', () => {
+describe('TransactionLink', () => {
   let wrapper
 
   const Wrapper = (functionN) => {
-    return mount(ShowTransactionLinkInformations, functionN)
+    return mount(TransactionLink, functionN)
   }
 
   describe('mount', () => {
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/TransactionLink.vue
similarity index 98%
rename from frontend/src/pages/ShowTransactionLinkInformations.vue
rename to frontend/src/pages/TransactionLink.vue
index 9551af052..bd88f051b 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -32,7 +32,7 @@ import { queryTransactionLink } from '@/graphql/queries'
 import { redeemTransactionLink } from '@/graphql/mutations'
 
 export default {
-  name: 'ShowTransactionLinkInformations',
+  name: 'TransactionLink',
   components: {
     TransactionLinkInformationItem,
     RedeemLoggedOut,
@@ -103,7 +103,6 @@ export default {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
         this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
           date: this.linkData.deletedAt,
-          user: this.linkData.user.firstName,
         })
         return `X4`
       } else {
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 1a966fdc6..24916bb05 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -183,9 +183,9 @@ describe('router', () => {
       })
 
       describe('redeem', () => {
-        it('loads the "ShowTransactionLinkInformations" page', async () => {
+        it('loads the "TransactionLink" page', async () => {
           const component = await routes.find((r) => r.path === '/redeem/:code').component()
-          expect(component.default.name).toBe('ShowTransactionLinkInformations')
+          expect(component.default.name).toBe('TransactionLink')
         })
       })
 
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 982091b4d..5e0b09c5e 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -84,7 +84,7 @@ const routes = [
   },
   {
     path: '/redeem/:code',
-    component: () => import('@/pages/ShowTransactionLinkInformations.vue'),
+    component: () => import('@/pages/TransactionLink.vue'),
   },
   { path: '*', component: NotFound },
 ]

From 837850c17eb746f8beaa0bb1f7aecfb4ffc27f7c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 08:24:48 +0100
Subject: [PATCH 47/64] change order name from LinkInformatins to
 LinkInformations

---
 .../RedeemLoggedOut.vue                                     | 0
 .../RedeemSelfCreator.vue                                   | 0
 .../{LinkInformatins => LinkInformations}/RedeemValid.vue   | 0
 .../RedeemedTextBox.vue                                     | 0
 frontend/src/pages/TransactionLink.vue                      | 6 +++---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename frontend/src/components/{LinkInformatins => LinkInformations}/RedeemLoggedOut.vue (100%)
 rename frontend/src/components/{LinkInformatins => LinkInformations}/RedeemSelfCreator.vue (100%)
 rename frontend/src/components/{LinkInformatins => LinkInformations}/RedeemValid.vue (100%)
 rename frontend/src/components/{LinkInformatins => LinkInformations}/RedeemedTextBox.vue (100%)

diff --git a/frontend/src/components/LinkInformatins/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
similarity index 100%
rename from frontend/src/components/LinkInformatins/RedeemLoggedOut.vue
rename to frontend/src/components/LinkInformations/RedeemLoggedOut.vue
diff --git a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
similarity index 100%
rename from frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
rename to frontend/src/components/LinkInformations/RedeemSelfCreator.vue
diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
similarity index 100%
rename from frontend/src/components/LinkInformatins/RedeemValid.vue
rename to frontend/src/components/LinkInformations/RedeemValid.vue
diff --git a/frontend/src/components/LinkInformatins/RedeemedTextBox.vue b/frontend/src/components/LinkInformations/RedeemedTextBox.vue
similarity index 100%
rename from frontend/src/components/LinkInformatins/RedeemedTextBox.vue
rename to frontend/src/components/LinkInformations/RedeemedTextBox.vue
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index bd88f051b..755026058 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -25,9 +25,9 @@
 <script>
 import TransactionLinkInformationItem from '@/components/TransactionLinkInformationItem'
 import RedeemLoggedOut from '@/components/LinkInformations/RedeemLoggedOut'
-import RedeemSelfCreator from '@/components/LinkInformatins/RedeemSelfCreator'
-import RedeemValid from '@/components/LinkInformatins/RedeemValid'
-import RedeemedTextBox from '@/components/LinkInformatins/RedeemedTextBox'
+import RedeemSelfCreator from '@/components/LinkInformations/RedeemSelfCreator'
+import RedeemValid from '@/components/LinkInformations/RedeemValid'
+import RedeemedTextBox from '@/components/LinkInformations/RedeemedTextBox'
 import { queryTransactionLink } from '@/graphql/queries'
 import { redeemTransactionLink } from '@/graphql/mutations'
 

From bf915a9668ff71322974a8abe10c0a9dabd76387 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 10:09:28 +0100
Subject: [PATCH 48/64] add components RedeemInformation.vue

---
 .../LinkInformations/RedeemInformation.vue    | 21 ++++++++++++
 .../LinkInformations/RedeemLoggedOut.vue      | 14 ++++----
 .../LinkInformations/RedeemSelfCreator.vue    | 13 ++++----
 .../LinkInformations/RedeemValid.vue          | 14 ++++----
 ...mationItem.vue => TransactionLinkItem.vue} |  2 +-
 frontend/src/pages/Register.vue               |  3 +-
 frontend/src/pages/TransactionLink.vue        | 32 +++++++++----------
 7 files changed, 57 insertions(+), 42 deletions(-)
 create mode 100644 frontend/src/components/LinkInformations/RedeemInformation.vue
 rename frontend/src/components/{TransactionLinkInformationItem.vue => TransactionLinkItem.vue} (81%)

diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
new file mode 100644
index 000000000..71c0b27ad
--- /dev/null
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="redeem-information">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
+      <h1>
+        {{ user.firstName }}
+        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
+      </h1>
+      <b>{{ memo }}</b>
+    </b-jumbotron>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RedeemInformation',
+  props: {
+    user: { type: Object, required: true },
+    amount: { type: String, required: true },
+    memo: { type: String, required: true, default: '' },
+  },
+}
+</script>
diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index d059dfc10..15d9a985b 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="redeem-logged-out">
-    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
-      <h1>
-        {{ user.firstName }}
-        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
-      </h1>
-      <b>{{ memo }}</b>
-    </b-jumbotron>
+    <redeem-information :user="user" :amount="amount" :memo="memo" />
+
     <b-jumbotron>
       <div class="mb-6">
         <h2>{{ $t('gdd_per_link.redeem') }}</h2>
@@ -28,8 +23,13 @@
   </div>
 </template>
 <script>
+import RedeemInformation from '@/components/LinkInformations/RedeemInformation.vue'
+
 export default {
   name: 'RedeemLoggedOut',
+  components: {
+    RedeemInformation,
+  },
   props: {
     user: { type: Object, required: true },
     amount: { type: String, required: true },
diff --git a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
index 9b8405ad6..ffcdc2543 100644
--- a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
+++ b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="redeem-self-creator">
-    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
-      <h1>
-        {{ user.firstName }}
-        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
-      </h1>
-      <b>{{ memo }}</b>
-    </b-jumbotron>
+    <redeem-information :user="user" :amount="amount" :memo="memo" />
 
     <b-jumbotron>
       <div class="mb-3 text-center">
@@ -21,8 +15,13 @@
   </div>
 </template>
 <script>
+import RedeemInformation from '@/components/LinkInformations/RedeemInformation.vue'
+
 export default {
   name: 'RedeemSelfCreator',
+  components: {
+    RedeemInformation,
+  },
   props: {
     user: { type: Object, required: true },
     amount: { type: String, required: true },
diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index 10b9200c8..96af8e3b2 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="redeem-valid">
-    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
-      <h1>
-        {{ user.firstName }}
-        {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
-      </h1>
-      <b>{{ memo }}</b>
-    </b-jumbotron>
-
+    <redeem-information :user="user" :amount="amount" :memo="memo" />
     <b-jumbotron>
       <div class="mb-3 text-center">
         <b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
@@ -18,8 +11,13 @@
   </div>
 </template>
 <script>
+import RedeemInformation from '@/components/LinkInformations/RedeemInformation.vue'
+
 export default {
   name: 'RedeemValid',
+  components: {
+    RedeemInformation,
+  },
   props: {
     user: { type: Object, required: false },
     amount: { type: String, required: false },
diff --git a/frontend/src/components/TransactionLinkInformationItem.vue b/frontend/src/components/TransactionLinkItem.vue
similarity index 81%
rename from frontend/src/components/TransactionLinkInformationItem.vue
rename to frontend/src/components/TransactionLinkItem.vue
index da17435a9..bea893724 100644
--- a/frontend/src/components/TransactionLinkInformationItem.vue
+++ b/frontend/src/components/TransactionLinkItem.vue
@@ -5,7 +5,7 @@
 </template>
 <script>
 export default {
-  name: 'TransactionLinkInformationItem',
+  name: 'TransactionLinkItem',
   props: {
     type: {
       type: String,
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 5638159b8..b2df16e0f 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -130,8 +130,7 @@
                             readonly
                             id="redeem-code"
                             type="text"
-                            v-model="redeemCode"
-                            @input="commitStoreRedeemCode(redeemCode)"
+                            v-model="$store.state.redeemCode"
                           ></b-form-input>
                         </b-input-group>
                       </div>
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 755026058..08601a977 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -2,28 +2,28 @@
   <div class="show-transaction-link-informations">
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="mt-4">
-      <transaction-link-information-item :type="itemType">
-        <template #X1>
+      <transaction-link-item :type="itemType">
+        <template #LOGGED_OUT>
           <redeem-logged-out v-bind="linkData" />
         </template>
 
-        <template #X2>
+        <template #SELF_CREATOR>
           <redeem-self-creator v-bind="linkData" />
         </template>
 
-        <template #X3>
+        <template #VALID>
           <redeem-valid v-bind="linkData" @redeem-link="redeemLink" />
         </template>
 
-        <template #X4>
+        <template #TEXT>
           <redeemed-text-box :text="redeemedBoxText" />
         </template>
-      </transaction-link-information-item>
+      </transaction-link-item>
     </b-container>
   </div>
 </template>
 <script>
-import TransactionLinkInformationItem from '@/components/TransactionLinkInformationItem'
+import TransactionLinkItem from '@/components/TransactionLinkItem'
 import RedeemLoggedOut from '@/components/LinkInformations/RedeemLoggedOut'
 import RedeemSelfCreator from '@/components/LinkInformations/RedeemSelfCreator'
 import RedeemValid from '@/components/LinkInformations/RedeemValid'
@@ -34,7 +34,7 @@ import { redeemTransactionLink } from '@/graphql/mutations'
 export default {
   name: 'TransactionLink',
   components: {
-    TransactionLinkInformationItem,
+    TransactionLinkItem,
     RedeemLoggedOut,
     RedeemSelfCreator,
     RedeemValid,
@@ -104,7 +104,7 @@ export default {
         this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', {
           date: this.linkData.deletedAt,
         })
-        return `X4`
+        return `TEXT`
       } else {
         // link ist abgelaufen, nicht gelöscht
         if (new Date(this.linkData.validUntil) < new Date()) {
@@ -112,7 +112,7 @@ export default {
           this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
             date: this.linkData.validUntil,
           })
-          return `X4`
+          return `TEXT`
         }
 
         // der link wurde eingelöst, nicht gelöscht
@@ -121,16 +121,14 @@ export default {
           this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
             date: this.linkData.redeemedAt,
           })
-          return `X4`
+          return `TEXT`
         }
       }
 
-      if (!this.$store.state.token) {
-        return `X1`
-      } else {
+      if (this.$store.state.token) {
         // logged in, nicht berechtigt einzulösen, eigener link
         if (this.$store.state.email === this.linkData.user.email) {
-          return `X2`
+          return `SELF_CREATOR`
         }
 
         // logged in und berechtigt einzulösen
@@ -139,11 +137,11 @@ export default {
           !this.linkData.redeemedAt &&
           !this.linkData.deletedAt
         ) {
-          return `X3`
+          return `VALID`
         }
       }
 
-      return `X`
+      return `LOGGED_OUT`
     },
   },
   created() {

From 12f2f2845ab144cc23c009b2aa7b4e51b68fdb07 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 13:05:31 +0100
Subject: [PATCH 49/64] remove store redeem and add params code

---
 frontend/src/pages/Register.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index b2df16e0f..9fb3db56e 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -118,7 +118,7 @@
                       {{ messageError }}
                     </span>
                   </b-alert>
-                  <b-row v-if="$route.params.code">
+                  <b-row v-if="redeemCode">
                     <b-col>
                       <label>{{ $t('gdd_per_link.redeem') }}</label>
                       <div class="mt-2 mb-2">
@@ -130,7 +130,7 @@
                             readonly
                             id="redeem-code"
                             type="text"
-                            v-model="$store.state.redeemCode"
+                            v-model="redeemCode"
                           ></b-form-input>
                         </b-input-group>
                       </div>
@@ -234,7 +234,7 @@ export default {
       messageError: '',
       register: true,
       publisherId: this.$store.state.publisherId,
-      redeemCode: this.$store.state.redeemCode,
+      redeemCode: this.$route.params.code,
     }
   },
   methods: {
@@ -248,9 +248,6 @@ export default {
     commitStorePublisherId(val) {
       this.$store.commit('publisherId', val)
     },
-    commitStoreRedeemCode(val) {
-      this.$store.commit('redeemCode', val)
-    },
     async onSubmit() {
       this.$apollo
         .mutate({
@@ -261,7 +258,7 @@ export default {
             lastName: this.form.lastname,
             language: this.language,
             publisherId: this.$store.state.publisherId,
-            redeemCode: this.$store.state.redeemCode,
+            redeemCode: this.redeem,
           },
         })
         .then(() => {
@@ -296,10 +293,5 @@ export default {
       return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language)
     },
   },
-  created() {
-    if (this.$route.params.code) {
-      this.commitStoreRedeemCode(this.$route.params.code)
-    }
-  },
 }
 </script>

From 58a7bc0e2a72f819f6cbba2a0f202729b7bb07f7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 13:08:11 +0100
Subject: [PATCH 50/64] delete redeem

---
 frontend/src/store/store.js      |  5 -----
 frontend/src/store/store.test.js | 11 +----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index fb74624fb..458c8c8de 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -47,9 +47,6 @@ export const mutations = {
   hasElopage: (state, hasElopage) => {
     state.hasElopage = hasElopage
   },
-  redeemCode: (state, redeemCode) => {
-    state.redeemCode = redeemCode
-  },
 }
 
 export const actions = {
@@ -76,7 +73,6 @@ export const actions = {
     commit('hasElopage', false)
     commit('publisherId', null)
     commit('isAdmin', false)
-    commit('redeemCode', null)
     localStorage.clear()
   },
 }
@@ -106,7 +102,6 @@ try {
       },
       hasElopage: false,
       publisherId: null,
-      redeemCode: null,
     },
     getters: {},
     // Syncronous mutation of the state
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index 29a703e8f..ea40d9474 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -26,7 +26,6 @@ const {
   isAdmin,
   community,
   hasElopage,
-  redeemCode,
 } = mutations
 const { login, logout } = actions
 
@@ -142,14 +141,6 @@ describe('Vuex store', () => {
         hasElopage(state, true)
         expect(state.hasElopage).toBeTruthy()
       })
-
-      describe('redeemCode', () => {
-        it('sets the state of token', () => {
-          const state = { redeemCode: null }
-          redeemCode(state, 'a0000b0000c0000')
-          expect(state.redeemCode).toEqual('a0000b0000c0000')
-        })
-      })
     })
   })
 
@@ -228,7 +219,7 @@ describe('Vuex store', () => {
 
       it('calls nine commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(10)
+        expect(commit).toHaveBeenCalledTimes(9)
       })
 
       it('commits token', () => {

From 07bf90e483a7d806f8079cce9d10d68a2ba1540f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 13:49:19 +0100
Subject: [PATCH 51/64] Update frontend/src/locales/en.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 c8c10a66c..3085ada35 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -109,7 +109,7 @@
     "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
     "no-account": "You don't have a Gradido account yet",
-    "no-redeem": "You can't redeem your own link!",
+    "no-redeem": "You not allowed to redeem your own link!",
     "not-copied": "Could not copy link: {err}",
     "redeem": "Redeem",
     "redeem-text": "Do you want to redeem the amount now?",

From be319ba5e431185d1d9849859df8ad427122bb92 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 13:50:17 +0100
Subject: [PATCH 52/64] Update frontend/src/locales/en.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 3085ada35..28d7c15ab 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -100,7 +100,7 @@
     "delete-the-link": "Delete the link?",
     "deleted": "The link was deleted!",
     "expired": "Expired",
-    "has-account": "You have a Gradido account",
+    "has-account": "You already have a Gradido account",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "link-deleted": "The link was deleted on {date}.",

From db0297b82638fe3fe540d85a2bf490918e7ae519 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 13:50:35 +0100
Subject: [PATCH 53/64] Update frontend/src/locales/de.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 5bdb5f9ab..ce4da7945 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -109,7 +109,7 @@
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
     "no-account": "Du hast noch kein Gradido Konto",
-    "no-redeem": "Du kannst deinen eigenen Link nicht einlösen!",
+    "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
     "not-copied": "Konnte den Link nicht kopieren: {err}",
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",

From e41f594fbd2af513bb9b0de8b075b193b115edf7 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 13:50:50 +0100
Subject: [PATCH 54/64] Update frontend/src/locales/de.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 ce4da7945..fc220a79f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -108,7 +108,7 @@
     "link-overview": "Linkübersicht",
     "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
-    "no-account": "Du hast noch kein Gradido Konto",
+    "no-account": "Du besitzt noch kein Gradido Konto",
     "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
     "not-copied": "Konnte den Link nicht kopieren: {err}",
     "redeem": "Einlösen",

From b68fab72ccd3b777aeefb8a87c2ec1f41c036024 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 14:01:41 +0100
Subject: [PATCH 55/64] review from ulf and hannes

---
 frontend/src/components/GddSend/TransactionForm.vue           | 2 +-
 .../src/components/LinkInformations/RedeemInformation.vue     | 4 ++--
 frontend/src/components/LinkInformations/RedeemLoggedOut.vue  | 2 +-
 .../src/components/LinkInformations/RedeemSelfCreator.vue     | 2 +-
 frontend/src/components/LinkInformations/RedeemValid.vue      | 2 +-
 frontend/src/locales/de.json                                  | 2 +-
 frontend/src/locales/en.json                                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 845e749cc..ec4aff4d3 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -19,7 +19,7 @@
             <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') }}
+                {{ $t('gdd_per_link.choose-amount') }}
               </div>
             </div>
 
diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
index 71c0b27ad..bdc17db9a 100644
--- a/frontend/src/components/LinkInformations/RedeemInformation.vue
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -2,7 +2,7 @@
   <div class="redeem-information">
     <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
-        {{ user.firstName }}
+        {{ firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
       </h1>
       <b>{{ memo }}</b>
@@ -13,7 +13,7 @@
 export default {
   name: 'RedeemInformation',
   props: {
-    user: { type: Object, required: true },
+    firstName: { type: String, required: true },
     amount: { type: String, required: true },
     memo: { type: String, required: true, default: '' },
   },
diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index 15d9a985b..20b75869a 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-logged-out">
-    <redeem-information :user="user" :amount="amount" :memo="memo" />
+    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
 
     <b-jumbotron>
       <div class="mb-6">
diff --git a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
index ffcdc2543..5a4928690 100644
--- a/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
+++ b/frontend/src/components/LinkInformations/RedeemSelfCreator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-self-creator">
-    <redeem-information :user="user" :amount="amount" :memo="memo" />
+    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
 
     <b-jumbotron>
       <div class="mb-3 text-center">
diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index 96af8e3b2..301afad69 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-valid">
-    <redeem-information :user="user" :amount="amount" :memo="memo" />
+    <redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
     <b-jumbotron>
       <div class="mb-3 text-center">
         <b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index fc220a79f..39245be9d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -116,7 +116,7 @@
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
     "successfully-redeemed": "Erfolgreich eingelöst!",
     "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
-    "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.",
+    "choose-amount": "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.",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 28d7c15ab..bc21452b3 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -116,7 +116,7 @@
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "redeemed-at": "The link was already redeemed on {date}.",
     "successfully-redeemed": "Successfully redeemed!",
-    "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.",
+    "choose-amount": "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.",
     "to-login": "Log in",
     "to-register": "Register a new account"
   },

From c2d0b566a8eaac847eb4a787927af311473fecfa Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 14:05:41 +0100
Subject: [PATCH 56/64] Update frontend/src/locales/de.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 39245be9d..5ddade03e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -100,7 +100,7 @@
     "delete-the-link": "Den Link löschen?",
     "deleted": "Der Link wurde gelöscht!",
     "expired": "Abgelaufen",
-    "has-account": "Du hast ein Gradido Konto",
+    "has-account": "Du besitzt bereits ein Gradido Konto",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "link-deleted": "Der Link wurde am {date} gelöscht.",

From 17bfbd6281a65d98075af256b3d1dfb12fd01a82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Mar 2022 14:29:00 +0100
Subject: [PATCH 57/64] fix test for optional code on login on register

---
 frontend/src/routes/router.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 24916bb05..85f765c69 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -99,14 +99,14 @@ describe('router', () => {
 
       describe('login', () => {
         it('loads the "Login" page', async () => {
-          const component = await routes.find((r) => r.path === '/login').component()
+          const component = await routes.find((r) => r.path === '/login/:code?').component()
           expect(component.default.name).toBe('Login')
         })
       })
 
       describe('register', () => {
         it('loads the "register" page', async () => {
-          const component = await routes.find((r) => r.path === '/register').component()
+          const component = await routes.find((r) => r.path === '/register/:code?').component()
           expect(component.default.name).toBe('Register')
         })
       })

From 7850127ae22239da73332b73f04704a15e71727c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 14:38:08 +0100
Subject: [PATCH 58/64] after login go to redeem page

---
 frontend/src/pages/Login.vue    | 29 +++++------------------------
 frontend/src/pages/Register.vue | 18 ------------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 590a56f74..79532cb21 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -42,10 +42,6 @@
               </validation-observer>
             </b-card-body>
           </b-card>
-          <div v-if="$route.params.code" class="mt-2 mb-2">
-            {{ $t('gdd_per_link.redeem') + ':' }}
-            <b>{{ $route.params.code }}</b>
-          </div>
           <b-row class="mt-3">
             <b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
               <router-link to="/forgot-password" class="mt-3">
@@ -68,7 +64,6 @@ import InputPassword from '@/components/Inputs/InputPassword'
 import InputEmail from '@/components/Inputs/InputEmail'
 import { login } from '@/graphql/queries'
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
-import { redeemTransactionLink } from '@/graphql/mutations'
 
 export default {
   name: 'Login',
@@ -101,16 +96,17 @@ export default {
           },
           fetchPolicy: 'network-only',
         })
-        .then((result) => {
+        .then(async (result) => {
           const {
             data: { login },
           } = result
           this.$store.dispatch('login', login)
+          await loader.hide()
           if (this.$route.params.code) {
-            this.redeemLink(this.$route.params.code)
+            this.$router.push(`/redeem/${this.$route.params.code}`)
+          } else {
+            this.$router.push('/overview')
           }
-          this.$router.push('/overview')
-          loader.hide()
         })
         .catch((error) => {
           this.toastError(this.$t('error.no-account'))
@@ -122,21 +118,6 @@ export default {
           loader.hide()
         })
     },
-    redeemLink(code) {
-      this.$apollo
-        .mutate({
-          mutation: redeemTransactionLink,
-          variables: {
-            code: code,
-          },
-        })
-        .then(() => {
-          this.toastSuccess(this.$t('gdd_per_link.successfully-redeemed'))
-        })
-        .catch((err) => {
-          this.toastError(err.message)
-        })
-    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 9fb3db56e..152c18198 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -118,24 +118,6 @@
                       {{ messageError }}
                     </span>
                   </b-alert>
-                  <b-row v-if="redeemCode">
-                    <b-col>
-                      <label>{{ $t('gdd_per_link.redeem') }}</label>
-                      <div class="mt-2 mb-2">
-                        <b-input-group class="shadow-sm p-2 bg-white rounded">
-                          <b-input-group-prepend is-text>
-                            <b-icon icon="link45deg"></b-icon>
-                          </b-input-group-prepend>
-                          <b-form-input
-                            readonly
-                            id="redeem-code"
-                            type="text"
-                            v-model="redeemCode"
-                          ></b-form-input>
-                        </b-input-group>
-                      </div>
-                    </b-col>
-                  </b-row>
 
                   <b-row
                     v-else

From 9377102f00247eb23d68715220b0816efbc44329 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 14:46:14 +0100
Subject: [PATCH 59/64] deleted v-else

---
 frontend/src/pages/Register.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 152c18198..2dfbac441 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -119,11 +119,7 @@
                     </span>
                   </b-alert>
 
-                  <b-row
-                    v-else
-                    v-b-toggle:my-collapse
-                    class="text-muted shadow-sm p-3 publisherCollaps"
-                  >
+                  <b-row v-b-toggle:my-collapse class="text-muted shadow-sm p-3 publisherCollaps">
                     <b-col>{{ $t('publisher.publisherId') }} {{ $store.state.publisherId }}</b-col>
                     <b-col class="text-right">
                       <b-icon icon="chevron-down" aria-hidden="true"></b-icon>

From ea99db0159f276c7fe9991ceef48cf4d84f0ed86 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Mar 2022 14:50:50 +0100
Subject: [PATCH 60/64] yarn lint and locales fixed

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5ddade03e..35155ca79 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -94,6 +94,7 @@
   },
   "GDD": "GDD",
   "gdd_per_link": {
+    "choose-amount": "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.",
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
     "decay-14-day": "Vergänglichkeit für 14 Tage",
@@ -114,9 +115,7 @@
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
-    "successfully-redeemed": "Erfolgreich eingelöst!",
     "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
-    "choose-amount": "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.",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index bc21452b3..af54f3b50 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -94,6 +94,7 @@
   },
   "GDD": "GDD",
   "gdd_per_link": {
+    "choose-amount": "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.",
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
@@ -115,8 +116,6 @@
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "redeemed-at": "The link was already redeemed on {date}.",
-    "successfully-redeemed": "Successfully redeemed!",
-    "choose-amount": "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.",
     "to-login": "Log in",
     "to-register": "Register a new account"
   },

From c57b40adc10506263abe5b0d5902d0e249cce8cb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Mar 2022 14:56:37 +0100
Subject: [PATCH 61/64] test Register with Redeem Code

---
 frontend/src/pages/Register.spec.js | 44 ++++++++++++++++++++++++++++-
 frontend/src/pages/Register.vue     |  2 +-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index c29909123..446c97928 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -32,6 +32,9 @@ describe('Register', () => {
     $router: {
       push: routerPushMock,
     },
+    $route: {
+      params: {},
+    },
     $apollo: {
       mutate: registerUserMutationMock,
       query: apolloQueryMock,
@@ -312,6 +315,45 @@ describe('Register', () => {
         })
       })
     })
-    // TODO: line 157
+
+    describe('redeem code', () => {
+      describe('no redeem code', () => {
+        it('has no redeem code', () => {
+          expect(wrapper.vm.redeemCode).toBe(undefined)
+        })
+      })
+    })
+
+    describe('with redeem code', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        mocks.$route.params = {
+          code: 'some-code',
+        }
+        wrapper = Wrapper()
+        wrapper.find('#registerFirstname').setValue('Max')
+        wrapper.find('#registerLastname').setValue('Mustermann')
+        wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net')
+        wrapper.find('.language-switch-select').findAll('option').at(1).setSelected()
+        wrapper.find('#registerCheckbox').setChecked()
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+      })
+
+      it('sends the redeem code to the server', () => {
+        expect(registerUserMutationMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: {
+              email: 'max.mustermann@gradido.net',
+              firstName: 'Max',
+              lastName: 'Mustermann',
+              language: 'en',
+              publisherId: 12345,
+              redeemCode: 'some-code',
+            },
+          }),
+        )
+      })
+    })
   })
 })
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 2dfbac441..cadc0f34c 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -236,7 +236,7 @@ export default {
             lastName: this.form.lastname,
             language: this.language,
             publisherId: this.$store.state.publisherId,
-            redeemCode: this.redeem,
+            redeemCode: this.redeemCode,
           },
         })
         .then(() => {

From 5baa14b359878954a7f598541e8f9c381dfc68cc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Mar 2022 16:25:17 +0100
Subject: [PATCH 62/64] test transaction link page

---
 frontend/src/pages/TransactionLink.spec.js | 363 ++++++++++++++++++---
 frontend/src/pages/TransactionLink.vue     |  39 +--
 2 files changed, 338 insertions(+), 64 deletions(-)

diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js
index f31812a10..8c41d0a92 100644
--- a/frontend/src/pages/TransactionLink.spec.js
+++ b/frontend/src/pages/TransactionLink.spec.js
@@ -1,83 +1,360 @@
 import { mount } from '@vue/test-utils'
 import TransactionLink from './TransactionLink'
 import { queryTransactionLink } from '@/graphql/queries'
+import { redeemTransactionLink } from '@/graphql/mutations'
+import { toastSuccessSpy, toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
-const errorHandler = jest.fn()
 const apolloQueryMock = jest.fn()
+const apolloMutateMock = jest.fn()
+const routerPushMock = jest.fn()
 
-localVue.config.errorHandler = errorHandler
+const now = new Date().toISOString()
+
+const transactionLinkValidExpireDate = () => {
+  const validUntil = new Date()
+  return new Date(validUntil.setDate(new Date().getDate() + 14)).toISOString()
+}
 
 apolloQueryMock.mockResolvedValue({
   data: {
-    listTransactionLinks: [
-      {
-        id: 92,
-        amount: '22',
-        memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
-        createdAt: '2022-03-17T16:10:28.000Z',
-        validUntil: '2022-03-31T16:10:28.000Z',
-        redeemedAt: '2022-03-18T10:08:43.000Z',
-        deletedAt: null,
-        user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
-      },
-    ],
+    queryTransactionLink: {
+      id: 92,
+      amount: '22',
+      memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+      createdAt: '2022-03-17T16:10:28.000Z',
+      validUntil: transactionLinkValidExpireDate(),
+      redeemedAt: '2022-03-18T10:08:43.000Z',
+      deletedAt: null,
+      user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+    },
   },
 })
 
-const createMockObject = (code) => {
-  return {
-    localVue,
-    mocks: {
-      $t: jest.fn((t) => t),
-      $i18n: {
-        locale: () => 'en',
-      },
-      $store: {
-        state: {
-          email: 'bibi@bloxberg.de',
-        },
-      },
-      $apollo: {
-        query: apolloQueryMock,
-      },
-      $route: {
-        params: {
-          code: 'c0000c0000c0000',
-        },
-      },
+const mocks = {
+  $t: jest.fn((t, obj = null) => (obj ? [t, obj.date].join('; ') : t)),
+  $store: {
+    state: {
+      token: null,
+      email: 'bibi@bloxberg.de',
     },
-  }
+  },
+  $apollo: {
+    query: apolloQueryMock,
+    mutate: apolloMutateMock,
+  },
+  $route: {
+    params: {
+      code: 'some-code',
+    },
+  },
+  $router: {
+    push: routerPushMock,
+  },
 }
 
 describe('TransactionLink', () => {
   let wrapper
 
-  const Wrapper = (functionN) => {
-    return mount(TransactionLink, functionN)
+  const Wrapper = () => {
+    return mount(TransactionLink, { localVue, mocks })
   }
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject())
+      jest.clearAllMocks()
+      wrapper = Wrapper()
     })
 
     it('renders the component', () => {
-      expect(wrapper.find('div.show-transaction-link-informations').exists()).toBeTruthy()
+      expect(wrapper.find('div.show-transaction-link-informations').exists()).toBe(true)
     })
 
     it('calls the queryTransactionLink query', () => {
       expect(apolloQueryMock).toBeCalledWith({
         query: queryTransactionLink,
         variables: {
-          code: 'c0000c0000c0000',
+          code: 'some-code',
         },
       })
     })
 
-    it('has link one information link data', () => {
-      expect(apolloQueryMock.mockResolvedValue).toHaveLength(1)
+    describe('deleted link', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: transactionLinkValidExpireDate(),
+              redeemedAt: '2022-03-18T10:08:43.000Z',
+              deletedAt: now,
+              user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a component RedeemedTextBox', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).exists()).toBe(true)
+      })
+
+      it('has a link deleted text in text box', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).text()).toContain(
+          'gdd_per_link.link-deleted; ' + now,
+        )
+      })
+    })
+
+    describe('expired link', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: '2020-03-18T10:08:43.000Z',
+              redeemedAt: '2022-03-18T10:08:43.000Z',
+              deletedAt: null,
+              user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a component RedeemedTextBox', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).exists()).toBe(true)
+      })
+
+      it('has a link deleted text in text box', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).text()).toContain(
+          'gdd_per_link.link-expired; 2020-03-18T10:08:43.000Z',
+        )
+      })
+    })
+
+    describe('redeemed link', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: transactionLinkValidExpireDate(),
+              redeemedAt: '2022-03-18T10:08:43.000Z',
+              deletedAt: null,
+              user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a component RedeemedTextBox', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).exists()).toBe(true)
+      })
+
+      it('has a link deleted text in text box', () => {
+        expect(wrapper.findComponent({ name: 'RedeemedTextBox' }).text()).toContain(
+          'gdd_per_link.redeemed-at; 2022-03-18T10:08:43.000Z',
+        )
+      })
+    })
+
+    describe('no token in store', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: transactionLinkValidExpireDate(),
+              redeemedAt: null,
+              deletedAt: null,
+              user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a RedeemLoggedOut component', () => {
+        expect(wrapper.findComponent({ name: 'RedeemLoggedOut' }).exists()).toBe(true)
+      })
+
+      it('has a link to register with code', () => {
+        expect(wrapper.find('a[href="/register/some-code"]').exists()).toBe(true)
+      })
+
+      it('has a link to login with code', () => {
+        expect(wrapper.find('a[href="/login/some-code"]').exists()).toBe(true)
+      })
+    })
+
+    describe('token in store and own link', () => {
+      beforeEach(() => {
+        mocks.$store.state.token = 'token'
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: transactionLinkValidExpireDate(),
+              redeemedAt: null,
+              deletedAt: null,
+              user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a RedeemSelfCreator component', () => {
+        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).exists()).toBe(true)
+      })
+
+      it('has a no redeem text', () => {
+        expect(wrapper.findComponent({ name: 'RedeemSelfCreator' }).text()).toContain(
+          'gdd_per_link.no-redeem',
+        )
+      })
+
+      it('has a link to transaction page', () => {
+        expect(wrapper.find('a[to="/transactions"]').exists()).toBe(true)
+      })
+    })
+
+    describe('valid link', () => {
+      beforeEach(() => {
+        mocks.$store.state.token = 'token'
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            queryTransactionLink: {
+              id: 92,
+              amount: '22',
+              memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+              createdAt: '2022-03-17T16:10:28.000Z',
+              validUntil: transactionLinkValidExpireDate(),
+              redeemedAt: null,
+              deletedAt: null,
+              user: { firstName: 'Peter', publisherId: 0, email: 'peter@listig.de' },
+            },
+          },
+        })
+        wrapper = Wrapper()
+      })
+
+      it('has a RedeemValid component', () => {
+        expect(wrapper.findComponent({ name: 'RedeemValid' }).exists()).toBe(true)
+      })
+
+      it('has a button with redeem text', () => {
+        expect(wrapper.findComponent({ name: 'RedeemValid' }).find('button').text()).toBe(
+          'gdd_per_link.redeem',
+        )
+      })
+
+      describe('redeem link with success', () => {
+        let spy
+
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          apolloMutateMock.mockResolvedValue()
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.findComponent({ name: 'RedeemValid' }).find('button').trigger('click')
+        })
+
+        it('opens the modal', () => {
+          expect(spy).toBeCalledWith('gdd_per_link.redeem-text')
+        })
+
+        it('calls the API', () => {
+          expect(apolloMutateMock).toBeCalledWith(
+            expect.objectContaining({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'some-code',
+              },
+            }),
+          )
+        })
+
+        it('toasts a success message', () => {
+          expect(mocks.$t).toBeCalledWith('gdd_per_link.redeemed', { n: '22' })
+          expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.redeemed; ')
+        })
+
+        it('pushes the route to overview', () => {
+          expect(routerPushMock).toBeCalledWith('/overview')
+        })
+      })
+
+      describe('cancel redeem link', () => {
+        let spy
+
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          apolloMutateMock.mockResolvedValue()
+          spy.mockImplementation(() => Promise.resolve(false))
+          await wrapper.findComponent({ name: 'RedeemValid' }).find('button').trigger('click')
+        })
+
+        it('does not call the API', () => {
+          expect(apolloMutateMock).not.toBeCalled()
+        })
+
+        it('does not toasts a success message', () => {
+          expect(mocks.$t).not.toBeCalledWith('gdd_per_link.redeemed', { n: '22' })
+          expect(toastSuccessSpy).not.toBeCalled()
+        })
+
+        it('does not push the route', () => {
+          expect(routerPushMock).not.toBeCalled()
+        })
+      })
+
+      describe('redeem link with error', () => {
+        let spy
+
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          apolloMutateMock.mockRejectedValue({ message: 'Oh Noo!' })
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.findComponent({ name: 'RedeemValid' }).find('button').trigger('click')
+        })
+
+        it('toasts an error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('Oh Noo!')
+        })
+
+        it('pushes the route to overview', () => {
+          expect(routerPushMock).toBeCalledWith('/overview')
+        })
+      })
+    })
+
+    describe('error on transaction link query', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockRejectedValue({ message: 'Ouchh!' })
+        wrapper = Wrapper()
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('Ouchh!')
+      })
     })
   })
 })
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index 08601a977..def8e2e7c 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -65,9 +65,8 @@ export default {
         .then((result) => {
           this.linkData = result.data.queryTransactionLink
         })
-        .catch(() => {
-          this.itemType = 'X4'
-          this.linkData.deletedAt = true
+        .catch((err) => {
+          this.toastError(err.message)
         })
     },
     redeemLink(amount) {
@@ -97,7 +96,6 @@ export default {
   },
   computed: {
     itemType() {
-      // logged out
       // link wurde gelöscht: am, von
       if (this.linkData.deletedAt) {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
@@ -105,24 +103,23 @@ export default {
           date: this.linkData.deletedAt,
         })
         return `TEXT`
-      } else {
-        // link ist abgelaufen, nicht gelöscht
-        if (new Date(this.linkData.validUntil) < new Date()) {
-          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
-            date: this.linkData.validUntil,
-          })
-          return `TEXT`
-        }
+      }
+      // link ist abgelaufen, nicht gelöscht
+      if (new Date(this.linkData.validUntil) < new Date()) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
+          date: this.linkData.validUntil,
+        })
+        return `TEXT`
+      }
 
-        // der link wurde eingelöst, nicht gelöscht
-        if (this.linkData.redeemedAt) {
-          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
-            date: this.linkData.redeemedAt,
-          })
-          return `TEXT`
-        }
+      // der link wurde eingelöst, nicht gelöscht
+      if (this.linkData.redeemedAt) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
+          date: this.linkData.redeemedAt,
+        })
+        return `TEXT`
       }
 
       if (this.$store.state.token) {

From be8e3f489ed5a1360c05bcd402d20725b06c9862 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Mar 2022 16:37:44 +0100
Subject: [PATCH 63/64] test with param code

---
 frontend/src/pages/Login.spec.js | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 732bc1301..e26888d49 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -52,6 +52,9 @@ describe('Login', () => {
     $router: {
       push: mockRouterPush,
     },
+    $route: {
+      params: {},
+    },
     $apollo: {
       query: apolloQueryMock,
     },
@@ -224,13 +227,33 @@ describe('Login', () => {
             expect(mockStoreDispach).toBeCalledWith('login', 'token')
           })
 
-          it('redirects to overview page', () => {
-            expect(mockRouterPush).toBeCalledWith('/overview')
-          })
-
           it('hides the spinner', () => {
             expect(spinnerHideMock).toBeCalled()
           })
+
+          describe('without code parameter', () => {
+            it('redirects to overview page', () => {
+              expect(mockRouterPush).toBeCalledWith('/overview')
+            })
+          })
+
+          describe('with code parameter', () => {
+            beforeEach(async () => {
+              mocks.$route.params = {
+                code: 'some-code',
+              }
+              wrapper = Wrapper()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to overview page', () => {
+              expect(mockRouterPush).toBeCalledWith('/redeem/some-code')
+            })
+          })
         })
 
         describe('login fails', () => {

From eaa621cc3a3248c36d2ba4da5bd7b71ad66b0f1d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Mar 2022 16:39:13 +0100
Subject: [PATCH 64/64] coverage unit tests forntend tp 95%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9762b4bb..18d1143db 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -438,7 +438,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 94
+          min_coverage: 95
           token: ${{ github.token }}
   
   ##############################################################################