diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index db971a2bc..b869eb2a9 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.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', () => { diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 5e683d132..21a9eb620 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -6,28 +6,38 @@ - + {{ $t('send_gdd') }} - + {{ $t('send_per_link') }} -
+

{{ $t('gdd_per_link.header') }}

{{ $t('gdd_per_link.choose-amount') }}
-
+
- {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} + {{ + radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') + }} @@ -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, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d204688db..9f2626153 100644 --- a/frontend/src/locales/de.json +++ b/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", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index dfe1c6d2b..df533b488 100644 --- a/frontend/src/locales/en.json +++ b/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",