From 62831a71df3faac4f0fe76e797dd32b707210e4f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 25 Mar 2022 21:46:38 +0100
Subject: [PATCH 01/16] add transactionLinkId on query

---
 frontend/src/graphql/queries.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 60b929c6d..e47da0fea 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -70,6 +70,7 @@ export const transactionsQuery = gql`
         linkedUser {
           email
         }
+        transactionLinkId
       }
     }
   }

From 095dffc7e6c3219e7dcd1c136802d313484a61ea Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 25 Mar 2022 21:47:16 +0100
Subject: [PATCH 02/16] add locales redeemed-title

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 35155ca79..e0b23583d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -116,6 +116,7 @@
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
     "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
+    "redeemed-title": "eingelöst",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index af54f3b50..ede4c4f2e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -116,6 +116,7 @@
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "redeemed-at": "The link was already redeemed on {date}.",
+    "redeemed-title": "redeemed",
     "to-login": "Log in",
     "to-register": "Register a new account"
   },

From fe2d1caa108d951456e42a46496cd43c0cf5835b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 25 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/16] add icon if transactionLinkId on transaction

---
 frontend/src/components/TransactionRows/TypeIcon.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/components/TransactionRows/TypeIcon.vue b/frontend/src/components/TransactionRows/TypeIcon.vue
index ff8aa8647..24cede717 100644
--- a/frontend/src/components/TransactionRows/TypeIcon.vue
+++ b/frontend/src/components/TransactionRows/TypeIcon.vue
@@ -2,6 +2,13 @@
   <div class="type-icon">
     <div class="gdd-transaction-list-item-icon">
       <b-icon :icon="icon" :class="color" class="m-mb-1 font2em" />
+      <b-icon
+        v-if="transactionLinkId"
+        icon="link45deg"
+        variant="muted"
+        class="m-mb-1"
+        :title="$t('gdd_per_link.redeemed-title')"
+      />
     </div>
   </div>
 </template>
@@ -17,6 +24,11 @@ export default {
       type: String,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+      default: null,
+    },
   },
 }
 </script>

From 5c099cd01fddc4ac32a55dd6673371c06cf4bbe8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 25 Mar 2022 21:49:35 +0100
Subject: [PATCH 04/16] add props transactionLinkId

---
 .../src/components/Transactions/TransactionReceive.vue | 10 +++++++++-
 .../src/components/Transactions/TransactionSend.vue    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index d1947a91a..3c9f3d0f8 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -8,7 +8,11 @@
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
-            <type-icon color="gradido-global-color-accent" icon="arrow-right-circle" />
+            <type-icon
+              color="gradido-global-color-accent"
+              icon="arrow-right-circle"
+              :transactionLinkId="transactionLinkId"
+            />
           </b-col>
 
           <b-col cols="11">
@@ -86,6 +90,10 @@ export default {
       type: Date,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+    },
   },
   data() {
     return {
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index dfe50225a..19616cbfb 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -8,7 +8,11 @@
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
-            <type-icon color="text-danger" icon="arrow-left-circle" />
+            <type-icon
+              color="text-danger"
+              icon="arrow-left-circle"
+              :transactionLinkId="transactionLinkId"
+            />
           </b-col>
 
           <b-col cols="11">
@@ -87,6 +91,10 @@ export default {
       type: Date,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+    },
   },
   data() {
     return {

From 184b94891615b4932c38d41d0b982a78776a9294 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:33:48 +0100
Subject: [PATCH 05/16] add locales via_link

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e0b23583d..7ca63fff4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -250,5 +250,6 @@
   },
   "transaction-link": {
     "send_you": "sendet dir"
-  }
+  },
+  "via_link":"über einen Link"
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ede4c4f2e..45c046389 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -250,5 +250,6 @@
   },
   "transaction-link": {
     "send_you": "wants to send you"
-  }
+  },
+  "via_link":"via Link"
 }

From bcfc60150b16f1f8e49fe8b88342a60f4bb87d26 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:34:53 +0100
Subject: [PATCH 06/16] remove linkk icon if redeemed

---
 frontend/src/components/TransactionRows/TypeIcon.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/frontend/src/components/TransactionRows/TypeIcon.vue b/frontend/src/components/TransactionRows/TypeIcon.vue
index 24cede717..ff8aa8647 100644
--- a/frontend/src/components/TransactionRows/TypeIcon.vue
+++ b/frontend/src/components/TransactionRows/TypeIcon.vue
@@ -2,13 +2,6 @@
   <div class="type-icon">
     <div class="gdd-transaction-list-item-icon">
       <b-icon :icon="icon" :class="color" class="m-mb-1 font2em" />
-      <b-icon
-        v-if="transactionLinkId"
-        icon="link45deg"
-        variant="muted"
-        class="m-mb-1"
-        :title="$t('gdd_per_link.redeemed-title')"
-      />
     </div>
   </div>
 </template>
@@ -24,11 +17,6 @@ export default {
       type: String,
       required: true,
     },
-    transactionLinkId: {
-      type: Number,
-      required: false,
-      default: null,
-    },
   },
 }
 </script>

From eecab9248d0df8326855cfa150046c01ab23a046 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:35:29 +0100
Subject: [PATCH 07/16] add link icon and locales via_link  if redeemed

---
 .../TransactionRows/AmountAndNameRow.vue           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/src/components/TransactionRows/AmountAndNameRow.vue b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
index be71b57f6..6ee6462ad 100644
--- a/frontend/src/components/TransactionRows/AmountAndNameRow.vue
+++ b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
@@ -12,6 +12,15 @@
         <div class="gdd-transaction-list-item-name">
           <b-link v-if="linkedUser && linkedUser.email" @click.stop="tunnelEmail">
             {{ itemText }}
+            <span v-if="transactionLinkId">
+              , {{ $t('via_link') }}
+              <b-icon
+                icon="link45deg"
+                variant="muted"
+                class="m-mb-1"
+                :title="$t('gdd_per_link.redeemed-title')"
+              />
+            </span>
           </b-link>
           <span v-else>{{ itemText }}</span>
         </div>
@@ -35,6 +44,11 @@ export default {
       type: String,
       required: false,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+      default: null,
+    },
   },
   methods: {
     tunnelEmail() {

From f9cc754ca0710e79568a8b873a7430baa6aed8b0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:36:35 +0100
Subject: [PATCH 08/16] add props transactionLinkId in TransactionReceive

---
 .../components/Transactions/TransactionReceive.vue  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 3c9f3d0f8..29fae11f4 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -8,16 +8,17 @@
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
-            <type-icon
-              color="gradido-global-color-accent"
-              icon="arrow-right-circle"
-              :transactionLinkId="transactionLinkId"
-            />
+            <type-icon color="gradido-global-color-accent" icon="arrow-right-circle" />
           </b-col>
 
           <b-col cols="11">
             <!-- Amount / Name || Text -->
-            <amount-and-name-row :amount="amount" :linkedUser="linkedUser" v-on="$listeners" />
+            <amount-and-name-row
+              :amount="amount"
+              :linkedUser="linkedUser"
+              v-on="$listeners"
+              :transactionLinkId="transactionLinkId"
+            />
 
             <!-- Nachricht Memo -->
             <memo-row :memo="memo" />

From 871a8ed14d8a51fa9faed648a523f8a2a8463833 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:36:48 +0100
Subject: [PATCH 09/16] add props transactionLinkId in TransactionSend

---
 .../src/components/Transactions/TransactionSend.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 19616cbfb..ecc47dc43 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -8,16 +8,17 @@
         <b-row>
           <!-- ICON  -->
           <b-col cols="1">
-            <type-icon
-              color="text-danger"
-              icon="arrow-left-circle"
-              :transactionLinkId="transactionLinkId"
-            />
+            <type-icon color="text-danger" icon="arrow-left-circle" />
           </b-col>
 
           <b-col cols="11">
             <!-- Amount / Name  -->
-            <amount-and-name-row :amount="amount" :linkedUser="linkedUser" v-on="$listeners" />
+            <amount-and-name-row
+              :amount="amount"
+              :linkedUser="linkedUser"
+              v-on="$listeners"
+              :transactionLinkId="transactionLinkId"
+            />
 
             <!-- Memo -->
             <memo-row :memo="memo" />

From 543b389f8c62099ec7918bf6256cc66c53b88640 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:39:14 +0100
Subject: [PATCH 10/16] add comma on via_link

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 7ca63fff4..8d9a7c9e1 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -251,5 +251,5 @@
   "transaction-link": {
     "send_you": "sendet dir"
   },
-  "via_link":"über einen Link"
+  "via_link": ", über einen Link"
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 45c046389..ec94534fe 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -251,5 +251,5 @@
   "transaction-link": {
     "send_you": "wants to send you"
   },
-  "via_link":"via Link"
+  "via_link": ", via Link"
 }

From 4909254a0237ef9b25006bdd927d5e755c31d9a7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 09:39:46 +0100
Subject: [PATCH 11/16] remove comma in text

---
 frontend/src/components/TransactionRows/AmountAndNameRow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionRows/AmountAndNameRow.vue b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
index 6ee6462ad..c98154909 100644
--- a/frontend/src/components/TransactionRows/AmountAndNameRow.vue
+++ b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
@@ -13,7 +13,7 @@
           <b-link v-if="linkedUser && linkedUser.email" @click.stop="tunnelEmail">
             {{ itemText }}
             <span v-if="transactionLinkId">
-              , {{ $t('via_link') }}
+              {{ $t('via_link') }}
               <b-icon
                 icon="link45deg"
                 variant="muted"

From 6b5288ca8f2a9bbc1a4cac7496f3fde983df4a85 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 26 Mar 2022 16:58:50 +0100
Subject: [PATCH 12/16] change, via_link text  outer link

---
 .../src/components/TransactionRows/AmountAndNameRow.vue   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/TransactionRows/AmountAndNameRow.vue b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
index c98154909..322ad7dfa 100644
--- a/frontend/src/components/TransactionRows/AmountAndNameRow.vue
+++ b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
@@ -10,8 +10,10 @@
       </b-col>
       <b-col cols="7">
         <div class="gdd-transaction-list-item-name">
-          <b-link v-if="linkedUser && linkedUser.email" @click.stop="tunnelEmail">
-            {{ itemText }}
+          <div v-if="linkedUser && linkedUser.email">
+            <b-link @click.stop="tunnelEmail">
+              {{ itemText }}
+            </b-link>
             <span v-if="transactionLinkId">
               {{ $t('via_link') }}
               <b-icon
@@ -21,7 +23,7 @@
                 :title="$t('gdd_per_link.redeemed-title')"
               />
             </span>
-          </b-link>
+          </div>
           <span v-else>{{ itemText }}</span>
         </div>
       </b-col>

From 3f7d9e73b3f68f82e4818d0d397a201185c1834b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:45:11 +0200
Subject: [PATCH 13/16] remove comma from via link

---
 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 8d9a7c9e1..81bc900e0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -251,5 +251,5 @@
   "transaction-link": {
     "send_you": "sendet dir"
   },
-  "via_link": ", über einen Link"
+  "via_link": "über einen Link"
 }

From 666f176b35afaa775c7d1f4f8fb3ec99bbca73ff Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:46:34 +0200
Subject: [PATCH 14/16] remove comma from via link

---
 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 ec94534fe..249664183 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -251,5 +251,5 @@
   "transaction-link": {
     "send_you": "wants to send you"
   },
-  "via_link": ", via Link"
+  "via_link": "via Link"
 }

From 640923dd5065eb2c1810f353c84ffac3124e3db3 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:47:45 +0200
Subject: [PATCH 15/16] sorting properties

---
 frontend/src/components/Transactions/TransactionSend.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index ecc47dc43..2f9ef54d2 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -14,9 +14,9 @@
           <b-col cols="11">
             <!-- Amount / Name  -->
             <amount-and-name-row
+              v-on="$listeners"
               :amount="amount"
               :linkedUser="linkedUser"
-              v-on="$listeners"
               :transactionLinkId="transactionLinkId"
             />
 

From 193e085439f2bcb10cd5d8cecd002a93ecceb7f8 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:51:24 +0200
Subject: [PATCH 16/16] sorting properties

---
 frontend/src/components/Transactions/TransactionReceive.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 29fae11f4..f83c84e53 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -14,9 +14,9 @@
           <b-col cols="11">
             <!-- Amount / Name || Text -->
             <amount-and-name-row
+              v-on="$listeners"
               :amount="amount"
               :linkedUser="linkedUser"
-              v-on="$listeners"
               :transactionLinkId="transactionLinkId"
             />