From 6b6cb432478f22a04aa7871c16ef4affb52cbaad Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 4 Mar 2022 14:31:08 +0100 Subject: [PATCH] fix decay start block info --- .../DecayInformation-DecayStartblock.vue | 19 ++++++++++++++----- ...> DecayInformation-NoDecayTransaction.vue} | 6 +++--- .../Pages/UserProfileTransactionList.vue | 2 ++ 3 files changed, 19 insertions(+), 8 deletions(-) rename frontend/src/components/DecayInformations/{DecayInformation-FirstTransaction.vue => DecayInformation-NoDecayTransaction.vue} (64%) diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue index aca959534..1b6b2320f 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue @@ -15,7 +15,7 @@
- {{ $d(new Date(decay.start * 1000), 'long') }} + {{ $d(new Date(decay.start), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
@@ -69,13 +69,13 @@
- {{ $n(Number(amount) - Number(decay.decay), 'decimal') }} + {{ $n(Number(amount) + Number(decay.decay), 'decimal') }}
- {{ $n(Number(amount) + Number(decay.decay), 'decimal') }} + {{ $n(Number(amount) - Number(decay.decay), 'decimal') }}
- {{ $n(Number(amount) + Number(decay.decay), 'decimal') }} + {{ $n(Number(amount) - Number(decay.decay), 'decimal') }}
@@ -86,7 +86,16 @@ export default { name: 'DecayInformation-StartBlock', props: { balanceDate: { type: String }, - decayStartBlock: { type: String }, + decayStartBlock: { type: Date }, + amount: { + type: String, + }, + decay: { + type: Object, + }, + typeId: { + type: String, + }, }, } diff --git a/frontend/src/components/DecayInformations/DecayInformation-FirstTransaction.vue b/frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue similarity index 64% rename from frontend/src/components/DecayInformations/DecayInformation-FirstTransaction.vue rename to frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue index 785a5e86f..c62f3791a 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-FirstTransaction.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue @@ -1,16 +1,16 @@