From c182b713580d93d2da6d893b41fbdff9b5fb0dff Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 15 Oct 2021 09:41:52 +0200
Subject: [PATCH 1/6] ink to the funding contributions of gradido.net
 memberships

---
 frontend/src/locales/de.json                                 | 3 ++-
 frontend/src/locales/en.json                                 | 5 +++--
 .../src/views/Pages/AccountOverview/GdtTransactionList.vue   | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4801d5e4b..ef51ff75b 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -101,7 +101,8 @@
     "no-transactions": "Du hast zur Zeit keine Transaktionen",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
-    "recruited-member": "Geworbenes Mitglied"
+    "recruited-member": "Geworbenes Mitglied",
+    "funding":"Zu den Förderbeiträgen"
   },
   "imprint": "Impressum",
   "language": "Sprache",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d3d5b05ab..8e8c471d0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -98,10 +98,11 @@
     "factor": "Factor",
     "formula": "Calculation formula",
     "gdt-received": "Gradido Transform (GDT) received",
-    "no-transactions": "You currently have no transactions",
+    "no-transactions": "You do not have Gradido Transform (GDT) yet.",
     "publisher": "A member you referred has paid a contribution",
     "raise": "Increase",
-    "recruited-member": "Recruited Member"
+    "recruited-member": "Recruited Member",
+    "funding":"Regarding the funding contributions"
   },
   "imprint": "Legal notice",
   "language": "Language",
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index e69e5edec..c867209aa 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -3,6 +3,8 @@
     <div class="list-group" style="background-color: #fff">
       <div v-if="transactionGdtCount === 0">
         {{ $t('gdt.no-transactions') }}
+        <hr />
+        <b-button :href="link" target="_blank">{{ $t('gdt.funding') }}</b-button>
       </div>
       <div
         v-else
@@ -52,6 +54,7 @@ export default {
       transactionGdtCount: { type: Number, default: 0 },
       currentPage: 1,
       pageSize: 25,
+      link: 'https://gradido.net/' + this.$store.state.language + '/memberships/',
     }
   },
   methods: {

From 5c6804aea747c153fc689d18548e5d2eda346104 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 15 Oct 2021 10:38:06 +0200
Subject: [PATCH 2/6] fix locales

---
 frontend/src/locales/de.json | 4 ++--
 frontend/src/locales/en.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ef51ff75b..a7b41d655 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -97,12 +97,12 @@
     "credit": "Gutschrift",
     "factor": "Faktor",
     "formula": "Berechungsformel",
+    "funding": "Zu den Förderbeiträgen",
     "gdt-received": "Gradido Transform (GDT) erhalten",
     "no-transactions": "Du hast zur Zeit keine Transaktionen",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
-    "recruited-member": "Geworbenes Mitglied",
-    "funding":"Zu den Förderbeiträgen"
+    "recruited-member": "Geworbenes Mitglied"
   },
   "imprint": "Impressum",
   "language": "Sprache",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8e8c471d0..d74b8ec5b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -97,12 +97,12 @@
     "credit": "Credit",
     "factor": "Factor",
     "formula": "Calculation formula",
+    "funding": "Regarding the funding contributions",
     "gdt-received": "Gradido Transform (GDT) received",
     "no-transactions": "You do not have Gradido Transform (GDT) yet.",
     "publisher": "A member you referred has paid a contribution",
     "raise": "Increase",
-    "recruited-member": "Recruited Member",
-    "funding":"Regarding the funding contributions"
+    "recruited-member": "Recruited Member"
   },
   "imprint": "Legal notice",
   "language": "Language",

From 2b64ca8fe03eab6f93de1f7c3ccfde5c063a1fd4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 15 Oct 2021 14:04:05 +0200
Subject: [PATCH 3/6] fix test

---
 .../views/Pages/AccountOverview/GddTransactionList.vue    | 2 +-
 .../Pages/AccountOverview/GdtTransactionList.spec.js      | 8 ++++++++
 .../views/Pages/AccountOverview/GdtTransactionList.vue    | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index ca4823bef..9cfe265f5 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -121,7 +121,7 @@
         :per-page="pageSize"
         :total-rows="transactionCount"
       ></pagination-buttons>
-      <div v-if="transactions.length === 0" class="mt-4 text-center">
+      <div v-if="transactionCount === 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </div>
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
index fcecf63fa..8130a0d52 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
@@ -51,10 +51,18 @@ const windowScrollToMock = jest.fn()
 
 window.scrollTo = windowScrollToMock
 
+const state = {
+  language: null,
+}
+
 describe('GdtTransactionList', () => {
   let wrapper
 
   const mocks = {
+    $store: {
+      state,
+      commit: jest.fn(),
+    },
     $i18n: {
       locale: 'en',
     },
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index c867209aa..0b6711a4d 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdt-transaction-list">
-    <div class="list-group" style="background-color: #fff">
-      <div v-if="transactionGdtCount === 0">
+    <div class="list-group">
+      <div v-if="transactionGdtCount === 0" class="text-center">
         {{ $t('gdt.no-transactions') }}
         <hr />
         <b-button :href="link" target="_blank">{{ $t('gdt.funding') }}</b-button>

From 5a931d62b0a16a64a6e1706d76ce05cf52009c4e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Oct 2021 09:48:03 +0200
Subject: [PATCH 4/6] test When no transactions are loaded, fix lint, fix
 locales

---
 frontend/src/locales/de.json                  |  2 +-
 .../GdtTransactionList.spec.js                | 54 ++++++++++++++++++-
 .../AccountOverview/GdtTransactionList.vue    |  4 +-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a7b41d655..d2042e941 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -99,7 +99,7 @@
     "formula": "Berechungsformel",
     "funding": "Zu den Förderbeiträgen",
     "gdt-received": "Gradido Transform (GDT) erhalten",
-    "no-transactions": "Du hast zur Zeit keine Transaktionen",
+    "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
     "recruited-member": "Geworbenes Mitglied"
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
index 8130a0d52..9b7e0a60f 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
@@ -4,6 +4,15 @@ import GdtTransactionList from './GdtTransactionList'
 
 const localVue = global.localVue
 
+const apolloMockNull = jest.fn().mockResolvedValue({
+  data: {
+    listGDTEntries: {
+      count: 0,
+      gdtEntries: [],
+    },
+  },
+})
+
 const apolloMock = jest.fn().mockResolvedValue({
   data: {
     listGDTEntries: {
@@ -52,9 +61,46 @@ const windowScrollToMock = jest.fn()
 window.scrollTo = windowScrollToMock
 
 const state = {
-  language: null,
+  language: 'en',
 }
 
+describe('GdtTransactionList ', () => {
+  let wrapper
+
+  const mocks = {
+    $store: {
+      state,
+      commit: jest.fn(),
+    },
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+    $n: jest.fn((n) => n),
+    $d: jest.fn((d) => d),
+    $toasted: {
+      error: toastErrorMock,
+    },
+    $apollo: {
+      query: apolloMockNull,
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(GdtTransactionList, { localVue, mocks })
+  }
+
+  describe('mount - When no transactions are loaded', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the funding button ', () => {
+      expect(wrapper.find('.gdt-funding').exists()).toBe(true)
+    })
+  })
+})
+
 describe('GdtTransactionList', () => {
   let wrapper
 
@@ -81,7 +127,7 @@ describe('GdtTransactionList', () => {
     return mount(GdtTransactionList, { localVue, mocks })
   }
 
-  describe('mount', () => {
+  describe('mount - When transactions are loaded', () => {
     beforeEach(() => {
       wrapper = Wrapper()
     })
@@ -90,6 +136,10 @@ describe('GdtTransactionList', () => {
       expect(wrapper.find('div.gdt-transaction-list').exists()).toBeTruthy()
     })
 
+    it('renders the not funding button ', () => {
+      expect(wrapper.find('.gdt-funding').exists()).toBe(false)
+    })
+
     describe('server returns valid data', () => {
       it('calls the API', async () => {
         await wrapper.vm.$nextTick()
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 0b6711a4d..f727d6297 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -4,7 +4,9 @@
       <div v-if="transactionGdtCount === 0" class="text-center">
         {{ $t('gdt.no-transactions') }}
         <hr />
-        <b-button :href="link" target="_blank">{{ $t('gdt.funding') }}</b-button>
+        <b-button class="gdt-funding" :href="link" target="_blank">
+          {{ $t('gdt.funding') }}
+        </b-button>
       </div>
       <div
         v-else

From 1e15b5d31279ba02ea4a9e62361ce564dc199de4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 21 Oct 2021 10:24:05 +0200
Subject: [PATCH 5/6] test link to gradido.net/de/memberships/

---
 .../views/Pages/AccountOverview/GdtTransactionList.spec.js   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
index 9b7e0a60f..359260db1 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
@@ -98,6 +98,11 @@ describe('GdtTransactionList ', () => {
     it('renders the funding button ', () => {
       expect(wrapper.find('.gdt-funding').exists()).toBe(true)
     })
+
+    it('links to https://gradido.net/en/memberships/ when clicking', async () => {
+      const link = 'https://gradido.net/' + state.language + '/memberships/'
+      expect(wrapper.find('.gdt-funding').attributes('href')).toBe(link)
+    })
   })
 })
 

From db6cea4cbdb03e077962808af8d7c41574ff660a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 22 Oct 2021 08:58:37 +0200
Subject: [PATCH 6/6] only one describe block on top level

---
 .../GdtTransactionList.spec.js                | 125 +++++++-----------
 1 file changed, 51 insertions(+), 74 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
index 359260db1..77507cb69 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
@@ -4,7 +4,7 @@ import GdtTransactionList from './GdtTransactionList'
 
 const localVue = global.localVue
 
-const apolloMockNull = jest.fn().mockResolvedValue({
+const apolloMock = jest.fn().mockResolvedValue({
   data: {
     listGDTEntries: {
       count: 0,
@@ -13,48 +13,6 @@ const apolloMockNull = jest.fn().mockResolvedValue({
   },
 })
 
-const apolloMock = jest.fn().mockResolvedValue({
-  data: {
-    listGDTEntries: {
-      count: 4,
-      gdtEntries: [
-        {
-          amount: 100,
-          gdt: 1700,
-          factor: 17,
-          comment: '',
-          date: '2021-05-02T17:20:11+00:00',
-          gdtEntryType: GdtEntryType.FORM,
-        },
-        {
-          amount: 1810,
-          gdt: 362,
-          factor: 0.2,
-          comment: 'Dezember 20',
-          date: '2020-12-31T12:00:00+00:00',
-          gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
-        },
-        {
-          amount: 100,
-          gdt: 1700,
-          factor: 17,
-          comment: '',
-          date: '2020-05-07T17:00:00+00:00',
-          gdtEntryType: GdtEntryType.FORM,
-        },
-        {
-          amount: 100,
-          gdt: 110,
-          factor: 22,
-          comment: '',
-          date: '2020-04-10T13:28:00+00:00',
-          gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
-        },
-      ],
-    },
-  },
-})
-
 const toastErrorMock = jest.fn()
 const windowScrollToMock = jest.fn()
 
@@ -82,7 +40,7 @@ describe('GdtTransactionList ', () => {
       error: toastErrorMock,
     },
     $apollo: {
-      query: apolloMockNull,
+      query: apolloMock,
     },
   }
 
@@ -100,40 +58,59 @@ describe('GdtTransactionList ', () => {
     })
 
     it('links to https://gradido.net/en/memberships/ when clicking', async () => {
-      const link = 'https://gradido.net/' + state.language + '/memberships/'
-      expect(wrapper.find('.gdt-funding').attributes('href')).toBe(link)
+      expect(wrapper.find('.gdt-funding').attributes('href')).toBe(
+        'https://gradido.net/' + state.language + '/memberships/',
+      )
     })
   })
-})
-
-describe('GdtTransactionList', () => {
-  let wrapper
-
-  const mocks = {
-    $store: {
-      state,
-      commit: jest.fn(),
-    },
-    $i18n: {
-      locale: 'en',
-    },
-    $t: jest.fn((t) => t),
-    $n: jest.fn((n) => n),
-    $d: jest.fn((d) => d),
-    $toasted: {
-      error: toastErrorMock,
-    },
-    $apollo: {
-      query: apolloMock,
-    },
-  }
-
-  const Wrapper = () => {
-    return mount(GdtTransactionList, { localVue, mocks })
-  }
 
   describe('mount - When transactions are loaded', () => {
     beforeEach(() => {
+      apolloMock.mockResolvedValue({
+        data: {
+          listGDTEntries: {
+            count: 4,
+            gdtEntries: [
+              {
+                id: 1,
+                amount: 100,
+                gdt: 1700,
+                factor: 17,
+                comment: '',
+                date: '2021-05-02T17:20:11+00:00',
+                gdtEntryType: GdtEntryType.FORM,
+              },
+              {
+                id: 2,
+                amount: 1810,
+                gdt: 362,
+                factor: 0.2,
+                comment: 'Dezember 20',
+                date: '2020-12-31T12:00:00+00:00',
+                gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
+              },
+              {
+                id: 3,
+                amount: 100,
+                gdt: 1700,
+                factor: 17,
+                comment: '',
+                date: '2020-05-07T17:00:00+00:00',
+                gdtEntryType: GdtEntryType.FORM,
+              },
+              {
+                id: 4,
+                amount: 100,
+                gdt: 110,
+                factor: 22,
+                comment: '',
+                date: '2020-04-10T13:28:00+00:00',
+                gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
+              },
+            ],
+          },
+        },
+      })
       wrapper = Wrapper()
     })
 
@@ -141,7 +118,7 @@ describe('GdtTransactionList', () => {
       expect(wrapper.find('div.gdt-transaction-list').exists()).toBeTruthy()
     })
 
-    it('renders the not funding button ', () => {
+    it('does not render the funding button ', () => {
       expect(wrapper.find('.gdt-funding').exists()).toBe(false)
     })