diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue deleted file mode 100644 index 54515eb5b..000000000 --- a/frontend/src/components/DecayInformation.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - {{ decay ? $n(decay.decay, 'decimal') : '' }} - - - - - - {{ $t('decay.first_transaction') }} - - - - - {{ $t('decay.before_startblock_transaction') }} - - - - - - - {{ $t('decay.calculation_decay') }} - - - - - - - {{ $t('decay.last_transaction') }} - - - - - {{ $d(new Date(decay.start), 'long') }} - {{ $i18n.locale === 'de' ? 'Uhr' : '' }} - - - - - - - - {{ $t('decay.past_time') }} - - - - {{ duration.years }} {{ $t('decay.year') }}, - - {{ duration.months }} {{ $t('decay.months') }}, - - {{ duration.days }} {{ $t('decay.days') }}, - {{ duration.hours }} {{ $t('decay.hours') }}, - - {{ duration.minutes }} {{ $t('decay.minutes') }}, - - - {{ duration.seconds }} {{ $t('decay.seconds') }} - - - - - - - - - {{ $t('decay.decay') }} - - - - {{ $n(decay.decay, 'decimal') }} - - {{ $n(decay.decay + amount, 'decimal') }} GDD - {{ $n(decay.decay, 'decimal') }} GDD = - {{ $n(amount, 'decimal') }} GDD - - - - - - - {{ $t('decay.calculation_total') }} - - - - - - {{ $t('decay.sent') }} - {{ $t('decay.received') }} - - - {{ $n(amount, 'decimal') }} - {{ $n(amount, 'decimal') }} - - - - - - {{ $t('decay.decay') }} - - - {{ $n(decay.decay, 'decimal') }} - - - - - - {{ $t('decay.total') }} - - - - {{ $n(amount + decay.decay, 'decimal') }} - - - {{ $n(amount - decay.decay, 'decimal') }} - - - {{ $n(amount - decay.decay, 'decimal') }} - - - - - - - - diff --git a/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue index 4248aeb80..c0f34e24d 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue @@ -8,9 +8,5 @@ diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue deleted file mode 100644 index e7e20c671..000000000 --- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - {{ $t('decay.calculation_decay') }} - - - - - - {{ $t('decay.decay') }} - - - - {{ $n(Number(balance) - Number(decay.decay), 'decimal') }} - GDD - {{ $n(Number(decay.decay) * -1, 'decimal') }} GDD = - {{ $n(Number(balance), 'decimal') }} GDD - - - - - - diff --git a/frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue b/frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue deleted file mode 100644 index c62f3791a..000000000 --- a/frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - {{ $t('decay.before_startblock_transaction') }} - - - - - diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue index 6a64772b5..988115a78 100644 --- a/frontend/src/components/Transactions/TransactionCreation.vue +++ b/frontend/src/components/Transactions/TransactionCreation.vue @@ -31,11 +31,7 @@ - {{ - typeId !== 'DECAY' - ? linkedUser.firstName + ' ' + linkedUser.lastName - : $t('decay.decay_since_last_transaction') - }} + {{ $t('decay.decay_since_last_transaction') }} @@ -51,7 +47,7 @@ - + {{ $t('form.date') }} @@ -67,12 +63,12 @@ - + - + diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue index bbba2d54f..7a7c59155 100644 --- a/frontend/src/components/Transactions/TransactionReceive.vue +++ b/frontend/src/components/Transactions/TransactionReceive.vue @@ -34,11 +34,7 @@ - {{ - typeId !== 'DECAY' - ? linkedUser.firstName + ' ' + linkedUser.lastName - : $t('decay.decay_since_last_transaction') - }} + {{ linkedUser.firstName + ' ' + linkedUser.lastName }} @@ -54,7 +50,7 @@ - + {{ $t('form.date') }} @@ -70,7 +66,7 @@ - + diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue index f9889ff97..6394c6905 100644 --- a/frontend/src/components/Transactions/TransactionSend.vue +++ b/frontend/src/components/Transactions/TransactionSend.vue @@ -31,11 +31,7 @@ - {{ - typeId !== 'DECAY' - ? linkedUser.firstName + ' ' + linkedUser.lastName - : $t('decay.decay_since_last_transaction') - }} + {{ linkedUser.firstName + ' ' + linkedUser.lastName }} @@ -51,7 +47,7 @@ - + {{ $t('form.date') }} @@ -67,7 +63,7 @@ - + diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 16d91686a..3ec3091de 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -98,7 +98,6 @@ export default { transactionList.balanceGDT === null ? null : Number(transactionList.balanceGDT) this.transactions = transactionList.transactions this.balance = Number(transactionList.balance) - // this.bookedBalance = Number(transactionList.balance) this.transactionCount = transactionList.count this.decayStartBlock = new Date(transactionList.decayStartBlock) this.pending = false diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 21f725bc1..af1e9775b 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -50,7 +50,7 @@ :per-page="pageSize" :total-rows="transactionCount" > - + {{ $t('transaction.nullTransactions') }}