From 7c37c345a1a9d38cae32bf9612a0b020dba52eb8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 6 Mar 2022 18:57:26 +0100
Subject: [PATCH] pull origin

---
 .../DecayInformations/DecayInformation-DecayStartblock.vue  | 2 +-
 .../components/DecayInformations/DecayInformation-Long.vue  | 2 +-
 frontend/src/components/Transactions/TransactionDecay.vue   | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 678fc9f09..deb9eeaa5 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -57,7 +57,7 @@
       </b-col>
       <b-col cols="6">
         <div v-if="typeId === 'SEND'">
-          <b>− {{ $n((Number(amount) + Number(decay.decay)) * -1, 'decimal') }}</b>
+          <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>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index e0c3b7759..1fdb5ff43 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -78,7 +78,7 @@
       </b-col>
       <b-col cols="6">
         <div v-if="typeId === 'SEND'">
-          <b>− {{ $n(Number(amount * -1) + Number(decay.decay * -1), 'decimal') }}</b>
+          <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>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index ef2139825..b05aaeb2e 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -31,11 +31,7 @@
               </b-col>
               <b-col cols="7">
                 <div class="gdd-transaction-list-item-name">
-                  {{
-                    typeId !== 'DECAY'
-                      ? linkedUser.firstName + ' ' + linkedUser.lastName
-                      : $t('decay.decay_since_last_transaction')
-                  }}
+                  {{ linkedUser.firstName + ' ' + linkedUser.lastName }}
                 </div>
               </b-col>
             </b-row>