From 151acea10853518ee53ca5c969e2c6f26ddf010f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 12 Aug 2021 11:38:57 +0200
Subject: [PATCH] gdt transaction header change

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

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index ef0108d83..413e8f885 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -19,7 +19,7 @@
               <div v-if="!decay.decay_start_block">{{ $t('decay.last_transaction') }}</div>
             </div>
             <div style="width: 60%">
-              <div v-if="decay.decay_start_block > 0">
+              <div v-if="decay.decay_start_block">
                 <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
                 <div>
                   {{ $t('decay.decay_introduced') }} :
@@ -35,12 +35,12 @@
             </div>
           </div>
 
-          <div class="d-flex" v-if="!decay.decay_start_block">
+          <div class="d-flex">
             <div style="width: 40%" class="text-right pr-3 mr-2">
-              {{ $t('decay.past_time') }}
+              <div v-if="!decay.decay_start_block">{{ $t('decay.past_time') }}</div>
             </div>
             <div style="width: 60%">
-              <div>{{ $t('decay.since_introduction') }}</div>
+              <div v-if="decay.decay_start_block">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
                 <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
                 <span v-if="duration.months > 0">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e497f86f3..d301792a9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -178,8 +178,8 @@
      "formula":"Berechungsformel",
      "no-transactions":"Du hast zur Zeit keine Transaktionen",
      "publisher":"Dein geworbenes Mitglied hat gespendet.",
-     "gdt-receive":"GDT erhalten",
-     "your-share":"Dein Anteil",
+     "gdt-receive":"Aktion",
+     "your-share":"Geworbenes Mitglied",
      "donation":"Spende"
   }
 }
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index a0efb39f9..d70807d10 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -34,42 +34,40 @@
           <b-row v-if="gdt_entry_type_id === 7">
             <div class="col-6 text-right">
               <div>{{ $t('gdt.gdt-receive') }}</div>
-              <div>{{ $n(gdt, 'decimal') }}</div>
+              <div>Gutschrift</div>
             </div>
             <div class="col-6">
-              <div>---</div>
-              <div>GDT</div>
+              <div>{{ comment }}</div>
+              <div>{{ $n(gdt, 'decimal') }} GDT</div>
             </div>
           </b-row>
           <!--4 publisher -->
           <b-row v-else-if="gdt_entry_type_id === 4">
             <div class="col-6 text-right">
               <div>{{ $t('gdt.your-share') }}</div>
-              <div>{{ $n(amount, 'decimal') }}</div>
+              <div>Gutschrift</div>
             </div>
             <div class="col-6">
               <div>5%</div>
-              <div>GDT</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.donation') }}</div>
-              <div>{{ $n(amount, 'decimal') }}</div>
-              <div>{{ $n(gdt, 'decimal') }}</div>
+              <div>Gutschrift</div>
             </div>
             <div class="col-6">
-              <div>---</div>
-              <div>EURO</div>
-              <div>GDT</div>
+              <div>{{ $n(amount, 'decimal') }} €</div>
+              <div>{{ $n(gdt, 'decimal') }} GDT</div>
             </div>
           </b-row>
 
           <!-- Betrag ENDE-->
 
           <!-- Nachricht-->
-          <b-row v-if="comment">
+          <b-row v-if="comment && gdt_entry_type_id !== 7">
             <div class="col-6 text-right">
               {{ $t('form.memo') }}
             </div>