From b64db8158a7ee198ad793903d18d788230bf338b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 12 Jan 2023 10:22:17 +0100
Subject: [PATCH] go back in the form

---
 .../components/GddSend/TransactionForm.vue    | 202 +++++++++---------
 .../GddSend/TransactionResultSendError.vue    |   2 +-
 .../src/components/Inputs/InputAmount.vue     |   3 +-
 frontend/src/components/Inputs/InputEmail.vue |   1 +
 .../src/components/Inputs/InputTextarea.vue   |   2 +-
 frontend/src/pages/Send.vue                   |   1 -
 6 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 607a20afc..6128079a3 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -1,112 +1,114 @@
 <template>
-  <b-row class="transaction-form">
-    <b-col cols="12">
-      <b-card class="appBoxShadow gradido-border-radius" body-class="p-3">
-        <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
-          <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
-            <b-form-radio-group v-model="radioSelected" class="container">
-              <b-row class="mb-4">
-                <b-col cols="12" lg="6">
-                  <b-row class="bg-248 gradido-border-radius pt-lg-2 mr-lg-2">
-                    <b-col cols="10" @click="radioSelected = sendTypes.send" class="pointer">
-                      {{ $t('send_gdd') }}
-                    </b-col>
-                    <b-col cols="2">
-                      <b-form-radio
-                        name="shipping"
-                        size="lg"
-                        :value="sendTypes.send"
-                        stacked
-                        class="custom-radio-button pointer"
-                      ></b-form-radio>
-                    </b-col>
-                  </b-row>
-                </b-col>
+  <div class="transaction-form">
+    <b-row>
+      <b-col cols="12">
+        <b-card class="appBoxShadow gradido-border-radius" body-class="p-3">
+          <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
+            <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
+              <b-form-radio-group v-model="radioSelected" class="container">
+                <b-row class="mb-4">
+                  <b-col cols="12" lg="6">
+                    <b-row class="bg-248 gradido-border-radius pt-lg-2 mr-lg-2">
+                      <b-col cols="10" @click="radioSelected = sendTypes.send" class="pointer">
+                        {{ $t('send_gdd') }}
+                      </b-col>
+                      <b-col cols="2">
+                        <b-form-radio
+                          name="shipping"
+                          size="lg"
+                          :value="sendTypes.send"
+                          stacked
+                          class="custom-radio-button pointer"
+                        ></b-form-radio>
+                      </b-col>
+                    </b-row>
+                  </b-col>
+                  <b-col>
+                    <b-row class="bg-248 gradido-border-radius pt-lg-2 ml-lg-2 mt-2 mt-lg-0">
+                      <b-col cols="10" @click="radioSelected = sendTypes.link" class="pointer">
+                        {{ $t('send_per_link') }}
+                      </b-col>
+                      <b-col cols="2" class="pointer">
+                        <b-form-radio
+                          name="shipping"
+                          :value="sendTypes.link"
+                          size="lg"
+                          class="custom-radio-button"
+                        ></b-form-radio>
+                      </b-col>
+                    </b-row>
+                  </b-col>
+                </b-row>
+
+                <div class="mt-4 mb-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>
+              </b-form-radio-group>
+              <b-row>
                 <b-col>
-                  <b-row class="bg-248 gradido-border-radius pt-lg-2 ml-lg-2 mt-2 mt-lg-0">
-                    <b-col cols="10" @click="radioSelected = sendTypes.link" class="pointer">
-                      {{ $t('send_per_link') }}
+                  <b-row>
+                    <b-col cols="12">
+                      <div v-if="radioSelected === sendTypes.send">
+                        <input-email
+                          :name="$t('form.recipient')"
+                          :label="$t('form.recipient')"
+                          :placeholder="$t('form.email')"
+                          v-model="form.email"
+                          :disabled="isBalanceDisabled"
+                        />
+                      </div>
                     </b-col>
-                    <b-col cols="2" class="pointer">
-                      <b-form-radio
-                        name="shipping"
-                        :value="sendTypes.link"
-                        size="lg"
-                        class="custom-radio-button"
-                      ></b-form-radio>
+                    <b-col cols="12" lg="6">
+                      <input-amount
+                        v-model="form.amount"
+                        :name="$t('form.amount')"
+                        :label="$t('form.amount')"
+                        :placeholder="'0.01'"
+                        :rules="{ required: true, gddSendAmount: [0.01, balance] }"
+                        typ="TransactionForm"
+                        :disabled="isBalanceDisabled"
+                      ></input-amount>
                     </b-col>
                   </b-row>
                 </b-col>
               </b-row>
 
-              <div class="mt-4 mb-4" v-if="radioSelected === sendTypes.link">
-                <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
-                <div>
-                  {{ $t('gdd_per_link.choose-amount') }}
-                </div>
+              <b-row>
+                <b-col>
+                  <input-textarea
+                    v-model="form.memo"
+                    :name="$t('form.message')"
+                    :label="$t('form.message')"
+                    :placeholder="$t('form.message')"
+                    :rules="{ required: true, min: 5, max: 255 }"
+                    :disabled="isBalanceDisabled"
+                  />
+                </b-col>
+              </b-row>
+              <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
+                {{ $t('form.no_gdd_available') }}
               </div>
-            </b-form-radio-group>
-            <b-row>
-              <b-col>
-                <b-row>
-                  <b-col cols="12">
-                    <div v-if="radioSelected === sendTypes.send">
-                      <input-email
-                        :name="$t('form.recipient')"
-                        :label="$t('form.recipient')"
-                        :placeholder="$t('form.email')"
-                        v-model="form.email"
-                        :disabled="isBalanceDisabled"
-                      />
-                    </div>
-                  </b-col>
-                  <b-col cols="12" lg="6">
-                    <input-amount
-                      v-model="form.amount"
-                      :name="$t('form.amount')"
-                      :label="$t('form.amount')"
-                      :placeholder="'0.01'"
-                      :rules="{ required: true, gddSendAmount: [0.01, balance] }"
-                      typ="TransactionForm"
-                      :disabled="isBalanceDisabled"
-                    ></input-amount>
-                  </b-col>
-                </b-row>
-              </b-col>
-            </b-row>
-
-            <b-row>
-              <b-col>
-                <input-textarea
-                  v-model="form.memo"
-                  :name="$t('form.message')"
-                  :label="$t('form.message')"
-                  :placeholder="$t('form.message')"
-                  :rules="{ required: true, min: 5, max: 255 }"
-                  :disabled="isBalanceDisabled"
-                />
-              </b-col>
-            </b-row>
-            <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
-              {{ $t('form.no_gdd_available') }}
-            </div>
-            <b-row v-else class="test-buttons mt-5">
-              <b-col>
-                <b-button type="reset" variant="secondary" @click="onReset">
-                  {{ $t('form.reset') }}
-                </b-button>
-              </b-col>
-              <b-col class="text-right">
-                <b-button type="submit" variant="gradido">
-                  {{ $t('form.check_now') }}
-                </b-button>
-              </b-col>
-            </b-row>
-          </b-form>
-        </validation-observer>
-      </b-card>
-    </b-col>
-  </b-row>
+              <b-row v-else class="test-buttons mt-5">
+                <b-col>
+                  <b-button type="reset" variant="secondary" @click="onReset">
+                    {{ $t('form.reset') }}
+                  </b-button>
+                </b-col>
+                <b-col class="text-right">
+                  <b-button type="submit" variant="gradido">
+                    {{ $t('form.check_now') }}
+                  </b-button>
+                </b-col>
+              </b-row>
+            </b-form>
+          </validation-observer>
+        </b-card>
+      </b-col>
+    </b-row>
+  </div>
 </template>
 <script>
 import { SEND_TYPES } from '@/pages/Send.vue'
diff --git a/frontend/src/components/GddSend/TransactionResultSendError.vue b/frontend/src/components/GddSend/TransactionResultSendError.vue
index a8bc2d74b..55fb3c8c5 100644
--- a/frontend/src/components/GddSend/TransactionResultSendError.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendError.vue
@@ -19,7 +19,7 @@
       <div v-else>{{ errorResult }}</div>
     </div>
     <p class="text-center mt-5">
-      <b-button variant="secondary" @click="$emit('on-reset')">
+      <b-button variant="secondary" @click="$emit('on-back')">
         {{ $t('form.close') }}
       </b-button>
     </p>
diff --git a/frontend/src/components/Inputs/InputAmount.vue b/frontend/src/components/Inputs/InputAmount.vue
index 0c49b620c..7a72a3a77 100644
--- a/frontend/src/components/Inputs/InputAmount.vue
+++ b/frontend/src/components/Inputs/InputAmount.vue
@@ -22,6 +22,7 @@
           @focus="amountFocused = true"
           @blur="normalizeAmount(true)"
           :disabled="disabled"
+          autocomplete="off"
         ></b-form-input>
 
         <b-form-invalid-feedback v-bind="ariaMsg">
@@ -63,7 +64,7 @@ export default {
   },
   data() {
     return {
-      currentValue: '',
+      currentValue: this.value,
       amountValue: 0.0,
       amountFocused: false,
     }
diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue
index 3a7ed4f4e..a1155e397 100644
--- a/frontend/src/components/Inputs/InputEmail.vue
+++ b/frontend/src/components/Inputs/InputEmail.vue
@@ -21,6 +21,7 @@
         @focus="emailFocused = true"
         @blur="normalizeEmail()"
         :disabled="disabled"
+        autocomplete="off"
       ></b-form-input>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}
diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue
index 1b0c7a00d..e8dcf2840 100644
--- a/frontend/src/components/Inputs/InputTextarea.vue
+++ b/frontend/src/components/Inputs/InputTextarea.vue
@@ -41,7 +41,7 @@ export default {
   },
   data() {
     return {
-      currentValue: '',
+      currentValue: this.value,
     }
   },
   computed: {
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 370943ad6..9d2adbad7 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -171,7 +171,6 @@ export default {
     },
     onBack() {
       this.currentTransactionStep = TRANSACTION_STEPS.transactionForm
-      this.$mount()
     },
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)