From df7f3d7668dd29ff1e8e99786ec8fd6047aa523f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Feb 2022 21:27:35 +0100
Subject: [PATCH] gdd balance pass down

---
 frontend/src/components/DecayInformation.vue              | 8 +++++++-
 .../views/Pages/AccountOverview/GddTransactionList.vue    | 5 ++++-
 frontend/src/views/Pages/UserProfileTransactionList.vue   | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index dd3fc225e..0e068318c 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -59,7 +59,12 @@
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
         <b-col cols="6">
-          <div>- {{ $n(decay.balance, 'decimal') }}</div>
+          <div v-if="decaytyp === 'new'">{{ $n(decay.balance, 'decimal') }}</div>
+          <div v-if="decaytyp === 'decayLastTransaction'">
+            {{ $n(decay.balance, 'decimal') }} GDD -
+            {{ $n(decay.balance + gddbalance, 'decimal') }} =
+            <b>{{ $n(gddbalance, 'decimal') }}</b>
+          </div>
         </b-col>
       </b-row>
       <hr class="mt-2 mb-2" />
@@ -112,6 +117,7 @@
 export default {
   name: 'DecayInformation',
   props: {
+    gddbalance: { type: Number },
     balance: { type: Number },
     type: { type: String, default: '' },
     decay: {
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index e92dc9636..e7972b5ce 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="gdd-transaction-list">
+    gddbalance {{ gddbalance }}
     <div class="list-group">
       <div v-if="!transactions" class="test-no-transactionlist text-right">
         <b-icon icon="exclamation-triangle" class="mr-2" variant="danger"></b-icon>
@@ -30,7 +31,7 @@
       >
         <div
           class="list-group-item gdd-transaction-list-item"
-          :class="getCollapseState(transactionId) ? 'bg-secondary border border-light' : ''"
+          :class="getCollapseState(transactionId) ? 'bg-secondary' : ''"
           v-b-toggle="'decay-' + transactionId"
         >
           <!-- Collaps Button  -->
@@ -148,6 +149,7 @@
               <div v-if="type === 'decay'" class="mt-3 mb-3">
                 <decay-information
                   decaytyp="decayLastTransaction"
+                  :gddbalance="gddbalance"
                   :balance="balance"
                   :decay="{
                     balance: balance,
@@ -201,6 +203,7 @@ export default {
     }
   },
   props: {
+    gddbalance: { type: Number },
     transactions: { default: () => [] },
     pageSize: { type: Number, default: 25 },
     timestamp: { type: Number, default: 0 },
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 97f0d84c1..c060da051 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -5,6 +5,7 @@
         <p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
 
         <gdd-transaction-list
+          :gddbalance="balance"
           :timestamp="timestamp"
           :transactionCount="transactionCount"
           :transactions="transactions"