From bc81a9a40f4f3f6980cda4d65253a7d29c2e9fa9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 4 Mar 2022 15:23:09 +0100
Subject: [PATCH] missign change for startBlock implementation

# Conflicts:
#	frontend/src/components/Transactions/TransactionCreation.vue
#	frontend/src/components/Transactions/TransactionReceive.vue
#	frontend/src/components/Transactions/TransactionSend.vue
---
 .../Transactions/TransactionCreation.vue        | 13 +++++++++++++
 .../Transactions/TransactionDecay.vue           |  3 ++-
 .../Transactions/TransactionReceive.vue         | 13 +++++++++++++
 .../components/Transactions/TransactionSend.vue | 17 +++++++++++++++--
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 6b8582a76..f87f25a80 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -78,6 +78,12 @@
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-before-startblock v-if="decay.start === null" />
+        <decay-information-decay-startblock
+          v-else-if="isStartBlock"
+          :amount="amount"
+          :decay="decay"
+          :typeId="typeId"
+        />
         <decay-information-long v-else :amount="amount" :decay="decay" :typeId="typeId" />
       </b-collapse>
     </div>
@@ -87,6 +93,7 @@
 import DecayInformationShort from '../DecayInformations/DecayInformation-Short'
 import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
 import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
+import DecayInformationNoDecayTransaction from '../DecayInformations/DecayInformation-NoDecayTransaction'
 
 export default {
   name: 'slot-creation',
@@ -94,6 +101,7 @@ export default {
     DecayInformationShort,
     DecayInformationLong,
     DecayInformationBeforeStartblock,
+    DecayInformationNoDecayTransaction,
   },
   props: {
     amount: {
@@ -130,5 +138,10 @@ export default {
       visible: false,
     }
   },
+  computed: {
+    isStartBlock() {
+      return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+    },
+  },
 }
 </script>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 16afe37c6..f7eaae512 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -23,8 +23,9 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
+                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ $n(Number(amount) * -1, 'decimal') }}
                   </span>
                 </div>
               </b-col>
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 40c50f1d9..8a9671cad 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -81,6 +81,12 @@
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-before-startblock v-if="decay.start === null" />
+        <decay-information-decay-startblock
+          v-else-if="isStartBlock"
+          :amount="amount"
+          :decay="decay"
+          :typeId="typeId"
+        />
         <decay-information-long v-else :amount="amount" :decay="decay" :typeId="typeId" />
       </b-collapse>
     </div>
@@ -90,6 +96,7 @@
 import DecayInformationShort from '../DecayInformations/DecayInformation-Short'
 import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
 import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
+import DecayInformationNoDecayTransaction from '../DecayInformations/DecayInformation-NoDecayTransaction'
 
 export default {
   name: 'slot-receive',
@@ -97,6 +104,7 @@ export default {
     DecayInformationShort,
     DecayInformationLong,
     DecayInformationBeforeStartblock,
+    DecayInformationNoDecayTransaction,)
   },
   props: {
     amount: {
@@ -130,5 +138,10 @@ export default {
       visible: false,
     }
   },
+  computed: {
+    isStartBlock() {
+      return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+    },
+  },
 }
 </script>
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index c031cb036..d7b91f76e 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -23,9 +23,9 @@
             <b-row>
               <b-col cols="5">
                 <div class="text-right">
-                  <span class="gdd-transaction-list-item-operator"></span>
+                  <span class="gdd-transaction-list-item-operator">−</span>
                   <span class="gdd-transaction-list-item-amount">
-                    {{ $n(amount, 'decimal') }}
+                    {{ $n(Number(amount) * -1, 'decimal') }}
                   </span>
                 </div>
               </b-col>
@@ -78,6 +78,12 @@
 
       <b-collapse class="pb-4 pt-5" v-model="visible">
         <decay-information-before-startblock v-if="decay.start === null" />
+        <decay-information-decay-startblock
+          v-else-if="isStartBlock"
+          :amount="amount"
+          :decay="decay"
+          :typeId="typeId"
+        />
         <decay-information-long v-else :amount="amount" :decay="decay" :typeId="typeId" />
       </b-collapse>
     </div>
@@ -87,12 +93,14 @@
 import DecayInformationShort from '../DecayInformations/DecayInformation-Short'
 import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
 import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
+import DecayInformationDecayStartblock from '../DecayInformations/DecayInformation-DecayStartblock'
 export default {
   name: 'slot-send',
   components: {
     DecayInformationShort,
     DecayInformationLong,
     DecayInformationBeforeStartblock,
+    DecayInformationDecayStartblock,
   },
   props: {
     amount: {
@@ -126,5 +134,10 @@ export default {
       visible: false,
     }
   },
+  computed: {
+    isStartBlock() {
+      return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+    },
+  },
 }
 </script>