diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 066eec5e1..807b9c516 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -5,104 +5,121 @@
-
-
-
- {{ $t('decay.calculation_decay') }}
-
+
+
+ {{ $t('decay.first_transaction') }}
-
-
-
- {{ $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.befor_startblock_transaction') }}
+
-
-
-
- {{ $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_decay') }}
-
-
-
-
-
- {{ $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') }}
-
-
-
+
+
+
+
+
+ {{ $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') }}
+
+
+
+
@@ -112,6 +129,8 @@ export default {
props: {
amount: { type: String, default: '0' },
typeId: { type: String, default: '' },
+ balanceDate: { type: String },
+ decayStartBlock: { type: String },
decay: {
decay: '',
start: 0,
diff --git a/frontend/src/components/transaction-slots/TransactionCreation.vue b/frontend/src/components/transaction-slots/TransactionCreation.vue
new file mode 100644
index 000000000..8f11bb2a9
--- /dev/null
+++ b/frontend/src/components/transaction-slots/TransactionCreation.vue
@@ -0,0 +1,147 @@
+
+
+
+ {{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
+ {{ memo }}, {{ properties }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ properties.operator }}
+
+
+ {{ $n(amount, 'decimal') }}
+
+
+
+
+
+ {{
+ typeId !== 'DECAY'
+ ? linkedUser.firstName + ' ' + linkedUser.lastName
+ : $t('decay.decay_since_last_transaction')
+ }}
+
+
+
+
+
+
+
+ {{ $t('form.memo') }}
+
+
+ {{ memo }}
+
+
+
+
+
+
+ {{ $t('form.date') }}
+
+
+
+ {{ $d(new Date(balanceDate), 'long') }}
+ {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/transaction-slots/TransactionDecay.vue b/frontend/src/components/transaction-slots/TransactionDecay.vue
new file mode 100644
index 000000000..9245a532e
--- /dev/null
+++ b/frontend/src/components/transaction-slots/TransactionDecay.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $n(amount, 'decimal') }}
+
+
+
+
+
+ {{
+ typeId !== 'DECAY'
+ ? linkedUser.firstName + ' ' + linkedUser.lastName
+ : $t('decay.decay_since_last_transaction')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('decay.calculation_decay') }}
+
+
+
+
+
+ {{ $t('decay.decay') }}
+
+
+
+ {{ Number(balance) + Number(decay.decay) * -1 }} :::: {{ Number(decay.decay) }} :::::
+ {{ $n(Number(balance) + Number(decay.decay) * -1, 'decimal') }}
+ GDD - {{ $n(Number(decay.decay) * -1, 'decimal') }} GDD =
+ {{ $n(Number(balance), 'decimal') }} GDD
+
+
+
+
+ {{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
+ {{ memo }}, {{ properties }},, {{ visible }}
+
+
+
+
+
diff --git a/frontend/src/components/transaction-slots/TransactionReceive.vue b/frontend/src/components/transaction-slots/TransactionReceive.vue
new file mode 100644
index 000000000..db6b7e18a
--- /dev/null
+++ b/frontend/src/components/transaction-slots/TransactionReceive.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ properties.operator }}
+
+
+ {{ $n(amount, 'decimal') }}
+
+
+
+
+
+ {{
+ typeId !== 'DECAY'
+ ? linkedUser.firstName + ' ' + linkedUser.lastName
+ : $t('decay.decay_since_last_transaction')
+ }}
+
+
+
+
+
+
+
+ {{ $t('form.memo') }}
+
+
+ {{ memo }}
+
+
+
+
+
+
+ {{ $t('form.date') }}
+
+
+
+ {{ $d(new Date(balanceDate), 'long') }}
+ {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
+ {{ memo }}, {{ properties }}
+
+
+
+
+
diff --git a/frontend/src/components/transaction-slots/TransactionSend.vue b/frontend/src/components/transaction-slots/TransactionSend.vue
new file mode 100644
index 000000000..3ee4b3bf0
--- /dev/null
+++ b/frontend/src/components/transaction-slots/TransactionSend.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ properties.operator }}
+
+
+ {{ $n(amount, 'decimal') }}
+
+
+
+
+
+ {{
+ typeId !== 'DECAY'
+ ? linkedUser.firstName + ' ' + linkedUser.lastName
+ : $t('decay.decay_since_last_transaction')
+ }}
+
+
+
+
+
+
+
+ {{ $t('form.memo') }}
+
+
+ {{ memo }}
+
+
+
+
+
+
+ {{ $t('form.date') }}
+
+
+
+ {{ $d(new Date(balanceDate), 'long') }}
+ {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
+ {{ memo }}, {{ properties }}
+
+
+
+
+
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index c833fb845..94a5e59f3 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -63,6 +63,7 @@ export const transactionsQuery = gql`
id
typeId
amount
+ balance
balanceDate
memo
linkedUser {
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 56c246006..e3e7df505 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -13,172 +13,58 @@