From 67f922fcd4ff78f59f2f82512eb9c9ef80167787 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 10:46:38 +0200 Subject: [PATCH 1/7] transaction type remains when jumping from the verification back --- .../components/GddSend/TransactionForm.vue | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 5e683d132..e0f332c52 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') }} + {{ + radio_selected === sendTypes.send + ? $t('form.send_now') + : $t('form.generate_now') + }} @@ -159,6 +173,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 +186,14 @@ export default { memo: this.memo, amountValue: 0.0, }, - selected: SEND_TYPES.send, + radio_selected: this.selected, } }, methods: { onSubmit() { this.normalizeAmount(true) this.$emit('set-transaction', { - selected: this.selected, + selected: this.radio_selected, email: this.form.email, amount: this.form.amountValue, memo: this.form.memo, From 307f1092d54e4866d29a04798b493a1bd52b84c9 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 11:03:01 +0200 Subject: [PATCH 2/7] text for toast expand link copied --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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", From b6b8baf2f8b670d2d6e0d473ab893a6fa5f95eda Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 11:13:09 +0200 Subject: [PATCH 3/7] fixed tests, change selected to radio_selected --- frontend/src/components/GddSend/TransactionForm.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index db971a2bc..cfca93023 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.radio_selected).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.radio_selected).toBe(SEND_TYPES.link) }) it('has no input field of id input-group-1', () => { From e3f76d6d35024bb1bb8e33092ef006d98d3c3fa1 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Mon, 4 Apr 2022 13:08:58 +0200 Subject: [PATCH 4/7] Update frontend/src/components/GddSend/TransactionForm.spec.js Co-authored-by: Moriz Wahl --- 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 cfca93023..dcc9671e2 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.radio_selected).toBe(SEND_TYPES.send) + expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send) }) describe('transaction form', () => { From 7ad9aae50ad95a286c0360afaead72326f9a0c4f Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 4 Apr 2022 16:16:41 +0200 Subject: [PATCH 5/7] change variable radio_selected to radioSelected --- .../src/components/GddSend/TransactionForm.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index e0f332c52..a41ff1897 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -7,7 +7,7 @@ -
+

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

{{ $t('gdd_per_link.choose-amount') }}
-
+
{{ - radio_selected === sendTypes.send + radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} @@ -186,14 +186,14 @@ export default { memo: this.memo, amountValue: 0.0, }, - radio_selected: this.selected, + radioSelected: this.selected, } }, methods: { onSubmit() { this.normalizeAmount(true) this.$emit('set-transaction', { - selected: this.radio_selected, + selected: this.radioSelected, email: this.form.email, amount: this.form.amountValue, memo: this.form.memo, From 41fe52fcc9172b75213caebb04c2bf016ebf7dee Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 4 Apr 2022 16:17:18 +0200 Subject: [PATCH 6/7] fixed lint --- frontend/src/components/GddSend/TransactionForm.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index a41ff1897..21a9eb620 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -145,9 +145,7 @@ {{ - radioSelected === sendTypes.send - ? $t('form.send_now') - : $t('form.generate_now') + radioSelected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} From d45d8cd02b0688a86c4a39d277cfaf034daf3ddb Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 4 Apr 2022 16:18:10 +0200 Subject: [PATCH 7/7] fixed test TransactionForm.spec.js --- 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 dcc9671e2..b869eb2a9 100644 --- a/frontend/src/components/GddSend/TransactionForm.spec.js +++ b/frontend/src/components/GddSend/TransactionForm.spec.js @@ -300,7 +300,7 @@ Die ganze Welt bezwingen.“`) }) it('has SEND_TYPES = link', () => { - expect(wrapper.vm.radio_selected).toBe(SEND_TYPES.link) + expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link) }) it('has no input field of id input-group-1', () => {