From 0e988b149152dee36fd734c7bb8be610f22fde9d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 6 Apr 2022 10:43:10 +0200
Subject: [PATCH 01/19] add tab system from bootstrap

---
 .../src/components/Tables/SearchUserTable.vue | 59 +++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 024001193..0cb56f2cb 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -49,30 +49,41 @@
 
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
-          <creation-formular
-            v-if="!row.item.deletedAt"
-            type="singleCreation"
-            pagetype="singleCreation"
-            :creation="row.item.creation"
-            :item="row.item"
-            :creationUserData="creationUserData"
-            @update-user-data="updateUserData"
-          />
-          <div v-else>{{ $t('userIsDeleted') }}</div>
-          <confirm-register-mail-formular
-            v-if="!row.item.deletedAt"
-            :checked="row.item.emailChecked"
-            :email="row.item.email"
-            :dateLastSend="
-              row.item.emailConfirmationSend
-                ? $d(new Date(row.item.emailConfirmationSend), 'long')
-                : ''
-            "
-          />
-          <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
-          <transaction-link-list :userId="row.item.userId" />
-
-          <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+          <b-tabs content-class="mt-3">
+            <b-tab title="Creations" active :disabled="row.item.deletedAt">
+              <creation-formular
+                v-if="!row.item.deletedAt"
+                type="singleCreation"
+                pagetype="singleCreation"
+                :creation="row.item.creation"
+                :item="row.item"
+                :creationUserData="creationUserData"
+                @update-user-data="updateUserData"
+              />
+              <div v-else>{{ $t('userIsDeleted') }}</div>
+            </b-tab>
+            <b-tab title="Email" :disabled="row.item.deletedAt">
+              <confirm-register-mail-formular
+                v-if="!row.item.deletedAt"
+                :checked="row.item.emailChecked"
+                :email="row.item.email"
+                :dateLastSend="
+                  row.item.emailConfirmationSend
+                    ? $d(new Date(row.item.emailConfirmationSend), 'long')
+                    : ''
+                "
+              />
+            </b-tab>
+            <b-tab title="ListCreations" :disabled="row.item.deletedAt">
+              <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
+            </b-tab>
+            <b-tab title="ListLinks" :disabled="row.item.deletedAt">
+              <transaction-link-list :userId="row.item.userId" />
+            </b-tab>
+            <b-tab title="Delete">
+              <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+            </b-tab>
+          </b-tabs>
         </b-card>
       </template>
     </b-table>

From bfd8f202e36979fef00649610ec0272f983ed2a0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 10:29:47 +0200
Subject: [PATCH 02/19] add gdt.gdt locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 600b36e65..2a910b3c5 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -123,16 +123,17 @@
     "valid_until": "Gültig bis"
   },
   "gdt": {
-    "calculation": "Berechnung der GradidoTransform",
+    "gdt":"Gradido Transform",
+    "calculation": "Berechnung der Gradido Transform",
     "contribution": "Beitrag",
     "conversion": "Umrechnung",
-    "conversion-gdt-euro": "Umrechnung Euro / GradidoTransform (GDT)",
+    "conversion-gdt-euro": "Umrechnung Euro / Gradido Transform (GDT)",
     "credit": "Gutschrift",
     "factor": "Faktor",
     "formula": "Berechnungsformel",
     "funding": "Zu den Förderbeiträgen",
-    "gdt-received": "GradidoTransform (GDT) erhalten",
-    "no-transactions": "Du hast noch keine GradidoTransform (GDT).",
+    "gdt-received": "Gradido Transform (GDT) erhalten",
+    "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
     "not-reachable": "Der GDT Server ist nicht erreichbar.",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ef9a14c0a..ef6a83f9a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -123,16 +123,17 @@
     "valid_until": "Valid until"
   },
   "gdt": {
-    "calculation": "Calculation of GradidoTransform",
+    "gdt":"Gradido Transform",
+    "calculation": "Calculation of Gradido Transform",
     "contribution": "Contribution",
     "conversion": "Conversion",
-    "conversion-gdt-euro": "Conversion Euro / GradidoTransform (GDT)",
+    "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
     "credit": "Credit",
     "factor": "Factor",
     "formula": "Calculation formula",
     "funding": "To the funding contributions",
-    "gdt-received": "GradidoTransform (GDT) received",
-    "no-transactions": "You do not have GradidoTransform (GDT) yet.",
+    "gdt-received": "Gradido Transform (GDT) received",
+    "no-transactions": "You do not have Gradido Transform (GDT) yet.",
     "not-reachable": "The GDT Server is not reachable.",
     "publisher": "A member you referred has paid a contribution",
     "raise": "Increase",

From cd41e548cdd1c3b9ea595ce2b54426827545e453 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 10:30:27 +0200
Subject: [PATCH 03/19] remove status row, fixed tests

---
 frontend/src/pages/Overview.spec.js |  6 ------
 frontend/src/pages/Overview.vue     | 16 ----------------
 2 files changed, 22 deletions(-)

diff --git a/frontend/src/pages/Overview.spec.js b/frontend/src/pages/Overview.spec.js
index af234801e..8f0dda01d 100644
--- a/frontend/src/pages/Overview.spec.js
+++ b/frontend/src/pages/Overview.spec.js
@@ -25,12 +25,6 @@ describe('Overview', () => {
       wrapper = Wrapper()
     })
 
-    it('has a status gdd-status-gdd', () => {
-      expect(wrapper.find('div.gdd-status-gdd').exists()).toBeTruthy()
-    })
-    it('has a status gdd-status-gdt', () => {
-      expect(wrapper.find('div.gdd-status-gdt').exists()).toBeTruthy()
-    })
     it('has a transactions table', () => {
       expect(wrapper.find('div.gdd-transaction-list').exists()).toBeTruthy()
     })
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 9723f6ade..1e1365e1f 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -1,19 +1,6 @@
 <template>
   <div>
     <div class="container-fluid">
-      <b-row class="ml-1 mr-1 mb-2">
-        <b-col class="col-6 p-3 g-border">
-          <status class="gdd-status-gdd" :pending="pending" :balance="balance" status-text="GDD" />
-        </b-col>
-        <b-col class="col-6 p-3 text-right g-border">
-          <status
-            class="gdd-status-gdt"
-            :pending="pending"
-            :balance="GdtBalance"
-            status-text="GDT"
-          />
-        </b-col>
-      </b-row>
       <gdd-transaction-list
         :transactions="transactions"
         :pageSize="5"
@@ -30,14 +17,12 @@
   </div>
 </template>
 <script>
-import Status from '@/components/Status.vue'
 import GddTransactionList from '@/components/GddTransactionList.vue'
 import GddTransactionListFooter from '@/components/GddTransactionListFooter.vue'
 
 export default {
   name: 'Overview',
   components: {
-    Status,
     GddTransactionList,
     GddTransactionListFooter,
   },
@@ -48,7 +33,6 @@ export default {
   },
   props: {
     balance: { type: Number, default: 0 },
-    GdtBalance: { type: Number, default: 0 },
     decayStartBlock: { type: Date },
     transactions: {
       default: () => [],

From 65fbc27bb3c2ee64a8ce97be72d44e02c415850c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 10:32:08 +0200
Subject: [PATCH 04/19] add function showGdtBalance()

---
 frontend/src/pages/Transactions.vue | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 9b2ad6fdf..b5604a714 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="pb-4">
     <b-tabs content-class="" justified>
-      <b-tab :title="`Gradido  (${$n(balance, 'decimal')} GDD)`" class="px-4">
+      <b-tab
+        :title="`Gradido  (${$n(balance, 'decimal')} GDD)`"
+        class="px-4"
+        @click="showGdtBalance(false)"
+      >
         <p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
 
         <gdd-transaction-list
@@ -16,10 +20,7 @@
         />
       </b-tab>
 
-      <b-tab
-        :title="`Gradido Transform  (${GdtBalance === null ? '—' : $n(GdtBalance, 'decimal')} GDT)`"
-        class="px-4"
-      >
+      <b-tab :title="titel_gdt" class="px-4" @click="showGdtBalance(true)">
         <p class="">{{ $t('transaction.gdt-text') }}</p>
 
         <gdt-transaction-list />
@@ -50,12 +51,22 @@ export default {
   data() {
     return {
       timestamp: Date.now(),
+      titel_gdt: this.$t('gdt.gdt'),
     }
   },
   methods: {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
+    showGdtBalance(Boolean) {
+      if (Boolean) {
+        this.titel_gdt += `( ${
+          this.GdtBalance === null ? '—' : this.$n(this.GdtBalance, 'decimal')
+        } GDT)`
+      } else {
+        this.titel_gdt = this.$t('gdt.gdt')
+      }
+    },
   },
 }
 </script>

From 7a3b73580fe7a1d628ef3265f667b97c4566ee24 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 10:33:52 +0200
Subject: [PATCH 05/19] git fix yarn locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 2a910b3c5..ef362b37f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -123,7 +123,6 @@
     "valid_until": "Gültig bis"
   },
   "gdt": {
-    "gdt":"Gradido Transform",
     "calculation": "Berechnung der Gradido Transform",
     "contribution": "Beitrag",
     "conversion": "Umrechnung",
@@ -132,6 +131,7 @@
     "factor": "Faktor",
     "formula": "Berechnungsformel",
     "funding": "Zu den Förderbeiträgen",
+    "gdt": "Gradido Transform",
     "gdt-received": "Gradido Transform (GDT) erhalten",
     "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
     "not-reachable": "Der GDT Server ist nicht erreichbar.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ef6a83f9a..c07fe37b8 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -123,7 +123,6 @@
     "valid_until": "Valid until"
   },
   "gdt": {
-    "gdt":"Gradido Transform",
     "calculation": "Calculation of Gradido Transform",
     "contribution": "Contribution",
     "conversion": "Conversion",
@@ -132,6 +131,7 @@
     "factor": "Factor",
     "formula": "Calculation formula",
     "funding": "To the funding contributions",
+    "gdt": "Gradido Transform",
     "gdt-received": "Gradido Transform (GDT) received",
     "no-transactions": "You do not have Gradido Transform (GDT) yet.",
     "not-reachable": "The GDT Server is not reachable.",

From be2bf87b84e28503c33f10f7b9753c76a8848fb3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 15:30:52 +0200
Subject: [PATCH 06/19] add b-tab :disabled='row.item.deletedAt !== null'

---
 admin/src/components/Tables/SearchUserTable.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 0cb56f2cb..0778b3528 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -50,7 +50,7 @@
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-tabs content-class="mt-3">
-            <b-tab title="Creations" active :disabled="row.item.deletedAt">
+            <b-tab title="Creations" active :disabled="row.item.deletedAt !== null">
               <creation-formular
                 v-if="!row.item.deletedAt"
                 type="singleCreation"
@@ -62,7 +62,7 @@
               />
               <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
-            <b-tab title="Email" :disabled="row.item.deletedAt">
+            <b-tab title="Email" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
                 v-if="!row.item.deletedAt"
                 :checked="row.item.emailChecked"
@@ -74,10 +74,10 @@
                 "
               />
             </b-tab>
-            <b-tab title="ListCreations" :disabled="row.item.deletedAt">
+            <b-tab title="ListCreations" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="ListLinks" :disabled="row.item.deletedAt">
+            <b-tab title="ListLinks" :disabled="row.item.deletedAt !== null">
               <transaction-link-list :userId="row.item.userId" />
             </b-tab>
             <b-tab title="Delete">

From 146ea12730e60cf6afb882b60d01a4273b4f3010 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 11 Apr 2022 17:51:07 +0200
Subject: [PATCH 07/19] Update frontend/src/pages/Transactions.vue

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

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index b5604a714..897f8ff9d 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -51,7 +51,7 @@ export default {
   data() {
     return {
       timestamp: Date.now(),
-      titel_gdt: this.$t('gdt.gdt'),
+      titelGdt: this.$t('gdt.gdt'),
     }
   },
   methods: {

From 1dbe9db5aab740038334795657d370852b0b2af0 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 11 Apr 2022 17:51:32 +0200
Subject: [PATCH 08/19] Update frontend/src/pages/Transactions.vue

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

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 897f8ff9d..1ff918e60 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -58,7 +58,7 @@ export default {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
-    showGdtBalance(Boolean) {
+    showGdtBalance(boolean) {
       if (Boolean) {
         this.titel_gdt += `( ${
           this.GdtBalance === null ? '—' : this.$n(this.GdtBalance, 'decimal')

From 841cf2514f4c5dc3d61c6355ff570c46a5f9c2ab Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 12 Apr 2022 16:19:40 +0200
Subject: [PATCH 09/19] resolve conflict

---
 frontend/src/pages/Transactions.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 1ff918e60..5fc14788b 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="pb-4">
     <b-tabs content-class="" justified>
-      <b-tab
-        :title="`Gradido  (${$n(balance, 'decimal')} GDD)`"
-        class="px-4"
-        @click="showGdtBalance(false)"
-      >
+      <b-tab :title="`Gradido  (${$n(balance, 'decimal')} GDD)`" class="px-4">
         <p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
 
         <gdd-transaction-list
@@ -20,9 +16,11 @@
         />
       </b-tab>
 
-      <b-tab :title="titel_gdt" class="px-4" @click="showGdtBalance(true)">
-        <p class="">{{ $t('transaction.gdt-text') }}</p>
-
+      <b-tab :title="titel_gdt" class="px-4">
+        <b-row class="mb-3">
+          <b-col>{{ $t('transaction.gdt-text') }}</b-col>
+          <b-col class="text-right">{{ $n(GdtBalance, 'decimal') }} GDT</b-col>
+        </b-row>
         <gdt-transaction-list />
       </b-tab>
     </b-tabs>
@@ -58,6 +56,7 @@ export default {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
+<<<<<<< HEAD
     showGdtBalance(boolean) {
       if (Boolean) {
         this.titel_gdt += `( ${
@@ -67,6 +66,8 @@ export default {
         this.titel_gdt = this.$t('gdt.gdt')
       }
     },
+=======
+>>>>>>> 183eb0bbf (remove function from tab)
   },
 }
 </script>

From 7224fd7cf7d300ec3c74ce8b2c406f87aa390ebd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 12 Apr 2022 16:21:26 +0200
Subject: [PATCH 10/19] resolve conflict

---
 frontend/src/pages/Transactions.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 5fc14788b..59bf5101e 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -56,18 +56,6 @@ export default {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
-<<<<<<< HEAD
-    showGdtBalance(boolean) {
-      if (Boolean) {
-        this.titel_gdt += `( ${
-          this.GdtBalance === null ? '—' : this.$n(this.GdtBalance, 'decimal')
-        } GDT)`
-      } else {
-        this.titel_gdt = this.$t('gdt.gdt')
-      }
-    },
-=======
->>>>>>> 183eb0bbf (remove function from tab)
   },
 }
 </script>

From fb8fed7cc547809fbabaa208c743846623af8ac5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 12 Apr 2022 16:54:23 +0200
Subject: [PATCH 11/19] fix yarn lint

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

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 59bf5101e..400112872 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -16,10 +16,10 @@
         />
       </b-tab>
 
-      <b-tab :title="titel_gdt" class="px-4">
+      <b-tab :title="titelGdt" class="px-4">
         <b-row class="mb-3">
           <b-col>{{ $t('transaction.gdt-text') }}</b-col>
-          <b-col class="text-right">{{ $n(GdtBalance, 'decimal') }} GDT</b-col>
+          <b-col class="text-right">{{ `${$n(GdtBalance, 'decimal')} GDT` }}</b-col>
         </b-row>
         <gdt-transaction-list />
       </b-tab>

From b1ccf1bf14fcd32af3c82f0fc516734cbbd4a716 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 12:37:21 +0200
Subject: [PATCH 12/19] add locales for tabs in userdatas  adminarea

---
 admin/src/components/Tables/SearchUserTable.vue | 13 ++++++++-----
 admin/src/locales/de.json                       |  1 +
 admin/src/locales/en.json                       |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 0778b3528..7d93103f0 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -50,7 +50,7 @@
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-tabs content-class="mt-3">
-            <b-tab title="Creations" active :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('creation')" active :disabled="row.item.deletedAt !== null">
               <creation-formular
                 v-if="!row.item.deletedAt"
                 type="singleCreation"
@@ -62,7 +62,7 @@
               />
               <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
-            <b-tab title="Email" :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('e_mail')" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
                 v-if="!row.item.deletedAt"
                 :checked="row.item.emailChecked"
@@ -74,13 +74,16 @@
                 "
               />
             </b-tab>
-            <b-tab title="ListCreations" :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('creationList')" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="ListLinks" :disabled="row.item.deletedAt !== null">
+            <b-tab
+              :title="$t('transactionlink.form_header')"
+              :disabled="row.item.deletedAt !== null"
+            >
               <transaction-link-list :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="Delete">
+            <b-tab :title="$t('delete_user')">
               <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
             </b-tab>
           </b-tabs>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 5574e09ae..87ff963e4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,6 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "creation": "Schöpfung",
+  "creationList":"Schöpfungsliste",
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f54af765a..286bb5e57 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,6 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "creation": "Creation",
+  "creationList":"Creation list",
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",

From 8b8b28c188ba52b909e753f8048c7311607347d3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 13:53:02 +0200
Subject: [PATCH 13/19] add deleteAt status on transaction-lik list

---
 admin/src/components/Tables/SearchUserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 7d93103f0..8170c6452 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -81,7 +81,7 @@
               :title="$t('transactionlink.form_header')"
               :disabled="row.item.deletedAt !== null"
             >
-              <transaction-link-list :userId="row.item.userId" />
+              <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
             <b-tab :title="$t('delete_user')">
               <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />

From 59cca07681b33973f46e197a040345894fd2d7ca Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 14:26:29 +0200
Subject: [PATCH 14/19] fixed yarn lint

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 87ff963e4..bfc8063be 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,7 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "creation": "Schöpfung",
-  "creationList":"Schöpfungsliste",
+  "creationList": "Schöpfungsliste",
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 286bb5e57..e7f48f42c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,7 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "creation": "Creation",
-  "creationList":"Creation list",
+  "creationList": "Creation list",
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",

From dfc4a7ddde1ac4d331a21ead824f2285ad23a412 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 13 Apr 2022 10:35:29 +0200
Subject: [PATCH 15/19] remove mounted

---
 frontend/src/components/GdtTransactionList.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/GdtTransactionList.vue b/frontend/src/components/GdtTransactionList.vue
index 8944ea69b..d0d375ca9 100644
--- a/frontend/src/components/GdtTransactionList.vue
+++ b/frontend/src/components/GdtTransactionList.vue
@@ -81,9 +81,6 @@ export default {
         })
     },
   },
-  mounted() {
-    this.updateGdt()
-  },
   watch: {
     currentPage() {
       this.updateGdt()

From 17f8a47f7f7bca0ba8d3ffba57d8ff9be42c107e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 13 Apr 2022 10:36:30 +0200
Subject: [PATCH 16/19] add ref in childComponent and refs on click tab

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

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 09a0f3c27..cb8d378ea 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -15,12 +15,12 @@
         />
       </b-tab>
 
-      <b-tab :title="titelGdt" class="px-4">
+      <b-tab :title="titelGdt" class="px-4" @click="$refs.childComponentRef.updateGdt()">
         <b-row class="mb-3">
           <b-col>{{ $t('transaction.gdt-text') }}</b-col>
           <b-col class="text-right">{{ `${$n(GdtBalance, 'decimal')} GDT` }}</b-col>
         </b-row>
-        <gdt-transaction-list />
+        <gdt-transaction-list ref="childComponentRef" />
       </b-tab>
     </b-tabs>
   </div>

From 7cae264f1398b26c9ca0dc382c0712698c156372 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 19 Apr 2022 12:25:09 +0200
Subject: [PATCH 17/19] fixed test updateGdt on click on tab

---
 .../src/components/GdtTransactionList.spec.js | 199 ++++++------------
 .../src/components/GdtTransactionList.vue     |  42 ++--
 frontend/src/pages/Transactions.spec.js       | 167 ++++++++++++---
 frontend/src/pages/Transactions.vue           |  43 +++-
 4 files changed, 263 insertions(+), 188 deletions(-)

diff --git a/frontend/src/components/GdtTransactionList.spec.js b/frontend/src/components/GdtTransactionList.spec.js
index c1b9a7cc9..ed72b660e 100644
--- a/frontend/src/components/GdtTransactionList.spec.js
+++ b/frontend/src/components/GdtTransactionList.spec.js
@@ -1,24 +1,9 @@
 import { mount } from '@vue/test-utils'
-import { GdtEntryType } from '@/graphql/enums'
 import GdtTransactionList from './GdtTransactionList'
-
-import { toastErrorSpy } from '@test/testSetup'
+import { GdtEntryType } from '@/graphql/enums'
 
 const localVue = global.localVue
 
-const apolloMock = jest.fn().mockResolvedValue({
-  data: {
-    listGDTEntries: {
-      count: 0,
-      gdtEntries: [],
-    },
-  },
-})
-
-const windowScrollToMock = jest.fn()
-
-window.scrollTo = windowScrollToMock
-
 const state = {
   language: 'en',
 }
@@ -37,16 +22,20 @@ describe('GdtTransactionList ', () => {
     $t: jest.fn((t) => t),
     $n: jest.fn((n) => n),
     $d: jest.fn((d) => d),
-    $apollo: {
-      query: apolloMock,
-    },
+  }
+
+  const propsData = {
+    transactionsGdt: [],
+    transactionGdtCount: 0,
+    pageSize: 25,
+    value: 1,
   }
 
   const Wrapper = () => {
-    return mount(GdtTransactionList, { localVue, mocks })
+    return mount(GdtTransactionList, { localVue, mocks, propsData })
   }
 
-  describe('mount - When no transactions are loaded', () => {
+  describe('transactionGdtCount is 0', () => {
     beforeEach(() => {
       wrapper = Wrapper()
     })
@@ -62,54 +51,50 @@ describe('GdtTransactionList ', () => {
     })
   })
 
-  describe('mount - When transactions are loaded', () => {
-    beforeEach(() => {
-      apolloMock.mockResolvedValue({
-        data: {
-          listGDTEntries: {
-            count: 4,
-            gdtEntries: [
-              {
-                id: 1,
-                amount: 100,
-                gdt: 1700,
-                factor: 17,
-                comment: '',
-                date: '2021-05-02T17:20:11+00:00',
-                gdtEntryType: GdtEntryType.FORM,
-              },
-              {
-                id: 2,
-                amount: 1810,
-                gdt: 362,
-                factor: 0.2,
-                comment: 'Dezember 20',
-                date: '2020-12-31T12:00:00+00:00',
-                gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
-              },
-              {
-                id: 3,
-                amount: 100,
-                gdt: 1700,
-                factor: 17,
-                comment: '',
-                date: '2020-05-07T17:00:00+00:00',
-                gdtEntryType: GdtEntryType.FORM,
-              },
-              {
-                id: 4,
-                amount: 100,
-                gdt: 110,
-                factor: 22,
-                comment: '',
-                date: '2020-04-10T13:28:00+00:00',
-                gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
-              },
-            ],
-          },
-        },
-      })
+  describe('Transactions are loaded', () => {
+    beforeEach(async () => {
       wrapper = Wrapper()
+      await wrapper.setProps({
+        transactionGdtCount: 42,
+        transactionsGdt: [
+          {
+            id: 1,
+            amount: 100,
+            gdt: 1700,
+            factor: 17,
+            comment: '',
+            date: '2021-05-02T17:20:11+00:00',
+            gdtEntryType: GdtEntryType.FORM,
+          },
+          {
+            id: 2,
+            amount: 1810,
+            gdt: 362,
+            factor: 0.2,
+            comment: 'Dezember 20',
+            date: '2020-12-31T12:00:00+00:00',
+            gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
+          },
+          {
+            id: 3,
+            amount: 100,
+            gdt: 1700,
+            factor: 17,
+            comment: '',
+            date: '2020-05-07T17:00:00+00:00',
+            gdtEntryType: GdtEntryType.FORM,
+          },
+          {
+            id: 4,
+            amount: 100,
+            gdt: 110,
+            factor: 22,
+            comment: '',
+            date: '2020-04-10T13:28:00+00:00',
+            gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
+          },
+        ],
+      })
     })
 
     it('renders the component', () => {
@@ -120,83 +105,25 @@ describe('GdtTransactionList ', () => {
       expect(wrapper.find('.gdt-funding').exists()).toBe(false)
     })
 
-    describe('server returns valid data', () => {
-      it('calls the API', async () => {
-        await wrapper.vm.$nextTick()
-        expect(apolloMock).toBeCalledWith(
-          expect.objectContaining({
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-            },
-          }),
-        )
-      })
-
-      it('scrolls to (0, 0) after API call', () => {
-        expect(windowScrollToMock).toBeCalledWith(0, 0)
-      })
-    })
-
-    describe('server returns error', () => {
-      beforeEach(() => {
-        jest.resetAllMocks()
-        apolloMock.mockRejectedValue({
-          message: 'Ouch!',
-        })
-        wrapper = Wrapper()
-      })
-
-      it('toasts an error message', () => {
-        expect(toastErrorSpy).toBeCalledWith('Ouch!')
-      })
-    })
-
     describe('change of currentPage', () => {
       it('calls the API after currentPage changes', async () => {
         jest.clearAllMocks()
-        await wrapper.setData({ transactionGdtCount: 42 })
         await wrapper.findComponent({ name: 'BPagination' }).vm.$emit('input', 2)
-        expect(apolloMock).toBeCalledWith(
-          expect.objectContaining({
-            variables: {
-              currentPage: 2,
-              pageSize: 25,
-            },
-          }),
-        )
+        expect(wrapper.emitted('input')).toEqual([[2]])
       })
 
       describe('pagination buttons', () => {
         describe('with transactionCount > pageSize', () => {
-          beforeEach(async () => {
-            apolloMock.mockResolvedValue({
-              data: {
-                listGDTEntries: {
-                  count: 42,
-                  gdtEntries: [],
-                },
-              },
-            })
-            wrapper = Wrapper()
-          })
-
           it('shows the pagination buttons', () => {
             expect(wrapper.find('ul.pagination').exists()).toBe(true)
           })
         })
 
         describe('with transactionCount < pageSize', () => {
-          beforeEach(async () => {
-            apolloMock.mockResolvedValue({
-              data: {
-                listGDTEntries: {
-                  count: 2,
-                  gdtEntries: [],
-                },
-              },
+          beforeEach(() => {
+            wrapper.setProps({
+              transactionGdtCount: 10,
             })
-            wrapper = Wrapper()
           })
 
           it('shows no pagination buttons', () => {
@@ -205,5 +132,17 @@ describe('GdtTransactionList ', () => {
         })
       })
     })
+
+    describe('server not reachable', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          transactionGdtCount: -1,
+        })
+      })
+
+      it('renders the not-reachable text', () => {
+        expect(wrapper.text()).toBe('gdt.not-reachable')
+      })
+    })
   })
 })
diff --git a/frontend/src/components/GdtTransactionList.vue b/frontend/src/components/GdtTransactionList.vue
index d0d375ca9..4934f9fce 100644
--- a/frontend/src/components/GdtTransactionList.vue
+++ b/frontend/src/components/GdtTransactionList.vue
@@ -8,7 +8,7 @@
           {{ $t('gdt.funding') }}
         </b-button>
       </div>
-      <div v-else-if="typeof transactionGdtCount === 'object'" class="text-center">
+      <div v-else-if="transactionGdtCount === -1" class="text-center">
         {{ $t('gdt.not-reachable') }}
       </div>
       <div
@@ -41,7 +41,6 @@
 </template>
 
 <script>
-import { listGDTEntriesQuery } from '@/graphql/queries'
 import Transaction from '@/components/Transaction.vue'
 
 export default {
@@ -49,41 +48,24 @@ export default {
   components: {
     Transaction,
   },
+  props: {
+    transactionsGdt: {
+      type: Array,
+      required: true,
+    },
+    transactionGdtCount: { type: Number, required: true },
+    pageSize: { type: Number, required: true },
+    value: { type: Number, required: true },
+  },
   data() {
     return {
-      transactionsGdt: [],
-      transactionGdtCount: { type: Number, default: 0 },
-      currentPage: 1,
-      pageSize: 25,
+      currentPage: this.value,
       link: 'https://gradido.net/' + this.$store.state.language + '/memberships/',
     }
   },
-  methods: {
-    async updateGdt() {
-      this.$apollo
-        .query({
-          query: listGDTEntriesQuery,
-          variables: {
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          },
-        })
-        .then((result) => {
-          const {
-            data: { listGDTEntries },
-          } = result
-          this.transactionsGdt = listGDTEntries.gdtEntries
-          this.transactionGdtCount = listGDTEntries.count
-          window.scrollTo(0, 0)
-        })
-        .catch((error) => {
-          this.toastError(error.message)
-        })
-    },
-  },
   watch: {
     currentPage() {
-      this.updateGdt()
+      if (this.value !== this.currentPage) this.$emit('input', this.currentPage)
     },
   },
 }
diff --git a/frontend/src/pages/Transactions.spec.js b/frontend/src/pages/Transactions.spec.js
index 25bc05985..94e0f51c1 100644
--- a/frontend/src/pages/Transactions.spec.js
+++ b/frontend/src/pages/Transactions.spec.js
@@ -1,28 +1,48 @@
 import { mount } from '@vue/test-utils'
 import Transactions from './Transactions'
+import { GdtEntryType } from '@/graphql/enums'
+
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
-window.scrollTo = jest.fn()
+const windowScrollToMock = jest.fn()
+window.scrollTo = windowScrollToMock
+
+const apolloMock = jest.fn().mockResolvedValue({
+  data: {
+    listGDTEntries: {
+      count: 0,
+      gdtEntries: [],
+    },
+  },
+})
 
 describe('Transactions', () => {
   let wrapper
 
+  const state = {
+    language: 'en',
+  }
+
   const mocks = {
+    $store: {
+      state,
+      commit: jest.fn(),
+    },
     $t: jest.fn((t) => t),
     $n: jest.fn((n) => String(n)),
     $d: jest.fn((d) => d),
     $i18n: {
       locale: jest.fn(() => 'en'),
     },
-  }
-
-  const stubs = {
-    GdtTransactionList: true,
+    $apollo: {
+      query: apolloMock,
+    },
   }
 
   const Wrapper = () => {
-    return mount(Transactions, { localVue, mocks, stubs })
+    return mount(Transactions, { localVue, mocks })
   }
 
   describe('mount', () => {
@@ -40,7 +60,7 @@ describe('Transactions', () => {
       )
     })
 
-    it('emist update-transactions when update-transactions is called', () => {
+    it('emits update-transactions when update-transactions is called', () => {
       wrapper
         .findComponent({ name: 'GddTransactionList' })
         .vm.$emit('update-transactions', { currentPage: 2, pageSize: 25 })
@@ -63,32 +83,129 @@ describe('Transactions', () => {
       })
 
       describe('click on GDT tab', () => {
-        beforeEach(() => {
-          wrapper.findAll('li[ role="presentation"]').at(1).find('a').trigger('click')
-        })
-
-        it('does not show the GDD transactions', () => {
-          expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeFalsy()
-        })
-
-        it('shows the GDT transactions', () => {
-          expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeTruthy()
-        })
-
-        describe('click on GDD tab', () => {
+        describe('server returns valid data', () => {
           beforeEach(() => {
-            wrapper.findAll('li[ role="presentation"]').at(0).find('a').trigger('click')
+            apolloMock.mockResolvedValue({
+              data: {
+                listGDTEntries: {
+                  count: 4,
+                  gdtEntries: [
+                    {
+                      id: 1,
+                      amount: 100,
+                      gdt: 1700,
+                      factor: 17,
+                      comment: '',
+                      date: '2021-05-02T17:20:11+00:00',
+                      gdtEntryType: GdtEntryType.FORM,
+                    },
+                    {
+                      id: 2,
+                      amount: 1810,
+                      gdt: 362,
+                      factor: 0.2,
+                      comment: 'Dezember 20',
+                      date: '2020-12-31T12:00:00+00:00',
+                      gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
+                    },
+                    {
+                      id: 3,
+                      amount: 100,
+                      gdt: 1700,
+                      factor: 17,
+                      comment: '',
+                      date: '2020-05-07T17:00:00+00:00',
+                      gdtEntryType: GdtEntryType.FORM,
+                    },
+                    {
+                      id: 4,
+                      amount: 100,
+                      gdt: 110,
+                      factor: 22,
+                      comment: '',
+                      date: '2020-04-10T13:28:00+00:00',
+                      gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
+                    },
+                  ],
+                },
+              },
+            })
+            wrapper.findAll('li[ role="presentation"]').at(1).find('a').trigger('click')
           })
 
-          it('shows the GDD transactions', () => {
-            expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeTruthy()
+          it('does not show the GDD transactions', () => {
+            expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeFalsy()
           })
 
-          it('does not show the GDT', () => {
-            expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeFalsy()
+          it('shows the GDT transactions', () => {
+            expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeTruthy()
+          })
+
+          it('calls the API', () => {
+            expect(apolloMock).toBeCalledWith(
+              expect.objectContaining({
+                variables: {
+                  currentPage: 1,
+                  pageSize: 25,
+                },
+              }),
+            )
+          })
+
+          it('scrolls to (0, 0) after API call', () => {
+            expect(windowScrollToMock).toBeCalledWith(0, 0)
+          })
+
+          describe('click on GDD tab', () => {
+            beforeEach(() => {
+              wrapper.findAll('li[ role="presentation"]').at(0).find('a').trigger('click')
+            })
+
+            it('shows the GDD transactions', () => {
+              expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeTruthy()
+            })
+
+            it('does not show the GDT', () => {
+              expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeFalsy()
+            })
+          })
+        })
+
+        describe('server returns error', () => {
+          beforeEach(() => {
+            apolloMock.mockRejectedValue({ message: 'Ouch!' })
+            wrapper.findAll('li[ role="presentation"]').at(1).find('a').trigger('click')
+          })
+
+          it('toasts an error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('Ouch!')
+          })
+
+          it('sets transactionGdtCount to -1', () => {
+            expect(wrapper.vm.transactionGdtCount).toBe(-1)
           })
         })
       })
     })
+
+    describe('update currentPage', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        wrapper.setData({
+          currentPage: 2,
+        })
+      })
+
+      it('calls the API', () => {
+        expect(apolloMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: {
+              currentPage: 2,
+              pageSize: 25,
+            },
+          }),
+        )
+      })
+    })
   })
 })
diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index cb8d378ea..6c6163b89 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -15,12 +15,17 @@
         />
       </b-tab>
 
-      <b-tab :title="titelGdt" class="px-4" @click="$refs.childComponentRef.updateGdt()">
+      <b-tab :title="titleGdt" class="px-4" @click="updateGdt()">
         <b-row class="mb-3">
           <b-col>{{ $t('transaction.gdt-text') }}</b-col>
           <b-col class="text-right">{{ `${$n(GdtBalance, 'decimal')} GDT` }}</b-col>
         </b-row>
-        <gdt-transaction-list ref="childComponentRef" />
+        <gdt-transaction-list
+          v-model="currentPage"
+          :transactionsGdt="transactionsGdt"
+          :transactionGdtCount="transactionGdtCount"
+          :pageSize="pageSize"
+        />
       </b-tab>
     </b-tabs>
   </div>
@@ -28,6 +33,7 @@
 <script>
 import GddTransactionList from '@/components/GddTransactionList.vue'
 import GdtTransactionList from '@/components/GdtTransactionList.vue'
+import { listGDTEntriesQuery } from '@/graphql/queries'
 
 export default {
   name: 'Transactions',
@@ -47,14 +53,45 @@ export default {
   data() {
     return {
       timestamp: Date.now(),
-      titelGdt: this.$t('gdt.gdt'),
+      titleGdt: this.$t('gdt.gdt'),
+      transactionsGdt: [],
+      transactionGdtCount: 0,
+      currentPage: 1,
+      pageSize: 25,
     }
   },
   methods: {
+    async updateGdt() {
+      this.$apollo
+        .query({
+          query: listGDTEntriesQuery,
+          variables: {
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+          },
+        })
+        .then((result) => {
+          const {
+            data: { listGDTEntries },
+          } = result
+          this.transactionsGdt = listGDTEntries.gdtEntries
+          this.transactionGdtCount = listGDTEntries.count
+          window.scrollTo(0, 0)
+        })
+        .catch((error) => {
+          this.transactionGdtCount = -1
+          this.toastError(error.message)
+        })
+    },
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
   },
+  watch: {
+    currentPage() {
+      this.updateGdt()
+    },
+  },
 }
 </script>
 <style>

From 119b8a84c9f023bc3864ca3f3032ade80f1922e9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 19 Apr 2022 13:51:54 +0200
Subject: [PATCH 18/19] fixed review requests

---
 admin/src/components/Tables/SearchUserTable.vue | 6 +-----
 admin/src/components/TransactionLinkList.vue    | 2 +-
 admin/src/locales/de.json                       | 3 +--
 admin/src/locales/en.json                       | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 8170c6452..0be24a099 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -60,7 +60,6 @@
                 :creationUserData="creationUserData"
                 @update-user-data="updateUserData"
               />
-              <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
             <b-tab :title="$t('e_mail')" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
@@ -77,10 +76,7 @@
             <b-tab :title="$t('creationList')" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab
-              :title="$t('transactionlink.form_header')"
-              :disabled="row.item.deletedAt !== null"
-            >
+            <b-tab :title="$t('transactionlink.name')" :disabled="row.item.deletedAt !== null">
               <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
             <b-tab :title="$t('delete_user')">
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index fa67c8797..0289792a2 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="transaction-link-list">
     <div v-if="items.length > 0">
-      <div class="h3">{{ $t('transactionlink.form_header') }}</div>
+      <div class="h3">{{ $t('transactionlink.name') }}</div>
       <b-table striped hover :fields="fields" :items="items"></b-table>
     </div>
     <b-pagination
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index bfc8063be..b667a1ada 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -79,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Erstellt",
-    "form_header": "Transaktion-Links",
+    "name": "Transaktion-Links",
     "valid_until": "Gültig bis"
   },
   "transactionlist": {
@@ -101,7 +101,6 @@
     "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({email}) gesendet.",
     "text_true": " Die Email wurde bestätigt."
   },
-  "userIsDeleted": "Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
   "user_search": "Nutzer-Suche"
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e7f48f42c..982c42d92 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -79,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Created",
-    "form_header": "Transaction links",
+    "name": "Transaction links",
     "valid_until": "Valid until"
   },
   "transactionlist": {
@@ -101,7 +101,6 @@
     "text_false": "The last email was sent to the member ({email}) on {date}.",
     "text_true": "The email was confirmed."
   },
-  "userIsDeleted": "The user is deleted. No more GDD can be created.",
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
   "user_search": "User search"

From 2ddf9cb33b13582ce045e91332bbf1b6867f0657 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 19 Apr 2022 15:08:21 +0200
Subject: [PATCH 19/19] fixed GdtBalance in tab visible

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

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 6c6163b89..568f80df2 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="pb-4">
-    <b-tabs content-class="" justified>
+    <b-tabs v-model="tabIndex" content-class="" justified>
       <b-tab :title="`Gradido  (${$n(balance, 'decimal')} GDD)`" class="px-4">
         <p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
 
@@ -53,11 +53,11 @@ export default {
   data() {
     return {
       timestamp: Date.now(),
-      titleGdt: this.$t('gdt.gdt'),
       transactionsGdt: [],
       transactionGdtCount: 0,
       currentPage: 1,
       pageSize: 25,
+      tabIndex: 0,
     }
   },
   methods: {
@@ -87,6 +87,13 @@ export default {
       this.$emit('update-transactions', pagination)
     },
   },
+  computed: {
+    titleGdt(boolean) {
+      if (this.tabIndex === 1)
+        return `${this.$t('gdt.gdt')} (${this.$n(this.GdtBalance, 'decimal')} GDT)`
+      return this.$t('gdt.gdt')
+    },
+  },
   watch: {
     currentPage() {
       this.updateGdt()