From bec0ea45f59c6a9986d5ecd33b0ed7a38449dc08 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 17 Jul 2021 13:34:40 +0200 Subject: [PATCH 1/4] error message if no receiver is found --- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- frontend/src/views/Pages/AccountOverview.spec.js | 4 ++-- frontend/src/views/Pages/AccountOverview.vue | 8 +++++++- .../AccountOverview/GddSend/TransactionResult.vue | 12 ++++++++++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 7de64ff6a..001fbfb0b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -90,7 +90,8 @@ "transaction":{ "show_all":"Alle {count} Transaktionen ansehen", "nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.", - "more": "mehr" + "more": "mehr", + "receiverNotFound":"Empfänger nicht gefunden" }, "site": { "login": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index ac75c90f0..8adfa80a2 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -90,7 +90,8 @@ "transaction":{ "show_all":"View all {count} transactions.", "nullTransactions":"You don't have any transactions on your account yet.", - "more": "more" + "more": "more", + "receiverNotFound":"Receiver not found" }, "site": { "login": { diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js index 18bc7c036..424835876 100644 --- a/frontend/src/views/Pages/AccountOverview.spec.js +++ b/frontend/src/views/Pages/AccountOverview.spec.js @@ -118,8 +118,8 @@ describe('AccountOverview', () => { .vm.$emit('send-transaction') }) - it('shows the error page', () => { - expect(wrapper.find('div.card-body').text()).toContain('form.send_transaction_error') + it('shows the error page', async () => { + expect(wrapper.find('div.card.card-body').text()).toContain('form.send_transaction_error') }) }) }) diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index 08eb503ad..863a148ea 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -23,7 +23,11 @@ >
@@ -71,6 +75,7 @@ export default { timestamp: Date.now(), transactionData: { ...EMPTY_TRANSACTION_DATA }, error: false, + errorResult: false, currentTransactionStep: 0, loading: false, } @@ -104,6 +109,7 @@ export default { this.error = false this.$emit('update-balance', this.transactionData.amount) } else { + this.errorResult = result.result.message this.error = true } this.currentTransactionStep = 2 diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionResult.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionResult.vue index ec242c75c..d8a2bd61b 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionResult.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionResult.vue @@ -17,9 +17,16 @@
- {{ $t('form.sorry') }} +
{{ $t('form.sorry') }}
- {{ $t('form.send_transaction_error') }} + +
{{ $t('form.send_transaction_error') }}
+ +
+
+ {{ $t('transaction.receiverNotFound') }} +
+
({{ errorResult }})

{{ $t('form.close') }} @@ -33,6 +40,7 @@ export default { name: 'TransactionResult', props: { error: { type: Boolean, default: true }, + errorResult: { type: String, default: '' }, }, } From 48d2d4b527cf5801ce34849c591849a06678cd5d Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 17 Jul 2021 14:00:43 +0200 Subject: [PATCH 2/4] removing data that is not needed --- frontend/src/views/Pages/AccountOverview.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js index 424835876..18bc7c036 100644 --- a/frontend/src/views/Pages/AccountOverview.spec.js +++ b/frontend/src/views/Pages/AccountOverview.spec.js @@ -118,8 +118,8 @@ describe('AccountOverview', () => { .vm.$emit('send-transaction') }) - it('shows the error page', async () => { - expect(wrapper.find('div.card.card-body').text()).toContain('form.send_transaction_error') + it('shows the error page', () => { + expect(wrapper.find('div.card-body').text()).toContain('form.send_transaction_error') }) }) }) From 72073a40ffb637d8d0d54c33c6c6a17a441b03cd Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 19 Jul 2021 12:09:27 +0200 Subject: [PATCH 3/4] fix test --- frontend/src/views/Pages/AccountOverview.spec.js | 6 +++++- frontend/src/views/Pages/AccountOverview.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js index 18bc7c036..8d47cdb27 100644 --- a/frontend/src/views/Pages/AccountOverview.spec.js +++ b/frontend/src/views/Pages/AccountOverview.spec.js @@ -112,7 +112,7 @@ describe('AccountOverview', () => { describe('transaction is confirmed and server response is error', () => { beforeEach(async () => { jest.clearAllMocks() - sendMock.mockReturnValue({ success: false }) + sendMock.mockReturnValue({ success: false, result: { message: 'receiver not found' } }) await wrapper .findComponent({ name: 'TransactionConfirmation' }) .vm.$emit('send-transaction') @@ -121,6 +121,10 @@ describe('AccountOverview', () => { it('shows the error page', () => { expect(wrapper.find('div.card-body').text()).toContain('form.send_transaction_error') }) + + it('shows recipient not found', () => { + expect(wrapper.text()).toContain('transaction.receiverNotFound') + }) }) }) }) diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index 863a148ea..54bcf2bdd 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -75,7 +75,7 @@ export default { timestamp: Date.now(), transactionData: { ...EMPTY_TRANSACTION_DATA }, error: false, - errorResult: false, + errorResult: '', currentTransactionStep: 0, loading: false, } From f21f3089ced94885fb6ee66e8ebe61d708f69f13 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 20 Jul 2021 13:45:03 +0200 Subject: [PATCH 4/4] Receiver transformed to Recepient. --- frontend/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 8adfa80a2..161870dd1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -91,7 +91,7 @@ "show_all":"View all {count} transactions.", "nullTransactions":"You don't have any transactions on your account yet.", "more": "more", - "receiverNotFound":"Receiver not found" + "receiverNotFound":"Recipient not found" }, "site": { "login": {