From dc09a0ccf665106d3e6c08b135f52e56ff4768db Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 30 Mar 2022 15:03:54 +0200
Subject: [PATCH] get balance of previous transaction to avoid decay
 calculation

---
 .../DecayInformations/DecayInformation-Decay.vue       |  6 +++++-
 frontend/src/components/GddTransactionList.vue         | 10 +++++++++-
 .../src/components/Transactions/TransactionDecay.vue   | 10 +++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 6abacd2b8..d8ba13738 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -13,7 +13,7 @@
       </b-col>
       <b-col cols="6">
         <div>
-          {{ (Number(balance) - Number(decay)) | GDD }}
+          {{ previousBookedBalance | GDD }}
           {{ decay | GDD }} {{ $t('math.equal') }}
           <b>{{ balance | GDD }}</b>
         </div>
@@ -33,6 +33,10 @@ export default {
       type: String,
       required: true,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 2424907c5..7be0797a8 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -15,7 +15,11 @@
       <div v-for="({ id, typeId }, index) in transactions" :key="id">
         <transaction-list-item :typeId="typeId" class="pointer">
           <template #DECAY>
-            <transaction-decay class="list-group-item" v-bind="transactions[index]" />
+            <transaction-decay
+              class="list-group-item"
+              v-bind="transactions[index]"
+              :previousBookedBalance="previousBookedBalance(index)"
+            />
           </template>
 
           <template #SEND>
@@ -110,6 +114,10 @@ export default {
       })
       window.scrollTo(0, 0)
     },
+    previousBookedBalance(idx) {
+      if (this.transactions[idx + 1]) return this.transactions[idx + 1].balance
+      return 0
+    },
   },
   watch: {
     currentPage() {
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 2f235502a..d61beb026 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -21,7 +21,11 @@
       </div>
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
-        <decay-information-decay :balance="balance" :decay="decay.decay" />
+        <decay-information-decay
+          :balance="balance"
+          :decay="decay.decay"
+          :previousBookedBalance="previousBookedBalance"
+        />
       </b-collapse>
     </div>
   </div>
@@ -53,6 +57,10 @@ export default {
       type: Object,
       required: true,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {