From 69c35131c5ac277622991e1d0f133b5325cf4320 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 23 Aug 2021 10:27:12 +0200
Subject: [PATCH 1/2] decay with the value 0 is no longer displayed

---
 .../AccountOverview/GddTransactionList.vue     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index fff400646..08018266b 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -8,8 +8,12 @@
       >
         <div class="list-group-item gdd-transaction-list-item" v-b-toggle="'a' + date + ''">
           <!-- Collaps Button  -->
-          <div v-if="type != 'decay'" class="text-right" style="width: 95%; position: absolute">
-            <b-button class="btn-sm">
+          <div
+            v-if="type != 'decay' && decay"
+            class="text-right"
+            style="width: 95%; position: absolute"
+          >
+            <b-button v-if="decay.balance > 0" class="btn-sm">
               <b>i</b>
             </b-button>
           </div>
@@ -49,7 +53,7 @@
               </b-row>
 
               <!-- Decay -->
-              <b-row v-if="decay">
+              <b-row v-if="decay && decay.balance > 0">
                 <div class="col-5 text-right">
                   <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-1" />
                 </div>
@@ -57,6 +61,14 @@
                   <decay-information v-if="decay" decaytyp="short" :decay="decay" />
                 </div>
               </b-row>
+              <b-row v-if="decay && decay.decayStartBlock">
+                <div class="col-5 text-right">
+                  <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-1" />
+                </div>
+                <div class="col-7 gdd-transaction-list-item-decay">
+                  <b>{{ $t('decay.Starting_block_decay') }}</b>
+                </div>
+              </b-row>
             </div>
           </b-row>
 

From db0ddb7d850b041715d25463fe5204787cf0ae8d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 24 Aug 2021 12:18:49 +0200
Subject: [PATCH 2/2] if decay is zero then this is displayed in writing
 otherwise the amount of decay is displayed

---
 frontend/src/components/DecayInformation.vue               | 7 ++++++-
 frontend/src/locales/de.json                               | 3 ++-
 frontend/src/locales/en.json                               | 3 ++-
 .../src/views/Pages/AccountOverview/GddTransactionList.vue | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 743881ca5..24acbd47e 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,7 +1,12 @@
 <template>
   <div>
     <span v-if="decaytyp === 'short'">
-      {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
+      <div v-if="decay.balance > 0">
+        {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
+      </div>
+      <div v-else>
+        {{ $t('decay.noDecay') }}
+      </div>
     </span>
 
     <div v-if="decaytyp === 'new'">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d157b96cd..5db4bc337 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -38,7 +38,8 @@
     "sent":"Gesendet",
     "created":"Geschöpft",
     "fromCommunity":"Aus der Gemeinschaft",
-    "toCommunity":"An die Gemeinschaft"
+    "toCommunity":"An die Gemeinschaft",
+    "noDecay": "Keine Vergänglichkeit"
   }, 
   "form": {
     "cancel": "Abbrechen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a9efa0639..323f96b4d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -38,7 +38,8 @@
     "sent":"Sent",
     "created":"Created",
     "fromCommunity":"From the community",
-    "toCommunity":"To the community"
+    "toCommunity":"To the community",
+    "noDecay": "No Decay"
   },
   "form": {
     "cancel":"Cancel",
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 08018266b..77aa78879 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -13,7 +13,7 @@
             class="text-right"
             style="width: 95%; position: absolute"
           >
-            <b-button v-if="decay.balance > 0" class="btn-sm">
+            <b-button class="btn-sm">
               <b>i</b>
             </b-button>
           </div>
@@ -53,7 +53,7 @@
               </b-row>
 
               <!-- Decay -->
-              <b-row v-if="decay && decay.balance > 0">
+              <b-row v-if="decay && !decay.decayStartBlock">
                 <div class="col-5 text-right">
                   <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-1" />
                 </div>