diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e3868124c..0fd68c060 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -46,8 +46,8 @@ "send_success":"Deine Zahlung wurde erfolgreich versendet." }, "transaction":{ - "show_part": "Die letzten {count} Transaktionen", "show_all":"Alle {count} Transaktionen ansehen", + "nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.", "more": "mehr" }, "site": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 521f68f0d..f734e75ee 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -47,7 +47,7 @@ }, "transaction":{ "show_part": "The last {count} transactions", - "show_all":"View all {count} transactions", + "nullTransactions":"You don't have any transactions on your account yet.", "more": "more" }, "site": { diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index 87a06dfb6..ba4c64e68 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -1,6 +1,6 @@ diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/KontoOverview.spec.js index b0385cbc3..3cb3b8271 100644 --- a/frontend/src/views/Pages/KontoOverview.spec.js +++ b/frontend/src/views/Pages/KontoOverview.spec.js @@ -35,8 +35,8 @@ describe('KontoOverview', () => { expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy() }) - it('updates transctions data when change-transactions is emitted', async () => { - wrapper.find('gdd-table-stub').vm.$emit('change-transactions', [0, 1]) + it('updates transctions data when update-transactions is emitted', async () => { + wrapper.find('gdd-table-stub').vm.$emit('update-transactions', [0, 1]) await wrapper.vm.$nextTick() expect(wrapper.vm.transactions).toEqual(expect.arrayContaining([0, 1])) }) diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/KontoOverview.vue index e05a6236d..52b9f832b 100644 --- a/frontend/src/views/Pages/KontoOverview.vue +++ b/frontend/src/views/Pages/KontoOverview.vue @@ -2,11 +2,7 @@
- +

@@ -32,13 +28,16 @@ export default { name: 'Overview', data() { return { - transactions: [], showTransactionList: true, } }, props: { balance: { type: Number, default: 0 }, GdtBalance: { type: Number, default: 0 }, + + transactions: { + default: [], + }, }, components: { GddStatus, @@ -52,8 +51,8 @@ export default { updateBalance(data) { this.$emit('update-balance', data.ammount) }, - setTransactions(transactions) { - this.transactions = transactions + updateTransactions() { + this.$emit('update-transactions') }, }, } diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue index 2033a189a..7b4ad2ccc 100644 --- a/frontend/src/views/Pages/UserProfileTransactionList.vue +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -7,19 +7,32 @@ - + + + {{ $t('transaction.nullTransactions') }} +