From afec1f7e59011fdb85723d2e7ae374e1d51c8339 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 21:15:40 +0200
Subject: [PATCH 01/18] =?UTF-8?q?remove=20button,=20add=20dropdown=20men?=
 =?UTF-8?q?=C3=BC,=20change=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TransactionLinks/TransactionLink.vue      | 59 ++++++++-----------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 66f9f2f92..abb54f8f6 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,49 +1,39 @@
 <template>
   <div class="transaction-link gradido-custom-background">
-    <b-row class="mb-2 pt-2 pb-2">
-      <b-col lg="2">
+    <b-row :class="validLink ? '' : 'bg-muted text-light'" class="mb-2 pt-2 pb-2">
+      <b-col cols="1">
         <type-icon color="text-danger" icon="link45deg" class="pt-4 pl-2" />
       </b-col>
-      <b-col lg="9" md="9">
+      <b-col cols="11">
         <b-row>
-          <b-col lg="11" md="10">
+          <b-col>
             <amount-and-name-row :amount="amount" :text="$t('form.amount')" />
             <memo-row :memo="memo" />
             <date-row :date="validUntil" :diffNow="true" />
             <decay-row :decay="decay" />
           </b-col>
-          <b-col lg="1" md="2" class="text-center text-lg-left qr-button">
-            <b-button
-              @click="$bvModal.show('modalPopover-' + id)"
-              class="p-2 test-qr-code"
-              size="sm"
-            >
-              <b-img src="img/svg/qr-code.svg" width="60" class="filter"></b-img>
-            </b-button>
+          <b-col cols="12" lg="1" md="1" class="text-center text-md-right">
+            <b-dropdown right class="ml--5">
+              <b-dropdown-item v-if="validLink" class="test-copy-link" size="lg" @click="copy">
+                <b-icon icon="clipboard" font-scale="2"></b-icon>
+                {{ $t('gdd_per_link.copy') }}
+              </b-dropdown-item>
+              <b-dropdown-item
+                v-if="validLink"
+                @click="$bvModal.show('modalPopover-' + id)"
+                class="pt-3 test-qr-code"
+              >
+                <b-img src="img/svg/qr-code.svg" width="30" class="filter"></b-img>
+                {{ $t('qrCode') }}
+              </b-dropdown-item>
+              <b-dropdown-item class="pt-3 test-delete-link" @click="deleteLink()">
+                <b-icon icon="trash" font-scale="2"></b-icon>
+                {{ $t('delete') }}
+              </b-dropdown-item>
+            </b-dropdown>
           </b-col>
         </b-row>
       </b-col>
-
-      <b-col lg="1" md="1" class="text-center text-lg-right">
-        <b-button
-          class="p-2 test-copy-link"
-          size="lg"
-          variant="outline-primary"
-          @click="copy"
-          :title="$t('gdd_per_link.copy')"
-        >
-          <b-icon icon="clipboard"></b-icon>
-        </b-button>
-        <br />
-        <b-button
-          class="p-2 mt-3 test-delete-link"
-          size="sm"
-          @click="deleteLink()"
-          :title="$t('delete')"
-        >
-          <b-icon icon="trash"></b-icon>
-        </b-button>
-      </b-col>
     </b-row>
     <b-modal :id="'modalPopover-' + id" title="QR-Code" ok-only hide-header-close>
       <div class="text-center">
@@ -118,6 +108,9 @@ export default {
     link() {
       return `${window.location.origin}/redeem/${this.code}`
     },
+    validLink() {
+      return new Date(this.validUntil) > new Date()
+    },
   },
 }
 </script>

From 8d447ffaffbe918ddd8d65deff6f97dd5f81afe8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 21:16:29 +0200
Subject: [PATCH 02/18] fixed test, validUntil and No validUntil

---
 .../TransactionLinks/TransactionLink.spec.js  | 196 ++++++++++--------
 1 file changed, 110 insertions(+), 86 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index ec2f657c3..fc39f5f69 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -44,115 +44,139 @@ describe('TransactionLink', () => {
       expect(wrapper.find('div.transaction-link').exists()).toBeTruthy()
     })
 
-    describe('Copy link to Clipboard', () => {
-      const navigatorClipboard = navigator.clipboard
-      beforeAll(() => {
-        delete navigator.clipboard
-        navigator.clipboard = { writeText: navigatorClipboardMock }
-      })
-      afterAll(() => {
-        navigator.clipboard = navigatorClipboard
+    describe('Link validUntil Date is not valid', () => {
+      it('find no link copy button', () => {
+        expect(wrapper.find('.test-copy-link').exists()).toBe(false)
       })
 
-      describe('copy with success', () => {
-        beforeEach(async () => {
-          navigatorClipboardMock.mockResolvedValue()
-          await wrapper.find('.test-copy-link').trigger('click')
-        })
-        it('should call clipboard.writeText', () => {
-          expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
-            'http://localhost/redeem/c00000000c000000c0000',
-          )
-        })
-        it('toasts success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
-        })
+      it('find no Qr-Code Button ', () => {
+        expect(wrapper.find('.test-qr-code').exists()).toBe(false)
+      })
+
+      it('find only Link Löschen Button ', () => {
+        expect(wrapper.find('.test-delete-link').exists()).toBe(true)
       })
     })
 
-    describe('qr code modal', () => {
-      let spy
-
-      beforeEach(() => {
+    describe('Link validUntil Date is valid ', () => {
+      beforeEach(async () => {
         jest.clearAllMocks()
+        await wrapper.setProps({
+          validUntil: '2022-05-30T14:22:40.000Z',
+        })
       })
 
-      describe('with success', () => {
+      describe('Copy link to Clipboard', () => {
+        const navigatorClipboard = navigator.clipboard
+        beforeAll(() => {
+          delete navigator.clipboard
+          navigator.clipboard = { writeText: navigatorClipboardMock }
+        })
+        afterAll(() => {
+          navigator.clipboard = navigatorClipboard
+        })
+
+        describe('copy with success', () => {
+          beforeEach(async () => {
+            navigatorClipboardMock.mockResolvedValue()
+            await wrapper.find('.test-copy-link .dropdown-item').trigger('click')
+          })
+
+          it('should call clipboard.writeText', () => {
+            expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
+              'http://localhost/redeem/c00000000c000000c0000',
+            )
+          })
+          it('toasts success message', () => {
+            expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
+          })
+        })
+      })
+
+      describe('qr code modal', () => {
+        let spy
+
         beforeEach(async () => {
-          spy = jest.spyOn(wrapper.vm.$bvModal, 'show')
-          // spy.mockImplementation(() => Promise.resolve('some value'))
-          // mockAPIcall.mockResolvedValue()
-          await wrapper.find('.test-qr-code').trigger('click')
+          jest.clearAllMocks()
         })
 
-        it('qr-code Modal if show', () => {
-          expect(spy).toBeCalled()
+        describe('with success', () => {
+          beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'show')
+            // spy.mockImplementation(() => Promise.resolve('some value'))
+            // mockAPIcall.mockResolvedValue()
+            await wrapper.find('.test-qr-code .dropdown-item').trigger('click')
+          })
+
+          it('qr-code Modal if show', () => {
+            expect(spy).toBeCalled()
+          })
         })
       })
-    })
 
-    describe('delete link', () => {
-      let spy
+      describe('delete link', () => {
+        let spy
 
-      beforeEach(() => {
-        jest.clearAllMocks()
-      })
-
-      describe('with success', () => {
         beforeEach(async () => {
-          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-          spy.mockImplementation(() => Promise.resolve('some value'))
-          mockAPIcall.mockResolvedValue()
-          await wrapper.find('.test-delete-link').trigger('click')
+          jest.clearAllMocks()
         })
 
-        it('test Modal if confirm true', () => {
-          expect(spy).toBeCalled()
+        describe('with success', () => {
+          beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+            spy.mockImplementation(() => Promise.resolve('some value'))
+            mockAPIcall.mockResolvedValue()
+            await wrapper.find('.test-delete-link .dropdown-item').trigger('click')
+          })
+
+          it('test Modal if confirm true', () => {
+            expect(spy).toBeCalled()
+          })
+
+          it('calls the API', () => {
+            expect(mockAPIcall).toBeCalledWith(
+              expect.objectContaining({
+                mutation: deleteTransactionLink,
+                variables: {
+                  id: 12,
+                },
+              }),
+            )
+          })
+
+          it('toasts a success message', () => {
+            expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.deleted')
+          })
+
+          it('emits reset transaction link list', () => {
+            expect(wrapper.emitted('reset-transaction-link-list')).toBeTruthy()
+          })
         })
 
-        it('calls the API', () => {
-          expect(mockAPIcall).toBeCalledWith(
-            expect.objectContaining({
-              mutation: deleteTransactionLink,
-              variables: {
-                id: 12,
-              },
-            }),
-          )
+        describe('with error', () => {
+          beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+            spy.mockImplementation(() => Promise.resolve('some value'))
+            mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
+            await wrapper.find('.test-delete-link .dropdown-item').trigger('click')
+          })
+
+          it('toasts an error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('Something went wrong :(')
+          })
         })
 
-        it('toasts a success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.deleted')
-        })
+        describe('cancel delete', () => {
+          beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+            spy.mockImplementation(() => Promise.resolve(false))
+            mockAPIcall.mockResolvedValue()
+            await wrapper.find('.test-delete-link .dropdown-item').trigger('click')
+          })
 
-        it('emits reset transaction link list', () => {
-          expect(wrapper.emitted('reset-transaction-link-list')).toBeTruthy()
-        })
-      })
-
-      describe('with error', () => {
-        beforeEach(async () => {
-          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-          spy.mockImplementation(() => Promise.resolve('some value'))
-          mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
-          await wrapper.find('.test-delete-link').trigger('click')
-        })
-
-        it('toasts an error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('Something went wrong :(')
-        })
-      })
-
-      describe('cancel delete', () => {
-        beforeEach(async () => {
-          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-          spy.mockImplementation(() => Promise.resolve(false))
-          mockAPIcall.mockResolvedValue()
-          await wrapper.find('.test-delete-link').trigger('click')
-        })
-
-        it('does not call the API', () => {
-          expect(mockAPIcall).not.toBeCalled()
+          it('does not call the API', () => {
+            expect(mockAPIcall).not.toBeCalled()
+          })
         })
       })
     })

From 5943ceeb20b07f2484da580d6032a4c1838fe93e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 21:18:57 +0200
Subject: [PATCH 03/18] add locales 'qrCode'

---
 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 20ce055d4..6c891d4b2 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -164,6 +164,7 @@
     "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
     "publisherId": "Publisher-Id:"
   },
+  "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
   "settings": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 201c44d93..759412019 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -164,6 +164,7 @@
     "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
     "publisherId": "PublisherID:"
   },
+  "qrCode": "QR Code",
   "send_gdd": "GDD send",
   "send_per_link": "GDD send via link",
   "settings": {

From ff37c1af9db8950122c4eb05bd38985248117e6d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 22:29:47 +0200
Subject: [PATCH 04/18] add locales 'expiredOn'

---
 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 6c891d4b2..16111ef4a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -102,6 +102,7 @@
     "decay-14-day": "Vergänglichkeit für 14 Tage",
     "delete-the-link": "Den Link löschen?",
     "deleted": "Der Link wurde gelöscht!",
+    "expiredOn": "Abgelaufen am",
     "has-account": "Du besitzt bereits ein Gradido Konto?",
     "header": "Gradidos versenden per Link",
     "isFree": "Gradido ist weltweit kostenfrei.",
@@ -121,7 +122,7 @@
     "redeemed-title": "eingelöst",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto.",
-    "valid_until": "Gültig bis"
+    "validUntil": "Gültig bis"
   },
   "gdt": {
     "calculation": "Berechnung der Gradido Transform",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 759412019..70a2fabca 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -102,6 +102,7 @@
     "decay-14-day": "Decay for 14 days",
     "delete-the-link": "Delete the link?",
     "deleted": "The link was deleted!",
+    "expiredOn": "Expired on",
     "has-account": "You already have a Gradido account?",
     "header": "Send Gradidos via link",
     "isFree": "Gradido is free of charge worldwide.",
@@ -121,7 +122,7 @@
     "redeemed-title": "redeemed",
     "to-login": "Log in",
     "to-register": "Register a new account.",
-    "valid_until": "Valid until"
+    "validUntil": "Valid until"
   },
   "gdt": {
     "calculation": "Calculation of Gradido Transform",

From 39517cdf52404e136ba149dbc4ecb1be6a2a95b5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 22:32:15 +0200
Subject: [PATCH 05/18] add computed text()

---
 .../src/components/TransactionRows/DateRow.vue   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 5f526caaf..5998be134 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -3,7 +3,7 @@
     <b-row>
       <b-col cols="5">
         <div class="text-right">
-          {{ diffNow ? $t('gdd_per_link.valid_until') : $t('form.date') }}
+          {{ text }}
         </div>
       </b-col>
       <b-col cols="7">
@@ -27,6 +27,20 @@ export default {
       required: false,
       default: false,
     },
+    validLink: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  computed: {
+    text() {
+      if (this.diffNow)
+        return this.validLink
+          ? this.$t('gdd_per_link.validUntil')
+          : this.$t('gdd_per_link.expiredOn')
+      return this.$t('form.date')
+    },
   },
 }
 </script>

From 76d2100c3cd9cdce1f358122b18fd02559ac2926 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 22:35:19 +0200
Subject: [PATCH 06/18] add props validLink

---
 .../TransactionLinks/TransactionLink.vue       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index abb54f8f6..b9d9cc93d 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -9,13 +9,17 @@
           <b-col>
             <amount-and-name-row :amount="amount" :text="$t('form.amount')" />
             <memo-row :memo="memo" />
-            <date-row :date="validUntil" :diffNow="true" />
+            <date-row :date="validUntil" :diffNow="true" :validLink="validLink" />
             <decay-row :decay="decay" />
           </b-col>
-          <b-col cols="12" lg="1" md="1" class="text-center text-md-right">
-            <b-dropdown right class="ml--5">
-              <b-dropdown-item v-if="validLink" class="test-copy-link" size="lg" @click="copy">
-                <b-icon icon="clipboard" font-scale="2"></b-icon>
+          <b-col cols="12" lg="1" md="1" class="text-center text-md-right pr-5 pr-lg-4">
+            <b-dropdown no-caret right aria-expanded="false" size="sm">
+              <template #button-content>
+                <b-icon icon="three-dots-vertical"></b-icon>
+              </template>
+
+              <b-dropdown-item v-if="validLink" class="test-copy-link" @click="copy">
+                <b-icon icon="clipboard" font-scale="1"></b-icon>
                 {{ $t('gdd_per_link.copy') }}
               </b-dropdown-item>
               <b-dropdown-item
@@ -23,11 +27,11 @@
                 @click="$bvModal.show('modalPopover-' + id)"
                 class="pt-3 test-qr-code"
               >
-                <b-img src="img/svg/qr-code.svg" width="30" class="filter"></b-img>
+                <b-img src="img/svg/qr-code.svg" width="18" class="filter"></b-img>
                 {{ $t('qrCode') }}
               </b-dropdown-item>
               <b-dropdown-item class="pt-3 test-delete-link" @click="deleteLink()">
-                <b-icon icon="trash" font-scale="2"></b-icon>
+                <b-icon icon="trash" font-scale="1"></b-icon>
                 {{ $t('delete') }}
               </b-dropdown-item>
             </b-dropdown>

From 158ca4abec0f7bcec8e2d7001d66192caef5204b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:37:52 +0200
Subject: [PATCH 07/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 672149c06..085b368dd 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -45,7 +45,7 @@ describe('TransactionLink', () => {
     })
 
     describe('Link validUntil Date is not valid', () => {
-      it('find no link copy button', () => {
+      it('has no copy link button', () => {
         expect(wrapper.find('.test-copy-link').exists()).toBe(false)
       })
 

From df958f0be8999372171507df3c27d5fd1410cd8f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:38:10 +0200
Subject: [PATCH 08/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 085b368dd..a86ff665c 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -53,7 +53,7 @@ describe('TransactionLink', () => {
         expect(wrapper.find('.test-qr-code').exists()).toBe(false)
       })
 
-      it('find only Link Löschen Button ', () => {
+      it('has  delete link button ', () => {
         expect(wrapper.find('.test-delete-link').exists()).toBe(true)
       })
     })

From a54ad7cef4a9b89153d80cdfea9a928efff315aa Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:40:25 +0200
Subject: [PATCH 09/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index a86ff665c..b856618a7 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -62,7 +62,7 @@ describe('TransactionLink', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
         await wrapper.setProps({
-          validUntil: '2022-05-30T14:22:40.000Z',
+          validUntil: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2),
         })
       })
 

From 720f90f4b21be70cdf4439cbd8889e3434a43ad2 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:40:40 +0200
Subject: [PATCH 10/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index b856618a7..cfbdf66c8 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -129,7 +129,7 @@ describe('TransactionLink', () => {
             await wrapper.find('.test-delete-link .dropdown-item').trigger('click')
           })
 
-          it('test Modal if confirm true', () => {
+          it('opens the modal ', () => {
             expect(spy).toBeCalled()
           })
 

From e4214bc193def65c3d7c12525e45a4f0cc9dc78d Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:41:10 +0200
Subject: [PATCH 11/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index cfbdf66c8..044cd3402 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -49,7 +49,7 @@ describe('TransactionLink', () => {
         expect(wrapper.find('.test-copy-link').exists()).toBe(false)
       })
 
-      it('find no Qr-Code Button ', () => {
+      it('has no Qr-Code Button ', () => {
         expect(wrapper.find('.test-qr-code').exists()).toBe(false)
       })
 

From 8df93df392f502dc0c49c2fd053037db341f2a37 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:42:23 +0200
Subject: [PATCH 12/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/TransactionLinks/TransactionLink.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 044cd3402..f7916c105 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -60,6 +60,7 @@ describe('TransactionLink', () => {
 
     describe('Link validUntil Date is valid ', () => {
       beforeEach(async () => {
+        const now = new Date()
         jest.clearAllMocks()
         await wrapper.setProps({
           validUntil: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2),

From 8748abf4f05314b8929719fa8d0db4d7aac069c9 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:43:30 +0200
Subject: [PATCH 13/18] Update
 frontend/src/components/TransactionLinks/TransactionLink.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../src/components/TransactionLinks/TransactionLink.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index f7916c105..19d0683ab 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -109,7 +109,7 @@ describe('TransactionLink', () => {
             await wrapper.find('.test-qr-code .dropdown-item').trigger('click')
           })
 
-          it('qr-code Modal if show', () => {
+          it('opens the qr-code Modal', () => {
             expect(spy).toBeCalled()
           })
         })

From f6c64af047883abbb8813748bd52a9431d028ff1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 11:59:06 +0200
Subject: [PATCH 14/18] resolve conflict unused computed link()

---
 frontend/src/components/TransactionLinks/TransactionLink.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index d52e19fb2..58fac9063 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -109,9 +109,6 @@ export default {
     decay() {
       return `${this.amount - this.holdAvailableAmount}`
     },
-    link() {
-      return `${window.location.origin}/redeem/${this.code}`
-    },
     validLink() {
       return new Date(this.validUntil) > new Date()
     },

From 0361b99a1105af5c8ae49c8cda4d1bc98b04a8b8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 12:17:43 +0200
Subject: [PATCH 15/18] fixed test validUntil to string

---
 .../src/components/TransactionLinks/TransactionLink.spec.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 19d0683ab..ad9e4860e 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -53,7 +53,7 @@ describe('TransactionLink', () => {
         expect(wrapper.find('.test-qr-code').exists()).toBe(false)
       })
 
-      it('has  delete link button ', () => {
+      it('has delete link button ', () => {
         expect(wrapper.find('.test-delete-link').exists()).toBe(true)
       })
     })
@@ -63,7 +63,7 @@ describe('TransactionLink', () => {
         const now = new Date()
         jest.clearAllMocks()
         await wrapper.setProps({
-          validUntil: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2),
+          validUntil: `${new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2)}`,
         })
       })
 

From 432e0c1e71d7e00368170b338d5051cac388fb5b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 13:05:56 +0200
Subject: [PATCH 16/18] remove unused font-scale 1

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

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 58fac9063..a1e683fdd 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -31,7 +31,7 @@
                 {{ $t('qrCode') }}
               </b-dropdown-item>
               <b-dropdown-item class="pt-3 test-delete-link" @click="deleteLink()">
-                <b-icon icon="trash" font-scale="1"></b-icon>
+                <b-icon icon="trash"></b-icon>
                 {{ $t('delete') }}
               </b-dropdown-item>
             </b-dropdown>

From f8e46cc1e1053b8271446f4ad82cd9f29de1c160 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 13:07:39 +0200
Subject: [PATCH 17/18] remove another unused font-scale 1

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

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index a1e683fdd..ba4a4dc00 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -19,7 +19,7 @@
               </template>
 
               <b-dropdown-item v-if="validLink" class="test-copy-link" @click="copy">
-                <b-icon icon="clipboard" font-scale="1"></b-icon>
+                <b-icon icon="clipboard"></b-icon>
                 {{ $t('gdd_per_link.copy') }}
               </b-dropdown-item>
               <b-dropdown-item

From 70a153c67c4fb2e917794bf220c7851d3937e400 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 15:20:46 +0200
Subject: [PATCH 18/18] changed paddings from dropdown menu

---
 frontend/src/components/TransactionLinks/TransactionLink.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index e921135f8..5b8e15d5c 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -25,12 +25,12 @@
               <b-dropdown-item
                 v-if="validLink"
                 @click="$bvModal.show('modalPopover-' + id)"
-                class="pt-3 test-qr-code"
+                class="pt-3 pb-3 test-qr-code"
               >
                 <b-img src="img/svg/qr-code.svg" width="18" class="filter"></b-img>
                 {{ $t('qrCode') }}
               </b-dropdown-item>
-              <b-dropdown-item class="pt-3 test-delete-link" @click="deleteLink()">
+              <b-dropdown-item class="test-delete-link" @click="deleteLink()">
                 <b-icon icon="trash"></b-icon>
                 {{ $t('delete') }}
               </b-dropdown-item>