From b2623cc83ea944ff643a3e25f4463919bcdcccec Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 17:46:43 +0200
Subject: [PATCH 1/9] 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 1823bc3611293d2d7479eff67f60625044ca4bee Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 17:47:55 +0200
Subject: [PATCH 2/9] add methods 'showQrCodeButton', add data 'showQrcode'

---
 .../components/GddSend/TransactionResultLink.vue   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index ee65b159a..852f8b285 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -4,10 +4,10 @@
       <b-card class="p-0 gradido-custom-background">
         <div class="h3 mb-4">{{ $t('gdd_per_link.created') }}</div>
 
-        <clipboard-copy :text="link" />
+        <clipboard-copy :text="link" @show-qr-code-button="showQrCodeButton" />
 
         <div class="text-center">
-          <figure-qr-code :text="link" />
+          <figure-qr-code v-if="showQrcode" :text="link" />
 
           <b-button variant="success" @click="$emit('on-reset')" class="mt-4">
             {{ $t('form.close') }}
@@ -33,6 +33,16 @@ export default {
       required: true,
     },
   },
+  data() {
+    return {
+      showQrcode: false,
+    }
+  },
+  methods: {
+    showQrCodeButton() {
+      this.showQrcode = !this.showQrcode
+    },
+  },
   computed: {
     link() {
       return `${window.location.origin}/redeem/${this.code}`

From 8972c05e8ad6303fb190bb32df8f6ce74ea934f2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 17:48:17 +0200
Subject: [PATCH 3/9] add emit 'showQrCodeButton'

---
 frontend/src/components/ClipboardCopy.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 810f73fe1..54dc67620 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -6,6 +6,9 @@
         <b-button size="sm" text="Button" variant="success" @click="CopyLink">
           {{ $t('gdd_per_link.copy') }}
         </b-button>
+        <b-button variant="info" @click="$emit('show-qr-code-button')">
+          {{ $t('qrCode') }}
+        </b-button>
       </b-input-group-append>
     </b-input-group>
   </div>

From e9767fc3dee7cc6f4dad8ebfd6e88af9295840a6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 18:02:44 +0200
Subject: [PATCH 4/9] add qr code svg in button

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

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 54dc67620..1e76472a4 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -6,8 +6,8 @@
         <b-button size="sm" text="Button" variant="success" @click="CopyLink">
           {{ $t('gdd_per_link.copy') }}
         </b-button>
-        <b-button variant="info" @click="$emit('show-qr-code-button')">
-          {{ $t('qrCode') }}
+        <b-button variant="outline-info" @click="$emit('show-qr-code-button')">
+          <b-img src="img/svg/qr-code.svg" width="19" ></b-img>
         </b-button>
       </b-input-group-append>
     </b-input-group>

From 475af6b5f1ea983a68ba3ba28d8822fd20d06ef6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 18:03:26 +0200
Subject: [PATCH 5/9] remove unused code

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

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 1e76472a4..753de32e0 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -7,7 +7,7 @@
           {{ $t('gdd_per_link.copy') }}
         </b-button>
         <b-button variant="outline-info" @click="$emit('show-qr-code-button')">
-          <b-img src="img/svg/qr-code.svg" width="19" ></b-img>
+          <b-img src="img/svg/qr-code.svg" width="19"></b-img>
         </b-button>
       </b-input-group-append>
     </b-input-group>

From 6360509cad72f4851c31c97677ef149a220ecd7c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 18:05:04 +0200
Subject: [PATCH 6/9] fixed yarn lint

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6c891d4b2..20ce055d4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -164,7 +164,6 @@
     "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 759412019..201c44d93 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -164,7 +164,6 @@
     "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 459dc217b6397f7043b89e7537882979d7fdc187 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Apr 2022 18:08:05 +0200
Subject: [PATCH 7/9] fixed yarn test

---
 frontend/src/pages/Send.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 447fdde33..2b7d25ef5 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -249,7 +249,7 @@ describe('Send', () => {
 
         describe('close button click', () => {
           beforeEach(async () => {
-            await wrapper.findAll('button').at(1).trigger('click')
+            await wrapper.findAll('button').at(2).trigger('click')
           })
 
           it('Shows the TransactionForm', () => {

From d595c76d08afef2d1742a185208700e3eb218a5c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 12:43:27 +0200
Subject: [PATCH 8/9] change props from text to link in FigureQrCode

---
 .../src/components/GddSend/TransactionResultLink.vue     | 9 ++-------
 frontend/src/components/QrCode/FigureQrCode.spec.js      | 2 +-
 frontend/src/components/QrCode/FigureQrCode.vue          | 4 ++--
 .../src/components/TransactionLinks/TransactionLink.vue  | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 449b3c997..f63b18164 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -3,10 +3,10 @@
     <b-col>
       <b-card class="p-0 gradido-custom-background">
         <div class="h3 mb-4">{{ $t('gdd_per_link.created') }}</div>
-        <clipboard-copy :text="link" @show-qr-code-button="showQrCodeButton" />
+        <clipboard-copy :link="link" @show-qr-code-button="showQrCodeButton" />
 
         <div class="text-center">
-          <figure-qr-code v-if="showQrcode" :text="link" />
+          <figure-qr-code v-if="showQrcode" :link="link" />
 
           <b-button variant="success" @click="$emit('on-reset')" class="mt-4">
             {{ $t('form.close') }}
@@ -42,10 +42,5 @@ export default {
       this.showQrcode = !this.showQrcode
     },
   },
-  computed: {
-    link() {
-      return `${window.location.origin}/redeem/${this.code}`
-    },
-  },
 }
 </script>
diff --git a/frontend/src/components/QrCode/FigureQrCode.spec.js b/frontend/src/components/QrCode/FigureQrCode.spec.js
index d19d806d3..715a5d5d5 100644
--- a/frontend/src/components/QrCode/FigureQrCode.spec.js
+++ b/frontend/src/components/QrCode/FigureQrCode.spec.js
@@ -4,7 +4,7 @@ import FigureQrCode from './FigureQrCode'
 const localVue = global.localVue
 
 const propsData = {
-  text: '',
+  link: '',
 }
 
 describe('FigureQrCode', () => {
diff --git a/frontend/src/components/QrCode/FigureQrCode.vue b/frontend/src/components/QrCode/FigureQrCode.vue
index df450a52e..00f1b54b9 100644
--- a/frontend/src/components/QrCode/FigureQrCode.vue
+++ b/frontend/src/components/QrCode/FigureQrCode.vue
@@ -14,14 +14,14 @@ export default {
     QRCanvas,
   },
   props: {
-    text: { type: String, required: true },
+    link: { type: String, required: true },
   },
   data() {
     return {
       options: {
         cellSize: 8,
         correctLevel: 'H',
-        data: this.text,
+        data: this.link,
       },
     }
   },
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 63e610b26..ea230419a 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -47,7 +47,7 @@
     </b-row>
     <b-modal :id="'modalPopover-' + id" title="QR-Code" ok-only hide-header-close>
       <div class="text-center">
-        <figure-qr-code :text="link" />
+        <figure-qr-code :link="link" />
         <p>{{ link }}</p>
       </div>
     </b-modal>

From 268289bc706ee4501b13633da34130d1a62ecb6e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 22 Apr 2022 12:59:55 +0200
Subject: [PATCH 9/9] change button color

---
 frontend/src/components/ClipboardCopy.vue             | 11 ++++++++---
 .../src/components/GddSend/TransactionResultLink.vue  |  2 +-
 .../components/GddSend/TransactionResultSendError.vue |  4 +++-
 .../GddSend/TransactionResultSendSuccess.vue          |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 0e46910c1..936f6db1a 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -3,11 +3,11 @@
     <b-input-group size="lg" class="mb-3" prepend="Link">
       <b-form-input :value="link" type="text" readonly></b-form-input>
       <b-input-group-append>
-        <b-button size="sm" text="Button" variant="success" @click="CopyLink">
+        <b-button size="sm" text="Button" variant="primary" @click="CopyLink">
           {{ $t('gdd_per_link.copy') }}
         </b-button>
-        <b-button variant="outline-info" @click="$emit('show-qr-code-button')">
-          <b-img src="img/svg/qr-code.svg" width="19"></b-img>
+        <b-button variant="primary" class="text-light" @click="$emit('show-qr-code-button')">
+          <b-img src="img/svg/qr-code.svg" width="19" class="svg"></b-img>
         </b-button>
       </b-input-group-append>
     </b-input-group>
@@ -33,3 +33,8 @@ export default {
   },
 }
 </script>
+<style>
+.svg {
+  filter: brightness(0) invert(1);
+}
+</style>
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index f63b18164..04445acfe 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -8,7 +8,7 @@
         <div class="text-center">
           <figure-qr-code v-if="showQrcode" :link="link" />
 
-          <b-button variant="success" @click="$emit('on-reset')" class="mt-4">
+          <b-button variant="secondary" @click="$emit('on-reset')" class="mt-4">
             {{ $t('form.close') }}
           </b-button>
         </div>
diff --git a/frontend/src/components/GddSend/TransactionResultSendError.vue b/frontend/src/components/GddSend/TransactionResultSendError.vue
index 6a3761092..279ee931e 100644
--- a/frontend/src/components/GddSend/TransactionResultSendError.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendError.vue
@@ -22,7 +22,9 @@
             <div v-else>{{ errorResult }}</div>
           </div>
           <p class="text-center mt-3">
-            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+            <b-button variant="secondary" @click="$emit('on-reset')">
+              {{ $t('form.close') }}
+            </b-button>
           </p>
         </b-card>
       </b-col>
diff --git a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
index 74bb6963a..bc8c39f3b 100644
--- a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
@@ -9,7 +9,7 @@
             {{ $t('form.send_transaction_success') }}
           </div>
           <p class="text-center mt-3">
-            <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+            <b-button variant="primary" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
           </p>
         </b-card>
       </b-col>