From a0bdecbe1a09156eeed461f88c3ef34e0987b7b7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 11:56:49 +0200 Subject: [PATCH 1/8] change text button --- .../src/components/GddSend/TransactionConfirmationLink.vue | 4 ++-- .../src/components/GddSend/TransactionConfirmationSend.vue | 4 ++-- frontend/src/components/GddSend/TransactionForm.vue | 6 +++--- frontend/src/locales/de.json | 5 +++-- frontend/src/locales/en.json | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index 78903deda..97ccc0428 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -39,10 +39,10 @@ - {{ $t('form.cancel') }} + {{ $t('form.edit') }} - + {{ $t('form.generate_now') }} diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue index 25519f4ed..3485c33ff 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue @@ -55,11 +55,11 @@ - {{ $t('form.cancel') }} + {{ $t('form.edit') }} diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 5e683d132..e079b55c2 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -129,12 +129,12 @@ - {{ $t('form.reset') }} + {{ $t('form.cancel') }} - - {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }} + + {{ $t('form.check_now') }} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d204688db..91f60b1db 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -52,6 +52,7 @@ "amount": "Betrag", "at": "am", "cancel": "Abbrechen", + "check_now":"Jetzt prüfen", "close": "Schließen", "current_balance": "Aktueller Kontostand", "date": "Datum", @@ -60,7 +61,7 @@ "email": "E-Mail", "firstname": "Vorname", "from": "Von", - "generate_now": "jetzt generieren", + "generate_now": "Jetzt generieren", "lastname": "Nachname", "memo": "Nachricht", "message": "Nachricht", @@ -95,7 +96,7 @@ }, "GDD": "GDD", "gdd_per_link": { - "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", + "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", "copy": "kopieren", "created": "Der Link wurde erstellt!", "decay-14-day": "Vergänglichkeit für 14 Tage", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index dfe1c6d2b..345d59fb8 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -52,6 +52,7 @@ "amount": "Amount", "at": "at", "cancel": "Cancel", + "check_now":"Check now", "close": "Close", "current_balance": "Current Balance", "date": "Date", From 00bb4a1abc5490dbf69d2c3eff3f1fdf949212a8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 11:57:54 +0200 Subject: [PATCH 2/8] fixed yarn lint --- 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 91f60b1db..ae7a84446 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -52,7 +52,7 @@ "amount": "Betrag", "at": "am", "cancel": "Abbrechen", - "check_now":"Jetzt prüfen", + "check_now": "Jetzt prüfen", "close": "Schließen", "current_balance": "Aktueller Kontostand", "date": "Datum", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 345d59fb8..5e624b4ce 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -52,7 +52,7 @@ "amount": "Amount", "at": "at", "cancel": "Cancel", - "check_now":"Check now", + "check_now": "Check now", "close": "Close", "current_balance": "Current Balance", "date": "Date", From d446afacbc0e77dc69125112da037bbdda2cf4d0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 12:03:56 +0200 Subject: [PATCH 3/8] change button.btn-success to button.btn-primary --- frontend/src/pages/Send.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js index 1f7c9ca9f..dd32fdb09 100644 --- a/frontend/src/pages/Send.spec.js +++ b/frontend/src/pages/Send.spec.js @@ -101,7 +101,7 @@ describe('Send', () => { jest.clearAllMocks() await wrapper .findComponent({ name: 'TransactionConfirmationSend' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -135,7 +135,7 @@ describe('Send', () => { apolloMutationMock.mockRejectedValue({ message: 'recipient not known' }) await wrapper .findComponent({ name: 'TransactionConfirmationSend' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -182,7 +182,7 @@ describe('Send', () => { jest.clearAllMocks() await wrapper .findComponent({ name: 'TransactionConfirmationLink' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) @@ -264,7 +264,7 @@ describe('Send', () => { apolloMutationMock.mockRejectedValue({ message: 'OUCH!' }) await wrapper .findComponent({ name: 'TransactionConfirmationLink' }) - .find('button.btn-success') + .find('button.btn-primary') .trigger('click') }) From 0569680b35c341d0ceb719d41b5b5cd1089c42d3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 12:05:07 +0200 Subject: [PATCH 4/8] change button[type=reset] text from reset to cancel --- 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 db971a2bc..3027ba7e7 100644 --- a/frontend/src/components/GddSend/TransactionForm.spec.js +++ b/frontend/src/components/GddSend/TransactionForm.spec.js @@ -249,7 +249,7 @@ Die ganze Welt bezwingen.“`) }) it('has the text "form.cancel"', () => { - expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset') + expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel') }) it('clears all fields on click', async () => { From 75d339903e5475b0eada64e5a3cc463987140abe Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 3 Apr 2022 12:05:56 +0200 Subject: [PATCH 5/8] change text from button.btn-success to button.btn-primary --- .../components/GddSend/TransactionConfirmationSend.spec.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js index 21462ebab..b2abb10b7 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js @@ -53,7 +53,7 @@ describe('GddSend confirm', () => { describe('single click', () => { beforeEach(async () => { - await wrapper.find('button.btn-success').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { @@ -63,8 +63,7 @@ describe('GddSend confirm', () => { describe('double click', () => { beforeEach(async () => { - await wrapper.find('button.btn-success').trigger('click') - await wrapper.find('button.btn-success').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { From cc340d2718d2c211e5f17c770b4a896480d5a2c8 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Mon, 4 Apr 2022 13:17:16 +0200 Subject: [PATCH 6/8] Update frontend/src/components/GddSend/TransactionConfirmationSend.spec.js Co-authored-by: Moriz Wahl --- .../src/components/GddSend/TransactionConfirmationSend.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js index b2abb10b7..ed5c2ef6f 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js @@ -64,6 +64,7 @@ describe('GddSend confirm', () => { describe('double click', () => { beforeEach(async () => { await wrapper.find('button.btn-primary').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { From 197305b81e7c5c015561fc1daaedfaa172672b5e Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 4 Apr 2022 16:25:45 +0200 Subject: [PATCH 7/8] change text button edit to back --- frontend/src/components/GddSend/TransactionConfirmationLink.vue | 2 +- frontend/src/components/GddSend/TransactionConfirmationSend.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index 97ccc0428..c23ed35d2 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -39,7 +39,7 @@ - {{ $t('form.edit') }} + {{ $t('back') }} diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue index 3485c33ff..33a8b9351 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue @@ -55,7 +55,7 @@ - {{ $t('form.edit') }} + {{ $t('back') }} Date: Mon, 4 Apr 2022 16:36:58 +0200 Subject: [PATCH 8/8] fixed lint --- .../src/components/GddSend/TransactionConfirmationSend.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js index ed5c2ef6f..3504b6e18 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js @@ -64,7 +64,7 @@ describe('GddSend confirm', () => { describe('double click', () => { beforeEach(async () => { await wrapper.find('button.btn-primary').trigger('click') - await wrapper.find('button.btn-primary').trigger('click') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => {