From 09de5294435b183fb51111fcb1f8f7f0f986520e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 04:21:47 +0100
Subject: [PATCH 01/12] feat: Use Vue Filter for Amounts

---
 .../components/DecayInformations/DecayInformation-Short.vue | 2 +-
 .../src/components/Transactions/TransactionCreation.vue     | 2 +-
 frontend/src/components/Transactions/TransactionDecay.vue   | 3 +--
 frontend/src/components/Transactions/TransactionReceive.vue | 2 +-
 frontend/src/components/Transactions/TransactionSend.vue    | 3 +--
 frontend/src/filters/amount.js                              | 6 ++++++
 frontend/src/main.js                                        | 2 ++
 7 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/filters/amount.js

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 8dba700d5..990ded29b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span>− {{ decay ? $n(Number(decay.decay) * -1, 'decimal') : '' }}</span>
+    <span v-if="decay.decay">{{ decay.decay | amount}}</span>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 69d1b8b13..7c31d6d0c 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -25,7 +25,7 @@
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index ab5a0f561..d45681ed8 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(Number(amount) * -1, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 43159a059..3ba1f6a31 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -28,7 +28,7 @@
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index baaa346c5..438b8b08c 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(Number(amount) * -1, 'decimal') }}
+                    {{ amount | amount }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
new file mode 100644
index 000000000..b8f9a79a0
--- /dev/null
+++ b/frontend/src/filters/amount.js
@@ -0,0 +1,6 @@
+import i18n from '@/i18n.js'
+
+export const amount = (value) => {
+  if (!value) return ''
+  return i18n.n(value.toString(), 'decimal').replace('-', '− ')
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index bcf80fbef..78f4098e4 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,6 +4,7 @@ import App from './App.vue'
 import i18n from './i18n.js'
 import { loadAllRules } from './validation-rules'
 import { toasters } from './mixins/toaster'
+import { amount } from './filters/amount'
 
 import 'regenerator-runtime'
 
@@ -20,6 +21,7 @@ Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 
 Vue.mixin(toasters)
+Vue.filter('amount', amount)
 
 loadAllRules(i18n)
 

From aa8432384ed3e7cc06fc238d348eee48bb497350 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 04:37:34 +0100
Subject: [PATCH 02/12] hack the i18n for tests

---
 .../DecayInformations/DecayInformation-Short.vue         | 2 +-
 frontend/src/filters/amount.js                           | 9 +++++++--
 frontend/src/main.js                                     | 5 +++--
 .../Pages/AccountOverview/GddTransactionList.spec.js     | 2 +-
 frontend/test/testSetup.js                               | 7 ++++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 990ded29b..3bed4b9cc 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span v-if="decay.decay">{{ decay.decay | amount}}</span>
+    <span v-if="decay.decay">{{ decay.decay | amount }}</span>
   </div>
 </template>
 <script>
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index b8f9a79a0..9a056b2ee 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -1,6 +1,11 @@
-import i18n from '@/i18n.js'
+let i18n
 
-export const amount = (value) => {
+export const loadFilters = (_i18n) => {
+  i18n = _i18n
+  return { amount }
+}
+
+const amount = (value) => {
   if (!value) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 78f4098e4..85f5cc5ca 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,7 +4,7 @@ import App from './App.vue'
 import i18n from './i18n.js'
 import { loadAllRules } from './validation-rules'
 import { toasters } from './mixins/toaster'
-import { amount } from './filters/amount'
+import { loadFilters } from './filters/amount'
 
 import 'regenerator-runtime'
 
@@ -21,7 +21,8 @@ Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 
 Vue.mixin(toasters)
-Vue.filter('amount', amount)
+const filters = loadFilters(i18n)
+Vue.filter('amount', filters.amount)
 
 loadAllRules(i18n)
 
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index b68d59958..31215e343 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -270,7 +270,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '− 0.20383140554826432',
+            '− 0.2038314055482643084',
           )
         })
       })
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 2e26db998..cec950813 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -17,7 +17,9 @@ import { focus } from 'vue-focus'
 
 import { loadAllRules } from '../src/validation-rules'
 
-import { toasters } from '../src/mixins/toaster'
+import { loadFilters } from '@/filters/amount'
+
+import { toasters } from '@/mixins/toaster'
 export const toastErrorSpy = jest.spyOn(toasters.methods, 'toastError')
 export const toastSuccessSpy = jest.spyOn(toasters.methods, 'toastSuccess')
 
@@ -53,6 +55,9 @@ global.localVue.directive('focus', focus)
 
 global.localVue.mixin(toasters)
 
+const filters = loadFilters(i18nMock)
+global.localVue.filter('amount', filters.amount)
+
 // Filter the warnings for portal vue
 // https://github.com/BeniRupp/bug_portal-vue-target-already-exists
 const consoleWarn = global.console.warn

From f58d1a843ba6375b3dbb56846ebdec6feafdd5c4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 05:15:58 +0100
Subject: [PATCH 03/12] GDD filter

---
 .../DecayInformation-Decay.vue                  |  6 +++---
 .../DecayInformation-DecayStartblock.vue        | 17 ++++-------------
 .../DecayInformations/DecayInformation-Long.vue | 17 ++++-------------
 .../Transactions/TransactionCreation.spec.js    |  1 -
 .../Transactions/TransactionCreation.vue        |  3 +--
 .../Transactions/TransactionDecay.spec.js       |  1 -
 .../Transactions/TransactionReceive.spec.js     |  1 -
 .../Transactions/TransactionReceive.vue         |  3 +--
 .../Transactions/TransactionSend.spec.js        |  1 -
 .../components/Transactions/TransactionSend.vue |  4 ++--
 frontend/src/filters/amount.js                  |  9 ++++++++-
 frontend/src/main.js                            |  1 +
 frontend/test/testSetup.js                      |  1 +
 13 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 0dc00a79a..80d45e242 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -13,9 +13,9 @@
       </b-col>
       <b-col cols="6">
         <div>
-          {{ $n(Number(balance) - Number(decay.decay), 'decimal') }}
-          GDD − {{ $n(Number(decay.decay) * -1, 'decimal') }} GDD =
-          <b>{{ $n(Number(balance), 'decimal') }} GDD</b>
+          {{ (Number(balance) - Number(decay.decay)) | GDD }}
+          {{ decay.decay | GDD }} =
+          <b>{{ balance | GDD }}</b>
         </div>
       </b-col>
     </b-row>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 678fc9f09..cf95cff1b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -21,7 +21,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
@@ -37,8 +37,7 @@
         <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">− {{ $n(amount * -1, 'decimal') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $n(amount, 'decimal') }}</div>
+        <div>{{ amount | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Decay-->
@@ -47,7 +46,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Total-->
@@ -56,15 +55,7 @@
         <div>{{ $t('decay.total') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">
-          <b>− {{ $n((Number(amount) + Number(decay.decay)) * -1, 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'RECEIVE'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'CREATION'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
+        <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index ac53b77b7..7fdf65f04 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -42,7 +42,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
@@ -58,8 +58,7 @@
         <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">− {{ $n(amount * -1, 'decimal') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $n(amount, 'decimal') }}</div>
+        <div>{{ amount | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Decay-->
@@ -68,7 +67,7 @@
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
       <b-col cols="6">
-        <div>− {{ $n(decay.decay * -1, 'decimal') }}</div>
+        <div>{{ decay.decay | GDD }}</div>
       </b-col>
     </b-row>
     <!-- Total-->
@@ -77,15 +76,7 @@
         <div>{{ $t('decay.total') }}</div>
       </b-col>
       <b-col cols="6">
-        <div v-if="typeId === 'SEND'">
-          <b>− {{ $n((Number(amount) + Number(decay.decay)) * -1, 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'RECEIVE'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
-        <div v-if="typeId === 'CREATION'">
-          <b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
-        </div>
+        <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/components/Transactions/TransactionCreation.spec.js b/frontend/src/components/Transactions/TransactionCreation.spec.js
index 62de8a9a2..e1ea9e0b0 100644
--- a/frontend/src/components/Transactions/TransactionCreation.spec.js
+++ b/frontend/src/components/Transactions/TransactionCreation.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 7c31d6d0c..e1e875f0a 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -23,9 +23,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionDecay.spec.js b/frontend/src/components/Transactions/TransactionDecay.spec.js
index 7b4b658a4..232e7f85a 100644
--- a/frontend/src/components/Transactions/TransactionDecay.spec.js
+++ b/frontend/src/components/Transactions/TransactionDecay.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionReceive.spec.js b/frontend/src/components/Transactions/TransactionReceive.spec.js
index 6643553f8..f5b27cf47 100644
--- a/frontend/src/components/Transactions/TransactionReceive.spec.js
+++ b/frontend/src/components/Transactions/TransactionReceive.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 3ba1f6a31..d12883adc 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -26,9 +26,8 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator">+</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionSend.spec.js b/frontend/src/components/Transactions/TransactionSend.spec.js
index 40c93437c..632c0857a 100644
--- a/frontend/src/components/Transactions/TransactionSend.spec.js
+++ b/frontend/src/components/Transactions/TransactionSend.spec.js
@@ -7,7 +7,6 @@ const mocks = {
   $i18n: {
     locale: 'en',
   },
-  $n: jest.fn((n) => n),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
 }
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 438b8b08c..88028d1f4 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -24,7 +24,7 @@
               <b-col cols="5">
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>
@@ -78,7 +78,7 @@
       <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-before-startblock v-if="decay.start === null" />
         <decay-information-decay-startblock
-          v-else-if="true"
+          v-else-if="isStartBlock"
           :amount="amount"
           :decay="decay"
           :typeId="typeId"
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 9a056b2ee..328aebbb2 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -2,10 +2,17 @@ let i18n
 
 export const loadFilters = (_i18n) => {
   i18n = _i18n
-  return { amount }
+  return { amount, GDD }
 }
 
 const amount = (value) => {
   if (!value) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
+
+const GDD = (value) => {
+  if (!value) return ''
+  value = amount(value)
+  if (!value.match(/^− /)) value = '+ ' + value
+  return value + ' GDD'
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 85f5cc5ca..585b603cb 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -23,6 +23,7 @@ Vue.config.productionTip = false
 Vue.mixin(toasters)
 const filters = loadFilters(i18n)
 Vue.filter('amount', filters.amount)
+Vue.filter('GDD', filters.GDD)
 
 loadAllRules(i18n)
 
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index cec950813..0ceb5affd 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -57,6 +57,7 @@ global.localVue.mixin(toasters)
 
 const filters = loadFilters(i18nMock)
 global.localVue.filter('amount', filters.amount)
+global.localVue.filter('GDD', filters.GDD)
 
 // Filter the warnings for portal vue
 // https://github.com/BeniRupp/bug_portal-vue-target-already-exists

From 0538b78cd1c3ea8a7d41721af6174d6d2ffdc4e8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:21:36 +0100
Subject: [PATCH 04/12] fix bugs in Transacrion Components, fix tests for GDD
 transaction list, use filter in menu and status

---
 frontend/src/components/Menu/Navbar.spec.js   |  1 -
 frontend/src/components/Menu/Navbar.vue       |  2 +-
 frontend/src/components/Status.vue            |  2 +-
 .../Transactions/TransactionCreation.vue      |  2 +-
 frontend/src/filters/amount.js                |  3 +-
 .../GddTransactionList.spec.js                | 42 ++++++++-----------
 6 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 21b0e97df..49765e0b3 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -21,7 +21,6 @@ const mocks = {
       isAdmin: true,
     },
   },
-  $n: jest.fn((n) => n),
 }
 
 describe('Navbar', () => {
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 72d193e4c..63a131d9d 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -10,7 +10,7 @@
       </div>
 
       <b-navbar-nav class="ml-auto" is-nav>
-        <b-nav-item>{{ pending ? '—' : $n(balance, 'decimal') }} GDD</b-nav-item>
+        <b-nav-item>{{ pending ? '—' : balance | amount }} GDD</b-nav-item>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
           <small>
             {{ $store.state.firstName }} {{ $store.state.lastName }},
diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 92d00452d..3aec54c67 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
+      {{ pending || balance === null ? '—' : balance | amount }} {{ statusText }}
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index e1e875f0a..70cbc53cd 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -30,7 +30,7 @@
               </b-col>
               <b-col cols="7">
                 <div class="gdd-transaction-list-item-name">
-                  {{ $t('decay.decay_since_last_transaction') }}
+                  {{ linkedUser.firstName + ' ' + linkedUser.lastName }}
                 </div>
               </b-col>
             </b-row>
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 328aebbb2..84d9388d3 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -6,12 +6,11 @@ export const loadFilters = (_i18n) => {
 }
 
 const amount = (value) => {
-  if (!value) return ''
+  if (!value && value !== 0) return ''
   return i18n.n(value.toString(), 'decimal').replace('-', '− ')
 }
 
 const GDD = (value) => {
-  if (!value) return ''
   value = amount(value)
   if (!value.match(/^− /)) value = '+ ' + value
   return value + ' GDD'
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index 31215e343..01566ef13 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -88,6 +88,7 @@ describe('GddTransactionList', () => {
 
     describe('with transactions', () => {
       beforeEach(async () => {
+        const decayStartBlock = new Date(2001, 8, 9)
         await wrapper.setProps({
           transactions: [
             {
@@ -103,9 +104,7 @@ describe('GddTransactionList', () => {
                 start: '2022-02-28T13:55:47.000Z',
                 end: '2022-03-03T08:54:54.020Z',
                 duration: 241147.02,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 9,
@@ -117,16 +116,13 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
-                __typename: 'User',
               },
               decay: {
                 decay: '-0.2038314055482643084',
                 start: '2022-02-25T07:29:26.000Z',
                 end: '2022-02-28T13:55:47.000Z',
                 duration: 282381,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 8,
@@ -138,16 +134,13 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Gradido',
                 lastName: 'Akademie',
-                __typename: 'User',
               },
               decay: {
                 decay: '-0.03517768386652623868',
                 start: '2022-02-23T10:55:30.000Z',
                 end: '2022-02-25T07:29:26.000Z',
                 duration: 160436,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
             {
               id: 6,
@@ -159,24 +152,22 @@ describe('GddTransactionList', () => {
               linkedUser: {
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
-                __typename: 'User',
               },
               decay: {
                 decay: '0',
                 start: null,
                 end: null,
                 duration: null,
-                __typename: 'Decay',
               },
-              __typename: 'Transaction',
             },
           ],
           count: 12,
+          decayStartBlock,
         })
       })
 
       it('renders 4 transactions', () => {
-        expect(wrapper.findAll('div.list-group-item')).toHaveLength(3)
+        expect(wrapper.findAll('div.list-group-item')).toHaveLength(4)
       })
 
       describe('decay transactions', () => {
@@ -238,11 +229,12 @@ describe('GddTransactionList', () => {
           expect(transaction.findAll('svg').at(1).classes()).toContain('text-danger')
         })
 
-        // it('has a minus operator', () => {
-        //   expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-        //     '-',
-        //   )
-        // })
+        // operators are renderd by GDD filter
+        it.skip('has a minus operator', () => {
+          expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
+            '-',
+          )
+        })
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
@@ -293,7 +285,7 @@ describe('GddTransactionList', () => {
 
         it('has a bi-gift icon', () => {
           expect(transaction.findAll('svg').at(1).classes()).toEqual([
-            'bi-arrow-right-circle',
+            'bi-gift',
             'gradido-global-color-accent',
             'm-mb-1',
             'font2em',
@@ -308,7 +300,8 @@ describe('GddTransactionList', () => {
           )
         })
 
-        it('has a plus operator', () => {
+        // operators are renderd by GDD filter
+        it.skip('has a plus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
             '+',
           )
@@ -316,19 +309,19 @@ describe('GddTransactionList', () => {
 
         it('shows the amount of transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
-            '10',
+            '1000',
           )
         })
 
         it('shows the name of the receiver', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
-            'Bibi Bloxberg',
+            'Gradido Akademie',
           )
         })
 
         it('shows the date of the transaction', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
-            'Wed Feb 23 2022 10:55:30 GMT+0000 (Coordinated Universal Time)',
+            'Fri Feb 25 2022 07:29:26 GMT+0000 (Coordinated Universal Time)',
           )
         })
       })
@@ -336,7 +329,7 @@ describe('GddTransactionList', () => {
       describe('receive transactions', () => {
         let transaction
         beforeEach(() => {
-          transaction = wrapper.findAll('div.list-group-item').at(2)
+          transaction = wrapper.findAll('div.list-group-item').at(3)
         })
 
         it('has a bi-caret-down-square icon', () => {
@@ -363,7 +356,8 @@ describe('GddTransactionList', () => {
           ])
         })
 
-        it('has a plus operator', () => {
+        // operators are renderd by GDD filter
+        it.skip('has a plus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
             '+',
           )

From 53338ee22386d4ccf61351932e5a460d5d76bfe5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:26:23 +0100
Subject: [PATCH 05/12] do not use amount filter in status component

---
 frontend/src/components/Status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 3aec54c67..92d00452d 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? '—' : balance | amount }} {{ statusText }}
+      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
     </div>
   </div>
 </template>

From 938b811d8a25dad39d6e8be1f51062ff45028b85 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:36:15 +0100
Subject: [PATCH 06/12] render decay with GDD

---
 frontend/src/components/Transactions/TransactionDecay.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index d45681ed8..101382c7c 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -24,7 +24,7 @@
               <b-col cols="5">
                 <div class="text-right">
                   <span class="gdd-transaction-list-item-amount">
-                    {{ amount | amount }}
+                    {{ amount | GDD }}
                   </span>
                 </div>
               </b-col>

From acba22040c2f81d7a3b11cf00a3b5462e0ddba3b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:51:56 +0100
Subject: [PATCH 07/12] add tests for amount filters

---
 frontend/src/filters/amount.js      |  1 +
 frontend/src/filters/amount.test.js | 35 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 frontend/src/filters/amount.test.js

diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 84d9388d3..ded1cceb7 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -12,6 +12,7 @@ const amount = (value) => {
 
 const GDD = (value) => {
   value = amount(value)
+  if (value === '') return ''
   if (!value.match(/^− /)) value = '+ ' + value
   return value + ' GDD'
 }
diff --git a/frontend/src/filters/amount.test.js b/frontend/src/filters/amount.test.js
new file mode 100644
index 000000000..65b507985
--- /dev/null
+++ b/frontend/src/filters/amount.test.js
@@ -0,0 +1,35 @@
+import { loadFilters } from './amount'
+
+const i18nMock = {
+  n: jest.fn((n) => n),
+}
+
+const { amount, GDD } = loadFilters(i18nMock)
+
+describe('amount', () => {
+  it('returns empty string when called with null', () => {
+    expect(amount(null)).toBe('')
+  })
+
+  it('returns 0 when called with 0', () => {
+    expect(amount(0)).toBe('0')
+  })
+
+  it('returns a leading proper minus sign when called with negative value', () => {
+    expect(amount(-1)).toBe('− 1')
+  })
+})
+
+describe('GDD', () => {
+  it('returns empty string when called with null', () => {
+    expect(GDD(null)).toBe('')
+  })
+
+  it('returns "+ 0 GDD" when called with 0', () => {
+    expect(GDD(0)).toBe('+ 0 GDD')
+  })
+
+  it('returns a leading proper minus sign when called with negative value', () => {
+    expect(GDD(-1)).toBe('− 1 GDD')
+  })
+})

From b2d731a641bf772f75b04c8fccbb69b76f6f5f86 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 06:53:36 +0100
Subject: [PATCH 08/12] block for tests

---
 frontend/src/filters/amount.test.js | 46 +++++++++++++++--------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/frontend/src/filters/amount.test.js b/frontend/src/filters/amount.test.js
index 65b507985..7a30059d0 100644
--- a/frontend/src/filters/amount.test.js
+++ b/frontend/src/filters/amount.test.js
@@ -6,30 +6,32 @@ const i18nMock = {
 
 const { amount, GDD } = loadFilters(i18nMock)
 
-describe('amount', () => {
-  it('returns empty string when called with null', () => {
-    expect(amount(null)).toBe('')
+describe('amount filters', () => {
+  describe('amount', () => {
+    it('returns empty string when called with null', () => {
+      expect(amount(null)).toBe('')
+    })
+
+    it('returns 0 when called with 0', () => {
+      expect(amount(0)).toBe('0')
+    })
+
+    it('returns a leading proper minus sign when called with negative value', () => {
+      expect(amount(-1)).toBe('− 1')
+    })
   })
 
-  it('returns 0 when called with 0', () => {
-    expect(amount(0)).toBe('0')
-  })
+  describe('GDD', () => {
+    it('returns empty string when called with null', () => {
+      expect(GDD(null)).toBe('')
+    })
 
-  it('returns a leading proper minus sign when called with negative value', () => {
-    expect(amount(-1)).toBe('− 1')
-  })
-})
-
-describe('GDD', () => {
-  it('returns empty string when called with null', () => {
-    expect(GDD(null)).toBe('')
-  })
-
-  it('returns "+ 0 GDD" when called with 0', () => {
-    expect(GDD(0)).toBe('+ 0 GDD')
-  })
-
-  it('returns a leading proper minus sign when called with negative value', () => {
-    expect(GDD(-1)).toBe('− 1 GDD')
+    it('returns "+ 0 GDD" when called with 0', () => {
+      expect(GDD(0)).toBe('+ 0 GDD')
+    })
+
+    it('returns a leading proper minus sign when called with negative value', () => {
+      expect(GDD(-1)).toBe('− 1 GDD')
+    })
   })
 })

From 2d2369ccaf0bd126e95ea9ca17c61648e170bdef Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:02:58 +0100
Subject: [PATCH 09/12] map transaction typeId to locales

---
 .../DecayInformations/DecayInformation-DecayStartblock.vue   | 5 +----
 .../components/DecayInformations/DecayInformation-Long.vue   | 5 +----
 frontend/src/locales/de.json                                 | 4 ++--
 frontend/src/locales/en.json                                 | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index cf95cff1b..9bde154ae 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -32,10 +32,7 @@
     </b-row>
     <!-- Type-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div v-if="typeId === 'SEND'">{{ $t('decay.sent') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
       <b-col cols="6">
         <div>{{ amount | GDD }}</div>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 7fdf65f04..34f579614 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -53,10 +53,7 @@
     </b-row>
     <!-- Type-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div v-if="typeId === 'SEND'">{{ $t('decay.sent') }}</div>
-        <div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
       <b-col cols="6">
         <div>{{ amount | GDD }}</div>
       </b-col>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 748bffe25..fb3b82c89 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -37,9 +37,9 @@
     "months": "Monate",
     "noDecay": "Keine Vergänglichkeit",
     "past_time": "Vergangene Zeit",
-    "received": "Empfangen",
+    "receive": "Empfangen",
     "seconds": "Sekunden",
-    "sent": "Gesendet",
+    "send": "Gesendet",
     "since_introduction": "seit Einführung der Vergänglichkeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "toCommunity": "An die Gemeinschaft",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 557c0a42c..aec28a51d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -37,9 +37,9 @@
     "months": "Months",
     "noDecay": "No Decay",
     "past_time": "Time passed",
-    "received": "Received",
+    "receive": "Received",
     "seconds": "Seconds",
-    "sent": "Sent",
+    "send": "Sent",
     "since_introduction": "Since the introduction of Decay",
     "Starting_block_decay": "Starting Block Decay",
     "toCommunity": "To the community",

From 1c03aa00dac6b71a6a94ddc1e0a98df087e00ad7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:27:07 +0100
Subject: [PATCH 10/12] refactor display of time passed for decay

---
 .../DecayInformation-Long.vue                 | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 34f579614..fad50ddab 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -25,14 +25,7 @@
         <div>{{ $t('decay.past_time') }}</div>
       </b-col>
       <b-col cols="6">
-        <span v-if="duration">
-          <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
-          <span v-if="duration.months > 0">{{ duration.months }} {{ $t('decay.months') }},</span>
-          <span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
-          <span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
-          <span v-if="duration.minutes > 0">{{ duration.minutes }} {{ $t('decay.minutes') }},</span>
-          <span v-if="duration.seconds > 0">{{ duration.seconds }} {{ $t('decay.seconds') }}</span>
-        </span>
+        <span v-if="duration">{{ durationText }}</span>
       </b-col>
     </b-row>
 
@@ -92,6 +85,17 @@ export default {
     duration() {
       return this.$moment.duration(new Date(this.decay.end) - new Date(this.decay.start))._data
     },
+    durationText() {
+      const order = ['years', 'months', 'days', 'hours', 'minutes', 'seconds']
+      const result = []
+      order.forEach((timeSpan) => {
+        if (this.duration[timeSpan] > 0) {
+          const locale = this.$t(`decay.${timeSpan}`)
+          result.push(`${this.duration[timeSpan]} ${locale}`)
+        }
+      })
+      return result.join(', ')
+    },
   },
 }
 </script>

From 2e75ceb73e4ce580b7c96ed4a8a24442065c3f12 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:35:34 +0100
Subject: [PATCH 11/12] remove unnecesesary divs

---
 .../DecayInformation-DecayStartblock.vue         | 16 ++++------------
 .../DecayInformations/DecayInformation-Long.vue  | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 9bde154ae..6f7e3f466 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -33,24 +33,16 @@
     <!-- Type-->
     <b-row>
       <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
-      <b-col cols="6">
-        <div>{{ amount | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ amount | GDD }}</b-col>
     </b-row>
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <!-- Total-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.total') }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.total') }}</b-col>
       <b-col cols="6">
         <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index fad50ddab..6a0b6a1c1 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -34,9 +34,7 @@
       <b-col cols="6" class="text-right">
         <div>{{ $t('decay.decay') }}</div>
       </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
     <b-row>
@@ -47,18 +45,12 @@
     <!-- Type-->
     <b-row>
       <b-col cols="6" class="text-right">{{ $t(`decay.${typeId.toLowerCase()}`) }}</b-col>
-      <b-col cols="6">
-        <div>{{ amount | GDD }}</div>
-      </b-col>
+      <b-col cols="6">{{ amount | GDD }}</b-col>
     </b-row>
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <!-- Total-->
     <b-row>

From eafa00b3bf9ed352baeb7af732422cd2e4a2b7dd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 8 Mar 2022 07:37:28 +0100
Subject: [PATCH 12/12] less divs

---
 .../DecayInformation-DecayStartblock.vue                  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 6f7e3f466..2ee9ecc2c 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -17,12 +17,8 @@
 
     <!-- Decay-->
     <b-row>
-      <b-col cols="6" class="text-right">
-        <div>{{ $t('decay.decay') }}</div>
-      </b-col>
-      <b-col cols="6">
-        <div>{{ decay.decay | GDD }}</div>
-      </b-col>
+      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
+      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
     </b-row>
     <hr class="mt-2 mb-2" />
     <b-row>