diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index 78903deda..c23ed35d2 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -39,10 +39,10 @@ - {{ $t('form.cancel') }} + {{ $t('back') }} - + {{ $t('form.generate_now') }} diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js index 21462ebab..3504b6e18 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,8 @@ 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') + await wrapper.find('button.btn-primary').trigger('click') }) it('emits send transaction one time', () => { diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue index 25519f4ed..33a8b9351 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue @@ -55,11 +55,11 @@ - {{ $t('form.cancel') }} + {{ $t('back') }} diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index b869eb2a9..0b7245b67 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 () => { diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 21a9eb620..a0ac3d3bc 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -139,14 +139,12 @@ - {{ $t('form.reset') }} + {{ $t('form.cancel') }} - - {{ - radioSelected === 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 9f2626153..80f7ded25 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 df533b488..500cceaae 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", 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') })