From 17ba78cc012cb1c3abe6eb132d6e1228ed95a2d4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:37:10 +0100
Subject: [PATCH 01/75] add query: listTransactionLinks

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

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 5887d585a..6f67deee8 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -143,3 +143,17 @@ export const queryTransactionLink = gql`
     }
   }
 `
+
+export const listTransactionLinks = gql`
+  query($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC) {
+    listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+      amount
+      holdAvailableAmount
+      memo
+      code
+      createdAt
+      validUntil
+      redeemedAt
+    }
+  }
+`

From e5dc99dad60526ab6bc8c0867de4c4f262dcb631 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:38:35 +0100
Subject: [PATCH 02/75] add apollo funktion for query transactionLinkList

---
 frontend/src/components/GddTransactionList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 9c7013ec5..da5f27add 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -43,7 +43,7 @@
           </template>
 
           <template #TRANSACTION_LINK>
-            <transaction-link
+            <transaction-link-summary
               class="list-group-item"
               v-bind="transactions[index]"
               :transactionLinkCount="transactionLinkCount"
@@ -71,7 +71,7 @@ import TransactionDecay from '@/components/Transactions/TransactionDecay'
 import TransactionSend from '@/components/Transactions/TransactionSend'
 import TransactionReceive from '@/components/Transactions/TransactionReceive'
 import TransactionCreation from '@/components/Transactions/TransactionCreation'
-import TransactionLink from '@/components/Transactions/TransactionLink'
+import TransactionLinkSummary from '@/components/Transactions/TransactionLinkSummary'
 
 export default {
   name: 'gdd-transaction-list',
@@ -82,7 +82,7 @@ export default {
     TransactionSend,
     TransactionReceive,
     TransactionCreation,
-    TransactionLink,
+    TransactionLinkSummary,
   },
   data() {
     return {

From cb27b7aebef936071fc9ed04f2252d5a3bd9c226 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:39:48 +0100
Subject: [PATCH 03/75] chang componentname  TransactionLink TO
 TransactionLinkSummary

---
 ...ionLink.vue => TransactionLinkSummary.vue} | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)
 rename frontend/src/components/Transactions/{TransactionLink.vue => TransactionLinkSummary.vue} (72%)

diff --git a/frontend/src/components/Transactions/TransactionLink.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue
similarity index 72%
rename from frontend/src/components/Transactions/TransactionLink.vue
rename to frontend/src/components/Transactions/TransactionLinkSummary.vue
index 5c261adbf..f24bb8a06 100644
--- a/frontend/src/components/Transactions/TransactionLink.vue
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue
@@ -24,7 +24,7 @@
       </div>
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
-        <collapse-links-list />
+        <collapse-links-list :transactionLinks="transactionLinks" />
       </b-collapse>
     </div>
   </div>
@@ -36,6 +36,7 @@ import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
 import LinkCountRow from '../TransactionRows/LinkCountRow'
 import DecayRow from '../TransactionRows/DecayRow'
 import CollapseLinksList from '../DecayInformations/CollapseLinksList'
+import { listTransactionLinks } from '@/graphql/queries'
 
 export default {
   name: 'TransactionSlotLink',
@@ -64,7 +65,30 @@ export default {
   data() {
     return {
       visible: false,
+      transactionLinks: [],
     }
   },
+  methods: {
+    async listTransactionLinks(pagination) {
+      this.$apollo
+        .query({
+          query: listTransactionLinks,
+          variables: {
+            currentPage: 1,
+            pageSize: 5,
+          },
+          fetchPolicy: 'network-only',
+        })
+        .then((result) => {
+          this.transactionLinks = result.data
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
+  },
+  created() {
+    this.listTransactionLinks()
+  },
 }
 </script>

From 7cc96f0883e59044dd52f3ae55050dc35548e5fa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:40:46 +0100
Subject: [PATCH 04/75] get apollo result in CollapseLinkList

---
 .../src/components/DecayInformations/CollapseLinksList.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 3c6bab053..6006e6a10 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -3,6 +3,7 @@
     <div class="d-flex">
       <div class="text-center pb-3 gradido-max-width">
         <b>{{ $t('links-list.header') }}</b>
+        {{ transactionLinks }}
       </div>
     </div>
   </div>
@@ -10,5 +11,8 @@
 <script>
 export default {
   name: 'CollapseLinksList',
+  props: {
+    transactionLinks: { type: Object, required: true },
+  },
 }
 </script>

From 5b56b8624f841eae194930e413fe48543a8fd111 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:45:32 +0100
Subject: [PATCH 05/75] chang componentname  TransactionLinkSummary TO
 TransactionLinksSummary

---
 frontend/src/components/GddTransactionList.vue              | 6 +++---
 ...ansactionLinkSummary.vue => TransactionLinksSummary.vue} | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename frontend/src/components/Transactions/{TransactionLinkSummary.vue => TransactionLinksSummary.vue} (98%)

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index da5f27add..9f1f1b003 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -43,7 +43,7 @@
           </template>
 
           <template #TRANSACTION_LINK>
-            <transaction-link-summary
+            <transaction-links-summary
               class="list-group-item"
               v-bind="transactions[index]"
               :transactionLinkCount="transactionLinkCount"
@@ -71,7 +71,7 @@ import TransactionDecay from '@/components/Transactions/TransactionDecay'
 import TransactionSend from '@/components/Transactions/TransactionSend'
 import TransactionReceive from '@/components/Transactions/TransactionReceive'
 import TransactionCreation from '@/components/Transactions/TransactionCreation'
-import TransactionLinkSummary from '@/components/Transactions/TransactionLinkSummary'
+import TransactionLinksSummary from '@/components/Transactions/TransactionLinksSummary'
 
 export default {
   name: 'gdd-transaction-list',
@@ -82,7 +82,7 @@ export default {
     TransactionSend,
     TransactionReceive,
     TransactionCreation,
-    TransactionLinkSummary,
+    TransactionLinksSummary,
   },
   data() {
     return {
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
similarity index 98%
rename from frontend/src/components/Transactions/TransactionLinkSummary.vue
rename to frontend/src/components/Transactions/TransactionLinksSummary.vue
index f24bb8a06..d10311e3a 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -69,7 +69,7 @@ export default {
     }
   },
   methods: {
-    async listTransactionLinks(pagination) {
+    async listTransactionLinks() {
       this.$apollo
         .query({
           query: listTransactionLinks,

From d843530e393569a2347756c9bae43f1d8a1772b2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 11:46:56 +0100
Subject: [PATCH 06/75] change props transactionLinks type from object to Array

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

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 6006e6a10..3be2f14f5 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -12,7 +12,7 @@
 export default {
   name: 'CollapseLinksList',
   props: {
-    transactionLinks: { type: Object, required: true },
+    transactionLinks: { type: Array, required: true },
   },
 }
 </script>

From a67c66baf532571f2fb5ed981caadcb02300f919 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 15:48:37 +0100
Subject: [PATCH 07/75] add id in listTransactionLinks in
 frontend/src/graphql/queries.js

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

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 6f67deee8..0a309284e 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -147,6 +147,7 @@ export const queryTransactionLink = gql`
 export const listTransactionLinks = gql`
   query($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC) {
     listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+      id
       amount
       holdAvailableAmount
       memo

From 601f74c58c68f44682df94fa270c398818c17ea6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 15:50:51 +0100
Subject: [PATCH 08/75] add mutation deleteTransactionLink in
 frontend/src/graphql/queries.js

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

diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index d4bf8c1da..89721f02b 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -69,3 +69,9 @@ export const createTransactionLink = gql`
     }
   }
 `
+
+export const deleteTransactionLink = gql`
+  mutation($id: Float!) {
+    deleteTransactionLink(id: $id)
+  }
+`

From 538a6f021fc9095bec1a8ed091001ae6bb801891 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 15:52:29 +0100
Subject: [PATCH 09/75] add components TransactionLink in CollapseLinksList.vue

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

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 3be2f14f5..d5663f16b 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -2,15 +2,27 @@
   <div class="collapse-links-list">
     <div class="d-flex">
       <div class="text-center pb-3 gradido-max-width">
-        <b>{{ $t('links-list.header') }}</b>
-        {{ transactionLinks }}
+        <div>
+          <b-row class="gradido-custom-background mb-2">
+            <b-col cols="2"><b>Betrag</b></b-col>
+            <b-col cols="2"><b>Vergänglichkeit</b></b-col>
+            <b-col cols="4"><b>Nachricht</b></b-col>
+            <b-col cols="2"><b>Abgelaufen</b></b-col>
+            <b-col cols="2"></b-col>
+          </b-row>
+          <transaction-link v-for="item in transactionLinks" :key="item.id" v-bind:item="item" />
+        </div>
       </div>
     </div>
   </div>
 </template>
 <script>
+import TransactionLink from '@/components/TransactionLinks/TransactionLink.vue'
 export default {
   name: 'CollapseLinksList',
+  components: {
+    TransactionLink,
+  },
   props: {
     transactionLinks: { type: Array, required: true },
   },

From 255a11ee5ab7555f98f3739fa94cdc02bb8b6875 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 15:54:01 +0100
Subject: [PATCH 10/75] add new component TransactionLink.vue

---
 .../TransactionLinks/TransactionLink.vue      | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 frontend/src/components/TransactionLinks/TransactionLink.vue

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
new file mode 100644
index 000000000..966fc3f54
--- /dev/null
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="transaction-link">
+    <!-- 
+        { "id": "1"
+          "amount": "11", 
+          "holdAvailableAmount": 
+          "11.28840866470862043644", 
+          "memo": "asdas das d", 
+          "code": "d9cc2a3a685ab17f8cd91d46", 
+          "createdAt": "2022-03-15T09:11:53.000Z", 
+          "validUntil": "2022-03-29T09:11:53.000Z", 
+          "redeemedAt": null,  
+    -->
+    <b-row class="gradido-custom-background mb-2">
+      <b-col cols="2">{{ item.amount | GDD }}</b-col>
+      <b-col cols="2">{{ (item.amount - item.holdAvailableAmount) | GDD }}</b-col>
+      <b-col cols="4">{{ item.memo }}</b-col>
+      <b-col cols="2">{{ $moment(item.validUntil).fromNow() }}</b-col>
+      <b-col cols="2">
+        <b-button size="sm" variant="primary" @click="copy">kopieren</b-button>
+        <b-button size="sm" variant="danger"  @click="deleteTransactionLink(item.id)">löschen</b-button>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+import { deleteTransactionLink } from '@/graphql/mutations'
+
+export default {
+  name: 'TransactionLink',
+  props: {
+    item: { type: Object, required: true },
+  },
+  methods: {
+    async deleteTransactionLink(id) {
+      await this.$apollo
+        .mutate({
+          mutation: deleteTransactionLink,
+          variables: {
+            id: id,
+          },
+        })
+        .then((result) => {
+          console.log(result.data)
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
+    copy() {
+      const link = `${window.location.origin}/redeem/${this.item.code}`
+      navigator.clipboard
+        .writeText(link)
+        .then(() => {
+          this.toastSuccess(this.$t('gdd_per_link.link-copied'))
+        })
+        .catch(() => {
+          this.toastError(this.$t('gdd_per_link.not-copied'))
+        })
+    },
+  },
+}
+</script>

From 83b1c4c9e19517bccd0e59ea8040888de07b6a18 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 15:55:23 +0100
Subject: [PATCH 11/75] change position from visible on collapse in
 TransactionLinksSummary.vue

---
 .../src/components/Transactions/TransactionLinksSummary.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index d10311e3a..dff7cff3a 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="transaction-slot-link">
-    <div @click="visible = !visible">
+    <div>
       <!-- Collaps Icon  -->
       <collapse-icon class="text-right" :visible="visible" />
-      <div>
+      <div @click="visible = !visible">
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
@@ -80,7 +80,7 @@ export default {
           fetchPolicy: 'network-only',
         })
         .then((result) => {
-          this.transactionLinks = result.data
+          this.transactionLinks = result.data.listTransactionLinks
         })
         .catch((err) => {
           this.toastError(err.message)

From f1718537b25e965b9985b4b3081ade811b2d5bf1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 17:13:28 +0100
Subject: [PATCH 12/75] ad function updateListTransactionLinks on component

---
 .../DecayInformations/CollapseLinksList.vue          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index d5663f16b..275615de1 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -10,7 +10,12 @@
             <b-col cols="2"><b>Abgelaufen</b></b-col>
             <b-col cols="2"></b-col>
           </b-row>
-          <transaction-link v-for="item in transactionLinks" :key="item.id" v-bind:item="item" />
+          <transaction-link
+            v-for="item in transactionLinks"
+            :key="item.id"
+            v-bind:item="item"
+            @update-list-transaction-links="updateListTransactionLinks"
+          />
         </div>
       </div>
     </div>
@@ -26,5 +31,10 @@ export default {
   props: {
     transactionLinks: { type: Array, required: true },
   },
+  methods: {
+    updateListTransactionLinks() {
+      this.$emit('update-list-transaction-links')
+    },
+  },
 }
 </script>

From 9d5cbf18b5b205e1da120795b6281581d6407f49 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 17:14:11 +0100
Subject: [PATCH 13/75] ad function updateTransactions on component

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

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 9f1f1b003..3a27912bc 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -47,6 +47,7 @@
               class="list-group-item"
               v-bind="transactions[index]"
               :transactionLinkCount="transactionLinkCount"
+              @update-transactions="updateTransactions"
             />
           </template>
         </transaction-list-item>

From 81df36a3fb65b4133e8edcd9f74934135b2f0f22 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 17:15:47 +0100
Subject: [PATCH 14/75] ad function deleteLink and bvModal confirm

---
 .../TransactionLinks/TransactionLink.vue          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 966fc3f54..d6dfb84f0 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -18,7 +18,7 @@
       <b-col cols="2">{{ $moment(item.validUntil).fromNow() }}</b-col>
       <b-col cols="2">
         <b-button size="sm" variant="primary" @click="copy">kopieren</b-button>
-        <b-button size="sm" variant="danger"  @click="deleteTransactionLink(item.id)">löschen</b-button>
+        <b-button size="sm" variant="danger" @click="deleteLink(item.id)">löschen</b-button>
       </b-col>
     </b-row>
   </div>
@@ -41,7 +41,8 @@ export default {
           },
         })
         .then((result) => {
-          console.log(result.data)
+          this.toastSuccess('Link gelöscht')
+          this.$emit('update-list-transaction-links')
         })
         .catch((err) => {
           this.toastError(err.message)
@@ -58,6 +59,16 @@ export default {
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },
+    deleteLink(id) {
+      this.$bvModal
+        .msgBoxConfirm('Den Link löschen?')
+        .then(() => {
+          this.deleteTransactionLink(id)
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+    },
   },
 }
 </script>

From baf4f66604a0f7d220e0e653974512d1fd32c4c9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 17:16:35 +0100
Subject: [PATCH 15/75] ad function updateListTransactionLinks on
 TransactionLinksSummary.vue

---
 .../Transactions/TransactionLinksSummary.vue           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index dff7cff3a..c4496ed0d 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -24,7 +24,10 @@
       </div>
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
-        <collapse-links-list :transactionLinks="transactionLinks" />
+        <collapse-links-list
+          :transactionLinks="transactionLinks"
+          @update-list-transaction-links="updateListTransactionLinks"
+        />
       </b-collapse>
     </div>
   </div>
@@ -69,7 +72,7 @@ export default {
     }
   },
   methods: {
-    async listTransactionLinks() {
+    async updateListTransactionLinks() {
       this.$apollo
         .query({
           query: listTransactionLinks,
@@ -81,6 +84,7 @@ export default {
         })
         .then((result) => {
           this.transactionLinks = result.data.listTransactionLinks
+          this.$emit('update-transactions')
         })
         .catch((err) => {
           this.toastError(err.message)
@@ -88,7 +92,7 @@ export default {
     },
   },
   created() {
-    this.listTransactionLinks()
+    this.updateListTransactionLinks()
   },
 }
 </script>

From 9bd74cb1488bf76ed9bd0f7a150752fcd90b49f5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 17:18:32 +0100
Subject: [PATCH 16/75] yarn lint --fix

---
 frontend/src/components/TransactionLinks/TransactionLink.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index d6dfb84f0..0ff13a1a0 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -65,9 +65,7 @@ export default {
         .then(() => {
           this.deleteTransactionLink(id)
         })
-        .catch((err) => {
-          console.log(err)
-        })
+        .catch(() => {})
     },
   },
 }

From 0f97dc60a35cf94a97fdeb152b2f8854aa0f0281 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 22:13:50 +0100
Subject: [PATCH 17/75] Duplicate id app deleted

---
 frontend/public/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/public/index.html b/frontend/public/index.html
index a15b46916..b9abe3876 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -52,10 +52,6 @@
 
 </head>
 <body>
-<div class="wrapper" id="app">
-
-</div>
 <!-- built files will be auto injected -->
-
 </body>
 </html>

From fe733c3f7705a1afd95a969ccd787af5c4838121 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 22:14:20 +0100
Subject: [PATCH 18/75] toast rendering error fixed

---
 frontend/src/mixins/toaster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 68fd78ff9..f6e61e5be 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -14,7 +14,7 @@ export const toasters = {
     },
     toast(message, options) {
       if (message.replace) message = message.replace(/^GraphQL error: /, '')
-      this.$bvToast.toast(message, {
+      this.$root.$bvToast.toast(message, {
         autoHideDelay: 5000,
         appendToast: true,
         solid: true,

From cf601fc5b31842056f32af426d06d39cdcb8b262 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 22:15:30 +0100
Subject: [PATCH 19/75] toast rendering error fixed in adminarea

---
 admin/src/mixins/toaster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/mixins/toaster.js b/admin/src/mixins/toaster.js
index 9f79b91e8..2db632a81 100644
--- a/admin/src/mixins/toaster.js
+++ b/admin/src/mixins/toaster.js
@@ -15,7 +15,7 @@ export const toasters = {
     toast(message, options) {
       // for unit tests, check that replace is present
       if (message.replace) message = message.replace(/^GraphQL error: /, '')
-      this.$bvToast.toast(message, {
+      this.$root.$bvToast.toast(message, {
         autoHideDelay: 5000,
         appendToast: true,
         solid: true,

From 90ce74a98c1a4d2f75c8ba2d1299b7eec5df7a66 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 11:01:07 +0100
Subject: [PATCH 20/75] add variables pageSize

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

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 0a309284e..141dc8651 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -145,8 +145,8 @@ export const queryTransactionLink = gql`
 `
 
 export const listTransactionLinks = gql`
-  query($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC) {
-    listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+  query($currentPage: Int = 1, $pageSize: Int = 5) {
+    listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize) {
       id
       amount
       holdAvailableAmount

From 1a89d94bdaa5de8d3345bc09a4db5cb17ed0792b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 11:02:26 +0100
Subject: [PATCH 21/75] add varibles object, add computed and watch currentPage

---
 .../Transactions/TransactionLinksSummary.vue  | 59 +++++++++++++------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index c4496ed0d..5d5bf3c93 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -25,8 +25,9 @@
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
         <collapse-links-list
+          v-model="variables"
+          :transactionLinkCount="transactionLinkCount"
           :transactionLinks="transactionLinks"
-          @update-list-transaction-links="updateListTransactionLinks"
         />
       </b-collapse>
     </div>
@@ -69,26 +70,50 @@ export default {
     return {
       visible: false,
       transactionLinks: [],
+      variables: {
+        currentPage: 1,
+        pending: false,
+        pageSize: 5,
+        itemsShown: 0,
+      },
     }
   },
   methods: {
     async updateListTransactionLinks() {
-      this.$apollo
-        .query({
-          query: listTransactionLinks,
-          variables: {
-            currentPage: 1,
-            pageSize: 5,
-          },
-          fetchPolicy: 'network-only',
-        })
-        .then((result) => {
-          this.transactionLinks = result.data.listTransactionLinks
-          this.$emit('update-transactions')
-        })
-        .catch((err) => {
-          this.toastError(err.message)
-        })
+      if (this.currentPage === 0) {
+        this.transactionLinks = []
+        this.variables.currentPage = 1
+      } else {
+        this.variables.pending = true
+        this.$apollo
+          .query({
+            query: listTransactionLinks,
+            variables: {
+              currentPage: this.currentPage,
+            },
+            fetchPolicy: 'network-only',
+          })
+          .then((result) => {
+            this.transactionLinks = [...this.transactionLinks, ...result.data.listTransactionLinks]
+            this.$emit('update-transactions')
+            this.variables.pending = false
+            this.variables.itemsShown = this.transactionLinks.length
+          })
+          .catch((err) => {
+            this.toastError(err.message)
+            this.variables.pending = false
+          })
+      }
+    },
+  },
+  computed: {
+    currentPage() {
+      return this.variables.currentPage
+    },
+  },
+  watch: {
+    currentPage() {
+      this.updateListTransactionLinks()
     },
   },
   created() {

From e49543ad5522ca64cda7fca276b2afe45a69ddc4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 11:03:45 +0100
Subject: [PATCH 22/75] add function resetTransactionLinkList, loadMoreLinks
 and computed buttonText

---
 .../DecayInformations/CollapseLinksList.vue   | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 275615de1..7492532b6 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -14,8 +14,24 @@
             v-for="item in transactionLinks"
             :key="item.id"
             v-bind:item="item"
-            @update-list-transaction-links="updateListTransactionLinks"
+            @reset-transaction-link-list="resetTransactionLinkList"
           />
+          <div class="mt-3 mb-3 text-center">
+            <b-button
+              v-if="!value.pending && value.itemsShown < transactionLinkCount"
+              block
+              variant="primary"
+              @click="loadMoreLinks"
+            >
+              {{ buttonText }}
+            </b-button>
+            <b-icon
+              v-if="value.pending"
+              icon="three-dots"
+              animation="cylon"
+              font-scale="4"
+            ></b-icon>
+          </div>
         </div>
       </div>
     </div>
@@ -30,10 +46,27 @@ export default {
   },
   props: {
     transactionLinks: { type: Array, required: true },
+    transactionLinkCount: {
+      type: Number,
+      required: true,
+    },
+    value: { type: Object, required: true },
   },
   methods: {
-    updateListTransactionLinks() {
-      this.$emit('update-list-transaction-links')
+    resetTransactionLinkList() {
+      this.$emit('input', { ...this.value, currentPage: 0 })
+    },
+    loadMoreLinks() {
+      this.$emit('input', { ...this.value, currentPage: this.value.currentPage + 1 })
+    },
+  },
+  computed: {
+    buttonText() {
+      if (this.transactionLinkCount - this.value.itemsShown > this.value.pageSize)
+        return 'weitere ' + this.value.pageSize + ' Links Nachladen'
+      return (
+        'die letzten ' + (this.transactionLinkCount - this.value.itemsShown) + ' Links nachladen'
+      )
     },
   },
 }

From b976e8441143e89ee8d0c4bc5cccccb7cd46167c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 11:05:08 +0100
Subject: [PATCH 23/75] refactor modal, deleteLink emit
 reset-transaction-link-list

---
 .../TransactionLinks/TransactionLink.vue      | 50 +++++++------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 0ff13a1a0..b8247c7fc 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,16 +1,5 @@
 <template>
   <div class="transaction-link">
-    <!-- 
-        { "id": "1"
-          "amount": "11", 
-          "holdAvailableAmount": 
-          "11.28840866470862043644", 
-          "memo": "asdas das d", 
-          "code": "d9cc2a3a685ab17f8cd91d46", 
-          "createdAt": "2022-03-15T09:11:53.000Z", 
-          "validUntil": "2022-03-29T09:11:53.000Z", 
-          "redeemedAt": null,  
-    -->
     <b-row class="gradido-custom-background mb-2">
       <b-col cols="2">{{ item.amount | GDD }}</b-col>
       <b-col cols="2">{{ (item.amount - item.holdAvailableAmount) | GDD }}</b-col>
@@ -32,22 +21,6 @@ export default {
     item: { type: Object, required: true },
   },
   methods: {
-    async deleteTransactionLink(id) {
-      await this.$apollo
-        .mutate({
-          mutation: deleteTransactionLink,
-          variables: {
-            id: id,
-          },
-        })
-        .then((result) => {
-          this.toastSuccess('Link gelöscht')
-          this.$emit('update-list-transaction-links')
-        })
-        .catch((err) => {
-          this.toastError(err.message)
-        })
-    },
     copy() {
       const link = `${window.location.origin}/redeem/${this.item.code}`
       navigator.clipboard
@@ -60,12 +33,23 @@ export default {
         })
     },
     deleteLink(id) {
-      this.$bvModal
-        .msgBoxConfirm('Den Link löschen?')
-        .then(() => {
-          this.deleteTransactionLink(id)
-        })
-        .catch(() => {})
+      this.$bvModal.msgBoxConfirm('Den Link löschen?').then(async (value) => {
+        if (value)
+          await this.$apollo
+            .mutate({
+              mutation: deleteTransactionLink,
+              variables: {
+                id: id,
+              },
+            })
+            .then((result) => {
+              this.toastSuccess('Link gelöscht')
+              this.$emit('reset-transaction-link-list')
+            })
+            .catch((err) => {
+              this.toastError(err.message)
+            })
+      })
     },
   },
 }

From 798a75e923f5d19e9ff3fa61acf36ededca66508 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 11:24:16 +0100
Subject: [PATCH 24/75] add locales in TransactionLink.vue

---
 .../DecayInformations/CollapseLinksList.vue     |  2 +-
 .../TransactionLinks/TransactionLink.vue        | 17 +++++++++++++----
 frontend/src/locales/de.json                    |  3 +++
 frontend/src/locales/en.json                    |  3 +++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 7492532b6..4de74fa0c 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -20,7 +20,7 @@
             <b-button
               v-if="!value.pending && value.itemsShown < transactionLinkCount"
               block
-              variant="primary"
+              variant="outline-primary"
               @click="loadMoreLinks"
             >
               {{ buttonText }}
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index b8247c7fc..715225ad4 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -6,8 +6,17 @@
       <b-col cols="4">{{ item.memo }}</b-col>
       <b-col cols="2">{{ $moment(item.validUntil).fromNow() }}</b-col>
       <b-col cols="2">
-        <b-button size="sm" variant="primary" @click="copy">kopieren</b-button>
-        <b-button size="sm" variant="danger" @click="deleteLink(item.id)">löschen</b-button>
+        <b-button class="mr-2" size="sm" variant="outline-primary" @click="copy">
+          {{ $t('gdd_per_link.copy') }}
+        </b-button>
+        <b-button
+          size="sm"
+          variant="outline-danger"
+          @click="deleteLink(item.id)"
+          :title="$t('delete')"
+        >
+          <b-icon icon="trash"></b-icon>
+        </b-button>
       </b-col>
     </b-row>
   </div>
@@ -33,7 +42,7 @@ export default {
         })
     },
     deleteLink(id) {
-      this.$bvModal.msgBoxConfirm('Den Link löschen?').then(async (value) => {
+      this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.delete-the-link')).then(async (value) => {
         if (value)
           await this.$apollo
             .mutate({
@@ -43,7 +52,7 @@ export default {
               },
             })
             .then((result) => {
-              this.toastSuccess('Link gelöscht')
+              this.toastSuccess(this.$t('gdd_per_link.deleted'))
               this.$emit('reset-transaction-link-list')
             })
             .catch((err) => {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 9c0e440b0..52a2b6fb9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,6 +46,7 @@
     "total": "Gesamt",
     "year": "Jahre"
   },
+  "delete":"löschen",
   "error": {
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
@@ -103,6 +104,8 @@
   "gdd_per_link": {
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
+    "delete-the-link":"Den Link löschen?",
+    "deleted":"Der Link wurde gelöscht!",
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a454ee785..48197abda 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -46,6 +46,7 @@
     "total": "Total",
     "year": "Years"
   },
+  "delete":"delete",
   "error": {
     "change-password": "Error while changing password",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
@@ -104,6 +105,8 @@
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
+    "deleted":"The link was deleted!",
+    "delete-the-link":"Delete the link?",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "links_count": "Active links",

From 4c55f2dc13dd1cca3f0db18861421961621cc9f1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 12:07:49 +0100
Subject: [PATCH 25/75] add locales in CollapseLinksList.vue

---
 .../DecayInformations/CollapseLinksList.vue   | 25 ++++++++++++-------
 frontend/src/locales/de.json                  |  2 ++
 frontend/src/locales/en.json                  |  2 ++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 4de74fa0c..c32032cbc 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -4,10 +4,18 @@
       <div class="text-center pb-3 gradido-max-width">
         <div>
           <b-row class="gradido-custom-background mb-2">
-            <b-col cols="2"><b>Betrag</b></b-col>
-            <b-col cols="2"><b>Vergänglichkeit</b></b-col>
-            <b-col cols="4"><b>Nachricht</b></b-col>
-            <b-col cols="2"><b>Abgelaufen</b></b-col>
+            <b-col cols="2">
+              <b>{{ $t('form.amount') }}</b>
+            </b-col>
+            <b-col cols="2">
+              <b>{{ $t('decay.decay') }}</b>
+            </b-col>
+            <b-col cols="4">
+              <b>{{ $t('form.memo') }}</b>
+            </b-col>
+            <b-col cols="2">
+              <b>{{ $t('gdd_per_link.expired') }}</b>
+            </b-col>
             <b-col cols="2"></b-col>
           </b-row>
           <transaction-link
@@ -62,11 +70,10 @@ export default {
   },
   computed: {
     buttonText() {
-      if (this.transactionLinkCount - this.value.itemsShown > this.value.pageSize)
-        return 'weitere ' + this.value.pageSize + ' Links Nachladen'
-      return (
-        'die letzten ' + (this.transactionLinkCount - this.value.itemsShown) + ' Links nachladen'
-      )
+      const i = this.transactionLinkCount - this.value.itemsShown
+      if (i === 1) return this.$tc('link-reload', i, { n: i })
+      if (i < 6) return this.$tc('link-reload', 2, { n: i })
+      return this.$tc('link-reload', 3, { n: 5 })
     },
   },
 }
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 52a2b6fb9..634491eb0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -107,6 +107,7 @@
     "delete-the-link":"Den Link löschen?",
     "deleted":"Der Link wurde gelöscht!",
     "decay-14-day": "Vergänglichkeit für 14 Tage",
+    "expired":"abgelaufen",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "links_count": "Aktive Links",
@@ -137,6 +138,7 @@
   },
   "imprint": "Impressum",
   "language": "Sprache",
+  "link-reload":"den letzten {n} Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
   "links-list": {
     "header": "Liste deiner aktiven Links"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 48197abda..70d56d4ef 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -105,6 +105,7 @@
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
+    "expired":"expired",
     "deleted":"The link was deleted!",
     "delete-the-link":"Delete the link?",
     "header": "Send Gradidos via link",
@@ -137,6 +138,7 @@
   },
   "imprint": "Legal notice",
   "language": "Language",
+  "link-reload":"Reload the last {n} link | reload the last {n} links |  reload more {n} links",
   "links-list": {
     "header": "List of your active links"
   },

From 8fbbf909388885943057c215dab596c2809f1921 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 12:09:03 +0100
Subject: [PATCH 26/75] yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 634491eb0..0edc33c2f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,7 +46,7 @@
     "total": "Gesamt",
     "year": "Jahre"
   },
-  "delete":"löschen",
+  "delete": "löschen",
   "error": {
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
@@ -104,10 +104,10 @@
   "gdd_per_link": {
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
-    "delete-the-link":"Den Link löschen?",
-    "deleted":"Der Link wurde gelöscht!",
     "decay-14-day": "Vergänglichkeit für 14 Tage",
-    "expired":"abgelaufen",
+    "delete-the-link": "Den Link löschen?",
+    "deleted": "Der Link wurde gelöscht!",
+    "expired": "abgelaufen",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "links_count": "Aktive Links",
@@ -138,7 +138,7 @@
   },
   "imprint": "Impressum",
   "language": "Sprache",
-  "link-reload":"den letzten {n} Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
+  "link-reload": "den letzten {n} Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
   "links-list": {
     "header": "Liste deiner aktiven Links"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 70d56d4ef..8fa628fe9 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -46,7 +46,7 @@
     "total": "Total",
     "year": "Years"
   },
-  "delete":"delete",
+  "delete": "delete",
   "error": {
     "change-password": "Error while changing password",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
@@ -105,9 +105,9 @@
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
-    "expired":"expired",
-    "deleted":"The link was deleted!",
-    "delete-the-link":"Delete the link?",
+    "delete-the-link": "Delete the link?",
+    "deleted": "The link was deleted!",
+    "expired": "expired",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "links_count": "Active links",
@@ -138,7 +138,7 @@
   },
   "imprint": "Legal notice",
   "language": "Language",
-  "link-reload":"Reload the last {n} link | reload the last {n} links |  reload more {n} links",
+  "link-reload": "Reload the last {n} link | reload the last {n} links |  reload more {n} links",
   "links-list": {
     "header": "List of your active links"
   },

From 896e5a1124464c0143d43e7d4c8c8d1443b7055e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:13:08 +0100
Subject: [PATCH 27/75] change pluralation for buttonText

---
 .../src/components/DecayInformations/CollapseLinksList.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index c32032cbc..6bfddbd47 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -71,9 +71,9 @@ export default {
   computed: {
     buttonText() {
       const i = this.transactionLinkCount - this.value.itemsShown
-      if (i === 1) return this.$tc('link-reload', i, { n: i })
-      if (i < 6) return this.$tc('link-reload', 2, { n: i })
-      return this.$tc('link-reload', 3, { n: 5 })
+      if (i === 1) return this.$tc('link-reload', 0, { n: i })
+      if (i < 6) return this.$tc('link-reload', 1, { n: i })
+      return this.$tc('link-reload', 2, { n: 5 })
     },
   },
 }

From 7188743af573022c5b9fb19dd1fde7b9880cdb60 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:22:12 +0100
Subject: [PATCH 28/75] remove  background color for collaps box

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

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 6bfddbd47..0dd76cff1 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -3,7 +3,7 @@
     <div class="d-flex">
       <div class="text-center pb-3 gradido-max-width">
         <div>
-          <b-row class="gradido-custom-background mb-2">
+          <b-row class="mb-2">
             <b-col cols="2">
               <b>{{ $t('form.amount') }}</b>
             </b-col>

From 34f3914e5c34b877aee385a0b398ea59c5cc5f64 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:23:06 +0100
Subject: [PATCH 29/75] remove click event visible on extra box bevore collapse
 box

---
 .../Transactions/TransactionLinksSummary.vue  | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index 5d5bf3c93..74251fc4b 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -1,30 +1,33 @@
 <template>
   <div class="transaction-slot-link">
     <div>
-      <!-- Collaps Icon  -->
-      <collapse-icon class="text-right" :visible="visible" />
       <div @click="visible = !visible">
-        <b-row>
-          <!-- ICON  -->
-          <b-col cols="1">
-            <type-icon color="text-danger" icon="link45deg" />
-          </b-col>
+        <!-- Collaps Icon  -->
+        <collapse-icon class="text-right" :visible="visible" />
+        <div>
+          <b-row>
+            <!-- ICON  -->
+            <b-col cols="1">
+              <type-icon color="text-danger" icon="link45deg" />
+            </b-col>
 
-          <b-col cols="11">
-            <!-- Amount / Name || Text -->
-            <amount-and-name-row :amount="amount" :text="$t('gdd_per_link.links_sum')" />
+            <b-col cols="11">
+              <!-- Amount / Name || Text -->
+              <amount-and-name-row :amount="amount" :text="$t('gdd_per_link.links_sum')" />
 
-            <!-- Count Links -->
-            <link-count-row :count="transactionLinkCount" />
+              <!-- Count Links -->
+              <link-count-row :count="transactionLinkCount" />
 
-            <!-- Decay -->
-            <decay-row :decay="decay" />
-          </b-col>
-        </b-row>
+              <!-- Decay -->
+              <decay-row :decay="decay" />
+            </b-col>
+          </b-row>
+        </div>
       </div>
 
-      <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
+      <b-collapse class="pb-4 pt-5" v-model="visible">
         <collapse-links-list
+          class="m-2"
           v-model="variables"
           :transactionLinkCount="transactionLinkCount"
           :transactionLinks="transactionLinks"

From 6f10431b103d0402c324869b26fdbff2c90507bf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:46:48 +0100
Subject: [PATCH 30/75] add new class background-color

---
 frontend/src/assets/scss/gradido.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index 53a296713..2f55c8cde 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -206,6 +206,11 @@ a,
   background-color: #fff;
 }
 
+.gradido-background-18f50533 {
+  background-color: #18f50533;
+}
+
+
 .gradido-font-15rem {
   font-size: 1.5rem;
 }

From 43185325eb115fc6ff7008f82de005fa1831e55e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:47:40 +0100
Subject: [PATCH 31/75] change background-color for table link

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

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 715225ad4..89f61230f 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="transaction-link">
-    <b-row class="gradido-custom-background mb-2">
+    <b-row class="gradido-background-18f50533 mb-2">
       <b-col cols="2">{{ item.amount | GDD }}</b-col>
       <b-col cols="2">{{ (item.amount - item.holdAvailableAmount) | GDD }}</b-col>
       <b-col cols="4">{{ item.memo }}</b-col>

From 2e93f522daf1a5b1c9d1f26508b84b0489321b7b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:51:26 +0100
Subject: [PATCH 32/75] add new class gradido-background-azure

---
 frontend/src/assets/scss/gradido.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index 2f55c8cde..a0601c177 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -210,6 +210,9 @@ a,
   background-color: #18f50533;
 }
 
+.gradido-background-azure {
+  background-color: #f0ffff;
+}
 
 .gradido-font-15rem {
   font-size: 1.5rem;

From e3a4eef9f7cc55e4237dca95dd953c38e38576f4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:54:42 +0100
Subject: [PATCH 33/75] add class gradido-background-azure on
 transaction-links-summary

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

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 3a27912bc..9520fc325 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -44,7 +44,7 @@
 
           <template #TRANSACTION_LINK>
             <transaction-links-summary
-              class="list-group-item"
+              class="list-group-item gradido-background-azure"
               v-bind="transactions[index]"
               :transactionLinkCount="transactionLinkCount"
               @update-transactions="updateTransactions"

From 781130d14cbc583a1e3ce001ca6461caffb6add3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 14:56:37 +0100
Subject: [PATCH 34/75] add new class gradido-background-beige

---
 frontend/src/assets/scss/gradido.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index a0601c177..7d09b86ac 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -214,6 +214,10 @@ a,
   background-color: #f0ffff;
 }
 
+.gradido-background-beige {
+  background-color: #f5f5dc;
+}
+
 .gradido-font-15rem {
   font-size: 1.5rem;
 }

From 9fb21c3ad9a2a9e30547c81b82f8d75d5d225277 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 15:07:28 +0100
Subject: [PATCH 35/75] add class gradido-background-azure on transaction-decay

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

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 9520fc325..1b62901af 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -15,7 +15,7 @@
       <div v-for="({ id, typeId }, index) in transactions" :key="id">
         <transaction-list-item :typeId="typeId" class="pointer">
           <template #DECAY>
-            <transaction-decay class="list-group-item" v-bind="transactions[index]" />
+            <transaction-decay class="list-group-item gradido-background-beige" v-bind="transactions[index]" />
           </template>
 
           <template #SEND>

From 77e09f5f4033eb8a11f9aefd8c2e8934494dda07 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 15:08:16 +0100
Subject: [PATCH 36/75] remove backgound-color from collapse box in
 TransactonDecay

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

diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 4038e782f..9c7d52495 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -20,7 +20,7 @@
         </b-row>
       </div>
 
-      <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
+      <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-decay :balance="balance" :decay="decay" />
       </b-collapse>
     </div>

From aea66031db37cf30119e0cfb9c2bd0244a705249 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 17:09:05 +0100
Subject: [PATCH 37/75] remove unused background-color

---
 frontend/src/assets/scss/gradido.scss          | 12 ------------
 frontend/src/components/GddTransactionList.vue |  5 ++++-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index 7d09b86ac..53a296713 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -206,18 +206,6 @@ a,
   background-color: #fff;
 }
 
-.gradido-background-18f50533 {
-  background-color: #18f50533;
-}
-
-.gradido-background-azure {
-  background-color: #f0ffff;
-}
-
-.gradido-background-beige {
-  background-color: #f5f5dc;
-}
-
 .gradido-font-15rem {
   font-size: 1.5rem;
 }
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 1b62901af..d769d6bba 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -15,7 +15,10 @@
       <div v-for="({ id, typeId }, index) in transactions" :key="id">
         <transaction-list-item :typeId="typeId" class="pointer">
           <template #DECAY>
-            <transaction-decay class="list-group-item gradido-background-beige" v-bind="transactions[index]" />
+            <transaction-decay
+              class="list-group-item gradido-background-beige"
+              v-bind="transactions[index]"
+            />
           </template>
 
           <template #SEND>

From f28b0067327139c0a78fe0f919b604a2241468be Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:19:24 +0100
Subject: [PATCH 38/75] change link-reload to link-load

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0edc33c2f..4885f119a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -138,7 +138,7 @@
   },
   "imprint": "Impressum",
   "language": "Sprache",
-  "link-reload": "den letzten {n} Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
+  "link-load": "den letzten Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
   "links-list": {
     "header": "Liste deiner aktiven Links"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8fa628fe9..cbdb546d6 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -138,7 +138,7 @@
   },
   "imprint": "Legal notice",
   "language": "Language",
-  "link-reload": "Reload the last {n} link | reload the last {n} links |  reload more {n} links",
+  "link-load": "Load the last link | Load the last {n} links |  Load more {n} links",
   "links-list": {
     "header": "List of your active links"
   },

From ab3ad69cc8d24b64552a79628912cc498416c2d4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:23:30 +0100
Subject: [PATCH 39/75] remove unused head row for transactionLinkList

---
 .../DecayInformations/CollapseLinksList.vue   | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 0dd76cff1..f9adf0f8d 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -1,30 +1,16 @@
 <template>
   <div class="collapse-links-list">
     <div class="d-flex">
-      <div class="text-center pb-3 gradido-max-width">
+      <div class="gradido-max-width">
+        <hr />
         <div>
-          <b-row class="mb-2">
-            <b-col cols="2">
-              <b>{{ $t('form.amount') }}</b>
-            </b-col>
-            <b-col cols="2">
-              <b>{{ $t('decay.decay') }}</b>
-            </b-col>
-            <b-col cols="4">
-              <b>{{ $t('form.memo') }}</b>
-            </b-col>
-            <b-col cols="2">
-              <b>{{ $t('gdd_per_link.expired') }}</b>
-            </b-col>
-            <b-col cols="2"></b-col>
-          </b-row>
           <transaction-link
             v-for="item in transactionLinks"
             :key="item.id"
             v-bind:item="item"
             @reset-transaction-link-list="resetTransactionLinkList"
           />
-          <div class="mt-3 mb-3 text-center">
+          <div class="mb-3">
             <b-button
               v-if="!value.pending && value.itemsShown < transactionLinkCount"
               block
@@ -71,9 +57,9 @@ export default {
   computed: {
     buttonText() {
       const i = this.transactionLinkCount - this.value.itemsShown
-      if (i === 1) return this.$tc('link-reload', 0, { n: i })
-      if (i < 6) return this.$tc('link-reload', 1, { n: i })
-      return this.$tc('link-reload', 2, { n: 5 })
+      if (i === 1) return this.$tc('link-load', 0)
+      if (i < 6) return this.$tc('link-load', 1, { n: i })
+      return this.$tc('link-load', 2, { n: 5 })
     },
   },
 }

From 5517ac3fa5d4a4e274d67c5014237222b8cc3cb4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:26:39 +0100
Subject: [PATCH 40/75] props decay set required: true

---
 .../src/components/DecayInformations/DecayInformation-Short.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 1cd0a2d09..333a38216 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -9,6 +9,7 @@ export default {
   props: {
     decay: {
       type: Object,
+      required: true,
     },
   },
 }

From dc505b59085d7ac49d7a37af13cfed359f53cf27 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:28:43 +0100
Subject: [PATCH 41/75] remove background-color azure and beige

---
 frontend/src/components/GddTransactionList.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index d769d6bba..3a27912bc 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -15,10 +15,7 @@
       <div v-for="({ id, typeId }, index) in transactions" :key="id">
         <transaction-list-item :typeId="typeId" class="pointer">
           <template #DECAY>
-            <transaction-decay
-              class="list-group-item gradido-background-beige"
-              v-bind="transactions[index]"
-            />
+            <transaction-decay class="list-group-item" v-bind="transactions[index]" />
           </template>
 
           <template #SEND>
@@ -47,7 +44,7 @@
 
           <template #TRANSACTION_LINK>
             <transaction-links-summary
-              class="list-group-item gradido-background-azure"
+              class="list-group-item"
               v-bind="transactions[index]"
               :transactionLinkCount="transactionLinkCount"
               @update-transactions="updateTransactions"

From 0bba201d3334c5bd93947b12ed01527099c3bc7f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:30:49 +0100
Subject: [PATCH 42/75] add components for transaction rows, chnage toast
 mesage, add computed decayObject()

---
 .../TransactionLinks/TransactionLink.vue      | 51 +++++++++++++++----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 89f61230f..800e7b01c 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,15 +1,29 @@
 <template>
-  <div class="transaction-link">
-    <b-row class="gradido-background-18f50533 mb-2">
-      <b-col cols="2">{{ item.amount | GDD }}</b-col>
-      <b-col cols="2">{{ (item.amount - item.holdAvailableAmount) | GDD }}</b-col>
-      <b-col cols="4">{{ item.memo }}</b-col>
-      <b-col cols="2">{{ $moment(item.validUntil).fromNow() }}</b-col>
+  <div class="transaction-link gradido-custom-background">
+    <b-row class="mb-2 pt-2 pb-2">
       <b-col cols="2">
-        <b-button class="mr-2" size="sm" variant="outline-primary" @click="copy">
-          {{ $t('gdd_per_link.copy') }}
-        </b-button>
+        <type-icon color="text-danger" icon="link45deg" class="pt-4 pl-2" />
+      </b-col>
+      <b-col cols="9">
+        <amount-and-name-row :amount="item.amount" :text="$t('form.amount')" />
+        <memo-row :memo="item.memo" />
+        <date-row :date="item.validUntil" :diffNow="true" />
+        <decay-row :decay="decayObject" />
+      </b-col>
+
+      <b-col cols="1" class="text-right">
         <b-button
+          class="p-2"
+          size="sm"
+          variant="outline-primary"
+          @click="copy"
+          :title="$t('gdd_per_link.copy')"
+        >
+          <b-icon icon="clipboard"></b-icon>
+        </b-button>
+        <br />
+        <b-button
+          class="p-2 mt-3"
           size="sm"
           variant="outline-danger"
           @click="deleteLink(item.id)"
@@ -23,9 +37,21 @@
 </template>
 <script>
 import { deleteTransactionLink } from '@/graphql/mutations'
+import TypeIcon from '../TransactionRows/TypeIcon'
+import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
+import MemoRow from '../TransactionRows/MemoRow'
+import DateRow from '../TransactionRows/DateRow'
+import DecayRow from '../TransactionRows/DecayRow'
 
 export default {
   name: 'TransactionLink',
+  components: {
+    TypeIcon,
+    AmountAndNameRow,
+    MemoRow,
+    DateRow,
+    DecayRow,
+  },
   props: {
     item: { type: Object, required: true },
   },
@@ -35,7 +61,7 @@ export default {
       navigator.clipboard
         .writeText(link)
         .then(() => {
-          this.toastSuccess(this.$t('gdd_per_link.link-copied'))
+          this.toastSuccess(this.$t('gdd_per_link.link-copied') + '\n' + link)
         })
         .catch(() => {
           this.toastError(this.$t('gdd_per_link.not-copied'))
@@ -61,5 +87,10 @@ export default {
       })
     },
   },
+  computed: {
+    decayObject() {
+      return { decay: this.item.amount - this.item.holdAvailableAmount }
+    },
+  },
 }
 </script>

From 54b7e58a5ea58c27a2fb7130894e24c1e13a9f21 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:32:28 +0100
Subject: [PATCH 43/75] add props diffNow, add computed dateString

---
 .../components/TransactionRows/DateRow.vue    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 5daccfa69..0c72907fe 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -2,12 +2,11 @@
   <div class="date-row">
     <b-row>
       <b-col cols="5">
-        <div class="text-right">{{ $t('form.date') }}</div>
+        <div class="text-right">{{ diffNow ? $t('gdd_per_link.expired') : $t('form.date') }}</div>
       </b-col>
       <b-col cols="7">
         <div class="gdd-transaction-list-item-date">
-          {{ $d(new Date(balanceDate), 'long') }}
-          {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+          {{ dateString }}
         </div>
       </b-col>
     </b-row>
@@ -17,10 +16,22 @@
 export default {
   name: 'DateRow',
   props: {
-    balanceDate: {
+    date: {
       type: String,
       required: true,
     },
+    diffNow: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  computed: {
+    dateString() {
+      return this.diffNow
+        ? this.$moment(this.date).locale(this.$i18n.locale).fromNow()
+        : this.$d(new Date(this.date), 'long')
+    },
   },
 }
 </script>

From 555addb26cca91f2b5503c668b59886e1617d322 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:34:03 +0100
Subject: [PATCH 44/75] add props memo required: true

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

diff --git a/frontend/src/components/TransactionRows/MemoRow.vue b/frontend/src/components/TransactionRows/MemoRow.vue
index ef79fb38e..26b421bf9 100644
--- a/frontend/src/components/TransactionRows/MemoRow.vue
+++ b/frontend/src/components/TransactionRows/MemoRow.vue
@@ -16,7 +16,7 @@ export default {
   props: {
     memo: {
       type: String,
-      required: false,
+      required: true,
     },
   },
 }

From d4ca15a28a3f798b8961ddf6e75232b9121c27b9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:36:08 +0100
Subject: [PATCH 45/75] change props balanceDate to date

---
 frontend/src/components/Transactions/TransactionCreation.vue | 2 +-
 frontend/src/components/Transactions/TransactionReceive.vue  | 2 +-
 frontend/src/components/Transactions/TransactionSend.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 43178e5f2..579bf06a5 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -18,7 +18,7 @@
             <memo-row :memo="memo" />
 
             <!-- Datum -->
-            <date-row :balanceDate="balanceDate" />
+            <date-row :date="balanceDate" />
 
             <!-- Decay -->
             <decay-row :decay="decay" />
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index e9dc23cdb..bffd61eab 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -19,7 +19,7 @@
             <memo-row :memo="memo" />
 
             <!-- Datum -->
-            <date-row :balanceDate="balanceDate" />
+            <date-row :date="balanceDate" />
 
             <!-- Decay -->
             <decay-row :decay="decay" />
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 18112f8e1..b7c6fefe6 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -19,7 +19,7 @@
             <memo-row :memo="memo" />
 
             <!-- Datum -->
-            <date-row :balanceDate="balanceDate" />
+            <date-row :date="balanceDate" />
 
             <!-- Decay -->
             <decay-row :decay="decay" />

From 291fb29528966037aaa305aa639a4866c3e9ab9e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 18:39:03 +0100
Subject: [PATCH 46/75] remove unused code

---
 .../src/components/Transactions/TransactionLinksSummary.vue    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index 74251fc4b..8c5cace4a 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -25,9 +25,8 @@
         </div>
       </div>
 
-      <b-collapse class="pb-4 pt-5" v-model="visible">
+      <b-collapse v-model="visible">
         <collapse-links-list
-          class="m-2"
           v-model="variables"
           :transactionLinkCount="transactionLinkCount"
           :transactionLinks="transactionLinks"

From b655bbb6585b8f55f5d8f3794024c74440e714df Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 20:39:21 +0100
Subject: [PATCH 47/75] remove unused props item, add props from v-bind, remove
 id in function

---
 .../TransactionLinks/TransactionLink.vue      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 800e7b01c..75d87897e 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -5,9 +5,9 @@
         <type-icon color="text-danger" icon="link45deg" class="pt-4 pl-2" />
       </b-col>
       <b-col cols="9">
-        <amount-and-name-row :amount="item.amount" :text="$t('form.amount')" />
-        <memo-row :memo="item.memo" />
-        <date-row :date="item.validUntil" :diffNow="true" />
+        <amount-and-name-row :amount="amount" :text="$t('form.amount')" />
+        <memo-row :memo="memo" />
+        <date-row :date="validUntil" :diffNow="true" />
         <decay-row :decay="decayObject" />
       </b-col>
 
@@ -26,7 +26,7 @@
           class="p-2 mt-3"
           size="sm"
           variant="outline-danger"
-          @click="deleteLink(item.id)"
+          @click="deleteLink()"
           :title="$t('delete')"
         >
           <b-icon icon="trash"></b-icon>
@@ -53,11 +53,16 @@ export default {
     DecayRow,
   },
   props: {
-    item: { type: Object, required: true },
+    amount: { type: String, required: true },
+    code: { type: String, required: true },
+    holdAvailableAmount: { type: String, required: true },
+    id: { type: Number, required: true },
+    memo: { type: String, required: true },
+    validUntil: { type: String, required: true },
   },
   methods: {
     copy() {
-      const link = `${window.location.origin}/redeem/${this.item.code}`
+      const link = `${window.location.origin}/redeem/${this.code}`
       navigator.clipboard
         .writeText(link)
         .then(() => {
@@ -67,14 +72,14 @@ export default {
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },
-    deleteLink(id) {
+    deleteLink() {
       this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.delete-the-link')).then(async (value) => {
         if (value)
           await this.$apollo
             .mutate({
               mutation: deleteTransactionLink,
               variables: {
-                id: id,
+                id: this.id,
               },
             })
             .then((result) => {
@@ -89,7 +94,7 @@ export default {
   },
   computed: {
     decayObject() {
-      return { decay: this.item.amount - this.item.holdAvailableAmount }
+      return { decay: this.amount - this.holdAvailableAmount }
     },
   },
 }

From f07ed70f308416c38f3900b8f092057ef2d6c1b2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 20:40:59 +0100
Subject: [PATCH 48/75] add class on loadMoreLinks button, refactor static 5 to
 value.pageSize

---
 .../src/components/DecayInformations/CollapseLinksList.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index f9adf0f8d..f219a127a 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -7,11 +7,12 @@
           <transaction-link
             v-for="item in transactionLinks"
             :key="item.id"
-            v-bind:item="item"
+            v-bind="item"
             @reset-transaction-link-list="resetTransactionLinkList"
           />
           <div class="mb-3">
             <b-button
+              class="test-button-load-more"
               v-if="!value.pending && value.itemsShown < transactionLinkCount"
               block
               variant="outline-primary"
@@ -58,8 +59,8 @@ export default {
     buttonText() {
       const i = this.transactionLinkCount - this.value.itemsShown
       if (i === 1) return this.$tc('link-load', 0)
-      if (i < 6) return this.$tc('link-load', 1, { n: i })
-      return this.$tc('link-load', 2, { n: 5 })
+      if (i <= this.value.pageSize) return this.$tc('link-load', 1, { n: i })
+      return this.$tc('link-load', 2, { n: this.value.pageSize })
     },
   },
 }

From 67a14b21cb844940d4265a7d29c2a916a393c97a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 20:43:27 +0100
Subject: [PATCH 49/75] test for CollapseLinksList.vue

---
 .../CollapseLinksList.spec.js                 | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 frontend/src/components/DecayInformations/CollapseLinksList.spec.js

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
new file mode 100644
index 000000000..5407df2fe
--- /dev/null
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -0,0 +1,112 @@
+import { mount } from '@vue/test-utils'
+import CollapseLinksList from './CollapseLinksList'
+
+const localVue = global.localVue
+
+const mocks = {
+  $i18n: {
+    locale: 'en',
+  },
+  $tc: jest.fn((tc) => tc),
+  $t: jest.fn((t) => t),
+}
+
+const propsData = {
+  transactionLinks: [
+    {
+      amount: '5',
+      code: 'ce28664b5308c17f931c0367',
+      createdAt: '2022-03-16T14:22:40.000Z',
+      holdAvailableAmount: '5.13109484759482747111',
+      id: 87,
+      memo: 'asdasdaadsdd asd asdadss',
+      redeemedAt: null,
+      validUntil: '2022-03-30T14:22:40.000Z',
+    },
+  ],
+  transactionLinkCount: 3,
+  value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 0 },
+}
+
+describe('CollapseLinksList', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(CollapseLinksList, { localVue, mocks, propsData })
+  }
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component div.collapse-links-list', () => {
+      expect(wrapper.find('div.collapse-links-list').exists()).toBeTruthy()
+    })
+
+    describe('load more links', () => {
+      beforeEach(async () => {
+        await wrapper.find('button.test-button-load-more').trigger('click')
+      })
+
+      it('emits input', () => {
+        expect(wrapper.emitted('input')).toEqual([
+          [{ currentPage: 2, itemsShown: 0, pageSize: 5, pending: false }],
+        ])
+      })
+    })
+
+    describe('reset transaction link list', () => {
+      beforeEach(async () => {
+        await wrapper
+          .findComponent({ name: 'TransactionLink' })
+          .vm.$emit('reset-transaction-link-list')
+      })
+
+      it('emits input ', () => {
+        expect(wrapper.emitted('input')).toEqual([
+          [{ currentPage: 0, itemsShown: 0, pageSize: 5, pending: false }],
+        ])
+      })
+    })
+
+    describe('button text', () => {
+      describe('one more link to load', () => {
+        beforeEach(async () => {
+          await wrapper.setProps({
+            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+          })
+        })
+
+        it('renders text in singular', () => {
+          expect(mocks.$tc).toBeCalledWith('link-load', 0)
+        })
+      })
+
+      describe('less than pageSize links to load', () => {
+        beforeEach(async () => {
+          await wrapper.setProps({
+            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+            transactionLinkCount: 6,
+          })
+        })
+
+        it('renders text in singular', () => {
+          expect(mocks.$tc).toBeCalledWith('link-load', 1, { n: 4 })
+        })
+      })
+
+      describe('more than pageSize links to load', () => {
+        beforeEach(async () => {
+          await wrapper.setProps({
+            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+            transactionLinkCount: 16,
+          })
+        })
+
+        it('renders text in singular', () => {
+          expect(mocks.$tc).toBeCalledWith('link-load', 2, { n: 5 })
+        })
+      })
+    })
+  })
+})

From abcaad720700a94cc0b9d12ac8d662060f2fbbfd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 16 Mar 2022 21:16:33 +0100
Subject: [PATCH 50/75] delete unused keys in locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 3f59525ae..7f606e827 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -125,9 +125,6 @@
   },
   "language": "Sprache",
   "link-load": "den letzten Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
-  "links-list": {
-    "header": "Liste deiner aktiven Links"
-  },
   "login": "Anmeldung",
   "math": {
     "aprox": "~",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 24e8c0c29..8377fc0b0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -125,9 +125,6 @@
   },
   "language": "Language",
   "link-load": "Load the last link | Load the last {n} links |  Load more {n} links",
-  "links-list": {
-    "header": "List of your active links"
-  },
   "login": "Login",
   "math": {
     "aprox": "~",

From 96a441314482c23a9f672621576ef6e40105d3c3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 09:59:10 +0100
Subject: [PATCH 51/75] remove itemsShown to transactionLinks.length

---
 .../src/components/DecayInformations/CollapseLinksList.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index f219a127a..cbd5f7a12 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -13,7 +13,7 @@
           <div class="mb-3">
             <b-button
               class="test-button-load-more"
-              v-if="!value.pending && value.itemsShown < transactionLinkCount"
+              v-if="!value.pending && transactionLinks.length < transactionLinkCount"
               block
               variant="outline-primary"
               @click="loadMoreLinks"
@@ -57,7 +57,7 @@ export default {
   },
   computed: {
     buttonText() {
-      const i = this.transactionLinkCount - this.value.itemsShown
+      const i = this.transactionLinkCount - this.transactionLinks.length
       if (i === 1) return this.$tc('link-load', 0)
       if (i <= this.value.pageSize) return this.$tc('link-load', 1, { n: i })
       return this.$tc('link-load', 2, { n: this.value.pageSize })

From 4eec006a49d8444c1076750ce77031a6302c2d98 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 10:01:02 +0100
Subject: [PATCH 52/75] add once data on transactionLink, remove
 valua.itemsShown

---
 .../CollapseLinksList.spec.js                 | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 5407df2fe..5dbf5f93c 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -23,9 +23,19 @@ const propsData = {
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
     },
+    {
+      amount: '6',
+      code: 'ce28664b5308c17f931c0367',
+      createdAt: '2022-03-16T14:22:40.000Z',
+      holdAvailableAmount: '5.13109484759482747111',
+      id: 86,
+      memo: 'asdasdaadsdd asd asdadss',
+      redeemedAt: null,
+      validUntil: '2022-03-30T14:22:40.000Z',
+    },
   ],
   transactionLinkCount: 3,
-  value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 0 },
+  value: { currentPage: 1, pending: false, pageSize: 5 },
 }
 
 describe('CollapseLinksList', () => {
@@ -50,7 +60,7 @@ describe('CollapseLinksList', () => {
 
       it('emits input', () => {
         expect(wrapper.emitted('input')).toEqual([
-          [{ currentPage: 2, itemsShown: 0, pageSize: 5, pending: false }],
+          [{ currentPage: 2, pageSize: 5, pending: false }],
         ])
       })
     })
@@ -64,7 +74,7 @@ describe('CollapseLinksList', () => {
 
       it('emits input ', () => {
         expect(wrapper.emitted('input')).toEqual([
-          [{ currentPage: 0, itemsShown: 0, pageSize: 5, pending: false }],
+          [{ currentPage: 0, pageSize: 5, pending: false }],
         ])
       })
     })
@@ -73,7 +83,7 @@ describe('CollapseLinksList', () => {
       describe('one more link to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+            value: { currentPage: 1, pending: false, pageSize: 5 },
           })
         })
 
@@ -85,7 +95,7 @@ describe('CollapseLinksList', () => {
       describe('less than pageSize links to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+            value: { currentPage: 1, pending: false, pageSize: 5 },
             transactionLinkCount: 6,
           })
         })
@@ -98,7 +108,7 @@ describe('CollapseLinksList', () => {
       describe('more than pageSize links to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5, itemsShown: 2 },
+            value: { currentPage: 1, pending: false, pageSize: 5 },
             transactionLinkCount: 16,
           })
         })

From 8a786d9fb4ce95d7dc7e45c03c691b5c46bf0049 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 10:02:19 +0100
Subject: [PATCH 53/75] remove itemsShown to transactionLinks.length in
 TransactionLinksSummary

---
 .../src/components/Transactions/TransactionLinksSummary.vue     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index 8c5cace4a..bfc774f71 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -76,7 +76,6 @@ export default {
         currentPage: 1,
         pending: false,
         pageSize: 5,
-        itemsShown: 0,
       },
     }
   },
@@ -99,7 +98,6 @@ export default {
             this.transactionLinks = [...this.transactionLinks, ...result.data.listTransactionLinks]
             this.$emit('update-transactions')
             this.variables.pending = false
-            this.variables.itemsShown = this.transactionLinks.length
           })
           .catch((err) => {
             this.toastError(err.message)

From e9879cf40c5ff5dd570a26a76327644d554640c0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 10:03:07 +0100
Subject: [PATCH 54/75] test for TransactionLinksSummary.vue

---
 .../TransactionLinksSummary.spec.js           | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 frontend/src/components/Transactions/TransactionLinksSummary.spec.js

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
new file mode 100644
index 000000000..29f9a9b9a
--- /dev/null
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -0,0 +1,171 @@
+import { mount } from '@vue/test-utils'
+import TransactionLinksSummary from './TransactionLinksSummary'
+import { listTransactionLinks } from '@/graphql/queries'
+import { toastErrorSpy } from '@test/testSetup'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValue({
+  data: {
+    listTransactionLinks: [
+      {
+        amount: '75',
+        code: 'ce28664b5308c17f931c0367',
+        createdAt: '2022-03-16T14:22:40.000Z',
+        holdAvailableAmount: '5.13109484759482747111',
+        id: 12,
+        memo: 'asdasdaadsdd asd asdadss',
+        redeemedAt: null,
+        validUntil: '2022-03-30T14:22:40.000Z',
+      },
+      {
+        amount: '85',
+        code: 'ce28664b5308c17f931c0367',
+        createdAt: '2022-03-16T14:22:40.000Z',
+        holdAvailableAmount: '5.13109484759482747111',
+        id: 34,
+        memo: 'asdasdaadsdd asd asdadss',
+        redeemedAt: null,
+        validUntil: '2022-03-30T14:22:40.000Z',
+      },
+      {
+        amount: '95',
+        code: 'ce28664b5308c17f931c0367',
+        createdAt: '2022-03-16T14:22:40.000Z',
+        holdAvailableAmount: '5.13109484759482747111',
+        id: 56,
+        memo: 'asdasdaadsdd asd asdadss',
+        redeemedAt: null,
+        validUntil: '2022-03-30T14:22:40.000Z',
+      },
+      {
+        amount: '150',
+        code: 'ce28664b5308c17f931c0367',
+        createdAt: '2022-03-16T14:22:40.000Z',
+        holdAvailableAmount: '5.13109484759482747111',
+        id: 78,
+        memo: 'asdasdaadsdd asd asdadss',
+        redeemedAt: null,
+        validUntil: '2022-03-30T14:22:40.000Z',
+      },
+    ],
+  },
+})
+
+const mocks = {
+  $i18n: {
+    locale: 'en',
+  },
+  $t: jest.fn((t) => t),
+  $tc: jest.fn((tc) => tc),
+  $apollo: {
+    query: apolloQueryMock,
+  },
+}
+
+const propsData = {
+  amount: '123',
+  decay: {
+    decay: '-0.2038314055482643084',
+    start: '2022-02-25T07:29:26.000Z',
+    end: '2022-02-28T13:55:47.000Z',
+    duration: 282381,
+  },
+  transactionLinkCount: 4,
+}
+
+describe('TransactionLinksSummary', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(TransactionLinksSummary, { localVue, mocks, propsData })
+  }
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component transaction-slot-link', () => {
+      expect(wrapper.find('div.transaction-slot-link').exists()).toBe(true)
+    })
+
+    it('has a component CollapseLinksList', () => {
+      expect(wrapper.findComponent({ name: 'CollapseLinksList' }).exists()).toBe(true)
+    })
+
+    it('calls the API to get the list transaction links', () => {
+      expect(apolloQueryMock).toBeCalledWith({
+        query: listTransactionLinks,
+        variables: {
+          currentPage: 1,
+        },
+        fetchPolicy: 'network-only',
+      })
+    })
+
+    it('has four transactionLinks', () => {
+      expect(wrapper.vm.transactionLinks).toHaveLength(4)
+    })
+
+    describe('reset transaction links', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        await wrapper.setData({
+          variables: {
+            currentPage: 0,
+            pending: false,
+            pageSize: 5,
+          },
+        })
+      })
+
+      it('reloads transaction links', () => {
+        expect(apolloQueryMock).toBeCalledWith({
+          query: listTransactionLinks,
+          variables: {
+            currentPage: 1,
+          },
+          fetchPolicy: 'network-only',
+        })
+      })
+
+      it('emits update transactions', () => {
+        expect(wrapper.emitted('update-transactions')).toBeTruthy()
+      })
+    })
+
+    describe('load more transaction links', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        await wrapper.setData({
+          variables: {
+            currentPage: 2,
+            pending: false,
+            pageSize: 5,
+          },
+        })
+      })
+
+      it('loads more transaction links', () => {
+        expect(apolloQueryMock).toBeCalledWith({
+          query: listTransactionLinks,
+          variables: {
+            currentPage: 2,
+          },
+          fetchPolicy: 'network-only',
+        })
+      })
+    })
+
+    describe('loads transaction links with error', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('OUCH!')
+      })
+    })
+  })
+})

From 05cd05094ba6ec2792ef0fda8916f9799e3d0023 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 11:32:33 +0100
Subject: [PATCH 55/75] test for TransactionLink.vue

---
 .../TransactionLinks/TransactionLink.spec.js  | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 frontend/src/components/TransactionLinks/TransactionLink.spec.js

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
new file mode 100644
index 000000000..d2c226026
--- /dev/null
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -0,0 +1,118 @@
+import { mount } from '@vue/test-utils'
+import TransactionLink from './TransactionLink'
+import { deleteTransactionLink } from '@/graphql/mutations'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
+
+const localVue = global.localVue
+
+const mockAPIcall = jest.fn()
+const navigatorClipboardMock = jest.fn()
+
+const mocks = {
+  $i18n: {
+    locale: 'en',
+  },
+  $t: jest.fn((t) => t),
+  $tc: jest.fn((tc) => tc),
+  $apollo: {
+    mutate: mockAPIcall,
+  },
+}
+
+const propsData = {
+  amount: '75',
+  code: 'c00000000c000000c0000',
+  holdAvailableAmount: '5.13109484759482747111',
+  id: 12,
+  memo: 'asdasdaadsdd asd asdadss',
+  validUntil: '2022-03-30T14:22:40.000Z',
+}
+
+describe('TransactionLink', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(TransactionLink, { localVue, mocks, propsData })
+  }
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component div.transaction-link', () => {
+      expect(wrapper.find('div.transaction-link').exists()).toBeTruthy()
+    })
+
+    describe('Copy link to Clipboard', () => {
+      const navigatorClipboard = navigator.clipboard
+      beforeAll(() => {
+        delete navigator.clipboard
+        navigator.clipboard = { writeText: navigatorClipboardMock }
+      })
+      afterAll(() => {
+        navigator.clipboard = navigatorClipboard
+      })
+
+      describe('copy with success', () => {
+        beforeEach(async () => {
+          navigatorClipboardMock.mockResolvedValue()
+          await wrapper.findAll('button').at(0).trigger('click')
+        })
+
+        it('toasts success message', () => {
+          expect(toastSuccessSpy).toBeCalledWith(
+            'gdd_per_link.link-copied' + '\n' + 'http://localhost/redeem/c00000000c000000c0000',
+          )
+        })
+      })
+
+      describe('copy with error', () => {
+        beforeEach(async () => {
+          navigatorClipboardMock.mockRejectedValue()
+          await wrapper.findAll('button').at(0).trigger('click')
+        })
+
+        it('toasts error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
+        })
+      })
+    })
+
+    describe('deleteLink', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        mockAPIcall.mockResolvedValue()
+        await wrapper.findAll('button').at(1).trigger('click')
+      })
+
+      it('test Modal if confirm true', () => {
+        const spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+        spy.mockImplementation(() => Promise.resolve('some value'))
+        wrapper.vm.deleteLink()
+        wrapper.vm.$nextTick(() => {
+          expect(spy).toHaveBeenCalled()
+        })
+      })
+
+      it('calls the API', () => {
+        expect.objectContaining({
+          mutation: deleteTransactionLink,
+          variables: {
+            id: 12,
+          },
+        })
+      })
+    })
+
+    // describe('delete with error', () => {
+    //   beforeEach(async () => {
+    //     mockAPIcall.mockRejectedValue({ message: 'Oh no!' })
+    //     await wrapper.findAll('button').at(1).trigger('click')
+    //   })
+
+    //   it('toasts an error message', () => {
+    //     expect(toastErrorSpy).toBeCalledWith('Oh no!')
+    //   })
+    // })
+  })
+})

From 97590373cbceadc2a98700f8b76e941c9375c368 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 11:56:11 +0100
Subject: [PATCH 56/75] change modal test

---
 .../src/components/TransactionLinks/TransactionLink.spec.js   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index d2c226026..f3eaf72ce 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -89,9 +89,7 @@ describe('TransactionLink', () => {
         const spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
         spy.mockImplementation(() => Promise.resolve('some value'))
         wrapper.vm.deleteLink()
-        wrapper.vm.$nextTick(() => {
-          expect(spy).toHaveBeenCalled()
-        })
+        expect(spy).toHaveBeenCalled()
       })
 
       it('calls the API', () => {

From 36ea3bf170abe013b2f07b3203994339be3d7c7d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Mar 2022 13:52:49 +0100
Subject: [PATCH 57/75] test bvModal, fix duplicate Id warning

---
 .../TransactionLinks/TransactionLink.spec.js  | 83 +++++++++++++------
 .../TransactionLinks/TransactionLink.vue      |  2 +-
 .../TransactionLinksSummary.spec.js           | 54 +++++++++++-
 3 files changed, 108 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index f3eaf72ce..338f2107e 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -78,39 +78,70 @@ describe('TransactionLink', () => {
       })
     })
 
-    describe('deleteLink', () => {
-      beforeEach(async () => {
+    describe('delete link', () => {
+      let spy
+
+      beforeEach(() => {
         jest.clearAllMocks()
-        mockAPIcall.mockResolvedValue()
-        await wrapper.findAll('button').at(1).trigger('click')
       })
 
-      it('test Modal if confirm true', () => {
-        const spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-        spy.mockImplementation(() => Promise.resolve('some value'))
-        wrapper.vm.deleteLink()
-        expect(spy).toHaveBeenCalled()
+      describe('with success', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
+          mockAPIcall.mockResolvedValue()
+          await wrapper.findAll('button').at(1).trigger('click')
+        })
+
+        it('test Modal if confirm true', () => {
+          expect(spy).toBeCalled()
+        })
+
+        it('calls the API', () => {
+          expect(mockAPIcall).toBeCalledWith(
+            expect.objectContaining({
+              mutation: deleteTransactionLink,
+              variables: {
+                id: 12,
+              },
+            }),
+          )
+        })
+
+        it('toasts a success message', () => {
+          expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.deleted')
+        })
+
+        it('emits reset transaction link list', () => {
+          expect(wrapper.emitted('reset-transaction-link-list')).toBeTruthy()
+        })
       })
 
-      it('calls the API', () => {
-        expect.objectContaining({
-          mutation: deleteTransactionLink,
-          variables: {
-            id: 12,
-          },
+      describe('with error', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
+          mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
+          await wrapper.findAll('button').at(1).trigger('click')
+        })
+
+        it('toasts an error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('Something went wrong :(')
+        })
+      })
+
+      describe('cancel delete', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(false))
+          mockAPIcall.mockResolvedValue()
+          await wrapper.findAll('button').at(1).trigger('click')
+        })
+
+        it('does not call the API', () => {
+          expect(mockAPIcall).not.toBeCalled()
         })
       })
     })
-
-    // describe('delete with error', () => {
-    //   beforeEach(async () => {
-    //     mockAPIcall.mockRejectedValue({ message: 'Oh no!' })
-    //     await wrapper.findAll('button').at(1).trigger('click')
-    //   })
-
-    //   it('toasts an error message', () => {
-    //     expect(toastErrorSpy).toBeCalledWith('Oh no!')
-    //   })
-    // })
   })
 })
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 75d87897e..e558ac50b 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -82,7 +82,7 @@ export default {
                 id: this.id,
               },
             })
-            .then((result) => {
+            .then(() => {
               this.toastSuccess(this.$t('gdd_per_link.deleted'))
               this.$emit('reset-transaction-link-list')
             })
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index 29f9a9b9a..d09aaa5d1 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -13,7 +13,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         code: 'ce28664b5308c17f931c0367',
         createdAt: '2022-03-16T14:22:40.000Z',
         holdAvailableAmount: '5.13109484759482747111',
-        id: 12,
+        id: 86,
         memo: 'asdasdaadsdd asd asdadss',
         redeemedAt: null,
         validUntil: '2022-03-30T14:22:40.000Z',
@@ -23,7 +23,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         code: 'ce28664b5308c17f931c0367',
         createdAt: '2022-03-16T14:22:40.000Z',
         holdAvailableAmount: '5.13109484759482747111',
-        id: 34,
+        id: 107,
         memo: 'asdasdaadsdd asd asdadss',
         redeemedAt: null,
         validUntil: '2022-03-30T14:22:40.000Z',
@@ -33,7 +33,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         code: 'ce28664b5308c17f931c0367',
         createdAt: '2022-03-16T14:22:40.000Z',
         holdAvailableAmount: '5.13109484759482747111',
-        id: 56,
+        id: 92,
         memo: 'asdasdaadsdd asd asdadss',
         redeemedAt: null,
         validUntil: '2022-03-30T14:22:40.000Z',
@@ -43,7 +43,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         code: 'ce28664b5308c17f931c0367',
         createdAt: '2022-03-16T14:22:40.000Z',
         holdAvailableAmount: '5.13109484759482747111',
-        id: 78,
+        id: 16,
         memo: 'asdasdaadsdd asd asdadss',
         redeemedAt: null,
         validUntil: '2022-03-30T14:22:40.000Z',
@@ -137,6 +137,52 @@ describe('TransactionLinksSummary', () => {
     describe('load more transaction links', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            listTransactionLinks: [
+              {
+                amount: '76',
+                code: 'ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 87,
+                memo: 'asdasdaadsdd asd asdadss',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '86',
+                code: 'ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 108,
+                memo: 'asdasdaadsdd asd asdadss',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '96',
+                code: 'ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 93,
+                memo: 'asdasdaadsdd asd asdadss',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '150',
+                code: 'ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 17,
+                memo: 'asdasdaadsdd asd asdadss',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+            ],
+          },
+        })
         await wrapper.setData({
           variables: {
             currentPage: 2,

From 06705366ad3e8e494cf5fafc56b078d5d36f8d31 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 16:44:06 +0100
Subject: [PATCH 58/75] change decay Object to String

---
 .../DecayInformations/DecayInformation-Decay.vue          | 8 +++++---
 .../DecayInformations/DecayInformation-Short.vue          | 4 ++--
 .../src/components/TransactionLinks/TransactionLink.vue   | 6 +++---
 frontend/src/components/TransactionRows/DecayRow.vue      | 2 +-
 .../src/components/Transactions/TransactionCreation.vue   | 2 +-
 frontend/src/components/Transactions/TransactionDecay.vue | 2 +-
 .../components/Transactions/TransactionLinksSummary.vue   | 2 +-
 .../src/components/Transactions/TransactionReceive.vue    | 2 +-
 frontend/src/components/Transactions/TransactionSend.vue  | 2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 7377b6fa8..6abacd2b8 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -13,8 +13,8 @@
       </b-col>
       <b-col cols="6">
         <div>
-          {{ (Number(balance) - Number(decay.decay)) | GDD }}
-          {{ decay.decay | GDD }} {{ $t('math.equal') }}
+          {{ (Number(balance) - Number(decay)) | GDD }}
+          {{ decay | GDD }} {{ $t('math.equal') }}
           <b>{{ balance | GDD }}</b>
         </div>
       </b-col>
@@ -27,9 +27,11 @@ export default {
   props: {
     balance: {
       type: String,
+      required: true,
     },
     decay: {
-      type: Object,
+      type: String,
+      required: true,
     },
   },
 }
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 333a38216..ba1f16d72 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span v-if="decay.decay">{{ decay.decay | GDD }}</span>
+    <span v-if="decay">{{ decay | GDD }}</span>
   </div>
 </template>
 <script>
@@ -8,7 +8,7 @@ export default {
   name: 'DecayInformation-Short',
   props: {
     decay: {
-      type: Object,
+      type: String,
       required: true,
     },
   },
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index e558ac50b..5851ba453 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -8,7 +8,7 @@
         <amount-and-name-row :amount="amount" :text="$t('form.amount')" />
         <memo-row :memo="memo" />
         <date-row :date="validUntil" :diffNow="true" />
-        <decay-row :decay="decayObject" />
+        <decay-row :decay="decay" />
       </b-col>
 
       <b-col cols="1" class="text-right">
@@ -93,8 +93,8 @@ export default {
     },
   },
   computed: {
-    decayObject() {
-      return { decay: this.amount - this.holdAvailableAmount }
+    decay() {
+      return `${this.amount - this.holdAvailableAmount}`
     },
   },
 }
diff --git a/frontend/src/components/TransactionRows/DecayRow.vue b/frontend/src/components/TransactionRows/DecayRow.vue
index 92d79ef4b..f853d9f93 100644
--- a/frontend/src/components/TransactionRows/DecayRow.vue
+++ b/frontend/src/components/TransactionRows/DecayRow.vue
@@ -23,7 +23,7 @@ export default {
   },
   props: {
     decay: {
-      type: Object,
+      type: String,
       required: false,
     },
   },
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 579bf06a5..bb131d39a 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -21,7 +21,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 9c7d52495..2f235502a 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -21,7 +21,7 @@
       </div>
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
-        <decay-information-decay :balance="balance" :decay="decay" />
+        <decay-information-decay :balance="balance" :decay="decay.decay" />
       </b-collapse>
     </div>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index bfc774f71..21a965803 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -19,7 +19,7 @@
               <link-count-row :count="transactionLinkCount" />
 
               <!-- Decay -->
-              <decay-row :decay="decay" />
+              <decay-row :decay="decay.decay" />
             </b-col>
           </b-row>
         </div>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index bffd61eab..eade4a30c 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -22,7 +22,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index b7c6fefe6..8183a5734 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -22,7 +22,7 @@
             <date-row :date="balanceDate" />
 
             <!-- Decay -->
-            <decay-row :decay="decay" />
+            <decay-row :decay="decay.decay" />
           </b-col>
         </b-row>
       </div>

From 691ea91eb79f3feb35b2f1d8a246ffd10bb87435 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:45:36 +0100
Subject: [PATCH 59/75] Update
 frontend/src/components/DecayInformations/CollapseLinksList.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/DecayInformations/CollapseLinksList.spec.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 5dbf5f93c..5d02bb787 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -100,7 +100,7 @@ describe('CollapseLinksList', () => {
           })
         })
 
-        it('renders text in singular', () => {
+        it('renders text in plural and shows the correct count of links, () => {
           expect(mocks.$tc).toBeCalledWith('link-load', 1, { n: 4 })
         })
       })

From 7347ed78fbc955d418023dbff8d1fae50d5b8e93 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:46:14 +0100
Subject: [PATCH 60/75] Update
 frontend/src/components/TransactionLinks/TransactionLink.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/TransactionLinks/TransactionLink.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 5851ba453..9cbfdfb93 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -66,7 +66,7 @@ export default {
       navigator.clipboard
         .writeText(link)
         .then(() => {
-          this.toastSuccess(this.$t('gdd_per_link.link-copied') + '\n' + link)
+          this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
           this.toastError(this.$t('gdd_per_link.not-copied'))

From b905235c74662f9b7a8a314951df71ad8a89e8a2 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:46:50 +0100
Subject: [PATCH 61/75] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 338f2107e..971cb8886 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -24,7 +24,7 @@ const propsData = {
   code: 'c00000000c000000c0000',
   holdAvailableAmount: '5.13109484759482747111',
   id: 12,
-  memo: 'asdasdaadsdd asd asdadss',
+  memo: 'Wie schön hier etwas Quatsch zu lesen!',
   validUntil: '2022-03-30T14:22:40.000Z',
 }
 

From 6af0d516288ecc93d2bd17560df44c5ea70b5ada Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:47:35 +0100
Subject: [PATCH 62/75] Update
 frontend/src/components/DecayInformations/CollapseLinksList.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/DecayInformations/CollapseLinksList.spec.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 5d02bb787..928ae2735 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -113,7 +113,7 @@ describe('CollapseLinksList', () => {
           })
         })
 
-        it('renders text in singular', () => {
+        it('renders text in plural with page size links to load', () => {
           expect(mocks.$tc).toBeCalledWith('link-load', 2, { n: 5 })
         })
       })

From 5e0864520a591373bcd2a70f10909a2fb388eede Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:47:44 +0100
Subject: [PATCH 63/75] 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 7f606e827..9c709c8f4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -27,7 +27,7 @@
       "send": "Gesendet"
     }
   },
-  "delete": "löschen",
+  "delete": "Löschen",
   "em-dash": "—",
   "error": {
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",

From a84c91cbb75972337568d0ed2da17a3e6646788d Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:48:05 +0100
Subject: [PATCH 64/75] 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 9c709c8f4..a20d92935 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -99,7 +99,7 @@
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "delete-the-link": "Den Link löschen?",
     "deleted": "Der Link wurde gelöscht!",
-    "expired": "abgelaufen",
+    "expired": "Abgelaufen",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
     "links_count": "Aktive Links",

From 85513f40f1bec6fca6030143ab5d063a2500a133 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:48:14 +0100
Subject: [PATCH 65/75] Update frontend/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8377fc0b0..be4196992 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -99,7 +99,7 @@
     "decay-14-day": "Decay for 14 days",
     "delete-the-link": "Delete the link?",
     "deleted": "The link was deleted!",
-    "expired": "expired",
+    "expired": "Expired",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
     "links_count": "Active links",

From e396aa52fb9f0825f221c2047e5cc53f0c354ec2 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:48:39 +0100
Subject: [PATCH 66/75] Update
 frontend/src/components/Transactions/TransactionLinksSummary.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/Transactions/TransactionLinksSummary.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index d09aaa5d1..6e01b376e 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -14,7 +14,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         createdAt: '2022-03-16T14:22:40.000Z',
         holdAvailableAmount: '5.13109484759482747111',
         id: 86,
-        memo: 'asdasdaadsdd asd asdadss',
+        memo: 'Na komm schon. Etwas Kreativität.',
         redeemedAt: null,
         validUntil: '2022-03-30T14:22:40.000Z',
       },

From 6b2cd9716dda516460845fc0a15388063bd0f8ed Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:48:49 +0100
Subject: [PATCH 67/75] Update frontend/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index be4196992..378a4dceb 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -27,7 +27,7 @@
       "send": "Sent"
     }
   },
-  "delete": "delete",
+  "delete": "Delete",
   "em-dash": "—",
   "error": {
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",

From 4a7a4f28cfbe6056e2112e84012df643c90026cb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 17:58:17 +0100
Subject: [PATCH 68/75] change object variables, pending extra, chnage text in
 tests

---
 .../DecayInformations/CollapseLinksList.spec.js      |  2 +-
 .../DecayInformations/CollapseLinksList.vue          | 12 +++++-------
 .../TransactionLinks/TransactionLink.spec.js         |  4 +---
 .../Transactions/TransactionLinksSummary.vue         |  9 +++++----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 928ae2735..d09922e3a 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -100,7 +100,7 @@ describe('CollapseLinksList', () => {
           })
         })
 
-        it('renders text in plural and shows the correct count of links, () => {
+        it('renders text in plural and shows the correct count of links', () => {
           expect(mocks.$tc).toBeCalledWith('link-load', 1, { n: 4 })
         })
       })
diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index cbd5f7a12..b1e42cd2d 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -13,19 +13,16 @@
           <div class="mb-3">
             <b-button
               class="test-button-load-more"
-              v-if="!value.pending && transactionLinks.length < transactionLinkCount"
+              v-if="!pending && transactionLinks.length < transactionLinkCount"
               block
               variant="outline-primary"
               @click="loadMoreLinks"
             >
               {{ buttonText }}
             </b-button>
-            <b-icon
-              v-if="value.pending"
-              icon="three-dots"
-              animation="cylon"
-              font-scale="4"
-            ></b-icon>
+            <div class="text-center">
+              <b-icon v-if="pending" icon="three-dots" animation="cylon" font-scale="4"></b-icon>
+            </div>
           </div>
         </div>
       </div>
@@ -46,6 +43,7 @@ export default {
       required: true,
     },
     value: { type: Object, required: true },
+    pending: { type: Boolean, default: false },
   },
   methods: {
     resetTransactionLinkList() {
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 971cb8886..f019a0ee1 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -60,9 +60,7 @@ describe('TransactionLink', () => {
         })
 
         it('toasts success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith(
-            'gdd_per_link.link-copied' + '\n' + 'http://localhost/redeem/c00000000c000000c0000',
-          )
+          expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
         })
       })
 
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index 21a965803..f98ef2ee2 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -28,6 +28,7 @@
       <b-collapse v-model="visible">
         <collapse-links-list
           v-model="variables"
+          :pending="pending"
           :transactionLinkCount="transactionLinkCount"
           :transactionLinks="transactionLinks"
         />
@@ -74,9 +75,9 @@ export default {
       transactionLinks: [],
       variables: {
         currentPage: 1,
-        pending: false,
         pageSize: 5,
       },
+      pending: false,
     }
   },
   methods: {
@@ -85,7 +86,7 @@ export default {
         this.transactionLinks = []
         this.variables.currentPage = 1
       } else {
-        this.variables.pending = true
+        this.pending = true
         this.$apollo
           .query({
             query: listTransactionLinks,
@@ -97,11 +98,11 @@ export default {
           .then((result) => {
             this.transactionLinks = [...this.transactionLinks, ...result.data.listTransactionLinks]
             this.$emit('update-transactions')
-            this.variables.pending = false
+            this.pending = false
           })
           .catch((err) => {
             this.toastError(err.message)
-            this.variables.pending = false
+            this.pending = false
           })
       }
     },

From b75330c142c39354005f12498f240b60d2f66a60 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 18:08:15 +0100
Subject: [PATCH 69/75] test transaction links four to eight

---
 .../components/Transactions/TransactionLinksSummary.spec.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index 6e01b376e..9e93b5c2c 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -192,6 +192,10 @@ describe('TransactionLinksSummary', () => {
         })
       })
 
+      it('has eight transactionLinks', () => {
+        expect(wrapper.vm.transactionLinks).toHaveLength(8)
+      })
+
       it('loads more transaction links', () => {
         expect(apolloQueryMock).toBeCalledWith({
           query: listTransactionLinks,

From b8d4366e46d8ab7e24909e6652679c264dd389cd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Mar 2022 20:06:24 +0100
Subject: [PATCH 70/75] 
 src/components/Transactions/TransactionLinksSummary.spec.js

---
 .../TransactionLinksSummary.spec.js           | 99 ++++++++++---------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index 9e93b5c2c..4d7a99448 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -5,52 +5,7 @@ import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
-const apolloQueryMock = jest.fn().mockResolvedValue({
-  data: {
-    listTransactionLinks: [
-      {
-        amount: '75',
-        code: 'ce28664b5308c17f931c0367',
-        createdAt: '2022-03-16T14:22:40.000Z',
-        holdAvailableAmount: '5.13109484759482747111',
-        id: 86,
-        memo: 'Na komm schon. Etwas Kreativität.',
-        redeemedAt: null,
-        validUntil: '2022-03-30T14:22:40.000Z',
-      },
-      {
-        amount: '85',
-        code: 'ce28664b5308c17f931c0367',
-        createdAt: '2022-03-16T14:22:40.000Z',
-        holdAvailableAmount: '5.13109484759482747111',
-        id: 107,
-        memo: 'asdasdaadsdd asd asdadss',
-        redeemedAt: null,
-        validUntil: '2022-03-30T14:22:40.000Z',
-      },
-      {
-        amount: '95',
-        code: 'ce28664b5308c17f931c0367',
-        createdAt: '2022-03-16T14:22:40.000Z',
-        holdAvailableAmount: '5.13109484759482747111',
-        id: 92,
-        memo: 'asdasdaadsdd asd asdadss',
-        redeemedAt: null,
-        validUntil: '2022-03-30T14:22:40.000Z',
-      },
-      {
-        amount: '150',
-        code: 'ce28664b5308c17f931c0367',
-        createdAt: '2022-03-16T14:22:40.000Z',
-        holdAvailableAmount: '5.13109484759482747111',
-        id: 16,
-        memo: 'asdasdaadsdd asd asdadss',
-        redeemedAt: null,
-        validUntil: '2022-03-30T14:22:40.000Z',
-      },
-    ],
-  },
-})
+const apolloQueryMock = jest.fn()
 
 const mocks = {
   $i18n: {
@@ -80,8 +35,56 @@ describe('TransactionLinksSummary', () => {
   const Wrapper = () => {
     return mount(TransactionLinksSummary, { localVue, mocks, propsData })
   }
+
   describe('mount', () => {
     beforeEach(() => {
+      apolloQueryMock.mockResolvedValue({
+        data: {
+          listTransactionLinks: [
+            {
+              amount: '75',
+              code: 'ce28664b5308c17f931c0367',
+              createdAt: '2022-03-16T14:22:40.000Z',
+              holdAvailableAmount: '5.13109484759482747111',
+              id: 86,
+              memo: 'Na komm schon. Etwas Kreativität.',
+              redeemedAt: null,
+              validUntil: '2022-03-30T14:22:40.000Z',
+            },
+            {
+              amount: '85',
+              code: 'ce28664b5308c17f931c0367',
+              createdAt: '2022-03-16T14:22:40.000Z',
+              holdAvailableAmount: '5.13109484759482747111',
+              id: 107,
+              memo: 'asdasdaadsdd asd asdadss',
+              redeemedAt: null,
+              validUntil: '2022-03-30T14:22:40.000Z',
+            },
+            {
+              amount: '95',
+              code: 'ce28664b5308c17f931c0367',
+              createdAt: '2022-03-16T14:22:40.000Z',
+              holdAvailableAmount: '5.13109484759482747111',
+              id: 92,
+              memo: 'asdasdaadsdd asd asdadss',
+              redeemedAt: null,
+              validUntil: '2022-03-30T14:22:40.000Z',
+            },
+            {
+              amount: '150',
+              code: 'ce28664b5308c17f931c0367',
+              createdAt: '2022-03-16T14:22:40.000Z',
+              holdAvailableAmount: '5.13109484759482747111',
+              id: 16,
+              memo: 'asdasdaadsdd asd asdadss',
+              redeemedAt: null,
+              validUntil: '2022-03-30T14:22:40.000Z',
+            },
+          ],
+        },
+      })
+
       wrapper = Wrapper()
     })
 
@@ -132,6 +135,10 @@ describe('TransactionLinksSummary', () => {
       it('emits update transactions', () => {
         expect(wrapper.emitted('update-transactions')).toBeTruthy()
       })
+
+      it('has four transaction links in list', () => {
+        expect(wrapper.vm.transactionLinks).toHaveLength(4)
+      })
     })
 
     describe('load more transaction links', () => {

From 5cf930841c9c9b72b9a904b20c0de56d060aa4e7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Mar 2022 20:13:11 +0100
Subject: [PATCH 71/75] remove comment

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

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index f98ef2ee2..2f9f946af 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -6,7 +6,6 @@
         <collapse-icon class="text-right" :visible="visible" />
         <div>
           <b-row>
-            <!-- ICON  -->
             <b-col cols="1">
               <type-icon color="text-danger" icon="link45deg" />
             </b-col>

From f5b0ef2265109e891d636b1804e562d680fefdbd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 21:28:40 +0100
Subject: [PATCH 72/75] resolve conflict

---
 .../TransactionLinksSummary.spec.js           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index 4d7a99448..120cd4009 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -47,7 +47,8 @@ describe('TransactionLinksSummary', () => {
               createdAt: '2022-03-16T14:22:40.000Z',
               holdAvailableAmount: '5.13109484759482747111',
               id: 86,
-              memo: 'Na komm schon. Etwas Kreativität.',
+              memo:
+                'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
             },
@@ -57,7 +58,7 @@ describe('TransactionLinksSummary', () => {
               createdAt: '2022-03-16T14:22:40.000Z',
               holdAvailableAmount: '5.13109484759482747111',
               id: 107,
-              memo: 'asdasdaadsdd asd asdadss',
+              memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
             },
@@ -67,7 +68,8 @@ describe('TransactionLinksSummary', () => {
               createdAt: '2022-03-16T14:22:40.000Z',
               holdAvailableAmount: '5.13109484759482747111',
               id: 92,
-              memo: 'asdasdaadsdd asd asdadss',
+              memo:
+                'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
             },
@@ -77,7 +79,8 @@ describe('TransactionLinksSummary', () => {
               createdAt: '2022-03-16T14:22:40.000Z',
               holdAvailableAmount: '5.13109484759482747111',
               id: 16,
-              memo: 'asdasdaadsdd asd asdadss',
+              memo:
+                'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
             },
@@ -153,7 +156,8 @@ describe('TransactionLinksSummary', () => {
                 createdAt: '2022-03-16T14:22:40.000Z',
                 holdAvailableAmount: '5.13109484759482747111',
                 id: 87,
-                memo: 'asdasdaadsdd asd asdadss',
+                memo:
+                  'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
                 redeemedAt: null,
                 validUntil: '2022-03-30T14:22:40.000Z',
               },
@@ -163,7 +167,8 @@ describe('TransactionLinksSummary', () => {
                 createdAt: '2022-03-16T14:22:40.000Z',
                 holdAvailableAmount: '5.13109484759482747111',
                 id: 108,
-                memo: 'asdasdaadsdd asd asdadss',
+                memo:
+                  'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
                 redeemedAt: null,
                 validUntil: '2022-03-30T14:22:40.000Z',
               },
@@ -173,7 +178,8 @@ describe('TransactionLinksSummary', () => {
                 createdAt: '2022-03-16T14:22:40.000Z',
                 holdAvailableAmount: '5.13109484759482747111',
                 id: 93,
-                memo: 'asdasdaadsdd asd asdadss',
+                memo:
+                  'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
                 redeemedAt: null,
                 validUntil: '2022-03-30T14:22:40.000Z',
               },
@@ -183,7 +189,7 @@ describe('TransactionLinksSummary', () => {
                 createdAt: '2022-03-16T14:22:40.000Z',
                 holdAvailableAmount: '5.13109484759482747111',
                 id: 17,
-                memo: 'asdasdaadsdd asd asdadss',
+                memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
                 redeemedAt: null,
                 validUntil: '2022-03-30T14:22:40.000Z',
               },

From 78a1459971b5adfac96a303a2f2dabbd146dde4e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 21:47:11 +0100
Subject: [PATCH 73/75] =?UTF-8?q?change=20props=20in=20tests=20for=20trans?=
 =?UTF-8?q?action=20links=20+=20zauberspr=C3=BCche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollapseLinksList.spec.js                 | 28 +++++++++++--------
 .../DecayInformations/CollapseLinksList.vue   | 11 ++++----
 .../TransactionLinksSummary.spec.js           | 16 ++++-------
 .../Transactions/TransactionLinksSummary.vue  | 16 ++++-------
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index d09922e3a..b533c6aa1 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -19,7 +19,7 @@ const propsData = {
       createdAt: '2022-03-16T14:22:40.000Z',
       holdAvailableAmount: '5.13109484759482747111',
       id: 87,
-      memo: 'asdasdaadsdd asd asdadss',
+      memo: 'Eene meene Siegerpreis, vor mir steht ein Schokoeis. Hex-hex!',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
     },
@@ -29,13 +29,15 @@ const propsData = {
       createdAt: '2022-03-16T14:22:40.000Z',
       holdAvailableAmount: '5.13109484759482747111',
       id: 86,
-      memo: 'asdasdaadsdd asd asdadss',
+      memo: 'Eene meene buntes Laub, auf dem Schrank da liegt kein Staub.',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
     },
   ],
   transactionLinkCount: 3,
-  value: { currentPage: 1, pending: false, pageSize: 5 },
+  value: 1,
+  pending: false,
+  pageSize: 5,
 }
 
 describe('CollapseLinksList', () => {
@@ -59,9 +61,7 @@ describe('CollapseLinksList', () => {
       })
 
       it('emits input', () => {
-        expect(wrapper.emitted('input')).toEqual([
-          [{ currentPage: 2, pageSize: 5, pending: false }],
-        ])
+        expect(wrapper.emitted('input')).toEqual([[2]])
       })
     })
 
@@ -73,9 +73,7 @@ describe('CollapseLinksList', () => {
       })
 
       it('emits input ', () => {
-        expect(wrapper.emitted('input')).toEqual([
-          [{ currentPage: 0, pageSize: 5, pending: false }],
-        ])
+        expect(wrapper.emitted('input')).toEqual([[0]])
       })
     })
 
@@ -83,7 +81,9 @@ describe('CollapseLinksList', () => {
       describe('one more link to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5 },
+            value: 1,
+            pending: false,
+            pageSize: 5,
           })
         })
 
@@ -95,7 +95,9 @@ describe('CollapseLinksList', () => {
       describe('less than pageSize links to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5 },
+            value: 1,
+            pending: false,
+            pageSize: 5,
             transactionLinkCount: 6,
           })
         })
@@ -108,7 +110,9 @@ describe('CollapseLinksList', () => {
       describe('more than pageSize links to load', () => {
         beforeEach(async () => {
           await wrapper.setProps({
-            value: { currentPage: 1, pending: false, pageSize: 5 },
+            value: 1,
+            pending: false,
+            pageSize: 5,
             transactionLinkCount: 16,
           })
         })
diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index b1e42cd2d..0c1db5f0a 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -42,23 +42,24 @@ export default {
       type: Number,
       required: true,
     },
-    value: { type: Object, required: true },
+    value: { type: Number, required: true },
+    pageSize: { type: Number, default: 5 },
     pending: { type: Boolean, default: false },
   },
   methods: {
     resetTransactionLinkList() {
-      this.$emit('input', { ...this.value, currentPage: 0 })
+      this.$emit('input', 0)
     },
     loadMoreLinks() {
-      this.$emit('input', { ...this.value, currentPage: this.value.currentPage + 1 })
+      this.$emit('input', this.value + 1)
     },
   },
   computed: {
     buttonText() {
       const i = this.transactionLinkCount - this.transactionLinks.length
       if (i === 1) return this.$tc('link-load', 0)
-      if (i <= this.value.pageSize) return this.$tc('link-load', 1, { n: i })
-      return this.$tc('link-load', 2, { n: this.value.pageSize })
+      if (i <= this.pageSize) return this.$tc('link-load', 1, { n: i })
+      return this.$tc('link-load', 2, { n: this.pageSize })
     },
   },
 }
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
index 120cd4009..60517a843 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.spec.js
@@ -117,11 +117,9 @@ describe('TransactionLinksSummary', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
         await wrapper.setData({
-          variables: {
-            currentPage: 0,
-            pending: false,
-            pageSize: 5,
-          },
+          currentPage: 0,
+          pending: false,
+          pageSize: 5,
         })
       })
 
@@ -197,11 +195,9 @@ describe('TransactionLinksSummary', () => {
           },
         })
         await wrapper.setData({
-          variables: {
-            currentPage: 2,
-            pending: false,
-            pageSize: 5,
-          },
+          currentPage: 2,
+          pending: false,
+          pageSize: 5,
         })
       })
 
diff --git a/frontend/src/components/Transactions/TransactionLinksSummary.vue b/frontend/src/components/Transactions/TransactionLinksSummary.vue
index 2f9f946af..3f80bfd18 100644
--- a/frontend/src/components/Transactions/TransactionLinksSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinksSummary.vue
@@ -26,8 +26,9 @@
 
       <b-collapse v-model="visible">
         <collapse-links-list
-          v-model="variables"
+          v-model="currentPage"
           :pending="pending"
+          :pageSize="pageSize"
           :transactionLinkCount="transactionLinkCount"
           :transactionLinks="transactionLinks"
         />
@@ -72,10 +73,8 @@ export default {
     return {
       visible: false,
       transactionLinks: [],
-      variables: {
-        currentPage: 1,
-        pageSize: 5,
-      },
+      currentPage: 1,
+      pageSize: 5,
       pending: false,
     }
   },
@@ -83,7 +82,7 @@ export default {
     async updateListTransactionLinks() {
       if (this.currentPage === 0) {
         this.transactionLinks = []
-        this.variables.currentPage = 1
+        this.currentPage = 1
       } else {
         this.pending = true
         this.$apollo
@@ -106,11 +105,6 @@ export default {
       }
     },
   },
-  computed: {
-    currentPage() {
-      return this.variables.currentPage
-    },
-  },
   watch: {
     currentPage() {
       this.updateListTransactionLinks()

From a0c6aeb3a53640c08b5a10244b2dff24eafd40df Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 21:58:38 +0100
Subject: [PATCH 74/75] change memo texte in tests for Gdd transaction list

---
 .../src/components/GddTransactionList.spec.js | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index 379e1144e..db0c36a7f 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -112,7 +112,8 @@ describe('GddTransactionList', () => {
               amount: '1',
               balance: '31.76099091058520945292',
               balanceDate: '2022-02-28T13:55:47',
-              memo: 'adasd adada',
+              memo:
+                'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -124,31 +125,14 @@ describe('GddTransactionList', () => {
                 duration: 282381,
               },
             },
-            {
-              id: 8,
-              typeId: 'CREATION',
-              amount: '1000',
-              balance: '32.96482231613347376132',
-              balanceDate: '2022-02-25T07:29:26',
-              memo: 'asd adada dad',
-              linkedUser: {
-                firstName: 'Gradido',
-                lastName: 'Akademie',
-              },
-              decay: {
-                decay: '-0.03517768386652623868',
-                start: '2022-02-23T10:55:30',
-                end: '2022-02-25T07:29:26',
-                duration: 160436,
-              },
-            },
             {
               id: 6,
               typeId: 'RECEIVE',
               amount: '10',
               balance: '10',
               balanceDate: '2022-02-23T10:55:30',
-              memo: 'asd adaaad adad addad ',
+              memo:
+                'Monatlanges Gift sog ein, In den Topf zuerst hinein… (William Shakespeare, Die Hexen aus Macbeth)',
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -160,6 +144,24 @@ describe('GddTransactionList', () => {
                 duration: null,
               },
             },
+            {
+              id: 8,
+              typeId: 'CREATION',
+              amount: '1000',
+              balance: '32.96482231613347376132',
+              balanceDate: '2022-02-25T07:29:26',
+              memo: 'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
+              linkedUser: {
+                firstName: 'Gradido',
+                lastName: 'Akademie',
+              },
+              decay: {
+                decay: '-0.03517768386652623868',
+                start: '2022-02-23T10:55:30',
+                end: '2022-02-25T07:29:26',
+                duration: 160436,
+              },
+            },
           ],
           count: 12,
           decayStartBlock,

From 39832bbcf3aadaaa5c8250b599f8650a69105bd4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Mar 2022 22:42:31 +0100
Subject: [PATCH 75/75] remove tests

---
 .../src/components/GddTransactionList.spec.js | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index db0c36a7f..043dd8d54 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -252,7 +252,7 @@ describe('GddTransactionList', () => {
 
         it('shows the message of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
-            'adasd adada',
+            'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
           )
         })
 
@@ -287,7 +287,7 @@ describe('GddTransactionList', () => {
 
         it('has a bi-gift icon', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
-            'bi-gift',
+            'bi-arrow-right-circle',
             'm-mb-1',
             'font2em',
             'b-icon',
@@ -298,7 +298,7 @@ describe('GddTransactionList', () => {
 
         it('has gradido-global-color-accent color', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
-            'bi-gift',
+            'bi-arrow-right-circle',
             'm-mb-1',
             'font2em',
             'b-icon',
@@ -316,19 +316,19 @@ describe('GddTransactionList', () => {
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
-            '1000',
+            '+ 10 GDD',
           )
         })
 
         it('shows the name of the receiver', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
-            'Gradido Akademie',
+            'Bibi Bloxberg',
           )
         })
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Fri Feb 25 2022 07:29:26 GMT+0000',
+            'Wed Feb 23 2022 10:55:30 GMT+0000',
           )
         })
       })
@@ -349,12 +349,19 @@ describe('GddTransactionList', () => {
         })
 
         it('has a bi-arrow-right-circle icon', () => {
-          expect(transaction.findAll('svg').at(1).classes()).toContain('bi-arrow-right-circle')
+          expect(transaction.findAll('svg').at(1).classes()).toEqual([
+            'bi-gift',
+            'm-mb-1',
+            'font2em',
+            'b-icon',
+            'bi',
+            'gradido-global-color-accent',
+          ])
         })
 
         it('has gradido-global-color-accent color', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
-            'bi-arrow-right-circle',
+            'bi-gift',
             'm-mb-1',
             'font2em',
             'b-icon',
@@ -378,19 +385,19 @@ describe('GddTransactionList', () => {
 
         it('shows the name of the recipient', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
-            'Bibi Bloxberg',
+            'Gradido Akademie',
           )
         })
 
         it('shows the message of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
-            'asd adaaad adad addad',
+            'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
           )
         })
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Wed Feb 23 2022 10:55:30 GMT+0000',
+            'Fri Feb 25 2022 07:29:26 GMT+0000',
           )
         })