From 449018a3a340d0b88565fdfabb3c00e24128d0ea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 6 May 2021 14:43:27 +0200
Subject: [PATCH] decay is the balance shown, max 5 transactions in overview

---
 frontend/src/views/Layout/DashboardLayout_gdd.vue  | 14 ++++----------
 frontend/src/views/Pages/AccountOverview.vue       |  1 +
 .../src/views/Pages/AccountOverview/GddSend.vue    |  2 +-
 .../src/views/Pages/AccountOverview/GddStatus.vue  |  2 +-
 .../src/views/Pages/AccountOverview/GddTable.vue   |  6 +++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 5f0f363f6..41e2eacc5 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -79,6 +79,7 @@ export default {
       balance: 0,
       GdtBalance: 0,
       transactions: [],
+      bookedBalance: 0,
     }
   },
   methods: {
@@ -94,19 +95,13 @@ export default {
       this.$store.dispatch('logout')
       this.$router.push('/login')
     },
-    async loadBalance() {
-      const result = await communityAPI.balance(this.$store.state.session_id)
-      if (result.success) {
-        this.balance = result.result.data.balance // / 10000
-      } else {
-        // what to do when loading balance fails?
-      }
-    },
     async updateTransactions() {
       const result = await communityAPI.transactions(this.$store.state.session_id)
       if (result.success) {
-        this.GdtBalance = result.result.data.gdtSum // / 10000
+        this.GdtBalance = Number(result.result.data.gdtSum)
         this.transactions = result.result.data.transactions
+        this.balance = Number(result.result.data.decay)
+        this.bookedBalance = Number(result.result.data.balance)
       } else {
         // what to do when loading balance fails?
       }
@@ -119,7 +114,6 @@ export default {
     this.initScrollbar()
   },
   created() {
-    this.loadBalance()
     this.updateTransactions()
   },
 }
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index dad678ca8..a9bc7852a 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -14,6 +14,7 @@
       <gdd-table
         v-if="showTransactionList"
         :transactions="transactions"
+        :max="5"
         @update-transactions="updateTransactions"
       />
     </b-container>
diff --git a/frontend/src/views/Pages/AccountOverview/GddSend.vue b/frontend/src/views/Pages/AccountOverview/GddSend.vue
index fdfe2e294..7337865b6 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend.vue
@@ -255,7 +255,7 @@ export default {
         this.$store.state.session_id,
         this.ajaxCreateData.email,
         // better to send the user's input here?
-        this.ajaxCreateData.amount * 10000,
+        this.ajaxCreateData.amount,
         this.ajaxCreateData.memo,
         this.ajaxCreateData.target_date,
       )
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index d8fa1939f..96267e335 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <b-row v-show="showTransactionList">
+    <b-row>
       <b-col col="6">
         <stats-card
           type="gradient-red"
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index ea082ffd4..84a049537 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <b-list-group v-show="showTransactionList">
+    <b-list-group>
       <b-list-group-item
-        v-for="item in transactions"
+        v-for="item in transactions.slice(0, max)"
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
@@ -106,8 +106,8 @@
 export default {
   name: 'GddTable',
   props: {
-    showTransactionList: { type: Boolean, default: true },
     transactions: { default: [] },
+    max: { type: Number, default: 25 },
   },
   data() {
     return {