From 67f922fcd4ff78f59f2f82512eb9c9ef80167787 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 3 Apr 2022 10:46:38 +0200
Subject: [PATCH 1/6] transaction type remains when jumping from the
 verification back

---
 .../components/GddSend/TransactionForm.vue    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 5e683d132..e0f332c52 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -6,28 +6,38 @@
           <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
             <b-row>
               <b-col>
-                <b-form-radio v-model="selected" name="radios" :value="sendTypes.send" size="lg">
+                <b-form-radio
+                  v-model="radio_selected"
+                  name="radios"
+                  :value="sendTypes.send"
+                  size="lg"
+                >
                   {{ $t('send_gdd') }}
                 </b-form-radio>
               </b-col>
               <b-col>
-                <b-form-radio v-model="selected" name="radios" :value="sendTypes.link" size="lg">
+                <b-form-radio
+                  v-model="radio_selected"
+                  name="radios"
+                  :value="sendTypes.link"
+                  size="lg"
+                >
                   {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
             </b-row>
-            <div class="mt-4" v-if="selected === sendTypes.link">
+            <div class="mt-4" v-if="radio_selected === sendTypes.link">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <div>
                 {{ $t('gdd_per_link.choose-amount') }}
               </div>
             </div>
 
-            <div v-if="selected === sendTypes.send">
+            <div v-if="radio_selected === sendTypes.send">
               <validation-provider
                 name="Email"
                 :rules="{
-                  required: selected === sendTypes.send ? true : false,
+                  required: radio_selected === sendTypes.send ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
@@ -134,7 +144,11 @@
               </b-col>
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
-                  {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }}
+                  {{
+                    radio_selected === sendTypes.send
+                      ? $t('form.send_now')
+                      : $t('form.generate_now')
+                  }}
                 </b-button>
               </b-col>
             </b-row>
@@ -159,6 +173,7 @@ export default {
     email: { type: String, default: '' },
     amount: { type: Number, default: 0 },
     memo: { type: String, default: '' },
+    selected: { type: String, default: 'send' },
   },
   inject: ['getTunneledEmail'],
   data() {
@@ -171,14 +186,14 @@ export default {
         memo: this.memo,
         amountValue: 0.0,
       },
-      selected: SEND_TYPES.send,
+      radio_selected: this.selected,
     }
   },
   methods: {
     onSubmit() {
       this.normalizeAmount(true)
       this.$emit('set-transaction', {
-        selected: this.selected,
+        selected: this.radio_selected,
         email: this.form.email,
         amount: this.form.amountValue,
         memo: this.form.memo,

From b6b8baf2f8b670d2d6e0d473ab893a6fa5f95eda Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 3 Apr 2022 11:13:09 +0200
Subject: [PATCH 2/6] fixed tests, change selected to radio_selected

---
 frontend/src/components/GddSend/TransactionForm.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index db971a2bc..cfca93023 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -68,7 +68,7 @@ describe('TransactionForm', () => {
       })
 
       it('has SEND_TYPES = send', () => {
-        expect(wrapper.vm.selected).toBe(SEND_TYPES.send)
+        expect(wrapper.vm.radio_selected).toBe(SEND_TYPES.send)
       })
 
       describe('transaction form', () => {
@@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`)
       })
 
       it('has SEND_TYPES = link', () => {
-        expect(wrapper.vm.selected).toBe(SEND_TYPES.link)
+        expect(wrapper.vm.radio_selected).toBe(SEND_TYPES.link)
       })
 
       it('has no input field of id input-group-1', () => {

From e3f76d6d35024bb1bb8e33092ef006d98d3c3fa1 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 4 Apr 2022 13:08:58 +0200
Subject: [PATCH 3/6] Update
 frontend/src/components/GddSend/TransactionForm.spec.js

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

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index cfca93023..dcc9671e2 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -68,7 +68,7 @@ describe('TransactionForm', () => {
       })
 
       it('has SEND_TYPES = send', () => {
-        expect(wrapper.vm.radio_selected).toBe(SEND_TYPES.send)
+        expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send)
       })
 
       describe('transaction form', () => {

From 7ad9aae50ad95a286c0360afaead72326f9a0c4f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 4 Apr 2022 16:16:41 +0200
Subject: [PATCH 4/6] change variable radio_selected to  radioSelected

---
 .../src/components/GddSend/TransactionForm.vue   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index e0f332c52..a41ff1897 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -7,7 +7,7 @@
             <b-row>
               <b-col>
                 <b-form-radio
-                  v-model="radio_selected"
+                  v-model="radioSelected"
                   name="radios"
                   :value="sendTypes.send"
                   size="lg"
@@ -17,7 +17,7 @@
               </b-col>
               <b-col>
                 <b-form-radio
-                  v-model="radio_selected"
+                  v-model="radioSelected"
                   name="radios"
                   :value="sendTypes.link"
                   size="lg"
@@ -26,18 +26,18 @@
                 </b-form-radio>
               </b-col>
             </b-row>
-            <div class="mt-4" v-if="radio_selected === sendTypes.link">
+            <div class="mt-4" v-if="radioSelected === sendTypes.link">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <div>
                 {{ $t('gdd_per_link.choose-amount') }}
               </div>
             </div>
 
-            <div v-if="radio_selected === sendTypes.send">
+            <div v-if="radioSelected === sendTypes.send">
               <validation-provider
                 name="Email"
                 :rules="{
-                  required: radio_selected === sendTypes.send ? true : false,
+                  required: radioSelected === sendTypes.send ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
@@ -145,7 +145,7 @@
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
                   {{
-                    radio_selected === sendTypes.send
+                    radioSelected === sendTypes.send
                       ? $t('form.send_now')
                       : $t('form.generate_now')
                   }}
@@ -186,14 +186,14 @@ export default {
         memo: this.memo,
         amountValue: 0.0,
       },
-      radio_selected: this.selected,
+      radioSelected: this.selected,
     }
   },
   methods: {
     onSubmit() {
       this.normalizeAmount(true)
       this.$emit('set-transaction', {
-        selected: this.radio_selected,
+        selected: this.radioSelected,
         email: this.form.email,
         amount: this.form.amountValue,
         memo: this.form.memo,

From 41fe52fcc9172b75213caebb04c2bf016ebf7dee Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 4 Apr 2022 16:17:18 +0200
Subject: [PATCH 5/6] fixed lint

---
 frontend/src/components/GddSend/TransactionForm.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index a41ff1897..21a9eb620 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -145,9 +145,7 @@
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
                   {{
-                    radioSelected === sendTypes.send
-                      ? $t('form.send_now')
-                      : $t('form.generate_now')
+                    radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now')
                   }}
                 </b-button>
               </b-col>

From d45d8cd02b0688a86c4a39d277cfaf034daf3ddb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 4 Apr 2022 16:18:10 +0200
Subject: [PATCH 6/6] fixed test TransactionForm.spec.js

---
 frontend/src/components/GddSend/TransactionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index dcc9671e2..b869eb2a9 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`)
       })
 
       it('has SEND_TYPES = link', () => {
-        expect(wrapper.vm.radio_selected).toBe(SEND_TYPES.link)
+        expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link)
       })
 
       it('has no input field of id input-group-1', () => {