Merge branch 'master' into STYLE-docu-folder-template-images

backend/src/graphql/resolver/TransactionResolver.ts

@@ -199,7 +199,12 @@ export class TransactionResolver {
     // decay & link transactions
     if (currentPage === 1 && order === Order.DESC) {
       transactions.push(
-        virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self),
+        virtualDecayTransaction(
+          lastTransaction.balance.minus(sumHoldAvailableAmount.toString()),
+          lastTransaction.balanceDate,
+          now,
+          self,
+        ),
       )
       // virtual transaction for pending transaction-links sum
       if (sumHoldAvailableAmount.greaterThan(0)) {

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>

frontend/src/components/GddTransactionList.spec.js

@@ -419,6 +419,7 @@ describe('GddTransactionList', () => {
           },
           id: idx + 1,
           typeId: 'RECEIVE',
+          balance: '33.33',
         }
       })
 

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>
@@ -23,6 +27,7 @@
               class="list-group-item"
               v-bind="transactions[index]"
               :decayStartBlock="decayStartBlock"
+              :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
           </template>
@@ -32,6 +37,7 @@
               class="list-group-item"
               v-bind="transactions[index]"
               :decayStartBlock="decayStartBlock"
+              :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
           </template>
@@ -41,6 +47,7 @@
               class="list-group-item"
               v-bind="transactions[index]"
               :decayStartBlock="decayStartBlock"
+              :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
           </template>
@@ -110,6 +117,10 @@ export default {
       })
       window.scrollTo(0, 0)
     },
+    previousBookedBalance(idx) {
+      if (this.transactions[idx + 1]) return this.transactions[idx + 1].balance
+      return '0'
+    },
   },
   watch: {
     currentPage() {

frontend/src/components/Transactions/TransactionCreation.spec.js

@@ -31,6 +31,7 @@ const propsData = {
   memo: 'sadasd asdasdasdasdadadd da dad aad',
   typeId: 'DECAY',
   decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+  previousBookedBalance: '43.56',
 }
 
 describe('TransactionCreation', () => {

frontend/src/components/Transactions/TransactionCreation.vue

@@ -47,7 +47,7 @@ import DecayRow from '../TransactionRows/DecayRow'
 import DecayInformation from '../DecayInformations/DecayInformation'
 
 export default {
-  name: 'slot-creation',
+  name: 'TransactionCreation',
   components: {
     CollapseIcon,
     TypeIcon,
@@ -86,6 +86,10 @@ export default {
       type: Date,
       required: true,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {

frontend/src/components/Transactions/TransactionDecay.spec.js

@@ -31,6 +31,7 @@ const propsData = {
   memo: 'sadasd asdasdasdasdadadd da dad aad',
   typeId: 'DECAY',
   decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+  previousBookedBalance: '43.56',
 }
 
 describe('TransactionDecay', () => {

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>
@@ -33,7 +37,7 @@ import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
 import DecayInformationDecay from '../DecayInformations/DecayInformation-Decay'
 
 export default {
-  name: 'slot-decay',
+  name: 'TransactionDecay',
   components: {
     CollapseIcon,
     TypeIcon,
@@ -53,6 +57,10 @@ export default {
       type: Object,
       required: true,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {

frontend/src/components/Transactions/TransactionReceive.spec.js

@@ -31,6 +31,7 @@ const propsData = {
   memo: 'sadasd asdasdasdasdadadd da dad aad',
   typeId: 'RECEIVE',
   decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+  previousBookedBalance: '43.56',
 }
 
 describe('TransactionReceive', () => {

frontend/src/components/Transactions/TransactionReceive.vue

@@ -53,7 +53,7 @@ import DecayRow from '../TransactionRows/DecayRow'
 import DecayInformation from '../DecayInformations/DecayInformation'
 
 export default {
-  name: 'slot-receive',
+  name: 'TransactionReceive',
   components: {
     CollapseIcon,
     TypeIcon,
@@ -95,6 +95,10 @@ export default {
       type: Number,
       required: false,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {

frontend/src/components/Transactions/TransactionSend.spec.js

@@ -31,6 +31,7 @@ const propsData = {
   memo: 'sadasd asdasdasdasdadadd da dad aad',
   typeId: 'SEND',
   decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+  previousBookedBalance: '43.56',
 }
 
 describe('TransactionSend', () => {

frontend/src/components/Transactions/TransactionSend.vue

@@ -53,7 +53,7 @@ import DecayRow from '../TransactionRows/DecayRow'
 import DecayInformation from '../DecayInformations/DecayInformation'
 
 export default {
-  name: 'slot-send',
+  name: 'TransactionSend',
   components: {
     CollapseIcon,
     TypeIcon,
@@ -96,6 +96,10 @@ export default {
       type: Number,
       required: false,
     },
+    previousBookedBalance: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {