From c9337bf93915f2d7348a2a9a0e3388f827221c68 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Sep 2021 11:37:57 +0200
Subject: [PATCH 01/12] WIP slots for transaktions

---
 frontend/src/components/Transaktion.vue       | 103 ++++++++++++++++++
 .../AccountOverview/GdtTransactionList.vue    |   3 +
 2 files changed, 106 insertions(+)
 create mode 100644 frontend/src/components/Transaktion.vue

diff --git a/frontend/src/components/Transaktion.vue b/frontend/src/components/Transaktion.vue
new file mode 100644
index 000000000..c27aa7298
--- /dev/null
+++ b/frontend/src/components/Transaktion.vue
@@ -0,0 +1,103 @@
+<template>
+  <div>
+    <div class="list-group">
+      <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
+        <!-- Icon  -->
+        <div class="text-right" style="position: absolute">
+            ICON
+         <b-icon
+              v-if="gdtEntryType"
+              :icon="getIcon(gdtEntryType).icon"
+              :class="getIcon(gdtEntryType).class"
+            ></b-icon>
+        </div>
+
+        <!-- Collaps Button  -->
+        <div class="text-right" style="width: 96%; position: absolute">
+          <b-button class="btn-sm">
+            <b>i</b>
+          </b-button>
+        </div>
+
+        <!-- Betrag -->
+
+        <b-row>
+          <div class="col-6 text-right">
+              text1Betrag
+            <!-- <div>{{ $t('gdt.your-share') }}</div>
+            <div>{{ $t('gdt.credit') }}</div> -->
+          </div>
+          <div class="col-6">
+              text1Betrag
+            <!-- <div><slot name="your-share"></slot></div>
+            <div><slot name="credit"></slot></div> -->
+          </div>
+        </b-row>
+
+        <!-- Betrag ENDE-->
+
+        <!-- Nachricht-->
+        <b-row v-if="comment">
+          <div class="col-6 text-right">
+              text2Memo
+            <!-- {{ $t('form.memo') }} -->
+          </div>
+          <div class="col-6">
+              text2Memo
+              <slot name="memo"></slot>
+          </div>
+        </b-row>
+
+        <!-- Datum-->
+        <b-row class="gdt-list-row text-header">
+          <div class="col-6 text-right">
+              text3Date
+           <!-- {{ $t('form.date') }} -->
+          </div>
+          <div class="col-6">
+              text3Data
+             <!-- <slot name="date"></slot> -->
+           </div>
+        </b-row>
+      </div>
+
+      <b-collapse :id="'a' + date + ''" class="pb-4">
+        <b-row class="gdt-list-clooaps-header-text text-center pb-3">
+          <div class="col h4"><!--{{ $t('gdt.publisher') }}--> CollapsData</div>
+        </b-row>
+      </b-collapse>
+    </div>
+  </div>
+</template>
+<script>
+
+const iconsByType = {
+  1: { icon: 'heart', classes: 'gradido-global-color-accent' },
+  4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
+  7: { icon: 'gift', classes: 'gradido-global-color-accent' },
+}
+
+export default {
+  props: {
+    date: {
+      type: Date,
+      default: function () {
+        return new Date()
+      },
+    },
+    comment: { type: String, default: '' },
+    gdtEntryType: { type: Number, default: '' },
+  },
+  methods: {
+    getIcon(givenType) {
+      const type = iconsByType[givenType]
+      if (type)
+        return {
+          icon: type.icon,
+          class: type.classes + ' m-mb-1 font2em',
+        }
+      this.throwError('no icon to given type: ' + givenType)
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 8193717cf..d031f9c4f 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,6 +17,7 @@
         } in transactionsGdt"
         :key="transactionId"
       >
+        <transaktion :date="date" :comment="comment" :gdtEntryType="gdtEntryType"> </transaktion>
         <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
           <!-- Icon  -->
           <div class="text-right" style="position: absolute">
@@ -162,6 +163,7 @@
 <script>
 import { listGDTEntriesQuery } from '../../../graphql/queries'
 import PaginationButtons from '../../../components/PaginationButtons'
+import Transaktion from '../../../components/Transaktion.vue'
 
 const iconsByType = {
   1: { icon: 'heart', classes: 'gradido-global-color-accent' },
@@ -173,6 +175,7 @@ export default {
   name: 'gdt-transaction-list',
   components: {
     PaginationButtons,
+    Transaktion,
   },
   data() {
     return {

From 9503c2a49a838cbe689bc65d650b938c236099e5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 6 Sep 2021 14:07:34 +0200
Subject: [PATCH 02/12] gdt transaction with arrays and without slots

---
 frontend/src/components/Transaction.vue       | 134 +++++++++++++++
 .../src/components/TransactionCollaps.vue     |  78 +++++++++
 frontend/src/components/Transaktion.vue       | 103 ------------
 .../AccountOverview/GdtTransactionList.vue    | 157 ++----------------
 4 files changed, 223 insertions(+), 249 deletions(-)
 create mode 100644 frontend/src/components/Transaction.vue
 create mode 100644 frontend/src/components/TransactionCollaps.vue
 delete mode 100644 frontend/src/components/Transaktion.vue

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
new file mode 100644
index 000000000..283ceb6cb
--- /dev/null
+++ b/frontend/src/components/Transaction.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <div class="list-group">
+      <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
+        <!-- Icon  -->
+        <div class="text-right" style="position: absolute">
+          <b-icon
+            v-if="gdtEntryType"
+            :icon="getLinesByType(gdtEntryType).icon"
+            :class="getLinesByType(gdtEntryType).iconclasses"
+          ></b-icon>
+        </div>
+
+        <!-- Collaps Button  -->
+        <div class="text-right" style="width: 96%; position: absolute">
+          <b-button class="btn-sm">
+            <b>i</b>
+          </b-button>
+        </div>
+
+        <!-- type  -->
+
+        <b-row>
+          <div class="col-6 text-right">
+            {{ getLinesByType(gdtEntryType).description }}
+          </div>
+          <div class="col-6">
+            {{ getLinesByType(gdtEntryType).descriptiontext }}
+          </div>
+        </b-row>
+
+        <!-- credit -->
+        <b-row>
+          <div class="col-6 text-right">
+            {{ $t('gdt.credit') }}
+          </div>
+          <div class="col-6">
+            {{ getLinesByType(gdtEntryType).credittext }}
+          </div>
+        </b-row>
+
+        <!-- Nachricht-->
+        <b-row v-if="comment && gdtEntryType !== 7">
+          <div class="col-6 text-right">
+            {{ $t('form.memo') }}
+          </div>
+          <div class="col-6">
+            {{ comment }}
+          </div>
+        </b-row>
+
+        <!-- Datum-->
+        <b-row class="gdt-list-row text-header">
+          <div class="col-6 text-right">
+            {{ $t('form.date') }}
+          </div>
+          <div class="col-6">
+            {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+          </div>
+        </b-row>
+      </div>
+
+      <b-collapse :id="'a' + date + ''" class="pb-4">
+        <transaction-collaps
+          :amount="amount"
+          :gdtEntryType="gdtEntryType"
+          :factor="factor"
+          :gdt="gdt"
+        ></transaction-collaps>
+      </b-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import TransactionCollaps from '../components/TransactionCollaps.vue'
+
+export default {
+  name: 'Transaction',
+  components: {
+    TransactionCollaps,
+  },
+  props: {
+    amount: { type: Number, default: 0 },
+    date: {
+      type: Date,
+      default: function () {
+        return new Date()
+      },
+    },
+    comment: { type: String, default: '' },
+    gdtEntryType: { type: Number, default: 0 },
+    factor: { type: Number, default: 0 },
+    gdt: { type: Number, default: 0 },
+  },
+  methods: {
+    getLinesByType(givenType) {
+      const linesByType = {
+        1: {
+          icon: 'heart',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: 'Beitrag',
+          descriptiontext: this.$n(this.amount, 'decimal') + ' €',
+          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+        },
+        4: {
+          icon: 'person-check',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: 'Geworbenes Mitglied',
+          descriptiontext: '5%',
+          credittext: this.$n(this.amount, 'decimal') + ' GDT',
+        },
+        7: {
+          icon: 'gift',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: 'Aktion',
+          descriptiontext: this.comment,
+          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+        },
+      }
+
+      const type = linesByType[givenType]
+
+      if (type)
+        return {
+          icon: type.icon,
+          iconclasses: type.iconclasses,
+          description: type.description,
+          descriptiontext: type.descriptiontext,
+          credittext: type.credittext,
+        }
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/TransactionCollaps.vue b/frontend/src/components/TransactionCollaps.vue
new file mode 100644
index 000000000..04299fa5f
--- /dev/null
+++ b/frontend/src/components/TransactionCollaps.vue
@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <b-row class="gdt-list-clooaps-header-text text-center pb-3">
+      <div class="col h4">
+        {{ getLinesByType(gdtEntryType).headline }}
+      </div>
+    </b-row>
+    <b-row class="gdt-list-clooaps-box--all">
+      <div class="col-6 text-right clooaps-col-left">
+        <div>{{ getLinesByType(gdtEntryType).first }}</div>
+        <div>{{ getLinesByType(gdtEntryType).second }}</div>
+      </div>
+      <div class="col-6 clooaps-col-right">
+        <div>{{ getLinesByType(gdtEntryType).firstMath }}</div>
+        <div>
+          {{ getLinesByType(gdtEntryType).secondMath }}
+        </div>
+      </div>
+    </b-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TransactionCollaps',
+  props: {
+    amount: { type: Number, default: 0 },
+    gdtEntryType: { type: Number, default: 0 },
+    factor: { type: Number, default: 0 },
+    gdt: { type: Number, default: 0 },
+  },
+  methods: {
+    getLinesByType(givenType) {
+      const linesByType = {
+        1: {
+          headline: this.$t('gdt.calculation'),
+          first: this.$t('gdt.factor'),
+          firstMath: this.factor + ' GDT pro €',
+          second: this.$t('gdt.formula'),
+          secondMath:
+            this.$n(this.amount, 'decimal') +
+            ' € * ' +
+            this.factor +
+            ' GDT / € = ' +
+            this.$n(this.gdt, 'decimal') +
+            ' GDT',
+        },
+        4: {
+          headline: this.$t('gdt.publisher'),
+        },
+        7: {
+          headline: this.$t('gdt.conversion-gdt-euro'),
+          first: this.$t('gdt.raise'),
+          firstMath: this.factor * 100 + ' % ',
+          second: this.$t('gdt.conversion'),
+          secondMath:
+            this.$n(this.amount, 'decimal') +
+            '  GDT * ' +
+            this.factor * 100 +
+            '% = ' +
+            this.$n(this.gdt, 'decimal') +
+            ' GDT',
+        },
+      }
+
+      const type = linesByType[givenType]
+
+      if (type)
+        return {
+          headline: type.headline,
+          first: type.first,
+          firstMath: type.firstMath,
+          second: type.second,
+          secondMath: type.secondMath,
+        }
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/Transaktion.vue b/frontend/src/components/Transaktion.vue
deleted file mode 100644
index c27aa7298..000000000
--- a/frontend/src/components/Transaktion.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div>
-    <div class="list-group">
-      <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
-        <!-- Icon  -->
-        <div class="text-right" style="position: absolute">
-            ICON
-         <b-icon
-              v-if="gdtEntryType"
-              :icon="getIcon(gdtEntryType).icon"
-              :class="getIcon(gdtEntryType).class"
-            ></b-icon>
-        </div>
-
-        <!-- Collaps Button  -->
-        <div class="text-right" style="width: 96%; position: absolute">
-          <b-button class="btn-sm">
-            <b>i</b>
-          </b-button>
-        </div>
-
-        <!-- Betrag -->
-
-        <b-row>
-          <div class="col-6 text-right">
-              text1Betrag
-            <!-- <div>{{ $t('gdt.your-share') }}</div>
-            <div>{{ $t('gdt.credit') }}</div> -->
-          </div>
-          <div class="col-6">
-              text1Betrag
-            <!-- <div><slot name="your-share"></slot></div>
-            <div><slot name="credit"></slot></div> -->
-          </div>
-        </b-row>
-
-        <!-- Betrag ENDE-->
-
-        <!-- Nachricht-->
-        <b-row v-if="comment">
-          <div class="col-6 text-right">
-              text2Memo
-            <!-- {{ $t('form.memo') }} -->
-          </div>
-          <div class="col-6">
-              text2Memo
-              <slot name="memo"></slot>
-          </div>
-        </b-row>
-
-        <!-- Datum-->
-        <b-row class="gdt-list-row text-header">
-          <div class="col-6 text-right">
-              text3Date
-           <!-- {{ $t('form.date') }} -->
-          </div>
-          <div class="col-6">
-              text3Data
-             <!-- <slot name="date"></slot> -->
-           </div>
-        </b-row>
-      </div>
-
-      <b-collapse :id="'a' + date + ''" class="pb-4">
-        <b-row class="gdt-list-clooaps-header-text text-center pb-3">
-          <div class="col h4"><!--{{ $t('gdt.publisher') }}--> CollapsData</div>
-        </b-row>
-      </b-collapse>
-    </div>
-  </div>
-</template>
-<script>
-
-const iconsByType = {
-  1: { icon: 'heart', classes: 'gradido-global-color-accent' },
-  4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
-  7: { icon: 'gift', classes: 'gradido-global-color-accent' },
-}
-
-export default {
-  props: {
-    date: {
-      type: Date,
-      default: function () {
-        return new Date()
-      },
-    },
-    comment: { type: String, default: '' },
-    gdtEntryType: { type: Number, default: '' },
-  },
-  methods: {
-    getIcon(givenType) {
-      const type = iconsByType[givenType]
-      if (type)
-        return {
-          icon: type.icon,
-          class: type.classes + ' m-mb-1 font2em',
-        }
-      this.throwError('no icon to given type: ' + givenType)
-    },
-  },
-}
-</script>
\ No newline at end of file
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index d031f9c4f..1aed9a3c9 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,135 +17,14 @@
         } in transactionsGdt"
         :key="transactionId"
       >
-        <transaktion :date="date" :comment="comment" :gdtEntryType="gdtEntryType"> </transaktion>
-        <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
-          <!-- Icon  -->
-          <div class="text-right" style="position: absolute">
-            <b-icon
-              v-if="gdtEntryType"
-              :icon="getIcon(gdtEntryType).icon"
-              :class="getIcon(gdtEntryType).class"
-            ></b-icon>
-          </div>
-
-          <!-- Collaps Button  -->
-          <div class="text-right" style="width: 96%; position: absolute">
-            <b-button class="btn-sm">
-              <b>i</b>
-            </b-button>
-          </div>
-
-          <!-- Betrag -->
-
-          <!-- 7 nur GDT erhalten -->
-          <b-row v-if="gdtEntryType === 7">
-            <div class="col-6 text-right">
-              <div>{{ $t('gdt.gdt-receive') }}</div>
-              <div>{{ $t('gdt.credit') }}</div>
-            </div>
-            <div class="col-6">
-              <div>{{ comment }}</div>
-              <div>{{ $n(gdt, 'decimal') }} GDT</div>
-            </div>
-          </b-row>
-          <!--4 publisher -->
-          <b-row v-else-if="gdtEntryType === 4">
-            <div class="col-6 text-right">
-              <div>{{ $t('gdt.your-share') }}</div>
-              <div>{{ $t('gdt.credit') }}</div>
-            </div>
-            <div class="col-6">
-              <div>5%</div>
-              <div>{{ $n(amount, 'decimal') }} GDT</div>
-            </div>
-          </b-row>
-          <!-- 1, 2, 3, 5, 6 spenden in euro -->
-          <b-row v-else>
-            <div class="col-6 text-right">
-              <div>{{ $t('gdt.contribution') }}</div>
-              <div>{{ $t('gdt.credit') }}</div>
-            </div>
-            <div class="col-6">
-              <div>{{ $n(amount, 'decimal') }} €</div>
-              <div>{{ $n(gdt, 'decimal') }} GDT</div>
-            </div>
-          </b-row>
-
-          <!-- Betrag ENDE-->
-
-          <!-- Nachricht-->
-          <b-row v-if="comment && gdtEntryType !== 7">
-            <div class="col-6 text-right">
-              {{ $t('form.memo') }}
-            </div>
-            <div class="col-6">
-              {{ comment }}
-            </div>
-          </b-row>
-
-          <!-- Datum-->
-          <b-row v-if="date" class="gdt-list-row text-header">
-            <div class="col-6 text-right">
-              {{ $t('form.date') }}
-            </div>
-            <div class="col-6">
-              {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
-            </div>
-          </b-row>
-        </div>
-
-        <!--     Collaps START    -->
-
-        <b-collapse v-if="gdtEntryType" :id="'a' + date + ''" class="pb-4">
-          <div style="border: 0px; background-color: #f1f1f1" class="p-2 pb-4 mb-4">
-            <!-- Überschrift -->
-            <b-row class="gdt-list-clooaps-header-text text-center pb-3">
-              <div class="col h4" v-if="gdtEntryType === 7">
-                {{ $t('gdt.conversion-gdt-euro') }}
-              </div>
-              <div class="col h4" v-else-if="gdtEntryType === 4">
-                {{ $t('gdt.publisher') }}
-              </div>
-              <div class="col h4" v-else>{{ $t('gdt.calculation') }}</div>
-            </b-row>
-
-            <!-- 7 nur GDT erhalten -->
-            <b-row class="gdt-list-clooaps-box-7" v-if="gdtEntryType == 7">
-              <div class="col-6 text-right clooaps-col-left">
-                <div>{{ $t('gdt.raise') }}</div>
-                <div>{{ $t('gdt.conversion') }}</div>
-              </div>
-              <div class="col-6 clooaps-col-right">
-                <div>{{ factor * 100 }} %</div>
-                <div>
-                  {{ $n(amount, 'decimal') }} GDT * {{ factor * 100 }} % =
-                  {{ $n(gdt, 'decimal') }} GDT
-                </div>
-              </div>
-            </b-row>
-            <!-- 4 publisher -->
-            <b-row class="gdt-list-clooaps-box-4" v-else-if="gdtEntryType === 4">
-              <div class="col-6 text-right clooaps-col-left"></div>
-              <div class="col-6 clooaps-col-right"></div>
-            </b-row>
-
-            <!-- 1, 2, 3, 5, 6 spenden in euro -->
-            <b-row class="gdt-list-clooaps-box--all" v-else>
-              <div class="col-6 text-right clooaps-col-left">
-                <div>{{ $t('gdt.factor') }}</div>
-                <div>{{ $t('gdt.formula') }}</div>
-              </div>
-              <div class="col-6 clooaps-col-right">
-                <div>{{ factor }} GDT pro €</div>
-                <div>
-                  {{ $n(amount, 'decimal') }} € * {{ factor }} GDT / € =
-                  {{ $n(gdt, 'decimal') }} GDT
-                </div>
-              </div>
-            </b-row>
-          </div>
-        </b-collapse>
-        <!--     Collaps ENDE    -->
+        <transaction
+          :amount="amount"
+          :date="date"
+          :comment="comment"
+          :gdtEntryType="gdtEntryType"
+          :factor="factor"
+          :gdt="gdt"
+        ></transaction>
       </div>
     </div>
     <pagination-buttons
@@ -163,19 +42,13 @@
 <script>
 import { listGDTEntriesQuery } from '../../../graphql/queries'
 import PaginationButtons from '../../../components/PaginationButtons'
-import Transaktion from '../../../components/Transaktion.vue'
-
-const iconsByType = {
-  1: { icon: 'heart', classes: 'gradido-global-color-accent' },
-  4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
-  7: { icon: 'gift', classes: 'gradido-global-color-accent' },
-}
+import Transaction from '../../../components/Transaction.vue'
 
 export default {
   name: 'gdt-transaction-list',
   components: {
     PaginationButtons,
-    Transaktion,
+    Transaction,
   },
   data() {
     return {
@@ -218,15 +91,7 @@ export default {
           this.$toasted.error(error.message)
         })
     },
-    getIcon(givenType) {
-      const type = iconsByType[givenType]
-      if (type)
-        return {
-          icon: type.icon,
-          class: type.classes + ' m-mb-1 font2em',
-        }
-      this.throwError('no icon to given type: ' + givenType)
-    },
+
     throwError(msg) {
       throw new Error(msg)
     },

From 8225d7975a93ce6fdca884ef62b992f8a2596ed5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Sep 2021 11:11:18 +0200
Subject: [PATCH 03/12] fixed error when gdtEntryType is empty

---
 frontend/src/components/Transaction.vue       | 76 +++++++++----------
 .../src/components/TransactionCollaps.vue     |  8 +-
 .../AccountOverview/GdtTransactionList.vue    |  1 +
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index 283ceb6cb..e1884a3e3 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
+    
     <div class="list-group">
       <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
         <!-- Icon  -->
         <div class="text-right" style="position: absolute">
-          <b-icon
-            v-if="gdtEntryType"
+          <b-icon          
             :icon="getLinesByType(gdtEntryType).icon"
             :class="getLinesByType(gdtEntryType).iconclasses"
           ></b-icon>
@@ -80,47 +80,46 @@ export default {
     TransactionCollaps,
   },
   props: {
-    amount: { type: Number, default: 0 },
+    amount: { type: Number },
     date: {
-      type: Date,
-      default: function () {
-        return new Date()
-      },
+      type: Date
     },
-    comment: { type: String, default: '' },
-    gdtEntryType: { type: Number, default: 0 },
-    factor: { type: Number, default: 0 },
-    gdt: { type: Number, default: 0 },
+    comment: { type: String },
+    gdtEntryType: { type: Number, default: 1},
+    factor: { type: Number},
+    gdt: { type: Number},
   },
   methods: {
     getLinesByType(givenType) {
-      const linesByType = {
-        1: {
-          icon: 'heart',
-          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-          description: 'Beitrag',
-          descriptiontext: this.$n(this.amount, 'decimal') + ' €',
-          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
-        },
-        4: {
-          icon: 'person-check',
-          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-          description: 'Geworbenes Mitglied',
-          descriptiontext: '5%',
-          credittext: this.$n(this.amount, 'decimal') + ' GDT',
-        },
-        7: {
-          icon: 'gift',
-          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-          description: 'Aktion',
-          descriptiontext: this.comment,
-          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
-        },
-      }
-
-      const type = linesByType[givenType]
-
-      if (type)
+       
+        const linesByType = {
+          1: {
+            icon: 'heart',
+            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+            description: 'Beitrag',
+            descriptiontext: this.$n(this.amount, 'decimal') + ' €',
+            credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+          },
+          4: {
+            icon: 'person-check',
+            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+            description: 'Geworbenes Mitglied',
+            descriptiontext: '5%',
+            credittext: this.$n(this.amount, 'decimal') + ' GDT',
+          },
+          7: {
+            icon: 'gift',
+            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+            description: 'Aktion',
+            descriptiontext: this.comment,
+            credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+          },
+        }
+        
+       
+      const type = linesByType[givenType]       
+      
+      if (type) 
         return {
           icon: type.icon,
           iconclasses: type.iconclasses,
@@ -128,6 +127,7 @@ export default {
           descriptiontext: type.descriptiontext,
           credittext: type.credittext,
         }
+      
     },
   },
 }
diff --git a/frontend/src/components/TransactionCollaps.vue b/frontend/src/components/TransactionCollaps.vue
index 04299fa5f..4c016ea9d 100644
--- a/frontend/src/components/TransactionCollaps.vue
+++ b/frontend/src/components/TransactionCollaps.vue
@@ -23,10 +23,10 @@
 export default {
   name: 'TransactionCollaps',
   props: {
-    amount: { type: Number, default: 0 },
-    gdtEntryType: { type: Number, default: 0 },
-    factor: { type: Number, default: 0 },
-    gdt: { type: Number, default: 0 },
+    amount: { type: Number },
+    gdtEntryType: { type: Number },
+    factor: { type: Number },
+    gdt: { type: Number },
   },
   methods: {
     getLinesByType(givenType) {
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 1aed9a3c9..538fc60bb 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,6 +17,7 @@
         } in transactionsGdt"
         :key="transactionId"
       >
+ 
         <transaction
           :amount="amount"
           :date="date"

From 69a6566c4b394b33d9cc18b817de652dc5d99acd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Sep 2021 11:02:21 +0200
Subject: [PATCH 04/12] fix locale, add  tests

---
 frontend/src/components/Transaction.spec.js   | 36 ++++++++
 frontend/src/components/Transaction.vue       | 82 +++++++++----------
 .../src/components/TransactionCollaps.spec.js | 36 ++++++++
 .../src/components/TransactionCollaps.vue     | 12 ++-
 frontend/src/locales/de.json                  |  6 +-
 frontend/src/locales/en.json                  |  3 +-
 .../AccountOverview/GdtTransactionList.vue    |  1 -
 7 files changed, 129 insertions(+), 47 deletions(-)
 create mode 100644 frontend/src/components/Transaction.spec.js
 create mode 100644 frontend/src/components/TransactionCollaps.spec.js

diff --git a/frontend/src/components/Transaction.spec.js b/frontend/src/components/Transaction.spec.js
new file mode 100644
index 000000000..e5e0c89f0
--- /dev/null
+++ b/frontend/src/components/Transaction.spec.js
@@ -0,0 +1,36 @@
+import { mount } from '@vue/test-utils'
+import Transaction from './Transaction'
+
+const localVue = global.localVue
+
+const toastErrorMock = jest.fn()
+
+describe('Transaction', () => {
+  let wrapper
+
+  const mocks = {
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+    $n: jest.fn((n) => n),
+    $d: jest.fn((d) => d),
+    $toasted: {
+      error: toastErrorMock,
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(Transaction, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.gdt-transaction-list-item').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index e1884a3e3..faf347a41 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -1,17 +1,16 @@
 <template>
   <div>
-    
     <div class="list-group">
       <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
-        <!-- Icon  -->
+        <!-- icon  -->
         <div class="text-right" style="position: absolute">
-          <b-icon          
+          <b-icon
             :icon="getLinesByType(gdtEntryType).icon"
             :class="getLinesByType(gdtEntryType).iconclasses"
           ></b-icon>
         </div>
 
-        <!-- Collaps Button  -->
+        <!-- collaps Button  -->
         <div class="text-right" style="width: 96%; position: absolute">
           <b-button class="btn-sm">
             <b>i</b>
@@ -19,7 +18,6 @@
         </div>
 
         <!-- type  -->
-
         <b-row>
           <div class="col-6 text-right">
             {{ getLinesByType(gdtEntryType).description }}
@@ -39,7 +37,7 @@
           </div>
         </b-row>
 
-        <!-- Nachricht-->
+        <!-- Message-->
         <b-row v-if="comment && gdtEntryType !== 7">
           <div class="col-6 text-right">
             {{ $t('form.memo') }}
@@ -49,7 +47,7 @@
           </div>
         </b-row>
 
-        <!-- Datum-->
+        <!-- date-->
         <b-row class="gdt-list-row text-header">
           <div class="col-6 text-right">
             {{ $t('form.date') }}
@@ -60,6 +58,7 @@
         </b-row>
       </div>
 
+      <!-- collaps trancaction info-->
       <b-collapse :id="'a' + date + ''" class="pb-4">
         <transaction-collaps
           :amount="amount"
@@ -82,44 +81,42 @@ export default {
   props: {
     amount: { type: Number },
     date: {
-      type: Date
+      type: Date,
     },
     comment: { type: String },
-    gdtEntryType: { type: Number, default: 1},
-    factor: { type: Number},
-    gdt: { type: Number},
+    gdtEntryType: { type: Number, default: 1 },
+    factor: { type: Number },
+    gdt: { type: Number },
   },
   methods: {
     getLinesByType(givenType) {
-       
-        const linesByType = {
-          1: {
-            icon: 'heart',
-            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-            description: 'Beitrag',
-            descriptiontext: this.$n(this.amount, 'decimal') + ' €',
-            credittext: this.$n(this.gdt, 'decimal') + ' GDT',
-          },
-          4: {
-            icon: 'person-check',
-            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-            description: 'Geworbenes Mitglied',
-            descriptiontext: '5%',
-            credittext: this.$n(this.amount, 'decimal') + ' GDT',
-          },
-          7: {
-            icon: 'gift',
-            iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-            description: 'Aktion',
-            descriptiontext: this.comment,
-            credittext: this.$n(this.gdt, 'decimal') + ' GDT',
-          },
-        }
-        
-       
-      const type = linesByType[givenType]       
-      
-      if (type) 
+      const linesByType = {
+        1: {
+          icon: 'heart',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: this.$t('gdt.contribution'),
+          descriptiontext: this.$n(this.amount, 'decimal') + ' €',
+          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+        },
+        4: {
+          icon: 'person-check',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: this.$t('gdt.recruited-member'),
+          descriptiontext: '5%',
+          credittext: this.$n(this.amount, 'decimal') + ' GDT',
+        },
+        7: {
+          icon: 'gift',
+          iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
+          description: this.$t('gdt.action'),
+          descriptiontext: this.comment,
+          credittext: this.$n(this.gdt, 'decimal') + ' GDT',
+        },
+      }
+
+      const type = linesByType[givenType]
+
+      if (type)
         return {
           icon: type.icon,
           iconclasses: type.iconclasses,
@@ -127,7 +124,10 @@ export default {
           descriptiontext: type.descriptiontext,
           credittext: type.credittext,
         }
-      
+      this.throwError('no lines for this type')
+    },
+    throwError(msg) {
+      throw new Error(msg)
     },
   },
 }
diff --git a/frontend/src/components/TransactionCollaps.spec.js b/frontend/src/components/TransactionCollaps.spec.js
new file mode 100644
index 000000000..edb5c5dd7
--- /dev/null
+++ b/frontend/src/components/TransactionCollaps.spec.js
@@ -0,0 +1,36 @@
+import { mount } from '@vue/test-utils'
+import TransactionCollaps from './TransactionCollaps'
+
+const localVue = global.localVue
+
+const toastErrorMock = jest.fn()
+
+describe('TransactionCollaps', () => {
+  let wrapper
+
+  const mocks = {
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+    $n: jest.fn((n) => n),
+    $d: jest.fn((d) => d),
+    $toasted: {
+      error: toastErrorMock,
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(TransactionCollaps, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.gdt-transaction-collaps').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/frontend/src/components/TransactionCollaps.vue b/frontend/src/components/TransactionCollaps.vue
index 4c016ea9d..4148c6d56 100644
--- a/frontend/src/components/TransactionCollaps.vue
+++ b/frontend/src/components/TransactionCollaps.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="gdt-transaction-collaps">
     <b-row class="gdt-list-clooaps-header-text text-center pb-3">
       <div class="col h4">
         {{ getLinesByType(gdtEntryType).headline }}
@@ -21,7 +21,7 @@
 </template>
 <script>
 export default {
-  name: 'TransactionCollaps',
+  name: 'transaction-collaps',
   props: {
     amount: { type: Number },
     gdtEntryType: { type: Number },
@@ -46,6 +46,10 @@ export default {
         },
         4: {
           headline: this.$t('gdt.publisher'),
+          first: null,
+          firstMath: null,
+          second: null,
+          secondMath: null,
         },
         7: {
           headline: this.$t('gdt.conversion-gdt-euro'),
@@ -72,6 +76,10 @@ export default {
           second: type.second,
           secondMath: type.secondMath,
         }
+      this.throwError('no additional transaction info for this type')
+    },
+    throwError(msg) {
+      throw new Error(msg)
     },
   },
 }
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ae1822396..b078fd21e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -138,6 +138,7 @@
       "add_work":"neuer Gemeinschaftsbeitrag"
     },
     "profil": {
+      "transactions":"Transaktionen",
       "activity": {
         "new":"Neue Gemeinschaftsstunden eintragen",
         "list":"Meine Gemeinschaftsstunden Liste"
@@ -183,8 +184,9 @@
     "formula":"Berechungsformel",
     "no-transactions":"Du hast zur Zeit keine Transaktionen",
     "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt",
-    "gdt-receive":"Aktion",
-    "your-share":"Geworbenes Mitglied",
+    "action":"Action",
+    "gdt-receive":"GDT erhalten",
+    "recruited-member":"Geworbenes Mitglied",
     "contribution":"Beitrag"
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4bd04116d..12e6f647d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -184,8 +184,9 @@
     "formula": "Calculation formula",
     "no-transactions":"You currently have no transactions",
     "publisher":"A member you referred has paid a contribution",
+    "action":"Aktion",
     "gdt-receive":"GDT receive",
-    "your-share":"Your share",
+    "recruited-member":"Your share",
     "contribution":"Contribution"
  }
 }
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 6a1ddce01..7591ec9ec 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,7 +17,6 @@
         } in transactionsGdt"
         :key="transactionId"
       >
- 
         <transaction
           :amount="amount"
           :date="date"

From 95e937f6e10310de620b34c7e0c6418dadcad71e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Sep 2021 12:19:19 +0200
Subject: [PATCH 05/12] fix test

---
 frontend/src/components/Transaction.spec.js   | 11 +++++++-
 frontend/src/components/Transaction.vue       | 26 +++++--------------
 ...ps.spec.js => TransactionCollapse.spec.js} |  6 ++---
 ...ionCollaps.vue => TransactionCollapse.vue} | 18 +++----------
 4 files changed, 24 insertions(+), 37 deletions(-)
 rename frontend/src/components/{TransactionCollaps.spec.js => TransactionCollapse.spec.js} (78%)
 rename frontend/src/components/{TransactionCollaps.vue => TransactionCollapse.vue} (83%)

diff --git a/frontend/src/components/Transaction.spec.js b/frontend/src/components/Transaction.spec.js
index e5e0c89f0..d78af1e76 100644
--- a/frontend/src/components/Transaction.spec.js
+++ b/frontend/src/components/Transaction.spec.js
@@ -20,8 +20,17 @@ describe('Transaction', () => {
     },
   }
 
+  const propsData = {
+    amount: 100,
+    gdt: 110,
+    factor: 22,
+    comment: '',
+    date: '2020-04-10T13:28:00+00:00',
+    gdtEntryType: 4,
+  }
+
   const Wrapper = () => {
-    return mount(Transaction, { localVue, mocks })
+    return mount(Transaction, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index faf347a41..ce5b225d9 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -60,29 +60,27 @@
 
       <!-- collaps trancaction info-->
       <b-collapse :id="'a' + date + ''" class="pb-4">
-        <transaction-collaps
+        <transaction-collapse
           :amount="amount"
           :gdtEntryType="gdtEntryType"
           :factor="factor"
           :gdt="gdt"
-        ></transaction-collaps>
+        ></transaction-collapse>
       </b-collapse>
     </div>
   </div>
 </template>
 <script>
-import TransactionCollaps from '../components/TransactionCollaps.vue'
+import TransactionCollapse from './TransactionCollapse.vue'
 
 export default {
   name: 'Transaction',
   components: {
-    TransactionCollaps,
+    TransactionCollapse,
   },
   props: {
     amount: { type: Number },
-    date: {
-      type: Date,
-    },
+    date: { type: String },
     comment: { type: String },
     gdtEntryType: { type: Number, default: 1 },
     factor: { type: Number },
@@ -116,18 +114,8 @@ export default {
 
       const type = linesByType[givenType]
 
-      if (type)
-        return {
-          icon: type.icon,
-          iconclasses: type.iconclasses,
-          description: type.description,
-          descriptiontext: type.descriptiontext,
-          credittext: type.credittext,
-        }
-      this.throwError('no lines for this type')
-    },
-    throwError(msg) {
-      throw new Error(msg)
+      if (type) return type
+      throw new Error('no lines for this type')
     },
   },
 }
diff --git a/frontend/src/components/TransactionCollaps.spec.js b/frontend/src/components/TransactionCollapse.spec.js
similarity index 78%
rename from frontend/src/components/TransactionCollaps.spec.js
rename to frontend/src/components/TransactionCollapse.spec.js
index edb5c5dd7..a4345dec0 100644
--- a/frontend/src/components/TransactionCollaps.spec.js
+++ b/frontend/src/components/TransactionCollapse.spec.js
@@ -1,11 +1,11 @@
 import { mount } from '@vue/test-utils'
-import TransactionCollaps from './TransactionCollaps'
+import TransactionCollapse from './TransactionCollapse'
 
 const localVue = global.localVue
 
 const toastErrorMock = jest.fn()
 
-describe('TransactionCollaps', () => {
+describe('TransactionCollapse', () => {
   let wrapper
 
   const mocks = {
@@ -21,7 +21,7 @@ describe('TransactionCollaps', () => {
   }
 
   const Wrapper = () => {
-    return mount(TransactionCollaps, { localVue, mocks })
+    return mount(TransactionCollapse, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/TransactionCollaps.vue b/frontend/src/components/TransactionCollapse.vue
similarity index 83%
rename from frontend/src/components/TransactionCollaps.vue
rename to frontend/src/components/TransactionCollapse.vue
index 4148c6d56..6d6acfdc5 100644
--- a/frontend/src/components/TransactionCollaps.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -21,10 +21,10 @@
 </template>
 <script>
 export default {
-  name: 'transaction-collaps',
+  name: 'TransactionCollapse',
   props: {
     amount: { type: Number },
-    gdtEntryType: { type: Number },
+    gdtEntryType: { type: Number, default: 1 },
     factor: { type: Number },
     gdt: { type: Number },
   },
@@ -68,18 +68,8 @@ export default {
 
       const type = linesByType[givenType]
 
-      if (type)
-        return {
-          headline: type.headline,
-          first: type.first,
-          firstMath: type.firstMath,
-          second: type.second,
-          secondMath: type.secondMath,
-        }
-      this.throwError('no additional transaction info for this type')
-    },
-    throwError(msg) {
-      throw new Error(msg)
+      if (type) return type
+      throw new Error('no additional transaction info for this type')
     },
   },
 }

From 28b871f11bc3f367bd13709dc9d9a24a4ec8de2b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Sep 2021 09:05:38 +0200
Subject: [PATCH 06/12] fix review, fix more tests in transaction.spec and
 transactionCollaps

---
 frontend/src/components/Transaction.spec.js   | 31 ++++++++++++----
 frontend/src/components/Transaction.vue       |  2 +-
 .../components/TransactionCollapse.spec.js    | 36 +++++++++++++------
 .../src/components/TransactionCollapse.vue    |  4 +--
 frontend/src/locales/de.json                  | 12 +------
 frontend/src/locales/en.json                  | 14 ++------
 6 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/frontend/src/components/Transaction.spec.js b/frontend/src/components/Transaction.spec.js
index d78af1e76..5bb704de6 100644
--- a/frontend/src/components/Transaction.spec.js
+++ b/frontend/src/components/Transaction.spec.js
@@ -3,8 +3,6 @@ import Transaction from './Transaction'
 
 const localVue = global.localVue
 
-const toastErrorMock = jest.fn()
-
 describe('Transaction', () => {
   let wrapper
 
@@ -15,16 +13,13 @@ describe('Transaction', () => {
     $t: jest.fn((t) => t),
     $n: jest.fn((n) => n),
     $d: jest.fn((d) => d),
-    $toasted: {
-      error: toastErrorMock,
-    },
   }
 
   const propsData = {
     amount: 100,
     gdt: 110,
     factor: 22,
-    comment: '',
+    comment: 'this is the comment for a gdt transaction',
     date: '2020-04-10T13:28:00+00:00',
     gdtEntryType: 4,
   }
@@ -41,5 +36,29 @@ describe('Transaction', () => {
     it('renders the component', () => {
       expect(wrapper.find('div.gdt-transaction-list-item').exists()).toBeTruthy()
     })
+
+    it('checks the prop amount  ', () => {
+      expect(wrapper.props().amount).toBe(100)
+    })
+
+    it('checks the prop gdt  ', () => {
+      expect(wrapper.props().gdt).toBe(110)
+    })
+
+    it('checks the prop factor  ', () => {
+      expect(wrapper.props().factor).toBe(22)
+    })
+
+    it('checks the prop comment  ', () => {
+      expect(wrapper.props().comment).toBe('this is the comment for a gdt transaction')
+    })
+
+    it('checks the prop date  ', () => {
+      expect(wrapper.props().date).toBe('2020-04-10T13:28:00+00:00')
+    })
+
+    it('checks the prop gdtEntryType  ', () => {
+      expect(wrapper.props().gdtEntryType).toBe(4)
+    })
   })
 })
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index ce5b225d9..39a62b878 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -115,7 +115,7 @@ export default {
       const type = linesByType[givenType]
 
       if (type) return type
-      throw new Error('no lines for this type')
+      throw new Error('no lines for this type: ' + givenType)
     },
   },
 }
diff --git a/frontend/src/components/TransactionCollapse.spec.js b/frontend/src/components/TransactionCollapse.spec.js
index a4345dec0..5e3207c57 100644
--- a/frontend/src/components/TransactionCollapse.spec.js
+++ b/frontend/src/components/TransactionCollapse.spec.js
@@ -3,25 +3,23 @@ import TransactionCollapse from './TransactionCollapse'
 
 const localVue = global.localVue
 
-const toastErrorMock = jest.fn()
-
 describe('TransactionCollapse', () => {
   let wrapper
 
   const mocks = {
-    $i18n: {
-      locale: 'en',
-    },
     $t: jest.fn((t) => t),
     $n: jest.fn((n) => n),
-    $d: jest.fn((d) => d),
-    $toasted: {
-      error: toastErrorMock,
-    },
+  }
+
+  const propsData = {
+    amount: 100,
+    gdt: 110,
+    factor: 22,
+    gdtEntryType: 4,
   }
 
   const Wrapper = () => {
-    return mount(TransactionCollapse, { localVue, mocks })
+    return mount(TransactionCollapse, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
@@ -30,7 +28,23 @@ describe('TransactionCollapse', () => {
     })
 
     it('renders the component', () => {
-      expect(wrapper.find('div.gdt-transaction-collaps').exists()).toBeTruthy()
+      expect(wrapper.find('div.gdt-transaction-collapse').exists()).toBeTruthy()
+    })
+
+    it('checks the prop amount  ', () => {
+      expect(wrapper.props().amount).toBe(100)
+    })
+
+    it('checks the prop gdt  ', () => {
+      expect(wrapper.props().gdt).toBe(110)
+    })
+
+    it('checks the prop factor  ', () => {
+      expect(wrapper.props().factor).toBe(22)
+    })
+
+    it('checks the prop gdtEntryType  ', () => {
+      expect(wrapper.props().gdtEntryType).toBe(4)
     })
   })
 })
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 6d6acfdc5..d36165785 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="gdt-transaction-collaps">
+  <div class="gdt-transaction-collapse">
     <b-row class="gdt-list-clooaps-header-text text-center pb-3">
       <div class="col h4">
         {{ getLinesByType(gdtEntryType).headline }}
@@ -69,7 +69,7 @@ export default {
       const type = linesByType[givenType]
 
       if (type) return type
-      throw new Error('no additional transaction info for this type')
+      throw new Error('no additional transaction info for this type: ' + givenType)
     },
   },
 }
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b078fd21e..a69ca515e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -137,16 +137,6 @@
       "send_gradido":"Gradido versenden",
       "add_work":"neuer Gemeinschaftsbeitrag"
     },
-    "profil": {
-      "transactions":"Transaktionen",
-      "activity": {
-        "new":"Neue Gemeinschaftsstunden eintragen",
-        "list":"Meine Gemeinschaftsstunden Liste"
-      },
-      "user-data": {
-        "change-success": "Deine Daten wurden gespeichert."
-      }
-    },
     "navbar" : {
       "my-profil":"Mein Profil",
       "settings":"Einstellungen",
@@ -184,7 +174,7 @@
     "formula":"Berechungsformel",
     "no-transactions":"Du hast zur Zeit keine Transaktionen",
     "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt",
-    "action":"Action",
+    "action":"Aktion",
     "gdt-receive":"GDT erhalten",
     "recruited-member":"Geworbenes Mitglied",
     "contribution":"Beitrag"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 12e6f647d..a03cc767c 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -137,16 +137,6 @@
       "send_gradido":"Send Gradido",
       "add_work":"New Community Contribution"
     },
-    "profil": {
-      "transactions":"transactions",
-      "activity": {
-        "new":"Register new community hours",
-        "list":"My Community Hours List"
-      },
-      "user-data": {
-        "change-success": "Your data has been saved."
-      }
-    },
     "navbar" : {
       "my-profil":"My profile",
       "settings":"Settings",
@@ -184,9 +174,9 @@
     "formula": "Calculation formula",
     "no-transactions":"You currently have no transactions",
     "publisher":"A member you referred has paid a contribution",
-    "action":"Aktion",
+    "action":"Action",
     "gdt-receive":"GDT receive",
-    "recruited-member":"Your share",
+    "recruited-member":"Recruited Member",
     "contribution":"Contribution"
  }
 }

From 25e42683f3743ef48ad4c5c97879a4507d8f91e7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 13 Sep 2021 10:43:34 +0200
Subject: [PATCH 07/12] more tests

---
 .../components/TransactionCollapse.spec.js    | 28 +++++++++++++------
 .../src/components/TransactionCollapse.vue    | 10 +++----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/TransactionCollapse.spec.js b/frontend/src/components/TransactionCollapse.spec.js
index 5e3207c57..66f73fcd9 100644
--- a/frontend/src/components/TransactionCollapse.spec.js
+++ b/frontend/src/components/TransactionCollapse.spec.js
@@ -15,7 +15,7 @@ describe('TransactionCollapse', () => {
     amount: 100,
     gdt: 110,
     factor: 22,
-    gdtEntryType: 4,
+    gdtEntryType: 1,
   }
 
   const Wrapper = () => {
@@ -31,20 +31,32 @@ describe('TransactionCollapse', () => {
       expect(wrapper.find('div.gdt-transaction-collapse').exists()).toBeTruthy()
     })
 
-    it('checks the prop amount  ', () => {
-      expect(wrapper.props().amount).toBe(100)
+    it('renders the component clooaps-header', () => {
+      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
     })
 
-    it('checks the prop gdt  ', () => {
-      expect(wrapper.props().gdt).toBe(110)
+    it('renders the component clooaps-headline', () => {
+      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.calculation')
     })
 
-    it('checks the prop factor  ', () => {
-      expect(wrapper.props().factor).toBe(22)
+    it('renders the component clooaps-first', () => {
+      expect(wrapper.find('#clooaps-first').text()).toBe('gdt.factor')
+    })
+
+    it('renders the component clooaps-second', () => {
+      expect(wrapper.find('#clooaps-second').text()).toBe('gdt.formula')
+    })
+
+    it('renders the component clooaps-firstMath', () => {
+      expect(wrapper.find('#clooaps-firstMath').text()).toBe('22 GDT pro €')
+    })
+
+    it('renders the component clooaps-secondMath', () => {
+      expect(wrapper.find('#clooaps-secondMath').text()).toBe('100 € * 22 GDT / € = 110 GDT')
     })
 
     it('checks the prop gdtEntryType  ', () => {
-      expect(wrapper.props().gdtEntryType).toBe(4)
+      expect(wrapper.props().gdtEntryType).toBe(1)
     })
   })
 })
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index d36165785..2f0955f04 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="gdt-transaction-collapse">
     <b-row class="gdt-list-clooaps-header-text text-center pb-3">
-      <div class="col h4">
+      <div id="clooaps-headline" class="col h4">
         {{ getLinesByType(gdtEntryType).headline }}
       </div>
     </b-row>
     <b-row class="gdt-list-clooaps-box--all">
       <div class="col-6 text-right clooaps-col-left">
-        <div>{{ getLinesByType(gdtEntryType).first }}</div>
-        <div>{{ getLinesByType(gdtEntryType).second }}</div>
+        <div id="clooaps-first">{{ getLinesByType(gdtEntryType).first }}</div>
+        <div id="clooaps-second">{{ getLinesByType(gdtEntryType).second }}</div>
       </div>
       <div class="col-6 clooaps-col-right">
-        <div>{{ getLinesByType(gdtEntryType).firstMath }}</div>
-        <div>
+        <div id="clooaps-firstMath">{{ getLinesByType(gdtEntryType).firstMath }}</div>
+        <div id="clooaps-secondMath">
           {{ getLinesByType(gdtEntryType).secondMath }}
         </div>
       </div>

From e56ba22dcb2eb7afcd4ef34ed33cd1712e939567 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 13 Sep 2021 11:08:06 +0200
Subject: [PATCH 08/12] tests for all gdtEntryTypes

---
 .../components/TransactionCollapse.spec.js    | 112 ++++++++++++++++--
 .../src/components/TransactionCollapse.vue    |   4 +-
 2 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/TransactionCollapse.spec.js b/frontend/src/components/TransactionCollapse.spec.js
index 66f73fcd9..a263a2878 100644
--- a/frontend/src/components/TransactionCollapse.spec.js
+++ b/frontend/src/components/TransactionCollapse.spec.js
@@ -11,26 +11,30 @@ describe('TransactionCollapse', () => {
     $n: jest.fn((n) => n),
   }
 
-  const propsData = {
-    amount: 100,
-    gdt: 110,
-    factor: 22,
-    gdtEntryType: 1,
-  }
-
-  const Wrapper = () => {
+  const Wrapper = (propsData) => {
     return mount(TransactionCollapse, { localVue, mocks, propsData })
   }
 
-  describe('mount', () => {
+  describe('mount with gdtEntryType: 1', () => {
     beforeEach(() => {
-      wrapper = Wrapper()
+      const propsData = {
+        amount: 100,
+        gdt: 110,
+        factor: 22,
+        gdtEntryType: 1,
+      }
+
+      wrapper = Wrapper(propsData)
     })
 
     it('renders the component', () => {
       expect(wrapper.find('div.gdt-transaction-collapse').exists()).toBeTruthy()
     })
 
+    it('checks the prop gdtEntryType  ', () => {
+      expect(wrapper.props().gdtEntryType).toBe(1)
+    })
+
     it('renders the component clooaps-header', () => {
       expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
     })
@@ -54,9 +58,95 @@ describe('TransactionCollapse', () => {
     it('renders the component clooaps-secondMath', () => {
       expect(wrapper.find('#clooaps-secondMath').text()).toBe('100 € * 22 GDT / € = 110 GDT')
     })
+  })
+
+  describe('mount with gdtEntryType: 7', () => {
+    beforeEach(() => {
+      const propsData = {
+        amount: 100,
+        gdt: 2200,
+        factor: 22,
+        gdtEntryType: 7,
+      }
+
+      wrapper = Wrapper(propsData)
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.gdt-transaction-collapse').exists()).toBeTruthy()
+    })
 
     it('checks the prop gdtEntryType  ', () => {
-      expect(wrapper.props().gdtEntryType).toBe(1)
+      expect(wrapper.props().gdtEntryType).toBe(7)
+    })
+
+    it('renders the component clooaps-header', () => {
+      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
+    })
+
+    it('renders the component clooaps-headline', () => {
+      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.conversion-gdt-euro')
+    })
+
+    it('renders the component clooaps-first', () => {
+      expect(wrapper.find('#clooaps-first').text()).toBe('gdt.raise')
+    })
+
+    it('renders the component clooaps-second', () => {
+      expect(wrapper.find('#clooaps-second').text()).toBe('gdt.conversion')
+    })
+
+    it('renders the component clooaps-firstMath', () => {
+      expect(wrapper.find('#clooaps-firstMath').text()).toBe('2200 %')
+    })
+
+    it('renders the component clooaps-secondMath', () => {
+      expect(wrapper.find('#clooaps-secondMath').text()).toBe('100 GDT * 2200 % = 2200 GDT')
+    })
+  })
+
+  describe('mount with gdtEntryType: 4', () => {
+    beforeEach(() => {
+      const propsData = {
+        amount: 100,
+        gdt: 2200,
+        factor: 22,
+        gdtEntryType: 4,
+      }
+
+      wrapper = Wrapper(propsData)
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.gdt-transaction-collapse').exists()).toBeTruthy()
+    })
+
+    it('checks the prop gdtEntryType  ', () => {
+      expect(wrapper.props().gdtEntryType).toBe(4)
+    })
+
+    it('renders the component clooaps-header', () => {
+      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
+    })
+
+    it('renders the component clooaps-headline', () => {
+      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.publisher')
+    })
+
+    it('renders the component clooaps-first', () => {
+      expect(wrapper.find('#clooaps-first').text()).toBe('')
+    })
+
+    it('renders the component clooaps-second', () => {
+      expect(wrapper.find('#clooaps-second').text()).toBe('')
+    })
+
+    it('renders the component clooaps-firstMath', () => {
+      expect(wrapper.find('#clooaps-firstMath').text()).toBe('')
+    })
+
+    it('renders the component clooaps-secondMath', () => {
+      expect(wrapper.find('#clooaps-secondMath').text()).toBe('')
     })
   })
 })
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 2f0955f04..7e92bace6 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -58,9 +58,9 @@ export default {
           second: this.$t('gdt.conversion'),
           secondMath:
             this.$n(this.amount, 'decimal') +
-            '  GDT * ' +
+            ' GDT * ' +
             this.factor * 100 +
-            '% = ' +
+            ' % = ' +
             this.$n(this.gdt, 'decimal') +
             ' GDT',
         },

From fa32b35f55203fe86a31ce69de8813a1bd74ae59 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 14 Sep 2021 10:05:17 +0200
Subject: [PATCH 09/12] add gdtEntryType 2,3,5,6

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

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index 39a62b878..fc7541a21 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -88,6 +88,8 @@ export default {
   },
   methods: {
     getLinesByType(givenType) {
+      if (givenType === 2 || givenType === 3 || givenType === 5 || givenType === 6) givenType = 1
+
       const linesByType = {
         1: {
           icon: 'heart',

From 6cbd798c720e70690972b9bad3ae29e03e5b1f96 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 14 Sep 2021 10:24:14 +0200
Subject: [PATCH 10/12] remove tests in transaction.vue Move test to the back

---
 frontend/src/components/Transaction.spec.js   | 35 +------------------
 .../AccountOverview/GdtTransactionList.vue    |  3 --
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/frontend/src/components/Transaction.spec.js b/frontend/src/components/Transaction.spec.js
index 5bb704de6..43dc44782 100644
--- a/frontend/src/components/Transaction.spec.js
+++ b/frontend/src/components/Transaction.spec.js
@@ -15,17 +15,8 @@ describe('Transaction', () => {
     $d: jest.fn((d) => d),
   }
 
-  const propsData = {
-    amount: 100,
-    gdt: 110,
-    factor: 22,
-    comment: 'this is the comment for a gdt transaction',
-    date: '2020-04-10T13:28:00+00:00',
-    gdtEntryType: 4,
-  }
-
   const Wrapper = () => {
-    return mount(Transaction, { localVue, mocks, propsData })
+    return mount(Transaction, { localVue, mocks })
   }
 
   describe('mount', () => {
@@ -36,29 +27,5 @@ describe('Transaction', () => {
     it('renders the component', () => {
       expect(wrapper.find('div.gdt-transaction-list-item').exists()).toBeTruthy()
     })
-
-    it('checks the prop amount  ', () => {
-      expect(wrapper.props().amount).toBe(100)
-    })
-
-    it('checks the prop gdt  ', () => {
-      expect(wrapper.props().gdt).toBe(110)
-    })
-
-    it('checks the prop factor  ', () => {
-      expect(wrapper.props().factor).toBe(22)
-    })
-
-    it('checks the prop comment  ', () => {
-      expect(wrapper.props().comment).toBe('this is the comment for a gdt transaction')
-    })
-
-    it('checks the prop date  ', () => {
-      expect(wrapper.props().date).toBe('2020-04-10T13:28:00+00:00')
-    })
-
-    it('checks the prop gdtEntryType  ', () => {
-      expect(wrapper.props().gdtEntryType).toBe(4)
-    })
   })
 })
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 7591ec9ec..1ad4ba13e 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -90,9 +90,6 @@ export default {
           this.$toasted.error(error.message)
         })
     },
-    throwError(msg) {
-      throw new Error(msg)
-    },
     showNext() {
       this.currentPage++
       this.updateGdt()

From 19efb09ab9f86b91a5180af47205b3c8252c2518 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 14 Sep 2021 10:29:40 +0200
Subject: [PATCH 11/12] change text gdt.action to gdt.gdt-receive

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

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index fc7541a21..095d8b63e 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -108,7 +108,7 @@ export default {
         7: {
           icon: 'gift',
           iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-          description: this.$t('gdt.action'),
+          description: this.$t('gdt.gdt-receive'),
           descriptiontext: this.comment,
           credittext: this.$n(this.gdt, 'decimal') + ' GDT',
         },

From f3fbab8c6b167c1d3ba4b4bf4011eb74be2012e2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 14 Sep 2021 10:43:38 +0200
Subject: [PATCH 12/12] rechtschreibfehler behoben collapse

---
 frontend/src/components/Transaction.vue       |  2 +-
 .../components/TransactionCollapse.spec.js    | 72 +++++++++----------
 .../src/components/TransactionCollapse.vue    | 18 ++---
 frontend/src/locales/de.json                  |  1 -
 frontend/src/locales/en.json                  |  1 -
 5 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index 095d8b63e..03b559463 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -108,7 +108,7 @@ export default {
         7: {
           icon: 'gift',
           iconclasses: 'gradido-global-color-accent m-mb-1 font2em',
-          description: this.$t('gdt.gdt-receive'),
+          description: this.$t('gdt.gdt-received'),
           descriptiontext: this.comment,
           credittext: this.$n(this.gdt, 'decimal') + ' GDT',
         },
diff --git a/frontend/src/components/TransactionCollapse.spec.js b/frontend/src/components/TransactionCollapse.spec.js
index a263a2878..f27c3ae66 100644
--- a/frontend/src/components/TransactionCollapse.spec.js
+++ b/frontend/src/components/TransactionCollapse.spec.js
@@ -35,28 +35,28 @@ describe('TransactionCollapse', () => {
       expect(wrapper.props().gdtEntryType).toBe(1)
     })
 
-    it('renders the component clooaps-header', () => {
-      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
+    it('renders the component collapse-header', () => {
+      expect(wrapper.find('.gdt-list-collapse-header-text')).toBeTruthy()
     })
 
-    it('renders the component clooaps-headline', () => {
-      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.calculation')
+    it('renders the component collapse-headline', () => {
+      expect(wrapper.find('#collapse-headline').text()).toBe('gdt.calculation')
     })
 
-    it('renders the component clooaps-first', () => {
-      expect(wrapper.find('#clooaps-first').text()).toBe('gdt.factor')
+    it('renders the component collapse-first', () => {
+      expect(wrapper.find('#collapse-first').text()).toBe('gdt.factor')
     })
 
-    it('renders the component clooaps-second', () => {
-      expect(wrapper.find('#clooaps-second').text()).toBe('gdt.formula')
+    it('renders the component collapse-second', () => {
+      expect(wrapper.find('#collapse-second').text()).toBe('gdt.formula')
     })
 
-    it('renders the component clooaps-firstMath', () => {
-      expect(wrapper.find('#clooaps-firstMath').text()).toBe('22 GDT pro €')
+    it('renders the component collapse-firstMath', () => {
+      expect(wrapper.find('#collapse-firstMath').text()).toBe('22 GDT pro €')
     })
 
-    it('renders the component clooaps-secondMath', () => {
-      expect(wrapper.find('#clooaps-secondMath').text()).toBe('100 € * 22 GDT / € = 110 GDT')
+    it('renders the component collapse-secondMath', () => {
+      expect(wrapper.find('#collapse-secondMath').text()).toBe('100 € * 22 GDT / € = 110 GDT')
     })
   })
 
@@ -80,28 +80,28 @@ describe('TransactionCollapse', () => {
       expect(wrapper.props().gdtEntryType).toBe(7)
     })
 
-    it('renders the component clooaps-header', () => {
-      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
+    it('renders the component collapse-header', () => {
+      expect(wrapper.find('.gdt-list-collapse-header-text')).toBeTruthy()
     })
 
-    it('renders the component clooaps-headline', () => {
-      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.conversion-gdt-euro')
+    it('renders the component collapse-headline', () => {
+      expect(wrapper.find('#collapse-headline').text()).toBe('gdt.conversion-gdt-euro')
     })
 
-    it('renders the component clooaps-first', () => {
-      expect(wrapper.find('#clooaps-first').text()).toBe('gdt.raise')
+    it('renders the component collapse-first', () => {
+      expect(wrapper.find('#collapse-first').text()).toBe('gdt.raise')
     })
 
-    it('renders the component clooaps-second', () => {
-      expect(wrapper.find('#clooaps-second').text()).toBe('gdt.conversion')
+    it('renders the component collapse-second', () => {
+      expect(wrapper.find('#collapse-second').text()).toBe('gdt.conversion')
     })
 
-    it('renders the component clooaps-firstMath', () => {
-      expect(wrapper.find('#clooaps-firstMath').text()).toBe('2200 %')
+    it('renders the component collapse-firstMath', () => {
+      expect(wrapper.find('#collapse-firstMath').text()).toBe('2200 %')
     })
 
-    it('renders the component clooaps-secondMath', () => {
-      expect(wrapper.find('#clooaps-secondMath').text()).toBe('100 GDT * 2200 % = 2200 GDT')
+    it('renders the component collapse-secondMath', () => {
+      expect(wrapper.find('#collapse-secondMath').text()).toBe('100 GDT * 2200 % = 2200 GDT')
     })
   })
 
@@ -125,28 +125,28 @@ describe('TransactionCollapse', () => {
       expect(wrapper.props().gdtEntryType).toBe(4)
     })
 
-    it('renders the component clooaps-header', () => {
-      expect(wrapper.find('.gdt-list-clooaps-header-text')).toBeTruthy()
+    it('renders the component collapse-header', () => {
+      expect(wrapper.find('.gdt-list-collapse-header-text')).toBeTruthy()
     })
 
-    it('renders the component clooaps-headline', () => {
-      expect(wrapper.find('#clooaps-headline').text()).toBe('gdt.publisher')
+    it('renders the component collapse-headline', () => {
+      expect(wrapper.find('#collapse-headline').text()).toBe('gdt.publisher')
     })
 
-    it('renders the component clooaps-first', () => {
-      expect(wrapper.find('#clooaps-first').text()).toBe('')
+    it('renders the component collapse-first', () => {
+      expect(wrapper.find('#collapse-first').text()).toBe('')
     })
 
-    it('renders the component clooaps-second', () => {
-      expect(wrapper.find('#clooaps-second').text()).toBe('')
+    it('renders the component collapse-second', () => {
+      expect(wrapper.find('#collapse-second').text()).toBe('')
     })
 
-    it('renders the component clooaps-firstMath', () => {
-      expect(wrapper.find('#clooaps-firstMath').text()).toBe('')
+    it('renders the component collapse-firstMath', () => {
+      expect(wrapper.find('#collapse-firstMath').text()).toBe('')
     })
 
-    it('renders the component clooaps-secondMath', () => {
-      expect(wrapper.find('#clooaps-secondMath').text()).toBe('')
+    it('renders the component collapse-secondMath', () => {
+      expect(wrapper.find('#collapse-secondMath').text()).toBe('')
     })
   })
 })
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 7e92bace6..854282a43 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="gdt-transaction-collapse">
-    <b-row class="gdt-list-clooaps-header-text text-center pb-3">
-      <div id="clooaps-headline" class="col h4">
+    <b-row class="gdt-list-collapse-header-text text-center pb-3">
+      <div id="collapse-headline" class="col h4">
         {{ getLinesByType(gdtEntryType).headline }}
       </div>
     </b-row>
-    <b-row class="gdt-list-clooaps-box--all">
-      <div class="col-6 text-right clooaps-col-left">
-        <div id="clooaps-first">{{ getLinesByType(gdtEntryType).first }}</div>
-        <div id="clooaps-second">{{ getLinesByType(gdtEntryType).second }}</div>
+    <b-row class="gdt-list-collapse-box--all">
+      <div class="col-6 text-right collapse-col-left">
+        <div id="collapse-first">{{ getLinesByType(gdtEntryType).first }}</div>
+        <div id="collapse-second">{{ getLinesByType(gdtEntryType).second }}</div>
       </div>
-      <div class="col-6 clooaps-col-right">
-        <div id="clooaps-firstMath">{{ getLinesByType(gdtEntryType).firstMath }}</div>
-        <div id="clooaps-secondMath">
+      <div class="col-6 collapse-col-right">
+        <div id="collapse-firstMath">{{ getLinesByType(gdtEntryType).firstMath }}</div>
+        <div id="collapse-secondMath">
           {{ getLinesByType(gdtEntryType).secondMath }}
         </div>
       </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a69ca515e..bc46aeac8 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -175,7 +175,6 @@
     "no-transactions":"Du hast zur Zeit keine Transaktionen",
     "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "action":"Aktion",
-    "gdt-receive":"GDT erhalten",
     "recruited-member":"Geworbenes Mitglied",
     "contribution":"Beitrag"
   }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a03cc767c..7dcfd5dec 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -175,7 +175,6 @@
     "no-transactions":"You currently have no transactions",
     "publisher":"A member you referred has paid a contribution",
     "action":"Action",
-    "gdt-receive":"GDT receive",
     "recruited-member":"Recruited Member",
     "contribution":"Contribution"
  }