From 54389b5be055758fdd2f032d9452568bf7333d20 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 12 Mar 2022 09:32:42 +0100
Subject: [PATCH 01/11] add new transaction type: TRANSACTION_LINK, add
 locales, add new TransactionRow: LinkCountRow.vue, add new
 CollapseLinksList.vue

---
 .../DecayInformations/CollapseLinksList.vue   | 15 ++++
 .../src/components/GddTransactionList.vue     |  6 ++
 .../TransactionRows/LinkCountRow.vue          | 23 ++++++
 .../Transactions/TransactionLink.vue          | 82 +++++++++++++++++++
 frontend/src/locales/de.json                  |  7 ++
 frontend/src/locales/en.json                  |  7 ++
 6 files changed, 140 insertions(+)
 create mode 100644 frontend/src/components/DecayInformations/CollapseLinksList.vue
 create mode 100644 frontend/src/components/TransactionRows/LinkCountRow.vue
 create mode 100644 frontend/src/components/Transactions/TransactionLink.vue

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
new file mode 100644
index 000000000..69e1c852b
--- /dev/null
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="collapse-links-list">
+    <div class="d-flex">
+      <div class="text-center pb-3 gradido-max-width">
+        <b-icon icon="droplet-half" height="12" class="mb-2" />
+        <b>{{ $t('links-list.header') }}</b>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'CollapseLinksList',
+}
+</script>
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index 3b4cd961d..dc21208c0 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -41,6 +41,10 @@
               :decayStartBlock="decayStartBlock"
             />
           </template>
+
+          <template #TRANSACTION_LINK>
+            <transaction-link class="list-group-item" v-bind="transactions[index]" />
+          </template>
         </transaction-list-item>
       </div>
     </div>
@@ -63,6 +67,7 @@ import TransactionDecay from '@/components/Transactions/TransactionDecay'
 import TransactionSend from '@/components/Transactions/TransactionSend'
 import TransactionReceive from '@/components/Transactions/TransactionReceive'
 import TransactionCreation from '@/components/Transactions/TransactionCreation'
+import TransactionLink from '@/components/Transactions/TransactionLink'
 
 export default {
   name: 'gdd-transaction-list',
@@ -73,6 +78,7 @@ export default {
     TransactionSend,
     TransactionReceive,
     TransactionCreation,
+    TransactionLink,
   },
   data() {
     return {
diff --git a/frontend/src/components/TransactionRows/LinkCountRow.vue b/frontend/src/components/TransactionRows/LinkCountRow.vue
new file mode 100644
index 000000000..fdb4c7089
--- /dev/null
+++ b/frontend/src/components/TransactionRows/LinkCountRow.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class="link-count-row">
+    <b-row>
+      <b-col cols="5">
+        <div class="text-right">{{ $t('gdd_per_link.links_count') }}</div>
+      </b-col>
+      <b-col cols="7">
+        <div class="gdd-transaction-list-link-count">{{ count }}</div>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'LinkCountRow',
+  props: {
+    count: {
+      type: String,
+      required: true,
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/Transactions/TransactionLink.vue b/frontend/src/components/Transactions/TransactionLink.vue
new file mode 100644
index 000000000..34221be6c
--- /dev/null
+++ b/frontend/src/components/Transactions/TransactionLink.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="transaction-slot-link">
+    <div @click="visible = !visible">
+      <!-- Collaps Icon  -->
+      <collapse-icon class="text-right" :visible="visible" />
+      <div>
+        <b-row>
+          <!-- ICON  -->
+          <b-col cols="1">
+            <type-icon color="text-danger" icon="share" />
+          </b-col>
+
+          <b-col cols="11">
+            <!-- Amount / Name || Text -->
+            <amount-and-name-row :amount="amount" :text="$t('gdd_per_link.links_sum')" />
+
+            <!-- Count Links -->
+            <link-count-row count="22" />
+
+            <!-- Decay -->
+            <decay-row :decay="decay" />
+          </b-col>
+        </b-row>
+      </div>
+
+      <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
+        <collapse-links-list />
+      </b-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import CollapseIcon from '../TransactionRows/CollapseIcon'
+import TypeIcon from '../TransactionRows/TypeIcon'
+import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
+import LinkCountRow from '../TransactionRows/LinkCountRow'
+import DecayRow from '../TransactionRows/DecayRow'
+import CollapseLinksList from '../DecayInformations/CollapseLinksList'
+
+export default {
+  name: 'TransactionSlotLink',
+  components: {
+    CollapseIcon,
+    TypeIcon,
+    AmountAndNameRow,
+    LinkCountRow,
+    DecayRow,
+    CollapseLinksList,
+  },
+  props: {
+    amount: {
+      type: String,
+    },
+    balance: {
+      type: String,
+    },
+    balanceDate: {
+      type: String,
+    },
+    decay: {
+      type: Object,
+    },
+    id: {
+      type: Number,
+    },
+    linkedUser: {
+      type: Object,
+    },
+    memo: {
+      type: String,
+    },
+    typeId: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      visible: false,
+    }
+  },
+}
+</script>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index fb3b82c89..806f7bbbf 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -99,6 +99,13 @@
     },
     "your_amount": "Dein Betrag"
   },
+  "gdd_per_link": {
+    "links_sum":"Summe deiner versendeten Gradidos",
+    "links_count":"aktive Links"
+  },
+  "links-list": {
+    "header": "Liste deiner aktiven Links"
+  },
   "gdt": {
     "action": "Aktion",
     "calculation": "Berechnung der GradidoTransform",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index aec28a51d..a6db06ec1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -99,6 +99,13 @@
     },
     "your_amount": "Your amount"
   },
+  "gdd_per_link": {
+    "links_sum":"Total of your sent Gradidos",
+    "links_count":"active links"
+  },
+  "links-list": {
+    "header": "List of your active links"
+  },
   "gdt": {
     "action": "Action",
     "calculation": "Calculation of GradidoTransform",

From b73e7c1042563f5069ad8cf931a8bb8acfdb9fde Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 12 Mar 2022 09:33:41 +0100
Subject: [PATCH 02/11] yarn locales fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 806f7bbbf..94f7afc0d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -100,11 +100,8 @@
     "your_amount": "Dein Betrag"
   },
   "gdd_per_link": {
-    "links_sum":"Summe deiner versendeten Gradidos",
-    "links_count":"aktive Links"
-  },
-  "links-list": {
-    "header": "Liste deiner aktiven Links"
+    "links_count": "aktive Links",
+    "links_sum": "Summe deiner versendeten Gradidos"
   },
   "gdt": {
     "action": "Aktion",
@@ -125,6 +122,9 @@
   },
   "imprint": "Impressum",
   "language": "Sprache",
+  "links-list": {
+    "header": "Liste deiner aktiven Links"
+  },
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a6db06ec1..11dd77bf5 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -100,11 +100,8 @@
     "your_amount": "Your amount"
   },
   "gdd_per_link": {
-    "links_sum":"Total of your sent Gradidos",
-    "links_count":"active links"
-  },
-  "links-list": {
-    "header": "List of your active links"
+    "links_count": "active links",
+    "links_sum": "Total of your sent Gradidos"
   },
   "gdt": {
     "action": "Action",
@@ -125,6 +122,9 @@
   },
   "imprint": "Legal notice",
   "language": "Language",
+  "links-list": {
+    "header": "List of your active links"
+  },
   "login": "Login",
   "logout": "Logout",
   "members_area": "Members area",

From 3f7cdca4bf77f78afd14b27cda20f1063f4f0428 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 13 Mar 2022 10:28:20 +0100
Subject: [PATCH 03/11] change review

---
 .../DecayInformations/CollapseLinksList.vue   |  1 -
 .../DecayInformation-Short.vue                |  2 +-
 .../Transactions/TransactionLink.vue          | 20 +------------------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue
index 69e1c852b..3c6bab053 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.vue
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue
@@ -2,7 +2,6 @@
   <div class="collapse-links-list">
     <div class="d-flex">
       <div class="text-center pb-3 gradido-max-width">
-        <b-icon icon="droplet-half" height="12" class="mb-2" />
         <b>{{ $t('links-list.header') }}</b>
       </div>
     </div>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Short.vue b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
index 3bed4b9cc..1cd0a2d09 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Short.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Short.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="decayinformation-short">
-    <span v-if="decay.decay">{{ decay.decay | amount }}</span>
+    <span v-if="decay.decay">{{ decay.decay | GDD }}</span>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/Transactions/TransactionLink.vue b/frontend/src/components/Transactions/TransactionLink.vue
index 34221be6c..0919716a7 100644
--- a/frontend/src/components/Transactions/TransactionLink.vue
+++ b/frontend/src/components/Transactions/TransactionLink.vue
@@ -7,7 +7,7 @@
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
-            <type-icon color="text-danger" icon="share" />
+            <type-icon color="text-danger" icon="link45deg" />
           </b-col>
 
           <b-col cols="11">
@@ -51,27 +51,9 @@ export default {
     amount: {
       type: String,
     },
-    balance: {
-      type: String,
-    },
-    balanceDate: {
-      type: String,
-    },
     decay: {
       type: Object,
     },
-    id: {
-      type: Number,
-    },
-    linkedUser: {
-      type: Object,
-    },
-    memo: {
-      type: String,
-    },
-    typeId: {
-      type: String,
-    },
   },
   data() {
     return {

From 7f89fb545229ace18fbf99780a2f253c745dc344 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Mar 2022 08:23:08 +0100
Subject: [PATCH 04/11] transactionList query includes the total count of the
 pending transaction links

---
 backend/src/graphql/model/TransactionList.ts        | 5 +++++
 backend/src/graphql/resolver/TransactionResolver.ts | 5 +++--
 backend/src/typeorm/repository/TransactionLink.ts   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts
index c34a594f5..9e8356747 100644
--- a/backend/src/graphql/model/TransactionList.ts
+++ b/backend/src/graphql/model/TransactionList.ts
@@ -9,12 +9,14 @@ export class TransactionList {
     balance: Decimal,
     transactions: Transaction[],
     count: number,
+    linkCount: number,
     balanceGDT?: number | null,
     decayStartBlock: Date = CONFIG.DECAY_START_TIME,
   ) {
     this.balance = balance
     this.transactions = transactions
     this.count = count
+    this.linkCount = linkCount
     this.balanceGDT = balanceGDT || null
     this.decayStartBlock = decayStartBlock
   }
@@ -25,6 +27,9 @@ export class TransactionList {
   @Field(() => Number)
   count: number
 
+  @Field(() => Number)
+  linkCount: number
+
   @Field(() => Decimal)
   balance: Decimal
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d2bfd7f28..b90bf46c7 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -170,7 +170,7 @@ export class TransactionResolver {
     }
 
     if (!lastTransaction) {
-      return new TransactionList(new Decimal(0), [], 0, balanceGDT)
+      return new TransactionList(new Decimal(0), [], 0, 0, balanceGDT)
     }
 
     // find transactions
@@ -204,7 +204,7 @@ export class TransactionResolver {
     const transactions: Transaction[] = []
 
     const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
-    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
+    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate, transactionLinkcount } =
       await transactionLinkRepository.summary(user.id, now)
 
     // decay & link transactions
@@ -244,6 +244,7 @@ export class TransactionResolver {
       ),
       transactions,
       userTransactionsCount,
+      transactionLinkcount,
       balanceGDT,
     )
   }
diff --git a/backend/src/typeorm/repository/TransactionLink.ts b/backend/src/typeorm/repository/TransactionLink.ts
index 2ce937d8d..46926673a 100644
--- a/backend/src/typeorm/repository/TransactionLink.ts
+++ b/backend/src/typeorm/repository/TransactionLink.ts
@@ -12,13 +12,15 @@ export class TransactionLinkRepository extends Repository<dbTransactionLink> {
     sumAmount: Decimal
     lastDate: Date | null
     firstDate: Date | null
+    transactionLinkcount: number
   }> {
-    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
+    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate, count } =
       await this.createQueryBuilder('transactionLinks')
         .select('SUM(transactionLinks.holdAvailableAmount)', 'sumHoldAvailableAmount')
         .addSelect('SUM(transactionLinks.amount)', 'sumAmount')
         .addSelect('MAX(transactionLinks.validUntil)', 'lastDate')
         .addSelect('MIN(transactionLinks.createdAt)', 'firstDate')
+        .addSelect('COUNT(*)', 'count')
         .where('transactionLinks.userId = :userId', { userId })
         .andWhere('transactionLinks.redeemedAt is NULL')
         .andWhere('transactionLinks.validUntil > :date', { date })
@@ -31,6 +33,7 @@ export class TransactionLinkRepository extends Repository<dbTransactionLink> {
       sumAmount: sumAmount ? new Decimal(sumAmount) : new Decimal(0),
       lastDate: lastDate || null,
       firstDate: firstDate || null,
+      transactionLinkcount: count || 0,
     }
   }
 }

From fde2a7f7bff5d22c2bb543463901a81accf2098b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Mar 2022 08:36:28 +0100
Subject: [PATCH 05/11] also query linkCount in transactionList

---
 frontend/src/components/GddTransactionList.vue           | 7 ++++++-
 frontend/src/components/TransactionRows/LinkCountRow.vue | 2 +-
 frontend/src/components/Transactions/TransactionLink.vue | 5 ++++-
 frontend/src/graphql/queries.js                          | 1 +
 frontend/src/layouts/DashboardLayout_gdd.vue             | 3 +++
 frontend/src/pages/Overview.vue                          | 2 ++
 frontend/src/pages/Transactions.vue                      | 2 ++
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index dc21208c0..9c7013ec5 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -43,7 +43,11 @@
           </template>
 
           <template #TRANSACTION_LINK>
-            <transaction-link class="list-group-item" v-bind="transactions[index]" />
+            <transaction-link
+              class="list-group-item"
+              v-bind="transactions[index]"
+              :transactionLinkCount="transactionLinkCount"
+            />
           </template>
         </transaction-list-item>
       </div>
@@ -91,6 +95,7 @@ export default {
     pageSize: { type: Number, default: 25 },
     timestamp: { type: Number, default: 0 },
     transactionCount: { type: Number, default: 0 },
+    transactionLinkCount: { type: Number, default: 0 },
     showPagination: { type: Boolean, default: false },
   },
   methods: {
diff --git a/frontend/src/components/TransactionRows/LinkCountRow.vue b/frontend/src/components/TransactionRows/LinkCountRow.vue
index fdb4c7089..5535efde1 100644
--- a/frontend/src/components/TransactionRows/LinkCountRow.vue
+++ b/frontend/src/components/TransactionRows/LinkCountRow.vue
@@ -15,7 +15,7 @@ export default {
   name: 'LinkCountRow',
   props: {
     count: {
-      type: String,
+      type: Number,
       required: true,
     },
   },
diff --git a/frontend/src/components/Transactions/TransactionLink.vue b/frontend/src/components/Transactions/TransactionLink.vue
index 0919716a7..9799a1365 100644
--- a/frontend/src/components/Transactions/TransactionLink.vue
+++ b/frontend/src/components/Transactions/TransactionLink.vue
@@ -15,7 +15,7 @@
             <amount-and-name-row :amount="amount" :text="$t('gdd_per_link.links_sum')" />
 
             <!-- Count Links -->
-            <link-count-row count="22" />
+            <link-count-row :count="transactionLinkCount" />
 
             <!-- Decay -->
             <decay-row :decay="decay" />
@@ -54,6 +54,9 @@ export default {
     decay: {
       type: Object,
     },
+    transactionLinkCount: {
+      type: Number,
+    },
   },
   data() {
     return {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 94a5e59f3..b81663248 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -57,6 +57,7 @@ export const transactionsQuery = gql`
     ) {
       balanceGDT
       count
+      linkCount
       balance
       decayStartBlock
       transactions {
diff --git a/frontend/src/layouts/DashboardLayout_gdd.vue b/frontend/src/layouts/DashboardLayout_gdd.vue
index 66221993f..e35faab2a 100755
--- a/frontend/src/layouts/DashboardLayout_gdd.vue
+++ b/frontend/src/layouts/DashboardLayout_gdd.vue
@@ -24,6 +24,7 @@
               :gdt-balance="GdtBalance"
               :transactions="transactions"
               :transactionCount="transactionCount"
+              :transactionLinkCount="transactionLinkCount"
               :pending="pending"
               :decayStartBlock="decayStartBlock"
               @update-balance="updateBalance"
@@ -59,6 +60,7 @@ export default {
       transactions: [],
       bookedBalance: 0,
       transactionCount: 0,
+      transactionLinkCount: 0,
       pending: true,
       visible: false,
       decayStartBlock: new Date(),
@@ -99,6 +101,7 @@ export default {
           this.transactions = transactionList.transactions
           this.balance = Number(transactionList.balance)
           this.transactionCount = transactionList.count
+          this.transactionLinkCount = transactionList.linkCount
           this.decayStartBlock = new Date(transactionList.decayStartBlock)
           this.pending = false
         })
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 842f6d2d5..93344b3ee 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -20,6 +20,7 @@
         :timestamp="timestamp"
         :decayStartBlock="decayStartBlock"
         :transaction-count="transactionCount"
+        :transactionLinkCount="transactionLinkCount"
         @update-transactions="updateTransactions"
       />
       <gdd-transaction-list-footer :count="transactionCount" />
@@ -51,6 +52,7 @@ export default {
       default: () => [],
     },
     transactionCount: { type: Number, default: 0 },
+    transactionLinkCount: { type: Number, default: 0 },
     pending: {
       type: Boolean,
       default: true,
diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 31094e454..6fc588b10 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -7,6 +7,7 @@
         <gdd-transaction-list
           :timestamp="timestamp"
           :transactionCount="transactionCount"
+          :transactionLinkCount="transactionLinkCount"
           :transactions="transactions"
           :show-pagination="true"
           :decayStartBlock="decayStartBlock"
@@ -42,6 +43,7 @@ export default {
       default: () => [],
     },
     transactionCount: { type: Number, default: 0 },
+    transactionLinkCount: { type: Number, default: 0 },
     decayStartBlock: { type: Date },
   },
   data() {

From f53bc38eb6701f5276063f83d83af400cb2b0de9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Mar 2022 08:42:12 +0100
Subject: [PATCH 06/11] test update of transactoin link count

---
 frontend/src/layouts/DashboardLayout_gdd.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/layouts/DashboardLayout_gdd.spec.js b/frontend/src/layouts/DashboardLayout_gdd.spec.js
index 8765c95e7..2a8b7bf42 100644
--- a/frontend/src/layouts/DashboardLayout_gdd.spec.js
+++ b/frontend/src/layouts/DashboardLayout_gdd.spec.js
@@ -155,6 +155,7 @@ describe('DashboardLayoutGdd', () => {
               transactionList: {
                 balanceGDT: 100,
                 count: 4,
+                linkCount: 8,
                 balance: 1450,
                 decay: 1250,
                 transactions: ['transaction', 'transaction', 'transaction', 'transaction'],
@@ -198,6 +199,10 @@ describe('DashboardLayoutGdd', () => {
         it('updates transaction count', () => {
           expect(wrapper.vm.transactionCount).toBe(4)
         })
+
+        it('updates transaction link count', () => {
+          expect(wrapper.vm.transactionLinkCount).toBe(8)
+        })
       })
 
       describe('update transactions returns error', () => {

From bb14c07747c6834c31875ebf24b8720039598f35 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Mar 2022 08:56:26 +0100
Subject: [PATCH 07/11] sum of hold available and hold available decay is
 negative

---
 backend/src/graphql/resolver/TransactionResolver.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b90bf46c7..f64ba19e9 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -217,9 +217,9 @@ export class TransactionResolver {
         transactions.push(
           virtualLinkTransaction(
             lastTransaction.balance.minus(sumHoldAvailableAmount.toString()),
-            sumAmount,
-            sumHoldAvailableAmount,
-            sumHoldAvailableAmount.minus(sumAmount.toString()),
+            sumAmount.mul(-1),
+            sumHoldAvailableAmount.mul(-1),
+            sumHoldAvailableAmount.minus(sumAmount.toString()).mul(-1),
             firstDate || now,
             lastDate || now,
             self,

From 1350001f29244318f7d8c309431b802482dfd810 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 08:59:48 +0100
Subject: [PATCH 08/11] yarn locales --fix

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 62df91b96..529ccc2e6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,13 +101,13 @@
     "your_amount": "Dein Betrag"
   },
   "gdd_per_link": {
-    "links_count": "aktive Links",
-    "links_sum": "Summe deiner versendeten Gradidos",
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
+    "links_count": "aktive Links",
+    "links_sum": "Summe deiner versendeten Gradidos",
     "not-copied": "Konnte den Link nicht kopieren: {err}",
     "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
     "sentence_2": "Der Link ist 14 Tage gültig!",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 7d4ebd9ba..e5b056be5 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -101,13 +101,13 @@
     "your_amount": "Your amount"
   },
   "gdd_per_link": {
-    "links_count": "active links",
-    "links_sum": "Total of your sent Gradidos",
     "copy": "copy",
     "created": "Link was created!",
     "decay-14-day": "Decay for 14 days",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
+    "links_count": "active links",
+    "links_sum": "Total of your sent Gradidos",
     "not-copied": "Could not copy link: {err}",
     "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
     "sentence_2": "The link is valid for 14 days!",

From 6f12f1f472ba4959e1a0ba4dc4e484aad778da30 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 09:09:50 +0100
Subject: [PATCH 09/11] chnage review

---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 529ccc2e6..9c0e440b0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -106,7 +106,7 @@
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "header": "Gradidos versenden per Link",
     "link-copied": "Link wurde in die Zwischenablage kopiert",
-    "links_count": "aktive Links",
+    "links_count": "Aktive Links",
     "links_sum": "Summe deiner versendeten Gradidos",
     "not-copied": "Konnte den Link nicht kopieren: {err}",
     "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",

From e8a276e5296bc8c964224662cc04b933213cb353 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 09:10:47 +0100
Subject: [PATCH 10/11] chnage review locales en

---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index e5b056be5..a454ee785 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -106,7 +106,7 @@
     "decay-14-day": "Decay for 14 days",
     "header": "Send Gradidos via link",
     "link-copied": "Link copied to clipboard",
-    "links_count": "active links",
+    "links_count": "Active links",
     "links_sum": "Total of your sent Gradidos",
     "not-copied": "Could not copy link: {err}",
     "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",

From d2365dcd30dbbcc9251fda71a9ba8f4cc9ed85eb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Mar 2022 09:22:48 +0100
Subject: [PATCH 11/11] set an all props  required: true

---
 .../Transactions/TransactionCreation.vue      | 23 ++++++++-----------
 .../Transactions/TransactionDecay.vue         |  3 +++
 .../Transactions/TransactionLink.vue          |  3 +++
 .../Transactions/TransactionReceive.vue       | 21 ++++++++---------
 .../Transactions/TransactionSend.vue          | 17 ++++++++------
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 33b048c07..43178e5f2 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -60,42 +60,37 @@ export default {
   props: {
     amount: {
       type: String,
-    },
-    balance: {
-      type: String,
+      required: true,
     },
     balanceDate: {
       type: String,
+      required: true,
     },
     decay: {
       type: Object,
-    },
-    id: {
-      type: Number,
+      required: true,
     },
     linkedUser: {
       type: Object,
+      required: true,
     },
     memo: {
       type: String,
+      required: true,
     },
     typeId: {
       type: String,
+      required: true,
     },
-    properties: {
-      type: Object,
+    decayStartBlock: {
+      type: Date,
+      required: true,
     },
-    decayStartBlock: { type: Date },
   },
   data() {
     return {
       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 d6c210d9d..4038e782f 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -43,12 +43,15 @@ export default {
   props: {
     amount: {
       type: String,
+      required: true,
     },
     balance: {
       type: String,
+      required: true,
     },
     decay: {
       type: Object,
+      required: true,
     },
   },
   data() {
diff --git a/frontend/src/components/Transactions/TransactionLink.vue b/frontend/src/components/Transactions/TransactionLink.vue
index 9799a1365..5c261adbf 100644
--- a/frontend/src/components/Transactions/TransactionLink.vue
+++ b/frontend/src/components/Transactions/TransactionLink.vue
@@ -50,12 +50,15 @@ export default {
   props: {
     amount: {
       type: String,
+      required: true,
     },
     decay: {
       type: Object,
+      required: true,
     },
     transactionLinkCount: {
       type: Number,
+      required: true,
     },
   },
   data() {
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 8766fbfa3..e9dc23cdb 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -61,39 +61,36 @@ export default {
   props: {
     amount: {
       type: String,
-    },
-    balance: {
-      type: String,
+      required: true,
     },
     balanceDate: {
       type: String,
+      required: true,
     },
     decay: {
       type: Object,
-    },
-    id: {
-      type: Number,
+      required: true,
     },
     linkedUser: {
       type: Object,
+      required: true,
     },
     memo: {
       type: String,
+      required: true,
     },
     typeId: {
       type: String,
     },
-    decayStartBlock: { type: Date },
+    decayStartBlock: {
+      type: Date,
+      required: true,
+    },
   },
   data() {
     return {
       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 0ae8495f5..18112f8e1 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -61,29 +61,32 @@ export default {
   props: {
     amount: {
       type: String,
-    },
-    balance: {
-      type: String,
+      required: true,
     },
     balanceDate: {
       type: String,
+      required: true,
     },
     decay: {
       type: Object,
-    },
-    id: {
-      type: Number,
+      required: true,
     },
     linkedUser: {
       type: Object,
+      required: true,
     },
     memo: {
       type: String,
+      required: true,
     },
     typeId: {
       type: String,
+      required: true,
+    },
+    decayStartBlock: {
+      type: Date,
+      required: true,
     },
-    decayStartBlock: { type: Date },
   },
   data() {
     return {