diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 24acbd47e..1fb0df3a4 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -19,11 +19,11 @@
-
-
+
+
{{ $t('decay.past_time') }}
-
-
+
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }},
@@ -60,7 +60,59 @@
{{ duration.seconds }} {{ $t('decay.seconds') }}
-
+
+
+
+
+
+
+
+ {{ $t('decay.decay') }}
+
+
+ - {{ decay.balance }}
+
+
+
+
+
+ {{ $t('decay.calculation_total') }}
+
+
+
+
+
+ {{ $t('decay.sent') }}
+ {{ $t('decay.received') }}
+
+
+ - {{ balance }}
+ + {{ balance }}
+
+
+
+
+
+ {{ $t('decay.decay') }}
+
+
+ - {{ decay.balance }}
+
+
+
+
+
+ {{ $t('decay.total') }}
+
+
+
+ - {{ parseInt(balance) + decay.balance }}
+
+
+ {{ parseInt(balance) - decay.balance }}
+
+
+
@@ -71,6 +123,8 @@
export default {
name: 'DecayInformation',
props: {
+ balance: { type: Number },
+ type: { type: String, default: '' },
decay: {
balance: '',
decayDuration: '',
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8999922cf..2842a6a39 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -12,6 +12,7 @@
},
"decay": {
"calculation_decay": "Berechnung der Vergänglichkeit",
+ "calculation_total": "Berechnung der Gesamtsumme",
"created": "Geschöpft",
"days": "Tage",
"decay": "Vergänglichkeit",
@@ -31,6 +32,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 7a06beeb4..90faa6b33 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -12,6 +12,7 @@
},
"decay": {
"calculation_decay": "Calculation of Decay",
+ "calculation_total": "Calculation of the grand total",
"created": "Created",
"days": "Days",
"decay": "Decay",
@@ -31,6 +32,7 @@
"since_introduction": "Since the introduction of Decay",
"Starting_block_decay": "Starting Block Decay",
"toCommunity": "To the community",
+ "total": "Total",
"year": "Years"
},
"error": {
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 206b12a76..bdf4199f3 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -76,7 +76,13 @@
-
+