From c0680d332d36d8b45102d8dd39431950bfc07df7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 29 Mar 2023 16:43:03 +0200
Subject: [PATCH 01/11] Transaction info, right-justified, so that the commas

---
 .../DecayInformation-Long.vue                 | 20 +++++++++++--------
 .../TransactionRows/DurationRow.vue           |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 782fe049c..0fd6b7f5c 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -14,7 +14,7 @@
           <b-col cols="12" lg="4" md="4">
             <div>{{ $t('decay.last_transaction') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
             <div>
               <span>
                 {{ $d(new Date(decay.start), 'long') }}
@@ -25,11 +25,13 @@
         <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
         <!-- Decay-->
-        <b-row>
-          <b-col cols="12" lg="4" md="4">
+        <b-row class="mt-2">
+          <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.decay') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">{{ decay.decay | GDD }}</b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ decay.decay | GDD }}
+          </b-col>
         </b-row>
       </b-col>
     </b-row>
@@ -38,15 +40,17 @@
       <b-col>
         <b-row>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <b-col cols="12" lg="4" md="4">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">{{ amount | GDD }}</b-col>
+          <b-col cols="12" lg="3" md="3">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ amount | GDD }}
+          </b-col>
         </b-row>
         <!-- Total-->
         <b-row>
-          <b-col cols="12" lg="4" md="4">
+          <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.total') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
             <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
           </b-col>
         </b-row>
diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue
index 9cadf8c24..aa20132d7 100644
--- a/frontend/src/components/TransactionRows/DurationRow.vue
+++ b/frontend/src/components/TransactionRows/DurationRow.vue
@@ -4,7 +4,7 @@
       <b-col cols="12" lg="4" md="4">
         <div>{{ $t('decay.past_time') }}</div>
       </b-col>
-      <b-col offset="1" offset-md="0" offset-lg="0">
+      <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
         <span v-if="duration">{{ durationText }}</span>
       </b-col>
     </b-row>

From 60ccdc5beb194ae771ae7606562b60de74aced6d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 12:54:11 +0200
Subject: [PATCH 02/11] feat(backend): previuos balance in transaction

---
 backend/src/graphql/model/Transaction.ts            | 11 ++++++++++-
 backend/src/graphql/resolver/TransactionResolver.ts |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 1b857391b..dc20a5c83 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -9,7 +9,12 @@ import { User } from './User'
 
 @ObjectType()
 export class Transaction {
-  constructor(transaction: dbTransaction, user: User, linkedUser: User | null = null) {
+  constructor(
+    transaction: dbTransaction,
+    user: User,
+    linkedUser: User | null = null,
+    previuosBalance: Decimal = new Decimal(0),
+  ) {
     this.id = transaction.id
     this.user = user
     this.previous = transaction.previous
@@ -47,6 +52,7 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
+    this.previousBalance = previuosBalance
   }
 
   @Field(() => Int)
@@ -70,6 +76,9 @@ export class Transaction {
   @Field(() => Date)
   balanceDate: Date
 
+  @Field(() => Decimal)
+  previousBalance: Decimal
+
   @Field(() => Decay)
   decay: Decay
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 430cdb363..8c51c6681 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -283,12 +283,13 @@ export class TransactionResolver {
     }
 
     // transactions
-    userTransactions.forEach((userTransaction) => {
+    userTransactions.forEach((userTransaction, idx) => {
       const linkedUser =
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      transactions.push(new Transaction(userTransaction, self, linkedUser))
+      const previousBalance = idx ? userTransactions[idx - 1].balance : new Decimal(0)
+      transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 

From d5782735896c61abc774292a4a9bdea2b192711e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:17:42 +0200
Subject: [PATCH 03/11] correct calculation of previuos balance

---
 backend/src/graphql/model/Transaction.ts            | 2 +-
 backend/src/graphql/resolver/TransactionResolver.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index dc20a5c83..50ca7d098 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -52,7 +52,7 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
-    this.previousBalance = previuosBalance
+    this.previousBalance = previuosBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
   }
 
   @Field(() => Int)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 8c51c6681..72e919dad 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -288,7 +288,8 @@ export class TransactionResolver {
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      const previousBalance = idx ? userTransactions[idx - 1].balance : new Decimal(0)
+      const previousBalance =
+        idx < userTransactions.length - 1 ? userTransactions[idx + 1].balance : new Decimal(0)
       transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)

From adbd8b1e5d01a71c7a98aa6a1808bd817c021e90 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:50:22 +0200
Subject: [PATCH 04/11] add previous balance to virtual transaction link
 transaction

---
 backend/src/graphql/resolver/TransactionResolver.ts | 1 +
 backend/src/util/virtualTransactions.ts             | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 72e919dad..d855a0701 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -276,6 +276,7 @@ export class TransactionResolver {
             firstDate || now,
             lastDate || now,
             self,
+            (userTransactions.length && userTransactions[0].balance) || new Decimal(0),
           ),
         )
         logger.debug(`transactions=${transactions}`)
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 68a37746b..9f4def31e 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -38,6 +38,7 @@ const virtualLinkTransaction = (
   createdAt: Date,
   validUntil: Date,
   user: User,
+  previousBalance: Decimal,
 ): Transaction => {
   const linkDbTransaction: dbTransaction = {
     id: -2,
@@ -54,7 +55,12 @@ const virtualLinkTransaction = (
     contribution: null,
     ...defaultModelFunctions,
   }
-  return new Transaction(linkDbTransaction, user)
+  return new Transaction(
+    linkDbTransaction,
+    user,
+    null,
+    previousBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
+  )
 }
 
 const virtualDecayTransaction = (

From 0a62c87dd992686302067d02ba2ad23d63b787c2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:54:48 +0200
Subject: [PATCH 05/11] locales for new and old balance

---
 frontend/src/locales/de.json | 2 ++
 frontend/src/locales/en.json | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b8635f44a..a5357e6d9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -89,6 +89,8 @@
     "decay_introduced": "Die Vergänglichkeit wurde eingeführt am:",
     "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion",
     "last_transaction": "Letzte Transaktion",
+    "new_balance": "Neuer Kontostand",
+    "old_balance": "Vorheriger Kontostand",
     "past_time": "Vergangene Zeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "total": "Gesamt",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 15449a208..42f22f709 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -89,6 +89,8 @@
     "decay_introduced": "Decay was introduced on:",
     "decay_since_last_transaction": "Decay since the last transaction",
     "last_transaction": "Last transaction:",
+    "new_balance": "New balance",
+    "old_balance": "Previous balance",
     "past_time": "Time passed",
     "Starting_block_decay": "Starting Block Decay",
     "total": "Total",

From 545e55659955c2de3371a7d352fe5a0fa8d5320e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:55:22 +0200
Subject: [PATCH 06/11] previuos balance from server, displayed in decay
 details

---
 .../DecayInformation-Decay.vue                |  4 +--
 .../DecayInformation-Long.vue                 | 22 +++++++++++----
 .../DecayInformations/DecayInformation.vue    | 18 ++++++++++++-
 .../src/components/GddTransactionList.vue     | 27 +++----------------
 .../Transactions/TransactionCreation.vue      | 15 +++++++++--
 .../Transactions/TransactionDecay.vue         |  9 ++++---
 .../Transactions/TransactionReceive.vue       | 15 +++++++++--
 .../Transactions/TransactionSend.vue          | 15 +++++++++--
 frontend/src/graphql/queries.js               |  1 +
 9 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 7abdb0f2b..ce679fb30 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -12,7 +12,7 @@
           </b-col>
           <b-col offset="1" offset-md="0" offset-lg="0">
             <div>
-              {{ previousBookedBalance | GDD }}
+              {{ previousBalance | GDD }}
               {{ decay === '0' ? $t('math.minus') : '' }}
               {{ decay | GDD }} {{ $t('math.equal') }}
               <b>{{ balance | GDD }}</b>
@@ -35,7 +35,7 @@ export default {
       type: String,
       required: true,
     },
-    previousBookedBalance: {
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 0fd6b7f5c..d7e943225 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -24,8 +24,18 @@
         </b-row>
         <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
-        <!-- Decay-->
+        <!-- Previous Balance -->
         <b-row class="mt-2">
+          <b-col cols="12" lg="6" md="3">
+            <div>{{ $t('decay.old_balance') }}</div>
+          </b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ previousBalance | GDD }}
+          </b-col>
+        </b-row>
+
+        <!-- Decay-->
+        <b-row class="mt-0">
           <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.decay') }}</div>
           </b-col>
@@ -38,7 +48,7 @@
     <!-- Type-->
     <b-row>
       <b-col>
-        <b-row>
+        <b-row class="mb-2">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <b-col cols="12" lg="3" md="3">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
           <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
@@ -46,12 +56,12 @@
           </b-col>
         </b-row>
         <!-- Total-->
-        <b-row>
+        <b-row class="border-top pt-2">
           <b-col cols="12" lg="3" md="3">
-            <div>{{ $t('decay.total') }}</div>
+            <div>{{ $t('decay.new_balance') }}</div>
           </b-col>
           <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
-            <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
+            <b>{{ balance | GDD }}</b>
           </b-col>
         </b-row>
       </b-col>
@@ -67,6 +77,8 @@ export default {
     DurationRow,
   },
   props: {
+    balance: { type: String, default: '0' },
+    previousBalance: { type: String, default: '0' },
     amount: { type: String, default: '0' },
     typeId: { type: String, default: '' },
     memo: { type: String, default: '' },
diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue
index 3329fd021..0be12d0de 100644
--- a/frontend/src/components/DecayInformations/DecayInformation.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation.vue
@@ -7,7 +7,15 @@
       :decay="decay"
       :typeId="typeId"
     />
-    <decay-information-long v-else :amount="amount" :decay="decay" :typeId="typeId" :memo="memo" />
+    <decay-information-long
+      v-else
+      :amount="amount"
+      :decay="decay"
+      :typeId="typeId"
+      :memo="memo"
+      :balance="balance"
+      :previousBalance="previousBalance"
+    />
   </div>
 </template>
 <script>
@@ -39,6 +47,14 @@ export default {
       type: String,
       required: true,
     },
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
     isStartBlock() {
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index deed0dedb..5347fae83 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -19,10 +19,7 @@
           class="pointer bg-white appBoxShadow gradido-border-radius px-4 pt-2 test-list-group-item"
         >
           <template #DECAY>
-            <transaction-decay
-              v-bind="transactions[index]"
-              :previousBookedBalance="previousBookedBalance(index)"
-            />
+            <transaction-decay v-bind="transactions[index]" />
           </template>
         </transaction-list-item>
       </div>
@@ -34,27 +31,15 @@
             class="pointer mb-3 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
           >
             <template #SEND>
-              <transaction-send
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-send v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #RECEIVE>
-              <transaction-receive
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-receive v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #CREATION>
-              <transaction-creation
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-creation v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #LINK_SUMMARY>
@@ -127,10 +112,6 @@ export default {
       })
       window.scrollTo(0, 0)
     },
-    previousBookedBalance(idx) {
-      if (this.transactions[idx + 1]) return this.transactions[idx + 1].balance
-      return '0'
-    },
   },
   computed: {
     isPaginationVisible() {
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 36068a27e..e398d601f 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -18,7 +18,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -61,7 +68,11 @@ export default {
       type: Number,
       required: false,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index bdbde0cac..9b6a957e4 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -14,7 +14,7 @@
       <decay-information-decay
         :balance="balance"
         :decay="decay.decay"
-        :previousBookedBalance="previousBookedBalance"
+        :previousBalance="previousBalance"
       />
     </b-collapse>
   </div>
@@ -44,9 +44,10 @@ export default {
       type: Object,
       required: true,
     },
-    previousBookedBalance: {
-      type: String,
-      required: true,
+  },
+  computed: {
+    previousBalance() {
+      return String(Number(this.balance) - Number(this.decay.decay))
     },
   },
   data() {
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 9d6f0207a..1a620baa3 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -43,7 +43,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -85,7 +92,11 @@ export default {
     typeId: {
       type: String,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index f150dd320..6be191714 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -42,7 +42,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -85,7 +92,11 @@ export default {
       type: String,
       required: true,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 1a37d082b..d1d92c51f 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -33,6 +33,7 @@ export const transactionsQuery = gql`
         typeId
         amount
         balance
+        previousBalance
         balanceDate
         memo
         linkedUser {

From 166debcc7d6e8d5bbdfc25deed8b56e553567b67 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 15:10:01 +0200
Subject: [PATCH 07/11] add previous balance to unit tests

---
 frontend/src/components/GddTransactionList.spec.js       | 9 +++++++--
 .../components/Transactions/TransactionCreation.spec.js  | 3 ++-
 .../components/Transactions/TransactionReceive.spec.js   | 3 ++-
 .../src/components/Transactions/TransactionSend.spec.js  | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index 7473c11e0..b1cdf9eb9 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -93,8 +93,9 @@ describe('GddTransactionList', () => {
             {
               id: -1,
               typeId: 'DECAY',
-              amount: '-0.16778637075575395772595',
-              balance: '31.59320453982945549519405',
+              amount: '-0.16',
+              balance: '31.59',
+              previousBalance: '31.75',
               balanceDate: '2022-03-03T08:54:54',
               memo: '',
               linkedUser: null,
@@ -110,6 +111,7 @@ describe('GddTransactionList', () => {
               typeId: 'SEND',
               amount: '1',
               balance: '31.76099091058520945292',
+              previousBalance: '30.76',
               balanceDate: '2022-02-28T13:55:47',
               memo:
                 'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
@@ -129,6 +131,7 @@ describe('GddTransactionList', () => {
               typeId: 'RECEIVE',
               amount: '10',
               balance: '10',
+              previousBalance: '31.75',
               balanceDate: '2022-02-23T10:55:30',
               memo:
                 'Monatlanges Gift sog ein, In den Topf zuerst hinein… (William Shakespeare, Die Hexen aus Macbeth)',
@@ -148,6 +151,7 @@ describe('GddTransactionList', () => {
               typeId: 'CREATION',
               amount: '1000',
               balance: '32.96482231613347376132',
+              previousBalance: '31.75',
               balanceDate: '2022-02-25T07:29:26',
               memo: 'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
               linkedUser: {
@@ -414,6 +418,7 @@ describe('GddTransactionList', () => {
         return {
           amount: '3.14',
           balanceDate: '2021-04-29T17:26:40+00:00',
+          previousBalance: '31.75',
           decay: {
             decay: '-477.01',
             start: '2021-05-13T17:46:31.000Z',
diff --git a/frontend/src/components/Transactions/TransactionCreation.spec.js b/frontend/src/components/Transactions/TransactionCreation.spec.js
index be0713ecf..cec48cce9 100644
--- a/frontend/src/components/Transactions/TransactionCreation.spec.js
+++ b/frontend/src/components/Transactions/TransactionCreation.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',
diff --git a/frontend/src/components/Transactions/TransactionReceive.spec.js b/frontend/src/components/Transactions/TransactionReceive.spec.js
index 46cb57e06..76c7977d4 100644
--- a/frontend/src/components/Transactions/TransactionReceive.spec.js
+++ b/frontend/src/components/Transactions/TransactionReceive.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',
diff --git a/frontend/src/components/Transactions/TransactionSend.spec.js b/frontend/src/components/Transactions/TransactionSend.spec.js
index 410fcc733..662d9fd76 100644
--- a/frontend/src/components/Transactions/TransactionSend.spec.js
+++ b/frontend/src/components/Transactions/TransactionSend.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',

From 466b755a3da64900c4da800b1d88875af8b644cf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 15:55:15 +0200
Subject: [PATCH 08/11] middleware to ensure best possible decay displayed

---
 .../graphql/resolver/TransactionResolver.ts   |  4 +++-
 backend/src/middleware/fixDecayCalculation.ts | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/middleware/fixDecayCalculation.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d855a0701..a968a9ebb 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -7,7 +7,7 @@ import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
+import { Resolver, Query, Args, Authorized, Ctx, Mutation, UseMiddleware } from 'type-graphql'
 
 import Paginated from '@arg/Paginated'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
@@ -25,6 +25,7 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
+import { fixDecayCalculation } from '@/middleware/fixDecayCalculation'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -184,6 +185,7 @@ export const executeTransaction = async (
 export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
   @Query(() => TransactionList)
+  @UseMiddleware(fixDecayCalculation)
   async transactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
diff --git a/backend/src/middleware/fixDecayCalculation.ts b/backend/src/middleware/fixDecayCalculation.ts
new file mode 100644
index 000000000..7d25b7484
--- /dev/null
+++ b/backend/src/middleware/fixDecayCalculation.ts
@@ -0,0 +1,24 @@
+import { Decimal } from 'decimal.js-light'
+import { MiddlewareFn } from 'type-graphql'
+
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { Transaction } from '@model/Transaction'
+import { TransactionList } from '@model/TransactionList'
+
+export const fixDecayCalculation: MiddlewareFn = async (
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+  { root, args, context, info },
+  next,
+) => {
+  const result: TransactionList = (await next()) as TransactionList
+  const { transactions } = result
+  transactions.forEach((transaction: Transaction) => {
+    if (transaction.typeId !== TransactionTypeId.DECAY) {
+      const { balance, previousBalance, amount } = transaction
+      transaction.decay.decay = new Decimal(
+        Number(balance) - Number(amount) - Number(previousBalance),
+      ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
+    }
+  })
+  return result
+}

From 95303c30e05c684e80bc0130790b08ae99287eb0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 18:38:09 +0200
Subject: [PATCH 09/11] add previous transaction relation

---
 .../0036-unique_previous_in_transactions/Transaction.ts       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/database/entity/0036-unique_previous_in_transactions/Transaction.ts b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
index ef8d0abdc..993ffd262 100644
--- a/database/entity/0036-unique_previous_in_transactions/Transaction.ts
+++ b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
@@ -96,4 +96,8 @@ export class Transaction extends BaseEntity {
   @OneToOne(() => Contribution, (contribution) => contribution.transaction)
   @JoinColumn({ name: 'id', referencedColumnName: 'transactionId' })
   contribution?: Contribution | null
+
+  @OneToOne(() => Transaction)
+  @JoinColumn({ name: 'previous' })
+  previousTransaction?: Transaction | null
 }

From 1fdd2e10142ff868e25ae973c94234a84c57058a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 18:42:17 +0200
Subject: [PATCH 10/11] get previuos transaction from database

---
 backend/src/graphql/model/Transaction.ts           | 12 +++++-------
 .../src/graphql/resolver/TransactionResolver.ts    |  6 ++----
 backend/src/typeorm/repository/Transaction.ts      | 14 +++-----------
 backend/src/util/virtualTransactions.ts            |  7 +------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 50ca7d098..3334dea84 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -9,12 +9,7 @@ import { User } from './User'
 
 @ObjectType()
 export class Transaction {
-  constructor(
-    transaction: dbTransaction,
-    user: User,
-    linkedUser: User | null = null,
-    previuosBalance: Decimal = new Decimal(0),
-  ) {
+  constructor(transaction: dbTransaction, user: User, linkedUser: User | null = null) {
     this.id = transaction.id
     this.user = user
     this.previous = transaction.previous
@@ -52,7 +47,10 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
-    this.previousBalance = previuosBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
+    this.previousBalance =
+      (transaction.previousTransaction &&
+        transaction.previousTransaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN)) ||
+      new Decimal(0)
   }
 
   @Field(() => Int)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a968a9ebb..5db293373 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -286,14 +286,12 @@ export class TransactionResolver {
     }
 
     // transactions
-    userTransactions.forEach((userTransaction, idx) => {
+    userTransactions.forEach((userTransaction) => {
       const linkedUser =
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      const previousBalance =
-        idx < userTransactions.length - 1 ? userTransactions[idx + 1].balance : new Decimal(0)
-      transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
+      transactions.push(new Transaction(userTransaction, self, linkedUser))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 
diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
index 61e87b3c8..0fb9f7ffe 100644
--- a/backend/src/typeorm/repository/Transaction.ts
+++ b/backend/src/typeorm/repository/Transaction.ts
@@ -2,7 +2,6 @@ import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { Transaction } from '@entity/Transaction'
 
 import { Order } from '@enum/Order'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
 
 @EntityRepository(Transaction)
 export class TransactionRepository extends Repository<Transaction> {
@@ -11,22 +10,15 @@ export class TransactionRepository extends Repository<Transaction> {
     limit: number,
     offset: number,
     order: Order,
-    onlyCreation?: boolean,
   ): Promise<[Transaction[], number]> {
     const query = this.createQueryBuilder('userTransaction')
       .leftJoinAndSelect(
-        'userTransaction.contribution',
-        'contribution',
-        'userTransaction.id = contribution.transactionId',
+        'userTransaction.previousTransaction',
+        'transaction',
+        'userTransaction.previous = transaction.id',
       )
       .where('userTransaction.userId = :userId', { userId })
 
-    if (onlyCreation) {
-      query.andWhere('userTransaction.typeId = :typeId', {
-        typeId: TransactionTypeId.CREATION,
-      })
-    }
-
     return query
       .orderBy('userTransaction.balanceDate', order)
       .limit(limit)
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 9f4def31e..5d1fbbfd3 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -55,12 +55,7 @@ const virtualLinkTransaction = (
     contribution: null,
     ...defaultModelFunctions,
   }
-  return new Transaction(
-    linkDbTransaction,
-    user,
-    null,
-    previousBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
-  )
+  return new Transaction(linkDbTransaction, user)
 }
 
 const virtualDecayTransaction = (

From ee9092878213337c067f250d71303a47a2ecd8b3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 4 Apr 2023 17:06:29 +0200
Subject: [PATCH 11/11] remove middleware

---
 .../graphql/resolver/TransactionResolver.ts   | 13 +++++++---
 backend/src/middleware/fixDecayCalculation.ts | 24 -------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 backend/src/middleware/fixDecayCalculation.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 4fcda3a15..4d546ddc0 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -7,7 +7,7 @@ import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Args, Authorized, Ctx, Mutation, UseMiddleware } from 'type-graphql'
+import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 
 import Paginated from '@arg/Paginated'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
@@ -25,7 +25,6 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
-import { fixDecayCalculation } from '@/middleware/fixDecayCalculation'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -184,7 +183,6 @@ export const executeTransaction = async (
 export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
   @Query(() => TransactionList)
-  @UseMiddleware(fixDecayCalculation)
   async transactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
@@ -294,6 +292,15 @@ export class TransactionResolver {
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 
+    transactions.forEach((transaction: Transaction) => {
+      if (transaction.typeId !== TransactionTypeId.DECAY) {
+        const { balance, previousBalance, amount } = transaction
+        transaction.decay.decay = new Decimal(
+          Number(balance) - Number(amount) - Number(previousBalance),
+        ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
+      }
+    })
+
     // Construct Result
     return new TransactionList(await balanceResolver.balance(context), transactions)
   }
diff --git a/backend/src/middleware/fixDecayCalculation.ts b/backend/src/middleware/fixDecayCalculation.ts
deleted file mode 100644
index 7d25b7484..000000000
--- a/backend/src/middleware/fixDecayCalculation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Decimal } from 'decimal.js-light'
-import { MiddlewareFn } from 'type-graphql'
-
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { Transaction } from '@model/Transaction'
-import { TransactionList } from '@model/TransactionList'
-
-export const fixDecayCalculation: MiddlewareFn = async (
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  { root, args, context, info },
-  next,
-) => {
-  const result: TransactionList = (await next()) as TransactionList
-  const { transactions } = result
-  transactions.forEach((transaction: Transaction) => {
-    if (transaction.typeId !== TransactionTypeId.DECAY) {
-      const { balance, previousBalance, amount } = transaction
-      transaction.decay.decay = new Decimal(
-        Number(balance) - Number(amount) - Number(previousBalance),
-      ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
-    }
-  })
-  return result
-}