From 34014affa09c5774b80cad3460d0767b566d62b7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 10 Jan 2023 12:20:55 +0100
Subject: [PATCH 1/2] send gdd and send link gdd is running

---
 .../GddSend/TransactionConfirmationLink.vue         |  2 +-
 .../GddSend/TransactionConfirmationSend.vue         |  2 +-
 frontend/src/components/GddSend/TransactionForm.vue |  2 +-
 .../components/GddSend/TransactionResultLink.vue    |  2 +-
 .../GddSend/TransactionResultSendSuccess.vue        |  2 +-
 frontend/src/pages/Send.vue                         | 13 +++++++------
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 0fcb94459..91fea3486 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -37,7 +37,7 @@
       </b-row>
       <b-row class="mt-5 p-5">
         <b-col>
-          <b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
+          <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
         </b-col>
         <b-col class="text-right">
           <b-button
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index 1e931f6b5..4f4644ffb 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -41,7 +41,7 @@
       </b-row>
       <b-row class="mt-5 p-5">
         <b-col>
-          <b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
+          <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
         </b-col>
         <b-col class="text-right">
           <b-button
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index cd311e3ee..607a20afc 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -144,7 +144,7 @@ export default {
       this.$emit('set-transaction', {
         selected: this.radioSelected,
         email: this.form.email,
-        amount: this.form.amount,
+        amount: Number(this.form.amount.replace(',', '.')),
         memo: this.form.memo,
       })
     },
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 11a6324ac..e72bbc73f 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -10,7 +10,7 @@
     <div class="text-center">
       <div><figure-qr-code :link="link" /></div>
       <div>
-        <b-button variant="secondary" @click="$emit('on-reset')" class="mt-4" data-test="close-btn">
+        <b-button variant="secondary" @click="$emit('on-back')" class="mt-4" data-test="close-btn">
           {{ $t('form.close') }}
         </b-button>
       </div>
diff --git a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
index 36ce3f4e6..b57196db4 100644
--- a/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendSuccess.vue
@@ -6,7 +6,7 @@
       {{ $t('form.send_transaction_success') }}
     </div>
     <div class="text-center mt-5">
-      <b-button variant="primary" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
+      <b-button variant="primary" @click="$emit('on-back')">{{ $t('form.close') }}</b-button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 7131a7247..370943ad6 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -15,7 +15,7 @@
           :amount="transactionData.amount"
           :memo="transactionData.memo"
           @send-transaction="sendTransaction"
-          @on-reset="onReset"
+          @on-back="onBack"
         ></transaction-confirmation-send>
       </template>
       <template #transactionConfirmationLink>
@@ -26,17 +26,17 @@
           :memo="transactionData.memo"
           :loading="loading"
           @send-transaction="sendTransaction"
-          @on-reset="onReset"
+          @on-back="onBack"
         ></transaction-confirmation-link>
       </template>
       <template #transactionResultSendSuccess>
-        <transaction-result-send-success @on-reset="onReset"></transaction-result-send-success>
+        <transaction-result-send-success @on-back="onBack"></transaction-result-send-success>
       </template>
       <template #transactionResultSendError>
         <transaction-result-send-error
           :error="error"
           :errorResult="errorResult"
-          @on-reset="onReset"
+          @on-back="onBack"
         ></transaction-result-send-error>
       </template>
       <template #transactionResultLink>
@@ -45,7 +45,7 @@
           :amount="amount"
           :memo="memo"
           :validUntil="validUntil"
-          @on-reset="onReset"
+          @on-back="onBack"
         ></transaction-result-link>
       </template>
     </gdd-send>
@@ -169,8 +169,9 @@ export default {
       }
       this.loading = false
     },
-    onReset() {
+    onBack() {
       this.currentTransactionStep = TRANSACTION_STEPS.transactionForm
+      this.$mount()
     },
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)

From 775240d13c68a72e8b36248fa2537e0032cf79c4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 10 Jan 2023 13:58:34 +0100
Subject: [PATCH 2/2] fix test

---
 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 213301fda..59537dc47 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -322,7 +322,7 @@ Die ganze Welt bezwingen.“`)
               [
                 {
                   email: 'someone@watches.tv',
-                  amount: '87.23',
+                  amount: 87.23,
                   memo: 'Long enough',
                   selected: 'send',
                 },