From dfc8aadce4e9edb8eeb50c1b8e35362be8055575 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 14 Mar 2022 14:18:11 +0100
Subject: [PATCH] add enum SEND_TYPEP: send and link

---
 .../GddSend/TransactionConfirmationLink.vue    |  4 ++--
 .../GddSend/TransactionConfirmationSend.vue    | 12 ++----------
 .../src/components/GddSend/TransactionForm.vue | 18 +++++++++++-------
 frontend/src/pages/Send.vue                    | 13 +++++++++----
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 6b91b0a08..f357ea654 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -4,7 +4,7 @@
       <b-col class="text-right mt-4 mb-3">
         <div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
 
-        <h1>{{ amount | GDD }}</h1>
+        <h1>− {{ $n(amount, 'decimal') }} GDD</h1>
         <b class="mt-2">{{ memo }}</b>
       </b-col>
     </b-row>
@@ -20,7 +20,7 @@
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
         <b-col class="text-right">
-          <strong>- {{ amount | GDD }}</strong>
+          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index f4ce6b080..0bfff3ddb 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -18,7 +18,7 @@
               <div class="m-1 mt-2">GDD</div>
             </b-input-group-prepend>
 
-            <div class="p-3">{{ amount | GDD }}</div>
+            <div class="p-3">− {{ $n(amount, 'decimal') }} GDD</div>
           </b-input-group>
 
           <br />
@@ -43,16 +43,8 @@
         <b-col class="text-right">
           <strong>{{ $t('form.your_amount') }}</strong>
         </b-col>
-        <b-col class="text-right">
-          <strong>- {{ amount | GDD }}</strong>
-        </b-col>
-      </b-row>
-      <b-row class="pr-3">
-        <b-col class="text-right">
-          <strong>Vergänglichkeit für 14 Tage</strong>
-        </b-col>
         <b-col class="text-right borderbottom">
-          <strong>~ {{ $n(amount * 0.028, 'decimal') }}</strong>
+          <strong>− {{ $n(amount, 'decimal') }} GDD</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 1a1dd7198..991e165ce 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -6,17 +6,17 @@
           <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
             <b-row>
               <b-col>
-                <b-form-radio v-model="selected" name="radios" value="send" size="lg">
+                <b-form-radio v-model="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="link" size="lg">
+                <b-form-radio v-model="selected" name="radios" :value="sendTypes.link" size="lg">
                   {{ $t('send_per_link') }}
                 </b-form-radio>
               </b-col>
             </b-row>
-            <div class="mt-4" v-show="selected === 'link'">
+            <div class="mt-4" v-show="selected === sendTypes.link">
               <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
               <div>
                 {{ $t('gdd_per_link.sentence_1') }}
@@ -25,10 +25,10 @@
 
             <div>
               <validation-provider
-                v-show="selected === 'send'"
+                v-show="selected === sendTypes.send"
                 name="Email"
                 :rules="{
-                  required: selected === 'send' ? true : false,
+                  required: selected === sendTypes.send ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
@@ -137,7 +137,7 @@
               </b-col>
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
-                  {{ selected === 'send' ? $t('form.send_now') : $t('form.generate_now') }}
+                  {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }}
                 </b-button>
               </b-col>
             </b-row>
@@ -151,6 +151,7 @@
 </template>
 <script>
 import { BIcon } from 'bootstrap-vue'
+import { SEND_TYPES } from '@/pages/Send.vue'
 
 export default {
   name: 'TransactionForm',
@@ -170,7 +171,7 @@ export default {
         memo: '',
         amountValue: 0.0,
       },
-      selected: 'send',
+      selected: SEND_TYPES.send,
     }
   },
   methods: {
@@ -204,6 +205,9 @@ export default {
     isBalanceDisabled() {
       return this.balance <= 0 ? 'disabled' : false
     },
+    sendTypes() {
+      return SEND_TYPES
+    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 786624045..e9cf3442f 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -71,6 +71,11 @@ const EMPTY_TRANSACTION_DATA = {
   memo: '',
 }
 
+export const SEND_TYPES = {
+  send: 'send',
+  link: 'link',
+}
+
 export default {
   name: 'Send',
   components: {
@@ -108,10 +113,10 @@ export default {
     setTransaction(data) {
       this.transactionData = { ...data }
       switch (data.selected) {
-        case 'send':
+        case SEND_TYPES.send:
           this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationSend
           break
-        case 'link':
+        case SEND_TYPES.link:
           this.currentTransactionStep = TRANSACTION_STEPS.transactionConfirmationLink
           break
       }
@@ -120,7 +125,7 @@ export default {
       this.loading = true
       this.error = false
       switch (this.transactionData.selected) {
-        case 'send':
+        case SEND_TYPES.send:
           this.$apollo
             .mutate({
               mutation: sendCoins,
@@ -137,7 +142,7 @@ export default {
               this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError
             })
           break
-        case 'link':
+        case SEND_TYPES.link:
           this.$apollo
             .mutate({
               mutation: createTransactionLink,