From 03149c5a3649574573dec01fc5889d6d2a91d9a9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 16:23:24 +0100
Subject: [PATCH 1/3] =?UTF-8?q?transactionCount=20fa=C3=B6se=20or=20transa?=
 =?UTF-8?q?ctionCount=20error=20text=20hide=20if=20transactionCount=20true?=
 =?UTF-8?q?=20and=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/Pages/AccountOverview/GddTransactionList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 955a6adc1..52a66817a 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -7,7 +7,7 @@
           {{ $t('error.no-transactionlist') }}
         </small>
       </div>
-      <div v-if="!transactionCount" class="test-empty-transactionlist text-right">
+      <div v-if="transactionCount === 'undefined'" class="test-empty-transactionlist text-right">
         <b-icon icon="exclamation-triangle" class="mr-2" style="color: red"></b-icon>
         <small>{{ $t('error.empty-transactionlist') }}</small>
       </div>

From 3e7144f816aa05dc993d1c24aa4f50f7bd399819 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 21:36:19 +0100
Subject: [PATCH 2/3] test div.test-empty-transactionlist is empty

---
 .../views/Pages/AccountOverview/GddTransactionList.spec.js  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index 55f65bee6..2c4b15e17 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -56,16 +56,14 @@ describe('GddTransactionList', () => {
         })
       })
       it('Transactions Array is empty, 0 transactions', () => {
-        expect(wrapper.find('div.test-empty-transactionlist').text()).toContain(
-          'error.empty-transactionlist',
-        )
+        expect(wrapper.find('div.test-empty-transactionlist').exists()).toBe(false)
       })
     })
 
     describe('without any properties', () => {
       it('renders text saying that there are error.empty-transactionlist ', () => {
         expect(wrapper.find('div.gdd-transaction-list').text()).toContain(
-          'error.empty-transactionlist',
+          'transaction.nullTransactions',
         )
       })
       it('renders text saying that there are no transaction.nullTransactions', () => {

From 151f497252b9f6bda4f16a18b4e464a21e38fa7f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 14 Jan 2022 08:47:07 +0100
Subject: [PATCH 3/3] Changed the logic of no transactions, sets -1 if error
 was thrown so that we dont have the error if no transactions are present.

---
 frontend/src/views/Layout/DashboardLayout_gdd.vue           | 1 +
 .../views/Pages/AccountOverview/GddTransactionList.spec.js  | 6 ++++++
 .../src/views/Pages/AccountOverview/GddTransactionList.vue  | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index bd3bd8e4c..40a6011d5 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -100,6 +100,7 @@ export default {
         })
         .catch((error) => {
           this.pending = true
+          this.transactionCount = -1
           this.$toasted.global.error(error.message)
           // what to do when loading balance fails?
         })
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index 2c4b15e17..b116de9e8 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -61,6 +61,12 @@ describe('GddTransactionList', () => {
     })
 
     describe('without any properties', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          transactions: [],
+          transactionCount: -1,
+        })
+      })
       it('renders text saying that there are error.empty-transactionlist ', () => {
         expect(wrapper.find('div.gdd-transaction-list').text()).toContain(
           'transaction.nullTransactions',
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 52a66817a..f6c046fe6 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -7,7 +7,7 @@
           {{ $t('error.no-transactionlist') }}
         </small>
       </div>
-      <div v-if="transactionCount === 'undefined'" class="test-empty-transactionlist text-right">
+      <div v-if="transactionCount < 0" class="test-empty-transactionlist text-right">
         <b-icon icon="exclamation-triangle" class="mr-2" style="color: red"></b-icon>
         <small>{{ $t('error.empty-transactionlist') }}</small>
       </div>
@@ -134,7 +134,7 @@
         :per-page="pageSize"
         :total-rows="transactionCount"
       ></pagination-buttons>
-      <div v-if="transactionCount === 0" class="mt-4 text-center">
+      <div v-if="transactionCount < 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </div>