From 9e3f4af7337d849e35c70bd6d1e6a80b625ee479 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 12 Aug 2021 14:43:52 +0200
Subject: [PATCH] fix review 2 pre release

---
 frontend/src/components/DecayInformation.vue    |  2 +-
 frontend/src/locales/de.json                    |  4 ++--
 frontend/src/locales/en.json                    |  4 ++--
 .../AccountOverview/GdtTransactionList.vue      | 17 ++++++++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 8b076af73..513cb06a4 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <span v-if="decaytyp === 'short'">
-       {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }} 
+      {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
     </span>
 
     <div v-if="decaytyp === 'new'">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 3fd01947a..4ad8d689f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -177,9 +177,9 @@
      "conversion":"Umrechnung",
      "formula":"Berechungsformel",
      "no-transactions":"Du hast zur Zeit keine Transaktionen",
-     "publisher":"Dein geworbenes Mitglied hat gespendet.",
+     "publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt",
      "gdt-receive":"Aktion",
      "your-share":"Geworbenes Mitglied",
-     "donation":"Spende"
+     "contribution":"Beitrag"
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 42949c96a..d4339bcea 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -178,9 +178,9 @@
     "conversion": "Conversion",
     "formula": "Calculation formula",
     "no-transactions":"You currently have no transactions",
-    "publisher":"Your recruited member has donated.",
+    "publisher":"A member you referred has paid a contribution",
     "gdt-receive":"GDT receive",
     "your-share":"Your share",
-    "donation":"Donation"
+    "contribution":"Contribution"
  }
 }
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index c049f7fe7..ac75247dc 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,7 +17,7 @@
           /*amount2,*/
           /*factor2,*/
           gdt,
-        } in this.transactionsGdt"
+        } in transactionsGdt"
         :key="id"
       >
         <div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
@@ -26,7 +26,7 @@
             <b-icon
               :icon="getIcon(gdt_entry_type_id).icon"
               :class="getIcon(gdt_entry_type_id).class"
-            />
+            ></b-icon>
           </div>
 
           <!-- Collaps Button  -->
@@ -63,7 +63,7 @@
           <!-- 1, 2, 3, 5, 6 spenden in euro -->
           <b-row v-else>
             <div class="col-6 text-right">
-              <div>{{ $t('gdt.donation') }}</div>
+              <div>{{ $t('gdt.contribution') }}</div>
               <div>Gutschrift</div>
             </div>
             <div class="col-6">
@@ -118,7 +118,9 @@
               </div>
               <div class="col-6 clooaps-col-right">
                 <div>{{ factor }}</div>
-                <div>{{ amount }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT</div>
+                <div>
+                  {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
+                </div>
               </div>
             </b-row>
             <!-- 4 publisher -->
@@ -131,7 +133,7 @@
             <b-row class="gdt-list-clooaps-box--all" v-else>
               <div class="col-6 text-right clooaps-col-left">{{ $t('gdt.formula') }}:</div>
               <div class="col-6 clooaps-col-right">
-                {{ amount }} GDT * {{ factor }} = {{ $n(gdt, 'decimal') }}
+                {{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
               </div>
             </b-row>
           </div>
@@ -156,9 +158,9 @@ import communityAPI from '../../../apis/communityAPI'
 import PaginationButtons from '../../../components/PaginationButtons'
 
 const iconsByType = {
-  7: { icon: 'gift', classes: 'gradido-global-color-accent' },
-  4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
   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 {
@@ -201,6 +203,7 @@ export default {
     },
     getIcon(givenType) {
       const type = iconsByType[givenType]
+
       if (type)
         return {
           icon: type.icon,