From 07c43b800fae7d769dd5e60e25c73b1a24e0b05b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Feb 2022 20:58:16 +0100
Subject: [PATCH] show decay info for decay from last transaction

---
 frontend/src/components/DecayInformation.vue     | 16 ++++++++--------
 .../Pages/AccountOverview/GddTransactionList.vue | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 28af9b2b4..dd3fc225e 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -4,7 +4,7 @@
       {{ decay ? ' - ' + $n(decay.balance, 'decimal') + ' ' + decayStartBlockTextShort : '' }}
     </span>
 
-    <div v-if="decaytyp === 'new'">
+    <div v-if="decaytyp === 'new' || decaytyp === 'decayLastTransaction'">
       <div class="d-flex" v-if="!decay.decayStartBlock">
         <div style="width: 100%" class="text-center pb-3">
           <b-icon icon="droplet-half" height="12" class="mb-2" />
@@ -12,7 +12,7 @@
         </div>
       </div>
 
-      <b-row>
+      <b-row v-if="decaytyp === 'new' || decaytyp === 'decayLastTransaction'">
         <b-col cols="6" class="text-right">
           <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
         </b-col>
@@ -32,7 +32,7 @@
           </div>
         </b-col>
       </b-row>
-      <b-row>
+      <b-row v-if="decaytyp === 'new' || decaytyp === 'decayLastTransaction'">
         <b-col cols="6" class="text-right">
           <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
         </b-col>
@@ -54,7 +54,7 @@
       </b-row>
 
       <!-- Decay-->
-      <b-row>
+      <b-row v-if="decaytyp === 'new' || decaytyp === 'decayLastTransaction'">
         <b-col cols="6" class="text-right">
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
@@ -63,13 +63,13 @@
         </b-col>
       </b-row>
       <hr class="mt-2 mb-2" />
-      <b-row>
+      <b-row v-if="decaytyp === 'new'">
         <b-col class="text-center pt-3 pb-2">
           <b>{{ $t('decay.calculation_total') }}</b>
         </b-col>
       </b-row>
       <!-- Type-->
-      <b-row>
+      <b-row v-if="decaytyp === 'new'">
         <b-col cols="6" class="text-right">
           <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
           <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
@@ -80,7 +80,7 @@
         </b-col>
       </b-row>
       <!-- Decay-->
-      <b-row>
+      <b-row v-if="decaytyp === 'new'">
         <b-col cols="6" class="text-right">
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
@@ -89,7 +89,7 @@
         </b-col>
       </b-row>
       <!-- Total-->
-      <b-row>
+      <b-row v-if="decaytyp === 'new'">
         <b-col cols="6" class="text-right">
           <div>{{ $t('decay.total') }}</div>
         </b-col>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index ea20539fe..e92dc9636 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -21,6 +21,9 @@
           name,
           memo,
           firstTransaction,
+          decayDuration,
+          decayEnd,
+          decayStart,
         } in transactions"
         :key="transactionId"
         :style="type === 'decay' ? 'background-color:#f1e0ae3d' : ''"
@@ -142,6 +145,19 @@
               >
                 <b>{{ $t('decay.befor_startblock_transaction') }}</b>
               </div>
+              <div v-if="type === 'decay'" class="mt-3 mb-3">
+                <decay-information
+                  decaytyp="decayLastTransaction"
+                  :balance="balance"
+                  :decay="{
+                    balance: balance,
+                    decayStart: parseInt(decayStart),
+                    decayEnd: parseInt(decayEnd),
+                    decayDuration: parseInt(decayDuration),
+                  }"
+                  :type="type"
+                />
+              </div>
             </div>
           </b-collapse>