From 7f24bc06731b2bd147f0ff1dede804a77584c4f1 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 7 May 2021 11:18:02 +0200
Subject: [PATCH 1/2] befor merge master

---
 frontend/src/views/Pages/AccountOverview.vue  | 13 ++++++-----
 .../views/Pages/AccountOverview/GddTable.vue  |  5 -----
 .../Pages/AccountOverview/GddTableFooter.vue  | 22 +++++++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/views/Pages/AccountOverview/GddTableFooter.vue

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index a9bc7852a..37045cd6e 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -17,6 +17,7 @@
         :max="5"
         @update-transactions="updateTransactions"
       />
+      <gdd-table-footer :count="count"/>
     </b-container>
   </div>
 </template>
@@ -24,9 +25,16 @@
 import GddStatus from './AccountOverview/GddStatus.vue'
 import GddSend from './AccountOverview/GddSend.vue'
 import GddTable from './AccountOverview/GddTable.vue'
+import GddTableFooter from './AccountOverview/GddTableFooter.vue'
 
 export default {
   name: 'Overview',
+  components: {
+    GddStatus,
+    GddSend,
+    GddTable,
+    GddTableFooter,
+  },
   data() {
     return {
       showTransactionList: true,
@@ -39,11 +47,6 @@ export default {
       default: () => [],
     },
   },
-  components: {
-    GddStatus,
-    GddSend,
-    GddTable,
-  },
   methods: {
     toggleShowList(bool) {
       this.showTransactionList = bool
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index 84a049537..ca8b9fcab 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -92,11 +92,6 @@
         <b-alert v-if="transactions.length === 0" show variant="secondary">
           <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>
-        <router-link
-          v-else-if="transactions.length > 5"
-          to="/transactions"
-          v-html="$t('transaction.show_all', { count: count })"
-        ></router-link>
       </b-list-group-item>
     </b-list-group>
   </div>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
new file mode 100644
index 000000000..682f060d4
--- /dev/null
+++ b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <b-list-group>
+      <b-list-group-item >
+        <router-link
+          to="/transactions"
+          v-html="$t('transaction.show_all', { count: count })"
+        ></router-link>
+      </b-list-group-item>
+    </b-list-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'GddTableFooter',
+  props: {
+    count: { count: Number },
+  },
+}
+</script>
+

From c9604135c1f366a3c87d461b259ae7e3f2ce28c9 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 7 May 2021 12:13:30 +0200
Subject: [PATCH 2/2] change

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

diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index a1242654d..194315b31 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -88,7 +88,7 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <b-list-group-item v-show="this.$route.path == '/overview'">
+      <b-list-group-item>
         <b-alert v-if="transactions.length === 0" show variant="secondary">
           <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>