Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list

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.radioSelected).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.radioSelected).toBe(SEND_TYPES.link)
       })
 
       it('has no input field of id input-group-1', () => {

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="radioSelected"
+                  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="radioSelected"
+                  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="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="selected === sendTypes.send">
+            <div v-if="radioSelected === sendTypes.send">
               <validation-provider
                 name="Email"
                 :rules="{
-                  required: selected === sendTypes.send ? true : false,
+                  required: radioSelected === sendTypes.send ? true : false,
                   email: true,
                   is_not: $store.state.email,
                 }"
@@ -134,7 +144,9 @@
               </b-col>
               <b-col class="text-right">
                 <b-button type="submit" variant="success">
-                  {{ selected === 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>
             </b-row>
@@ -159,6 +171,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 +184,14 @@ export default {
         memo: this.memo,
         amountValue: 0.0,
       },
-      selected: SEND_TYPES.send,
+      radioSelected: this.selected,
     }
   },
   methods: {
     onSubmit() {
       this.normalizeAmount(true)
       this.$emit('set-transaction', {
-        selected: this.selected,
+        selected: this.radioSelected,
         email: this.form.email,
         amount: this.form.amountValue,
         memo: this.form.memo,

frontend/src/locales/de.json

@@ -103,7 +103,7 @@
     "deleted": "Der Link wurde gelöscht!",
     "has-account": "Du besitzt bereits ein Gradido Konto",
     "header": "Gradidos versenden per Link",
-    "link-copied": "Link wurde in die Zwischenablage kopiert",
+    "link-copied": "Link wurde in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.",
     "link-deleted": "Der Link wurde am {date} gelöscht.",
     "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
     "link-overview": "Linkübersicht",

frontend/src/locales/en.json

@@ -103,7 +103,7 @@
     "deleted": "The link was deleted!",
     "has-account": "You already have a Gradido account",
     "header": "Send Gradidos via link",
-    "link-copied": "Link copied to clipboard",
+    "link-copied": "Link has been copied to the clipboard. You can now paste it into an email or message.",
     "link-deleted": "The link was deleted on {date}.",
     "link-expired": "The link is no longer valid. The validity expired on {date}.",
     "link-overview": "Link overview",