From 735414fab0a6ebeecc28a4fd47d43bdb762e7de1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 May 2021 13:43:13 +0200
Subject: [PATCH 01/24] locale is saved in db when session_id is available.
 Lists of languages is defined in locales/index.js

---
 frontend/src/apis/loginAPI.js              | 12 ++++++
 frontend/src/components/LanguageSwitch.vue | 45 ++++++++++++++++++++--
 frontend/src/locales/index.js              | 16 ++++++++
 frontend/src/store/store.js                |  5 ++-
 frontend/src/views/Pages/Login.vue         |  2 +-
 5 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/locales/index.js

diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js
index f5b0c57f5..55e32e6dd 100644
--- a/frontend/src/apis/loginAPI.js
+++ b/frontend/src/apis/loginAPI.js
@@ -1,5 +1,7 @@
 import axios from 'axios'
 import CONFIG from '../config'
+// eslint-disable-next-line no-unused-vars
+import regeneratorRuntime from 'regenerator-runtime'
 
 // control email-text sended with email verification code
 const EMAIL_TYPE = {
@@ -86,6 +88,16 @@ const loginAPI = {
     }
     return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload)
   },
+  updateLanguage: async (sessionId, email, language) => {
+    const payload = {
+      session_id: sessionId,
+      email,
+      update: {
+        'User.language': language,
+      },
+    }
+    return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload)
+  },
 }
 
 export default loginAPI
diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 0fad036a6..650ab57ed 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -1,22 +1,59 @@
 <template>
   <div class="language-switch">
-    <b-dropdown size="sm" :text="$t('language') + ' - ' + $i18n.locale">
-      <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
-      <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
+    <b-dropdown size="sm" :text="currentLanguageName + ' - ' + currentLanguage">
+      <b-dropdown-item
+        v-for="lang in locales"
+        @click.prevent="saveLocale(lang.code)"
+        :key="lang.code"
+      >
+        {{ lang.name }}
+      </b-dropdown-item>
     </b-dropdown>
   </div>
 </template>
 <script>
 import { localeChanged } from 'vee-validate'
+import locales from '../locales/'
+import loginAPI from '../apis/loginAPI'
 
 export default {
-  name: 'language-switch',
+  name: 'LanguageSwitch',
+  data() {
+    return {
+      locales: locales,
+    }
+  },
   methods: {
     setLocale(locale) {
       this.$i18n.locale = locale
       this.$store.commit('language', this.$i18n.locale)
       localeChanged(locale)
     },
+    async saveLocale(locale) {
+      this.setLocale(locale)
+      if (this.$store.state.sessionId && this.$store.state.email) {
+        const result = loginAPI.updateLanguage(
+          this.$store.state.sessionId,
+          this.$store.state.email,
+          locale,
+        )
+        if (result.success) {
+          // toast success message
+        } else {
+          // toast error message
+        }
+      }
+    },
+  },
+  computed: {
+    currentLanguage() {
+      const locale = this.$store.state.language || navigator.language || 'en'
+      this.setLocale(this.$store.state.language)
+      return locale
+    },
+    currentLanguageName() {
+      return this.locales.find((l) => l.code === this.currentLanguage).name
+    },
   },
 }
 </script>
diff --git a/frontend/src/locales/index.js b/frontend/src/locales/index.js
new file mode 100644
index 000000000..4cb375b40
--- /dev/null
+++ b/frontend/src/locales/index.js
@@ -0,0 +1,16 @@
+const locales = [
+  {
+    name: 'English',
+    code: 'en',
+    iso: 'en-US',
+    enabled: true,
+  },
+  {
+    name: 'Deutsch',
+    code: 'de',
+    iso: 'de-DE',
+    enabled: true,
+  },
+]
+
+export default locales
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index aed286bc6..1d89894fb 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -18,7 +18,8 @@ export const mutations = {
 export const actions = {
   login: ({ dispatch, commit }, data) => {
     commit('sessionId', data.sessionId)
-    commit('email', data.email)
+    commit('email', data.user.email)
+    commit('language', data.user.language)
   },
   logout: ({ commit, state }) => {
     commit('sessionId', null)
@@ -36,7 +37,7 @@ export const store = new Vuex.Store({
   state: {
     sessionId: null,
     email: '',
-    language: 'en',
+    language: null,
     modals: false,
   },
   getters: {},
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index b04bce7b0..e79acd353 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -111,7 +111,7 @@ export default {
       if (result.success) {
         this.$store.dispatch('login', {
           sessionId: result.result.data.session_id,
-          email: this.model.email,
+          user: result.result.data.user,
         })
         this.$router.push('/overview')
         loader.hide()

From c4440f50e37b06288165a83116b421db86466f02 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 May 2021 15:26:28 +0200
Subject: [PATCH 02/24] try to get the tests running

---
 frontend/src/components/LanguageSwitch.vue    | 28 +++++++++++++------
 .../components/SidebarPlugin/SideBar.spec.js  |  3 +-
 frontend/src/store/store.test.js              | 25 ++++++++++++++---
 .../src/views/Layout/ContentFooter.spec.js    |  3 ++
 frontend/src/views/Pages/Login.spec.js        | 11 +-------
 frontend/src/views/Pages/Register.spec.js     | 11 +-------
 6 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 650ab57ed..0905bb3af 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="language-switch">
-    <b-dropdown size="sm" :text="currentLanguageName + ' - ' + currentLanguage">
+    <b-dropdown size="sm" :text="currentLanguage.name + ' - ' + currentLanguage.code">
       <b-dropdown-item
         v-for="lang in locales"
         @click.prevent="saveLocale(lang.code)"
@@ -24,7 +24,7 @@ export default {
     }
   },
   methods: {
-    setLocale(locale) {
+    async setLocale(locale) {
       this.$i18n.locale = locale
       this.$store.commit('language', this.$i18n.locale)
       localeChanged(locale)
@@ -32,7 +32,7 @@ export default {
     async saveLocale(locale) {
       this.setLocale(locale)
       if (this.$store.state.sessionId && this.$store.state.email) {
-        const result = loginAPI.updateLanguage(
+        const result = await loginAPI.updateLanguage(
           this.$store.state.sessionId,
           this.$store.state.email,
           locale,
@@ -44,15 +44,25 @@ export default {
         }
       }
     },
+    getLocaleObject(code) {
+      return this.locales.find((l) => l.code === code)
+    },
+    getNavigatorLanguage() {
+      const lang = navigator.language
+      if (lang) return lang.split('-')[0]
+      return lang
+    },
   },
   computed: {
     currentLanguage() {
-      const locale = this.$store.state.language || navigator.language || 'en'
-      this.setLocale(this.$store.state.language)
-      return locale
-    },
-    currentLanguageName() {
-      return this.locales.find((l) => l.code === this.currentLanguage).name
+      let locale = this.$store.state.language || this.getNavigatorLanguage() || 'en'
+      let object = this.getLocaleObject(locale)
+      if (!object) {
+        locale = 'en'
+        object = this.getLocaleObject(locale)
+      }
+      this.setLocale(locale)
+      return object
     },
   },
 }
diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 36230849f..30f1193cd 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -19,6 +19,7 @@ describe('SideBar', () => {
       state: {
         email: 'test@example.org',
       },
+      commit: jest.fn(),
     },
     $i18n: {
       locale: 'en',
@@ -93,7 +94,7 @@ describe('SideBar', () => {
             mocks.$i18n.locale = 'de'
           })
 
-          it('links to the German elopage when locale is set to de', () => {
+          it('links to the German elopage when locale is set to de', async () => {
             expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
               'https://elopage.com/s/gradido/sign_in?locale=de',
             )
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index 655cca7a0..cc88c719e 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -36,19 +36,36 @@ describe('Vuex store', () => {
       const state = {}
 
       it('calls two commits', () => {
-        login({ commit, state }, { sessionId: 1234, email: 'someone@there.is' })
-        expect(commit).toHaveBeenCalledTimes(2)
+        login(
+          { commit, state },
+          { sessionId: 1234, user: { email: 'someone@there.is', language: 'en' } },
+        )
+        expect(commit).toHaveBeenCalledTimes(3)
       })
 
       it('commits sessionId', () => {
-        login({ commit, state }, { sessionId: 1234, email: 'someone@there.is' })
+        login(
+          { commit, state },
+          { sessionId: 1234, user: { email: 'someone@there.is', language: 'en' } },
+        )
         expect(commit).toHaveBeenNthCalledWith(1, 'sessionId', 1234)
       })
 
       it('commits email', () => {
-        login({ commit, state }, { sessionId: 1234, email: 'someone@there.is' })
+        login(
+          { commit, state },
+          { sessionId: 1234, user: { email: 'someone@there.is', language: 'en' } },
+        )
         expect(commit).toHaveBeenNthCalledWith(2, 'email', 'someone@there.is')
       })
+
+      it('commits language', () => {
+        login(
+          { commit, state },
+          { sessionId: 1234, user: { email: 'someone@there.is', language: 'en' } },
+        )
+        expect(commit).toHaveBeenNthCalledWith(3, 'language', 'en')
+      })
     })
 
     describe('logout', () => {
diff --git a/frontend/src/views/Layout/ContentFooter.spec.js b/frontend/src/views/Layout/ContentFooter.spec.js
index 8d0c6dfbd..013ec8244 100644
--- a/frontend/src/views/Layout/ContentFooter.spec.js
+++ b/frontend/src/views/Layout/ContentFooter.spec.js
@@ -12,6 +12,9 @@ describe('ContentFooter', () => {
       locale: 'en',
     },
     $t: jest.fn((t) => t),
+    $store: {
+      commit: jest.fn(),
+    },
   }
 
   const Wrapper = () => {
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index c95aa5a4c..0d94840b0 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -1,5 +1,4 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import Vuex from 'vuex'
 import flushPromises from 'flush-promises'
 
 import Login from './Login'
@@ -16,20 +15,12 @@ describe('Login', () => {
     $t: jest.fn((t) => t),
   }
 
-  const state = {
-    loginfail: false,
-  }
-
-  const store = new Vuex.Store({
-    state,
-  })
-
   const stubs = {
     RouterLink: RouterLinkStub,
   }
 
   const Wrapper = () => {
-    return mount(Login, { localVue, mocks, store, stubs })
+    return mount(Login, { localVue, mocks, stubs })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index dcb97cf42..3d4296567 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -1,5 +1,4 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import Vuex from 'vuex'
 import flushPromises from 'flush-promises'
 
 import Register from './Register'
@@ -16,20 +15,12 @@ describe('Register', () => {
     $t: jest.fn((t) => t),
   }
 
-  const state = {
-    // loginfail: false,
-  }
-
-  const store = new Vuex.Store({
-    state,
-  })
-
   const stubs = {
     RouterLink: RouterLinkStub,
   }
 
   const Wrapper = () => {
-    return mount(Register, { localVue, mocks, store, stubs })
+    return mount(Register, { localVue, mocks, stubs })
   }
 
   describe('mount', () => {

From f7cae0359e93042b8f2704cd58bc06486ea2dc49 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 May 2021 16:19:53 +0200
Subject: [PATCH 03/24] tests are working again

---
 frontend/src/components/LanguageSwitch.vue          | 13 ++++++++-----
 frontend/src/views/Layout/ContentFooter.spec.js     |  3 ---
 .../src/views/Layout/DashboardLayout_gdd.spec.js    |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 0905bb3af..2b160b3e3 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -21,12 +21,14 @@ export default {
   data() {
     return {
       locales: locales,
+      currentLanguage: {},
     }
   },
   methods: {
-    async setLocale(locale) {
+    setLocale(locale) {
       this.$i18n.locale = locale
       this.$store.commit('language', this.$i18n.locale)
+      this.currentLanguage = this.getLocaleObject(locale)
       localeChanged(locale)
     },
     async saveLocale(locale) {
@@ -52,9 +54,7 @@ export default {
       if (lang) return lang.split('-')[0]
       return lang
     },
-  },
-  computed: {
-    currentLanguage() {
+    setCurrentLanguage() {
       let locale = this.$store.state.language || this.getNavigatorLanguage() || 'en'
       let object = this.getLocaleObject(locale)
       if (!object) {
@@ -62,8 +62,11 @@ export default {
         object = this.getLocaleObject(locale)
       }
       this.setLocale(locale)
-      return object
+      this.currentLanguage = object
     },
   },
+  created() {
+    this.setCurrentLanguage()
+  },
 }
 </script>
diff --git a/frontend/src/views/Layout/ContentFooter.spec.js b/frontend/src/views/Layout/ContentFooter.spec.js
index 013ec8244..8d0c6dfbd 100644
--- a/frontend/src/views/Layout/ContentFooter.spec.js
+++ b/frontend/src/views/Layout/ContentFooter.spec.js
@@ -12,9 +12,6 @@ describe('ContentFooter', () => {
       locale: 'en',
     },
     $t: jest.fn((t) => t),
-    $store: {
-      commit: jest.fn(),
-    },
   }
 
   const Wrapper = () => {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 8c1e604c0..84c955042 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -44,6 +44,9 @@ describe('DashboardLayoutGdd', () => {
 
   const store = new Vuex.Store({
     state,
+    mutations: {
+      language: jest.fn(),
+    },
   })
 
   const Wrapper = () => {

From 85424c6611855de2c01bc1e95c2e71657b497c68 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 May 2021 16:24:35 +0200
Subject: [PATCH 04/24] fix test naming, removed unused async

---
 frontend/src/components/SidebarPlugin/SideBar.spec.js | 2 +-
 frontend/src/store/store.test.js                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 30f1193cd..9f9ce8a8f 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -94,7 +94,7 @@ describe('SideBar', () => {
             mocks.$i18n.locale = 'de'
           })
 
-          it('links to the German elopage when locale is set to de', async () => {
+          it('links to the German elopage when locale is set to de', () => {
             expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
               'https://elopage.com/s/gradido/sign_in?locale=de',
             )
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index cc88c719e..11dd5949b 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -35,7 +35,7 @@ describe('Vuex store', () => {
       const commit = jest.fn()
       const state = {}
 
-      it('calls two commits', () => {
+      it('calls three commits', () => {
         login(
           { commit, state },
           { sessionId: 1234, user: { email: 'someone@there.is', language: 'en' } },

From 0bbbb3a4c8935c38e3d340d6ae169f8303c6125d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 May 2021 21:34:22 +0200
Subject: [PATCH 05/24] coverage to 19%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 320a9cfea..cf0b061ef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -212,7 +212,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 15
+          min_coverage: 19
           token: ${{ github.token }}
   
   #test:

From 458f39c113b6fc07f630f355f88ad9883996cd9f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 May 2021 03:29:02 +0200
Subject: [PATCH 06/24] specs for locale switch

---
 .../src/components/LanguageSwitch.spec.js     | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 frontend/src/components/LanguageSwitch.spec.js

diff --git a/frontend/src/components/LanguageSwitch.spec.js b/frontend/src/components/LanguageSwitch.spec.js
new file mode 100644
index 000000000..14dc978ac
--- /dev/null
+++ b/frontend/src/components/LanguageSwitch.spec.js
@@ -0,0 +1,95 @@
+import { mount } from '@vue/test-utils'
+import LanguageSwitch from './LanguageSwitch'
+
+const localVue = global.localVue
+
+describe('LanguageSwitch', () => {
+  let wrapper
+
+  const state = {
+    sessionId: 1234,
+    email: 'he@ho.he',
+    language: null,
+  }
+
+  const mocks = {
+    $store: {
+      state,
+      commit: jest.fn(),
+    },
+    $i18n: {
+      locale: 'en',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(LanguageSwitch, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
+    })
+
+    describe('with locales en and de', () => {
+      describe('empty store', () => {
+        it('shows English as default navigator langauge', () => {
+          expect(wrapper.find('button.dropdown-toggle').text()).toBe('English - en')
+        })
+
+        describe('navigator language is "de-DE"', () => {
+          const mockNavigator = jest.fn(() => {
+            return 'de'
+          })
+
+          it('shows Deutsch as language ', async () => {
+            wrapper.vm.getNavigatorLanguage = mockNavigator
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.find('button.dropdown-toggle').text()).toBe('Deutsch - de')
+          })
+        })
+
+        describe('navigator language is "es-ES" (not supported)', () => {
+          const mockNavigator = jest.fn(() => {
+            return 'es'
+          })
+
+          it('shows English as language ', async () => {
+            wrapper.vm.getNavigatorLanguage = mockNavigator
+            wrapper.vm.setCurrentLanguage()
+            await wrapper.vm.$nextTick()
+            expect(wrapper.find('button.dropdown-toggle').text()).toBe('English - en')
+          })
+        })
+      })
+
+      describe('language "de" in store', () => {
+        it('shows Deutsch as language', async () => {
+          wrapper.vm.$store.state.language = 'de'
+          wrapper.vm.setCurrentLanguage()
+          await wrapper.vm.$nextTick()
+          expect(wrapper.find('button.dropdown-toggle').text()).toBe('Deutsch - de')
+        })
+      })
+
+      describe('dropdown menu', () => {
+        it('has English and German as languages to choose', () => {
+          expect(wrapper.findAll('li')).toHaveLength(2)
+        })
+
+        it('has English as first language to choose', () => {
+          expect(wrapper.findAll('li').at(0).text()).toBe('English')
+        })
+
+        it('has German as second language to choose', () => {
+          expect(wrapper.findAll('li').at(1).text()).toBe('Deutsch')
+        })
+      })
+    })
+  })
+})

From d8697a98ad8364d343bc61b7a225e20d9b594395 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Tue, 18 May 2021 09:15:24 +0000
Subject: [PATCH 07/24] require memo between 5 and 150 character by send
 transaction

---
 community_server/src/Controller/AppRequestsController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php
index 12ea77d0b..41552f6dc 100644
--- a/community_server/src/Controller/AppRequestsController.php
+++ b/community_server/src/Controller/AppRequestsController.php
@@ -156,6 +156,9 @@ class AppRequestsController extends AppController
         if($required_fields !== true) {
             return $this->returnJson($required_fields);
         }
+        if(!isset($params['memo']) || count($params['memo']) < 5 || count($params['memo']) > 150) {
+            return $this->returnJson(['state' => 'error', 'msg' => 'memo is not set or not in expected range [5;150]']);
+        }
         $params['transaction_type'] = 'transfer';
         
         $requestAnswear = $this->JsonRequestClient->sendRequest(json_encode($params), '/createTransaction');

From 5a79d993305fac78dd0468d3fcc2327fc873fd96 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Tue, 18 May 2021 09:32:25 +0000
Subject: [PATCH 08/24] add to old frontend

---
 .../src/Controller/TransactionSendCoinsController.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/community_server/src/Controller/TransactionSendCoinsController.php b/community_server/src/Controller/TransactionSendCoinsController.php
index 033e2343f..1018309cc 100644
--- a/community_server/src/Controller/TransactionSendCoinsController.php
+++ b/community_server/src/Controller/TransactionSendCoinsController.php
@@ -237,6 +237,11 @@ class TransactionSendCoinsController extends AppController
                    $this->set('timeUsed', microtime(true) - $startTime);
                    return;
                  }
+                 if($answear_data['msg'] === 'memo is not set or not in expected range [5;150]') {
+                    $this->Flash->error(__('Ein Verwendungszweck zwischen 5 und 150 Zeichen wird benötig!'));
+                    $this->set('timeUsed', microtime(true) - $startTime);
+                    return;
+                 }
                } else if($answear_data['state'] === 'not found' && $answear_data['msg'] === 'receiver not found') {
                   $this->Flash->error(__('Der Empfänger wurde nicht auf dem Login-Server gefunden, hat er sein Konto schon angelegt?'));
                   $this->set('timeUsed', microtime(true) - $startTime);

From 4ecbea80b59f0707dd7389abeede725d6cca340d Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Tue, 18 May 2021 11:32:54 +0200
Subject: [PATCH 09/24] add check for memo also in login-server

---
 login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp | 3 +++
 login_server/src/cpp/model/gradido/TransactionBase.h         | 3 ++-
 login_server/src/cpp/model/gradido/TransactionTransfer.cpp   | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp b/login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp
index 786af9d71..7fb40913e 100644
--- a/login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp
@@ -108,6 +108,9 @@ Poco::JSON::Object* JsonCreateTransaction::transfer(Poco::Dynamic::Var params)
 	else {
 		result = stateError("parameter format unknown");
 	}
+	if (mMemo.size() < 5 || mMemo.size() > 150) {
+		result = stateError("memo is not set or not in expected range [5;150]");
+	}
 	if (result) {
 		mm->releaseMemory(target_pubkey);
 		return result;
diff --git a/login_server/src/cpp/model/gradido/TransactionBase.h b/login_server/src/cpp/model/gradido/TransactionBase.h
index 6a82b2a28..9f5a87d85 100644
--- a/login_server/src/cpp/model/gradido/TransactionBase.h
+++ b/login_server/src/cpp/model/gradido/TransactionBase.h
@@ -31,7 +31,8 @@ namespace model {
 			TRANSACTION_VALID_INVALID_AMOUNT,
 			TRANSACTION_VALID_INVALID_PUBKEY,
 			TRANSACTION_VALID_INVALID_GROUP_ALIAS,
-			TRANSACTION_VALID_INVALID_SIGN
+			TRANSACTION_VALID_INVALID_SIGN,
+			TRANSACTION_VALID_INVALID_MEMO
 		};
 		const char* TransactionValidationToString(TransactionValidation result);
 
diff --git a/login_server/src/cpp/model/gradido/TransactionTransfer.cpp b/login_server/src/cpp/model/gradido/TransactionTransfer.cpp
index 759d79690..ef0d3a3f6 100644
--- a/login_server/src/cpp/model/gradido/TransactionTransfer.cpp
+++ b/login_server/src/cpp/model/gradido/TransactionTransfer.cpp
@@ -186,6 +186,10 @@ namespace model {
 				addError(new Error(function_name, "sender and receiver are the same"));
 				return TRANSACTION_VALID_INVALID_PUBKEY;
 			}
+			if (mMemo.size() < 5 || mMemo.size() > 150) {
+				addError(new Error(function_name, "memo is not set or not in expected range [5;150]"));
+				return TRANSACTION_VALID_INVALID_MEMO;
+			}
 			return TRANSACTION_VALID_OK;
 		}
 

From 8b29556ba56a0fb34642918b83426f635a8c132c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 May 2021 22:53:01 +0200
Subject: [PATCH 10/24] add memo valiadation to frontend

---
 .../AccountOverview/GddSend/TransactionForm.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
index 3967bbec0..777ba2394 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue
@@ -87,7 +87,22 @@
                     style="font-size: xx-large; padding-left: 20px"
                   ></b-form-input>
                 </b-input-group>
-                <b-col class="text-left p-3 p-sm-1">{{ $t('form.memo') }}</b-col>
+              </validation-provider>
+              <validation-provider
+                :rules="{
+                  required: true,
+                  min: 5,
+                  max: 150,
+                }"
+                :name="$t('form.memo')"
+                v-slot="{ errors }"
+              >
+                <b-row>
+                  <b-col class="text-left p-3 p-sm-1">{{ $t('form.memo') }}</b-col>
+                  <b-col v-if="errors" class="text-right p-3 p-sm-1">
+                    <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
+                  </b-col>
+                </b-row>
                 <b-input-group id="input-group-3">
                   <b-input-group-prepend class="p-3 d-none d-md-block">
                     <b-icon icon="chat-right-text" class="display-3"></b-icon>

From 76c77088295eddeca31b5af84e8ff0c2602c2d8c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 01:40:29 +0200
Subject: [PATCH 11/24] Thx page shows content dependent of route from

---
 frontend/src/locales/de.json               |  4 +-
 frontend/src/locales/en.json               |  4 +-
 frontend/src/routes/routes.js              |  8 ++++
 frontend/src/views/Pages/ResetPassword.vue |  4 ++
 frontend/src/views/Pages/thx.vue           | 46 +++++++++++++++++++++-
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index be4574e6d..558de7813 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -85,7 +85,9 @@
     },
     "thx": {
       "title": "Danke!",
-      "subtitle": "Wir haben dir eine eMail gesendet."
+      "email": "Wir haben dir eine eMail gesendet.",
+      "reset": "Dein Passwort wurde geändert",
+      "register": "Du bist jetzt regisriert"      
     },
     "overview":{
       "account_overview":"Kontoübersicht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d9a3d278b..2daa1696f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -85,7 +85,9 @@
     },
     "thx": {
       "title": "Thank you!",
-      "subtitle": "We have sent you an email."
+      "email": "We have sent you an email.",
+      "reset": "Your password has been changed",
+      "register": "You are registred now"      
     },
     "overview":{
       "account_overview":"Account overview",
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index e9bcf38c8..0021aa1ed 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -49,6 +49,14 @@ const routes = [
   {
     path: '/thx',
     component: () => import('../views/Pages/thx.vue'),
+    beforeEnter: (to, from, next) => {
+      const validFrom = ['/password', '/reset', '/register']
+      if (!validFrom.includes(from.path)) {
+        next({ path: '/login' })
+      } else {
+        next()
+      }
+    },
   },
   {
     path: '/password',
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index de5f256d6..c24a33257 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -107,6 +107,10 @@ export default {
       const result = await loginAPI.changePassword(this.sessionId, this.email, this.password)
       if (result.success) {
         this.password = ''
+        this.$store.dispatch('login', {
+          sessionId: result.result.data.session_id,
+          email: result.result.data.user.email,
+        })
         this.$router.push('/thx')
       } else {
         alert(result.result.message)
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index db0b967d6..53db302a9 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -5,12 +5,54 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <p class="h1">{{ $t('site.thx.title') }}</p>
-          <p class="h4">{{ $t('site.thx.subtitle') }}</p>
+          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
           <hr />
-          <b-button to="/login">{{ $t('login') }}</b-button>
+          <b-button :to="displaySetup.linkTo">{{ $t(displaySetup.button) }}</b-button>
         </div>
       </b-container>
     </div>
     <!-- Page content -->
   </div>
 </template>
+<script>
+const textFields = {
+  '/password': {
+    subtitle: 'site.thx.email',
+    button: 'login',
+    linkTo: '/login',
+  },
+  '/reset': {
+    subtitle: 'site.thx.reset',
+    button: 'site.login.signin',
+    linkTo: '/overview',
+  },
+  '/register': {
+    subtitle: 'site.thx.register',
+    button: 'site.login.signin',
+    linkTo: '/overview',
+  },
+}
+
+export default {
+  name: 'Thx',
+  data() {
+    return {
+      comingFrom: null,
+      displaySetup: {},
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      vm.comingFrom = from.path
+    })
+  },
+  methods: {
+    setupDisplay() {
+      this.displaySetup = textFields[this.comingFrom]
+    },
+  },
+  created() {
+    this.setupDisplay()
+  },
+}
+</script>

From 18b4f5d584a8252a7893026cf5494ca551bf5b2a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 19 May 2021 10:31:07 +0200
Subject: [PATCH 12/24]  [Bug] German "Dir" is written with capital D in send
 validation bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 [Bug] German "Dir" is written with capital D in send validation bug
#403  opened 7 days ago by ulfgebhardt
 🏃21/05 May
---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index be4574e6d..f98f26fa0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -49,7 +49,7 @@
     "send_transaction_error":"Leider konnte die Transaktion nicht ausgeführt werden!",
     "validation": {
       "double": "Das Feld {field} muss eine Dezimalzahl mit zwei Nachkommastellen sein",
-      "is-not": "Du kannst Dir selbst keine Gradidos überweisen"
+      "is-not": "Du kannst dir selbst keine Gradidos überweisen"
     }
   },
   "error": {

From db4a2bbaee6984d4c3a9ecab6abe66623d97b05f Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 19 May 2021 12:02:10 +0200
Subject: [PATCH 13/24] bug: responsive display error on pads fixed

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

diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js
index 68d91ee98..0ee75ef9f 100644
--- a/frontend/src/views/Pages/AccountOverview.spec.js
+++ b/frontend/src/views/Pages/AccountOverview.spec.js
@@ -19,10 +19,6 @@ describe('AccountOverview', () => {
       wrapper = Wrapper()
     })
 
-    it('has a header', () => {
-      expect(wrapper.find('base-header-stub').exists()).toBeTruthy()
-    })
-
     it('has a status line', () => {
       expect(wrapper.find('gdd-status-stub').exists()).toBeTruthy()
     })
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 8f6ffc4e1..7753b1427 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <base-header class="pb-md-4 pt-md-2 pb-lg-4 pt-lg-2 bg-transparent"></base-header>
-    <b-container fluid class="p-lg-2 mt-lg-5">
+    <b-container fluid class="p-lg-2 mt-lg-1">
       <gdd-status
         v-if="showContext"
         :pending="pending"

From e89744e9fa883dd53b8f029aec3b27ae1756dd5f Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 19 May 2021 12:06:05 +0200
Subject: [PATCH 14/24] fix lint

---
 frontend/src/views/Layout/DashboardNavbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 7c83bef1b..fb819c13f 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -15,7 +15,7 @@
           <span class="pb-2 text-lg font-weight-bold">
             {{ $store.state.email }}
           </span>
-          <b-media-body class="ml-2 d-none d-lg-block">
+          <b-media-body class="ml-2 d-none d-lg-block d-md-block">
             <span class="avatar">
               <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
             </span>

From 6b48f580051977d75a306efd1a45d9ff0ab98058 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Wed, 19 May 2021 10:35:37 +0000
Subject: [PATCH 15/24] change to strlen in php strings cannot be counted

---
 community_server/src/Controller/AppRequestsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php
index 41552f6dc..4d70a68b1 100644
--- a/community_server/src/Controller/AppRequestsController.php
+++ b/community_server/src/Controller/AppRequestsController.php
@@ -156,7 +156,7 @@ class AppRequestsController extends AppController
         if($required_fields !== true) {
             return $this->returnJson($required_fields);
         }
-        if(!isset($params['memo']) || count($params['memo']) < 5 || count($params['memo']) > 150) {
+        if(!isset($params['memo']) || strlen($params['memo']) < 5 || strlen($params['memo']) > 150) {
             return $this->returnJson(['state' => 'error', 'msg' => 'memo is not set or not in expected range [5;150]']);
         }
         $params['transaction_type'] = 'transfer';

From e9eb3331fe91b3f9c568c445e0a86a038fe19989 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 19 May 2021 14:33:23 +0200
Subject: [PATCH 16/24] Transactions list clearer + date visible

---
 .../src/views/Pages/AccountOverview.spec.js   |  2 +-
 frontend/src/views/Pages/AccountOverview.vue  | 14 ++--
 .../{GddTable.vue => GddTransactionList.vue}  | 71 +++++++++----------
 ...ooter.vue => GddTransactionListFooter.vue} |  2 +-
 .../Pages/UserProfileTransactionList.vue      | 25 +++----
 5 files changed, 54 insertions(+), 60 deletions(-)
 rename frontend/src/views/Pages/AccountOverview/{GddTable.vue => GddTransactionList.vue} (72%)
 rename frontend/src/views/Pages/AccountOverview/{GddTableFooter.vue => GddTransactionListFooter.vue} (91%)

diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js
index 68d91ee98..d28b295d8 100644
--- a/frontend/src/views/Pages/AccountOverview.spec.js
+++ b/frontend/src/views/Pages/AccountOverview.spec.js
@@ -32,7 +32,7 @@ describe('AccountOverview', () => {
     })
 
     it('has a transactions table', () => {
-      expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy()
+      expect(wrapper.find('gdd-transaction-list-stub').exists()).toBeTruthy()
     })
   })
 })
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 5c7b9fb76..cf05b846a 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <base-header class="pb-lg-4 pt-lg-2 bg-transparent"></base-header>
-    <b-container fluid class="p-lg-2 mt-lg-5">
+    <b-container fluid class="p-0 p-lg-2 mt-lg-5">
       <gdd-status
         v-if="showContext"
         :pending="pending"
@@ -29,7 +29,7 @@
         </template>
       </gdd-send>
       <hr />
-      <gdd-table
+      <gdd-transaction-list
         v-if="showContext"
         :transactions="transactions"
         :max="5"
@@ -37,15 +37,15 @@
         :transactionCount="transactionCount"
         @update-transactions="$emit('update-transactions')"
       />
-      <gdd-table-footer v-if="showContext" :count="transactionCount" />
+      <gdd-transaction-list-footer v-if="showContext" :count="transactionCount" />
     </b-container>
   </div>
 </template>
 <script>
 import GddStatus from './AccountOverview/GddStatus.vue'
 import GddSend from './AccountOverview/GddSend.vue'
-import GddTable from './AccountOverview/GddTable.vue'
-import GddTableFooter from './AccountOverview/GddTableFooter.vue'
+import GddTransactionList from './AccountOverview/GddTransactionList.vue'
+import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'
 import TransactionForm from './AccountOverview/GddSend/TransactionForm.vue'
 import TransactionConfirmation from './AccountOverview/GddSend/TransactionConfirmation.vue'
 import TransactionResult from './AccountOverview/GddSend/TransactionResult.vue'
@@ -63,8 +63,8 @@ export default {
   components: {
     GddStatus,
     GddSend,
-    GddTable,
-    GddTableFooter,
+    GddTransactionList,
+    GddTransactionListFooter,
     TransactionForm,
     TransactionConfirmation,
     TransactionResult,
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
similarity index 72%
rename from frontend/src/views/Pages/AccountOverview/GddTable.vue
rename to frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index f516f7cbb..7a7c5cb7f 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -6,43 +6,36 @@
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
-        <div class="d-flex w-100 justify-content-between">
-          <b-icon
-            v-if="item.type === 'send'"
-            icon="arrow-left-circle"
-            class="m-1 text-danger"
-            font-scale="2"
-            style="color: red"
-          ></b-icon>
-          <b-icon
-            v-else-if="item.type === 'receive'"
-            icon="arrow-right-circle"
-            class="m-1"
-            font-scale="2"
-            style="color: green"
-          ></b-icon>
-          <b-icon
-            v-else-if="item.type === 'creation'"
-            icon="gift"
-            class="m-1"
-            font-scale="2"
-            style="color: orange"
-          ></b-icon>
-          <b-icon
-            v-else
-            icon="droplet-half"
-            class="m-1"
-            font-scale="2"
-            style="color: orange"
-          ></b-icon>
-          <h1 class="">
+        <div class="d-flex">
+          <div style="width: 10%">
+            <b-icon
+              v-if="item.type === 'send'"
+              icon="arrow-left-circle"
+              class="m-mb-1 text-danger font2em"
+            ></b-icon>
+            <b-icon
+              v-else-if="item.type === 'receive'"
+              icon="arrow-right-circle"
+              class="m-md-1 text-success font2em"
+            ></b-icon>
+            <b-icon
+              v-else-if="item.type === 'creation'"
+              icon="gift"
+              class="m-md-1 font2em"
+              style="color: green"
+            ></b-icon>
+            <b-icon v-else icon="droplet-half" class="m-md-1 font2em" style="color: gray"></b-icon>
+          </div>
+          <div class="font1_2em pl-2" style="width: 30%">
+            {{ $n(item.balance) }}
             <span v-if="item.type === 'receive' || item.type === 'creation'">+</span>
             <span v-else>-</span>
-            {{ $n(item.balance) }}
-            <small>GDD</small>
-          </h1>
-          <h2 class="text-muted">{{ item.name }}</h2>
-          <b-button v-b-toggle="'a' + item.transaction_id" variant="secondary">
+          </div>
+          <div class="font1_2em" style="width: 50%">
+            {{ item.name }} -
+            <div class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
+          </div>
+          <b-button v-b-toggle="'a' + item.transaction_id" class="btn-sm">
             <b>i</b>
           </b-button>
         </div>
@@ -97,7 +90,7 @@
 
 <script>
 export default {
-  name: 'GddTable',
+  name: 'gdd-transaction-list',
   props: {
     transactions: { default: [] },
     max: { type: Number, default: 1000 },
@@ -125,6 +118,12 @@ export default {
 }
 </script>
 <style>
+.font1_2em {
+  font-size: 1.2em;
+}
+.font2em {
+  font-size: 1.5em;
+}
 .el-table .cell {
   padding-left: 0px;
   padding-right: 0px;
diff --git a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.vue
similarity index 91%
rename from frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
rename to frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.vue
index 74f254ebb..0e30d85dc 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'GddTableFooter',
+  name: 'GddTransactionListFooter',
   props: {
     count: { count: Number },
   },
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 6b1a32d48..1b5b30f7b 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -1,29 +1,24 @@
 <template>
   <div>
     <div
-      class="header pb-8 pt-lg-4 d-flex align-items-center profile-header"
+      class="header pb-sm-1 pb-md-7 d-flex align-items-center profile-header"
       style="max-height: 200px"
     ></div>
-    <b-container fluid class="mt--6">
-      <b-row>
-        <b-col class="order-xl-1">
-          <gdd-table
-            :timestamp="timestamp"
-            :transactionCount="transactionCount"
-            :transactions="transactions"
-            @update-transactions="updateTransactions"
-          />
-        </b-col>
-      </b-row>
-    </b-container>
+
+    <gdd-transaction-list
+      :timestamp="timestamp"
+      :transactionCount="transactionCount"
+      :transactions="transactions"
+      @update-transactions="updateTransactions"
+    />
   </div>
 </template>
 <script>
-import GddTable from '../../views/Pages/AccountOverview/GddTable.vue'
+import GddTransactionList from './AccountOverview/GddTransactionList.vue'
 
 export default {
   components: {
-    GddTable,
+    GddTransactionList,
   },
   props: {
     transactions: {

From 77ec0877758affaa8819f276da16b4e058f6bd9b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 16:54:34 +0200
Subject: [PATCH 17/24] thx pages works without errors

---
 frontend/src/routes/routes.js               |  6 +++---
 frontend/src/views/Pages/ForgotPassword.vue |  2 +-
 frontend/src/views/Pages/Register.vue       |  2 +-
 frontend/src/views/Pages/ResetPassword.vue  | 12 ++++++-----
 frontend/src/views/Pages/thx.vue            | 22 ++++++++-------------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0021aa1ed..e32aa6eee 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -47,11 +47,11 @@ const routes = [
     component: () => import('../views/Pages/Login.vue'),
   },
   {
-    path: '/thx',
+    path: '/thx/:comingFrom',
     component: () => import('../views/Pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['/password', '/reset', '/register']
-      if (!validFrom.includes(from.path)) {
+      const validFrom = ['password', 'reset', 'register']
+      if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {
         next()
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index 484b50629..32331d080 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -62,7 +62,7 @@ export default {
     async onSubmit() {
       const result = await loginAPI.sendEmail(this.form.email)
       if (result.success) {
-        this.$router.push({ path: '/thx', params: { id: 'resetmail' } })
+        this.$router.push('/thx/password')
       } else {
         alert(result.result)
       }
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 30ab578a2..d7b9ab8f0 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -192,7 +192,7 @@ export default {
         this.model.firstname = ''
         this.model.lastname = ''
         this.password = ''
-        this.$router.push('/thx')
+        this.$router.push('/thx/register')
       } else {
         this.showError = true
         this.messageError = result.result.message
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index c24a33257..99892612c 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -107,11 +107,13 @@ export default {
       const result = await loginAPI.changePassword(this.sessionId, this.email, this.password)
       if (result.success) {
         this.password = ''
-        this.$store.dispatch('login', {
-          sessionId: result.result.data.session_id,
-          email: result.result.data.user.email,
-        })
-        this.$router.push('/thx')
+        /*
+         this.$store.dispatch('login', {
+           sessionId: result.result.data.session_id,
+           email: result.result.data.user.email,
+         })
+         */
+        this.$router.push('/thx/reset')
       } else {
         alert(result.result.message)
       }
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index 53db302a9..a4a31ff41 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -16,17 +16,17 @@
 </template>
 <script>
 const textFields = {
-  '/password': {
+  password: {
     subtitle: 'site.thx.email',
     button: 'login',
     linkTo: '/login',
   },
-  '/reset': {
+  reset: {
     subtitle: 'site.thx.reset',
-    button: 'site.login.signin',
-    linkTo: '/overview',
+    button: 'login',
+    linkTo: '/login',
   },
-  '/register': {
+  register: {
     subtitle: 'site.thx.register',
     button: 'site.login.signin',
     linkTo: '/overview',
@@ -37,22 +37,16 @@ export default {
   name: 'Thx',
   data() {
     return {
-      comingFrom: null,
       displaySetup: {},
     }
   },
-  beforeRouteEnter(to, from, next) {
-    next((vm) => {
-      vm.comingFrom = from.path
-    })
-  },
   methods: {
-    setupDisplay() {
-      this.displaySetup = textFields[this.comingFrom]
+    setDisplaySetup(from) {
+      this.displaySetup = textFields[this.$route.params.comingFrom]
     },
   },
   created() {
-    this.setupDisplay()
+    this.setDisplaySetup()
   },
 }
 </script>

From 8b9aa31339b230721d04bce07882683dbc3c9eed Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 17:13:34 +0200
Subject: [PATCH 18/24] remove changes from other PR

---
 frontend/src/locales/de.json               |  4 +-
 frontend/src/locales/en.json               |  4 +-
 frontend/src/routes/routes.js              |  8 ----
 frontend/src/views/Pages/ResetPassword.vue |  4 --
 frontend/src/views/Pages/thx.vue           | 46 +---------------------
 5 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b840fc34b..84236f71d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -84,9 +84,7 @@
     },
     "thx": {
       "title": "Danke!",
-      "email": "Wir haben dir eine eMail gesendet.",
-      "reset": "Dein Passwort wurde geändert",
-      "register": "Du bist jetzt regisriert"      
+      "subtitle": "Wir haben dir eine eMail gesendet."
     },
     "overview":{
       "account_overview":"Kontoübersicht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4a7a8b09f..9a4a42314 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -84,9 +84,7 @@
     },
     "thx": {
       "title": "Thank you!",
-      "email": "We have sent you an email.",
-      "reset": "Your password has been changed",
-      "register": "You are registred now"      
+      "subtitle": "We have sent you an email."
     },
     "overview":{
       "account_overview":"Account overview",
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0021aa1ed..e9bcf38c8 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -49,14 +49,6 @@ const routes = [
   {
     path: '/thx',
     component: () => import('../views/Pages/thx.vue'),
-    beforeEnter: (to, from, next) => {
-      const validFrom = ['/password', '/reset', '/register']
-      if (!validFrom.includes(from.path)) {
-        next({ path: '/login' })
-      } else {
-        next()
-      }
-    },
   },
   {
     path: '/password',
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index c24a33257..de5f256d6 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -107,10 +107,6 @@ export default {
       const result = await loginAPI.changePassword(this.sessionId, this.email, this.password)
       if (result.success) {
         this.password = ''
-        this.$store.dispatch('login', {
-          sessionId: result.result.data.session_id,
-          email: result.result.data.user.email,
-        })
         this.$router.push('/thx')
       } else {
         alert(result.result.message)
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index 53db302a9..db0b967d6 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -5,54 +5,12 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <p class="h1">{{ $t('site.thx.title') }}</p>
-          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <p class="h4">{{ $t('site.thx.subtitle') }}</p>
           <hr />
-          <b-button :to="displaySetup.linkTo">{{ $t(displaySetup.button) }}</b-button>
+          <b-button to="/login">{{ $t('login') }}</b-button>
         </div>
       </b-container>
     </div>
     <!-- Page content -->
   </div>
 </template>
-<script>
-const textFields = {
-  '/password': {
-    subtitle: 'site.thx.email',
-    button: 'login',
-    linkTo: '/login',
-  },
-  '/reset': {
-    subtitle: 'site.thx.reset',
-    button: 'site.login.signin',
-    linkTo: '/overview',
-  },
-  '/register': {
-    subtitle: 'site.thx.register',
-    button: 'site.login.signin',
-    linkTo: '/overview',
-  },
-}
-
-export default {
-  name: 'Thx',
-  data() {
-    return {
-      comingFrom: null,
-      displaySetup: {},
-    }
-  },
-  beforeRouteEnter(to, from, next) {
-    next((vm) => {
-      vm.comingFrom = from.path
-    })
-  },
-  methods: {
-    setupDisplay() {
-      this.displaySetup = textFields[this.comingFrom]
-    },
-  },
-  created() {
-    this.setupDisplay()
-  },
-}
-</script>

From e9b6138a097b60f8a6aecfbd7c202cba3aeac84f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 17:36:59 +0200
Subject: [PATCH 19/24] added period at the end of phrases

---
 frontend/src/locales/.#de.json | 1 +
 frontend/src/locales/en.json   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 120000 frontend/src/locales/.#de.json

diff --git a/frontend/src/locales/.#de.json b/frontend/src/locales/.#de.json
new file mode 120000
index 000000000..9f47defcf
--- /dev/null
+++ b/frontend/src/locales/.#de.json
@@ -0,0 +1 @@
+moriz@bluestar.2378:1620885678
\ No newline at end of file
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4a7a8b09f..eb9a9874d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -85,8 +85,8 @@
     "thx": {
       "title": "Thank you!",
       "email": "We have sent you an email.",
-      "reset": "Your password has been changed",
-      "register": "You are registred now"      
+      "reset": "Your password has been changed.",
+      "register": "You are registred now."      
     },
     "overview":{
       "account_overview":"Account overview",

From d1245e98fe384cc3f24adfb6b4602967d0daf5fa Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 17:37:36 +0200
Subject: [PATCH 20/24] added period at the end of phrases

---
 frontend/src/locales/.#de.json | 1 -
 frontend/src/locales/de.json   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 120000 frontend/src/locales/.#de.json

diff --git a/frontend/src/locales/.#de.json b/frontend/src/locales/.#de.json
deleted file mode 120000
index 9f47defcf..000000000
--- a/frontend/src/locales/.#de.json
+++ /dev/null
@@ -1 +0,0 @@
-moriz@bluestar.2378:1620885678
\ No newline at end of file
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b840fc34b..74e32c1bb 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -85,8 +85,8 @@
     "thx": {
       "title": "Danke!",
       "email": "Wir haben dir eine eMail gesendet.",
-      "reset": "Dein Passwort wurde geändert",
-      "register": "Du bist jetzt regisriert"      
+      "reset": "Dein Passwort wurde geändert.",
+      "register": "Du bist jetzt regisriert."      
     },
     "overview":{
       "account_overview":"Kontoübersicht",

From 9f8abd2a8642a2f10a99f98b567c9781bb101cf7 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 20 May 2021 09:44:56 +0200
Subject: [PATCH 21/24] add geticon and getClass for send type from transaction
 request

---
 frontend/src/App.vue                          | 33 +++++++----
 frontend/src/routes/routes.js                 |  4 +-
 .../AccountOverview/GddTransactionList.vue    | 59 +++++++++----------
 .../{UserProfileCard.vue => UserProfile.vue}  |  0
 4 files changed, 50 insertions(+), 46 deletions(-)
 rename frontend/src/views/Pages/{UserProfileCard.vue => UserProfile.vue} (100%)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d44d64ab3..a6613bec1 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -49,40 +49,49 @@ a,
 .copyright {
   color: #5a7b02;
 }
-gradido-global-color-text {
+.font1_2em {
+  font-size: 1.2em;
+}
+.font2em {
+  font-size: 1.5em;
+}
+.gradido-global-color-text {
   color: #3d443b;
 }
-gradido-global-color-accent {
+.gradido-global-color-accent {
   color: #047006;
 }
-gradido-global-color-6e0a9c9e {
+.gradido-global-color-6e0a9c9e {
   color: #000;
 }
-gradido-global-color-2d0fb154 {
+.gradido-global-color-2d0fb154 {
   color: #047006;
 }
-gradido-global-color-16efe88c {
+.gradido-global-color-16efe88c {
   color: #7ebc55;
 }
-gradido-global-color-1939326 {
+.gradido-global-color-1939326 {
   color: #f6fff6;
 }
-gradido-global-color-9d79fc1 {
+.gradido-global-color-9d79fc1 {
   color: #047006;
 }
-gradido-global-color-6347f4d {
+.gradido-global-color-6347f4d {
   color: #5a7b02;
 }
-gradido-global-color-4fbc19a {
+.gradido-global-color-4fbc19a {
   color: #014034;
 }
-gradido-global-color-d341874 {
+.gradido-global-color-d341874 {
   color: #b6d939;
 }
-gradido-global-color-619d338 {
+.gradido-global-color-619d338 {
   color: #8ebfb1;
 }
-gradido-global-color-44819a9 {
+.gradido-global-color-44819a9 {
   color: #026873;
 }
+.gradido-global-color-gray {
+  color: #858383;
+}
 </style>
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0021aa1ed..d96f4fb62 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -16,7 +16,7 @@ const routes = [
   },
   {
     path: '/profile',
-    component: () => import('../views/Pages/UserProfileCard.vue'),
+    component: () => import('../views/Pages/UserProfile.vue'),
     meta: {
       requiresAuth: true,
     },
@@ -53,8 +53,6 @@ const routes = [
       const validFrom = ['/password', '/reset', '/register']
       if (!validFrom.includes(from.path)) {
         next({ path: '/login' })
-      } else {
-        next()
       }
     },
   },
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 7a7c5cb7f..cd12c4e5a 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -8,36 +8,20 @@
       >
         <div class="d-flex">
           <div style="width: 10%">
-            <b-icon
-              v-if="item.type === 'send'"
-              icon="arrow-left-circle"
-              class="m-mb-1 text-danger font2em"
-            ></b-icon>
-            <b-icon
-              v-else-if="item.type === 'receive'"
-              icon="arrow-right-circle"
-              class="m-md-1 text-success font2em"
-            ></b-icon>
-            <b-icon
-              v-else-if="item.type === 'creation'"
-              icon="gift"
-              class="m-md-1 font2em"
-              style="color: green"
-            ></b-icon>
-            <b-icon v-else icon="droplet-half" class="m-md-1 font2em" style="color: gray"></b-icon>
+            <b-icon :icon="getIcon(item)" :class="getClass(item)" />
           </div>
-          <div class="font1_2em pl-2" style="width: 30%">
+          <div class="font1_2em pl-2" style="width: 20%">
             {{ $n(item.balance) }}
-            <span v-if="item.type === 'receive' || item.type === 'creation'">+</span>
-            <span v-else>-</span>
           </div>
-          <div class="font1_2em" style="width: 50%">
+          <div class="font1_2em text-left pl-2" style="width: 65%">
             {{ item.name }} -
             <div class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
           </div>
-          <b-button v-b-toggle="'a' + item.transaction_id" class="btn-sm">
-            <b>i</b>
-          </b-button>
+          <div class="font1_2em text-right" style="width: 5%">
+            <b-button v-b-toggle="'a' + item.transaction_id" class="btn-sm">
+              <b>i</b>
+            </b-button>
+          </div>
         </div>
         <b-collapse :id="'a' + item.transaction_id" class="mt-2">
           <b-card>
@@ -81,7 +65,7 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <div v-if="transactions.length === 0" class="mt-lg-4 text-center">
+      <div v-if="transactions.length !== 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </b-list-group>
@@ -89,6 +73,13 @@
 </template>
 
 <script>
+const iconsByType = {
+  send: { icon: 'arrow-left-circle', classes: 'text-danger' },
+  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent' },
+  creation: { icon: 'gift', classes: 'gradido-global-color-accent' },
+  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray' },
+}
+
 export default {
   name: 'gdd-transaction-list',
   props: {
@@ -114,16 +105,22 @@ export default {
     updateTransactions() {
       this.$emit('update-transactions')
     },
+    getIcon(item) {
+      const icon = iconsByType[item.type]
+      if (icon) return icon.icon
+      const thing = new Error('no item to given type')
+      thing()
+    },
+    getClass(item) {
+      const icon = iconsByType[item.type]
+      if (icon) return icon.classes + ' m-mb-1 font2em'
+      const thing = new Error('no item to given type')
+      thing()
+    },
   },
 }
 </script>
 <style>
-.font1_2em {
-  font-size: 1.2em;
-}
-.font2em {
-  font-size: 1.5em;
-}
 .el-table .cell {
   padding-left: 0px;
   padding-right: 0px;
diff --git a/frontend/src/views/Pages/UserProfileCard.vue b/frontend/src/views/Pages/UserProfile.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfileCard.vue
rename to frontend/src/views/Pages/UserProfile.vue

From 34e573a1e03267fa2b88556a8d3c8cb0a92c5167 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 20 May 2021 15:04:34 +0200
Subject: [PATCH 22/24] add operator, click event info transaction from button
 to row

---
 frontend/src/locales/de.json                  |  1 +
 frontend/src/locales/en.json                  |  1 +
 .../AccountOverview/GddTransactionList.vue    | 32 ++++++++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 84236f71d..7dfa05ad1 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -18,6 +18,7 @@
     "de": "Deutsch",
     "en": "English"
   },
+  "decay": "Vergänglichkeit",
   "form": {
     "cancel":"Abbrechen",
     "reset": "Zurücksetzen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9a4a42314..f8a4a88a4 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -18,6 +18,7 @@
     "de": "Deutsch",
     "en": "English"
   },
+  "decay": "Decay",
   "form": {
     "cancel":"Cancel",
     "reset": "Reset",
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index cd12c4e5a..b878e5a76 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -6,24 +6,26 @@
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
-        <div class="d-flex">
+        <div class="d-flex" v-b-toggle="'a' + item.date + ''" >
           <div style="width: 10%">
             <b-icon :icon="getIcon(item)" :class="getClass(item)" />
           </div>
-          <div class="font1_2em pl-2" style="width: 20%">
+          <div class="font1_2em pr-2 text-right" style="width: 20%">
+            <span>{{getOperator(item)}}</span>
             {{ $n(item.balance) }}
           </div>
           <div class="font1_2em text-left pl-2" style="width: 65%">
-            {{ item.name }} -
+            {{ item.name }} <small>{{ item.name ? '' : $t('decay') }}</small>
             <div class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
           </div>
-          <div class="font1_2em text-right" style="width: 5%">
-            <b-button v-b-toggle="'a' + item.transaction_id" class="btn-sm">
+           <div class="font1_2em text-right" style="width: 5%">
+            <b-button class="btn-sm">
               <b>i</b>
             </b-button>
           </div>
+        
         </div>
-        <b-collapse :id="'a' + item.transaction_id" class="mt-2">
+        <b-collapse :id="'a' + item.date + ''" class="mt-2">
           <b-card>
             <b-list-group>
               <b-list-group-item v-if="item.type === 'send'">
@@ -56,10 +58,10 @@
                 {{ item.memo }}
               </b-list-group-item>
             </b-list-group>
-            <b-button v-b-toggle="'collapse-1-inner' + item.transaction_id" variant="secondary">
+            <b-button v-b-toggle="'collapse-1-inner' + item.date" variant="secondary">
               {{ $t('transaction.more') }}
             </b-button>
-            <b-collapse :id="'collapse-1-inner' + item.transaction_id" class="mt-2">
+            <b-collapse :id="'collapse-1-inner' + item.date" class="mt-2">
               <b-card>{{ item }}</b-card>
             </b-collapse>
           </b-card>
@@ -74,10 +76,10 @@
 
 <script>
 const iconsByType = {
-  send: { icon: 'arrow-left-circle', classes: 'text-danger' },
-  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent' },
-  creation: { icon: 'gift', classes: 'gradido-global-color-accent' },
-  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray' },
+  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-'},
+  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
+  creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
+  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '-' },
 }
 
 export default {
@@ -116,6 +118,12 @@ export default {
       if (icon) return icon.classes + ' m-mb-1 font2em'
       const thing = new Error('no item to given type')
       thing()
+    }, 
+    getOperator(item) {
+      const icon = iconsByType[item.type]
+      if (icon) return icon.operator
+      const thing = new Error('no item to given type')
+      thing()
     },
   },
 }

From 4c6414fd81ae45ca2c8a3c8c40bcc78ec41075d2 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 20 May 2021 15:06:22 +0200
Subject: [PATCH 23/24] translation decay, yarn lint fix, yarn test

---
 .../Pages/AccountOverview/GddTransactionList.vue   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index b878e5a76..fa1f9f6a9 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -6,24 +6,24 @@
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
-        <div class="d-flex" v-b-toggle="'a' + item.date + ''" >
+        <div class="d-flex" v-b-toggle="'a' + item.date + ''">
           <div style="width: 10%">
             <b-icon :icon="getIcon(item)" :class="getClass(item)" />
           </div>
           <div class="font1_2em pr-2 text-right" style="width: 20%">
-            <span>{{getOperator(item)}}</span>
+            <span>{{ getOperator(item) }}</span>
             {{ $n(item.balance) }}
           </div>
           <div class="font1_2em text-left pl-2" style="width: 65%">
-            {{ item.name }} <small>{{ item.name ? '' : $t('decay') }}</small>
+            {{ item.name }}
+            <small>{{ item.name ? '' : $t('decay') }}</small>
             <div class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
           </div>
-           <div class="font1_2em text-right" style="width: 5%">
+          <div class="font1_2em text-right" style="width: 5%">
             <b-button class="btn-sm">
               <b>i</b>
             </b-button>
           </div>
-        
         </div>
         <b-collapse :id="'a' + item.date + ''" class="mt-2">
           <b-card>
@@ -76,7 +76,7 @@
 
 <script>
 const iconsByType = {
-  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-'},
+  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-' },
   receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
   creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
   decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '-' },
@@ -118,7 +118,7 @@ export default {
       if (icon) return icon.classes + ' m-mb-1 font2em'
       const thing = new Error('no item to given type')
       thing()
-    }, 
+    },
     getOperator(item) {
       const icon = iconsByType[item.type]
       if (icon) return icon.operator

From 427843c4466889a5137314211528f0ddce3e936f Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 20 May 2021 15:37:56 +0200
Subject: [PATCH 24/24] fix remove test transactions.length !== 0

---
 .../views/Pages/AccountOverview/GddTransactionList.vue    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index fa1f9f6a9..7fae1d935 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -7,10 +7,10 @@
         style="background-color: #ebebeba3 !important"
       >
         <div class="d-flex" v-b-toggle="'a' + item.date + ''">
-          <div style="width: 10%">
+          <div style="width: 8%">
             <b-icon :icon="getIcon(item)" :class="getClass(item)" />
           </div>
-          <div class="font1_2em pr-2 text-right" style="width: 20%">
+          <div class="font1_2em pr-2 text-right" style="width: 22%">
             <span>{{ getOperator(item) }}</span>
             {{ $n(item.balance) }}
           </div>
@@ -19,7 +19,7 @@
             <small>{{ item.name ? '' : $t('decay') }}</small>
             <div class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
           </div>
-          <div class="font1_2em text-right" style="width: 5%">
+          <div class="text-right" style="width: 5%">
             <b-button class="btn-sm">
               <b>i</b>
             </b-button>
@@ -67,7 +67,7 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <div v-if="transactions.length !== 0" class="mt-4 text-center">
+      <div v-if="transactions.length === 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </b-list-group>