From 691a8c4dadd50a7d58b8ea138a5612e640e12abc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Sep 2021 08:55:45 +0200
Subject: [PATCH] Decay better explained in transactional info

---
 frontend/src/components/DecayInformation.vue | 36 +++++++++++---------
 frontend/src/locales/de.json                 |  1 +
 frontend/src/locales/en.json                 |  1 +
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index c827b26ee..c9ffa9115 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -20,10 +20,10 @@
           </div>
 
           <div class="d-flex">
-            <div style="width: 40%" class="text-right pr-3 mr-2">
+            <div style="width: 47%" class="text-right pr-3 mr-2">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
             </div>
-            <div style="width: 60%">
+            <div style="width: 53%">
               <div v-if="decay.decayStartBlock > 0">
                 <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
                 <div>
@@ -32,7 +32,7 @@
                 </div>
               </div>
               <div>
-                <span v-if="!decay.decayStart">
+                <span v-if="decay.decayStart">
                   {{ $d($moment.unix(decay.decayStart), 'long') }}
                   {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
                 </span>
@@ -41,10 +41,10 @@
           </div>
 
           <div class="d-flex">
-            <div style="width: 40%" class="text-right pr-3 mr-2">
+            <div style="width: 47%" class="text-right pr-3 mr-2">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
             </div>
-            <div style="width: 60%">
+            <div style="width: 53%">
               <div v-if="decay.decayStartBlock > 0">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
                 <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
@@ -64,29 +64,31 @@
           </div>
           <div v-if="decay.balance > 0">
             <div class="d-flex">
-              <div style="width: 40%" class="text-right pr-3 mr-2">
-                <div v-if="type === 'send'">{{ $t('form.amount') }}</div>
-                <div v-if="type === 'receive'">{{ $t('form.amount') }}</div>
+              <div style="width: 47%" class="text-right pr-3 mr-2">
+                <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
+                <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
               </div>
-              <div style="width: 60%">
-                <div>{{ balance }}</div>
+              <div style="width: 53%">
+                <div v-if="type === 'send'">- {{ balance }}</div>
+                <div v-if="type === 'receive'">+ {{ balance }}</div>
               </div>
             </div>
             <div class="d-flex">
-              <div style="width: 40%" class="text-right pr-3 mr-2">
+              <div style="width: 47%" class="text-right pr-3 mr-2">
                 <div>{{ $t('decay.decay') }}</div>
               </div>
-              <div style="width: 60%">
-                <div>{{ decay.balance }}</div>
+              <div style="width: 53%">
+                <div>- {{ decay.balance }}</div>
               </div>
             </div>
+            <hr class="mt-2 mb-2" />
             <div class="d-flex">
-              <div style="width: 40%" class="text-right pr-3 mr-2">
+              <div style="width: 47%" class="text-right pr-3 mr-2">
                 <div>{{ $t('decay.total') }}</div>
               </div>
-              <div style="width: 60%">
+              <div style="width: 53%">
                 <div v-if="type === 'send'">
-                  <b>{{ parseInt(balance) + decay.balance }}</b>
+                  <b>- {{ parseInt(balance) + decay.balance }}</b>
                 </div>
                 <div v-if="type === 'receive'">
                   <b>{{ parseInt(balance) - decay.balance }}</b>
@@ -103,7 +105,7 @@
 export default {
   name: 'DecayInformation',
   props: {
-    balance: { type: String, default: '' },
+    balance: { type: Number },
     type: { type: String, default: '' },
     decay: {
       balance: '',
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 851f2a376..237eaff8f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,6 +31,7 @@
     "since_introduction": "seit Einführung der Vergänglichkeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "toCommunity": "An die Gemeinschaft",
+    "total":"Gesamt",
     "year": "Jahre"
   },
   "error": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4edf8e72d..882bca8c8 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,6 +31,7 @@
     "since_introduction": "Since the introduction of Decay",
     "Starting_block_decay": "Starting Block Decay",
     "toCommunity": "To the community",
+    "total":"Total",
     "year": "Years"
   },
   "error": {