From c4fae48b1d9f094fc4c4f75c702fd1e91c5ae4c4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 09:44:21 +0100
Subject: [PATCH 01/20] toast by automatically logged out

---
 frontend/src/components/SessionLogoutTimeout.vue |  2 ++
 frontend/src/mixins/toaster.js                   | 11 ++++++++++-
 frontend/src/pages/Login.vue                     |  6 ++++++
 frontend/src/store/store.js                      |  5 +++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/SessionLogoutTimeout.vue b/frontend/src/components/SessionLogoutTimeout.vue
index 1ebff752a..7a7cdfc5e 100644
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@@ -67,6 +67,7 @@ export default {
       }
       if (this.tokenExpiresInSeconds === 0) {
         this.$timer.stop('tokenExpires')
+        this.$store.commit('automaticallyLoggedOut', true)
         this.$emit('logout')
       }
     },
@@ -84,6 +85,7 @@ export default {
         })
         .catch(() => {
           this.$timer.stop('tokenExpires')
+          this.$store.commit('automaticallyLoggedOut', true)
           this.$emit('logout')
         })
     },
diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 175ffeec0..109bf0d9a 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -4,24 +4,33 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('success'),
         variant: 'success',
+        autoHideDelay: 5000,
       })
     },
     toastError(message) {
       this.toast(message, {
         title: this.$t('error.error'),
         variant: 'danger',
+        autoHideDelay: 5000,
       })
     },
     toastInfo(message) {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
+        autoHideDelay: 5000,
+      })
+    },
+    toastInfoNoHide(message) {
+      this.toast(message, {
+        title: this.$t('navigation.info'),
+        variant: 'warning',
+        noAutoHide: true,
       })
     },
     toast(message, options) {
       if (message.replace) message = message.replace(/^GraphQL error: /, '')
       this.$root.$bvToast.toast(message, {
-        autoHideDelay: 5000,
         appendToast: true,
         solid: true,
         toaster: 'b-toaster-top-right',
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index bd07af3ef..5e2597c45 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -123,5 +123,11 @@ export default {
       return !this.showPageMessage
     },
   },
+  mounted() {
+    if (this.$store.state.automaticallyLoggedOut) {
+      this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
+      this.$store.commit('automaticallyLoggedOut', false)
+    }
+  },
 }
 </script>
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 1cd874c06..8f87cf468 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -53,6 +53,9 @@ export const mutations = {
   hideAmountGDT: (state, hideAmountGDT) => {
     state.hideAmountGDT = !!hideAmountGDT
   },
+  automaticallyLoggedOut: (state, automaticallyLoggedOut) => {
+    state.automaticallyLoggedOut = !!automaticallyLoggedOut
+  },
 }
 
 export const actions = {
@@ -68,6 +71,7 @@ export const actions = {
     commit('isAdmin', data.isAdmin)
     commit('hideAmountGDD', data.hideAmountGDD)
     commit('hideAmountGDT', data.hideAmountGDT)
+    commit('automaticallyLoggedOut', false)
   },
   logout: ({ commit, state }) => {
     commit('token', null)
@@ -108,6 +112,7 @@ try {
       publisherId: null,
       hideAmountGDD: null,
       hideAmountGDT: null,
+      automaticallyLoggedOut: false,
     },
     getters: {},
     // Syncronous mutation of the state

From af47bf847ba1d008e9675faf81cab0770c637e79 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:19:21 +0100
Subject: [PATCH 02/20] remove store way

---
 frontend/src/components/SessionLogoutTimeout.vue | 4 ++--
 frontend/src/pages/Login.vue                     | 6 ------
 frontend/src/store/store.js                      | 5 -----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/SessionLogoutTimeout.vue b/frontend/src/components/SessionLogoutTimeout.vue
index 7a7cdfc5e..a41da851e 100644
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@@ -67,7 +67,7 @@ export default {
       }
       if (this.tokenExpiresInSeconds === 0) {
         this.$timer.stop('tokenExpires')
-        this.$store.commit('automaticallyLoggedOut', true)
+        this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
         this.$emit('logout')
       }
     },
@@ -85,7 +85,7 @@ export default {
         })
         .catch(() => {
           this.$timer.stop('tokenExpires')
-          this.$store.commit('automaticallyLoggedOut', true)
+          this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
           this.$emit('logout')
         })
     },
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 5e2597c45..bd07af3ef 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -123,11 +123,5 @@ export default {
       return !this.showPageMessage
     },
   },
-  mounted() {
-    if (this.$store.state.automaticallyLoggedOut) {
-      this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
-      this.$store.commit('automaticallyLoggedOut', false)
-    }
-  },
 }
 </script>
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 8f87cf468..1cd874c06 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -53,9 +53,6 @@ export const mutations = {
   hideAmountGDT: (state, hideAmountGDT) => {
     state.hideAmountGDT = !!hideAmountGDT
   },
-  automaticallyLoggedOut: (state, automaticallyLoggedOut) => {
-    state.automaticallyLoggedOut = !!automaticallyLoggedOut
-  },
 }
 
 export const actions = {
@@ -71,7 +68,6 @@ export const actions = {
     commit('isAdmin', data.isAdmin)
     commit('hideAmountGDD', data.hideAmountGDD)
     commit('hideAmountGDT', data.hideAmountGDT)
-    commit('automaticallyLoggedOut', false)
   },
   logout: ({ commit, state }) => {
     commit('token', null)
@@ -112,7 +108,6 @@ try {
       publisherId: null,
       hideAmountGDD: null,
       hideAmountGDT: null,
-      automaticallyLoggedOut: false,
     },
     getters: {},
     // Syncronous mutation of the state

From 12e7b9cce3fb2cf791d4778f7239fd1b7ce68da0 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:38:11 +0100
Subject: [PATCH 03/20] Update frontend/src/mixins/toaster.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/mixins/toaster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 109bf0d9a..3d180dd61 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -21,7 +21,7 @@ export const toasters = {
         autoHideDelay: 5000,
       })
     },
-    toastInfoNoHide(message) {
+    toastInfoNoHide(message, { noAutoHide: true }) {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',

From c7e3425f29663eba5f073a9eab3f1a3bef88d3ac Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:38:31 +0100
Subject: [PATCH 04/20] Update frontend/src/mixins/toaster.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/mixins/toaster.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 3d180dd61..c5c0f0204 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -25,7 +25,6 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
-        noAutoHide: true,
       })
     },
     toast(message, options) {

From f12da2c7ade8f49aac5a84fe55d0d09e042c8edd Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:38:44 +0100
Subject: [PATCH 05/20] Update frontend/src/mixins/toaster.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/mixins/toaster.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index c5c0f0204..8a2b2f812 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -18,7 +18,6 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
-        autoHideDelay: 5000,
       })
     },
     toastInfoNoHide(message, { noAutoHide: true }) {

From 77c72b00d97dc216f0b9acc7586e819efa113b7e Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:38:54 +0100
Subject: [PATCH 06/20] Update frontend/src/mixins/toaster.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/mixins/toaster.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 8a2b2f812..d2b4ad6fb 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -4,7 +4,6 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('success'),
         variant: 'success',
-        autoHideDelay: 5000,
       })
     },
     toastError(message) {

From b7740e5351caa7364f14edeecdf2dbfaa2626add Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:49:19 +0100
Subject: [PATCH 07/20] remove code

---
 frontend/src/mixins/toaster.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index d2b4ad6fb..109bf0d9a 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -4,6 +4,7 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('success'),
         variant: 'success',
+        autoHideDelay: 5000,
       })
     },
     toastError(message) {
@@ -17,12 +18,14 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
+        autoHideDelay: 5000,
       })
     },
-    toastInfoNoHide(message, { noAutoHide: true }) {
+    toastInfoNoHide(message) {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
+        noAutoHide: true,
       })
     },
     toast(message, options) {

From 72e0e90e2ef6ecf6351f8d3b76e87d342ab9fdcb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 16:53:44 +0100
Subject: [PATCH 08/20] remove code 2

---
 frontend/src/mixins/toaster.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js
index 109bf0d9a..6ed73b697 100644
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@@ -4,21 +4,18 @@ export const toasters = {
       this.toast(message, {
         title: this.$t('success'),
         variant: 'success',
-        autoHideDelay: 5000,
       })
     },
     toastError(message) {
       this.toast(message, {
         title: this.$t('error.error'),
         variant: 'danger',
-        autoHideDelay: 5000,
       })
     },
     toastInfo(message) {
       this.toast(message, {
         title: this.$t('navigation.info'),
         variant: 'warning',
-        autoHideDelay: 5000,
       })
     },
     toastInfoNoHide(message) {
@@ -32,6 +29,7 @@ export const toasters = {
       if (message.replace) message = message.replace(/^GraphQL error: /, '')
       this.$root.$bvToast.toast(message, {
         appendToast: true,
+        autoHideDelay: 5000,
         solid: true,
         toaster: 'b-toaster-top-right',
         headerClass: 'gdd-toaster-title',

From bacac0c93da361da16cccc248cda02270328d6c7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 17:02:01 +0100
Subject: [PATCH 09/20] add locales

---
 frontend/src/components/SessionLogoutTimeout.vue | 4 ++--
 frontend/src/locales/de.json                     | 3 ++-
 frontend/src/locales/en.json                     | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/SessionLogoutTimeout.vue b/frontend/src/components/SessionLogoutTimeout.vue
index a41da851e..7a11d1d83 100644
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@@ -67,7 +67,7 @@ export default {
       }
       if (this.tokenExpiresInSeconds === 0) {
         this.$timer.stop('tokenExpires')
-        this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
+        this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
         this.$emit('logout')
       }
     },
@@ -85,7 +85,7 @@ export default {
         })
         .catch(() => {
           this.$timer.stop('tokenExpires')
-          this.toastInfoNoHide('Du wurdest automatisch abgemeldet')
+          this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
           this.$emit('logout')
         })
     },
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index eff4237ca..4563db397 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -275,7 +275,8 @@
     "extend": "Angemeldet bleiben",
     "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
     "logoutIn": "Abmelden in ",
-    "warningText": "Bist du noch da?"
+    "warningText": "Bist du noch da?",
+    "automaticallyLoggedOut":"Du wurdest automatisch abgemeldet"
   },
   "settings": {
     "hideAmountGDD": "Dein GDD Betrag ist versteckt.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 068282891..50a8e45a1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -275,7 +275,8 @@
     "extend": "Stay logged in",
     "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
     "logoutIn": "Log out in ",
-    "warningText": "Are you still there?"
+    "warningText": "Are you still there?",
+    "automaticallyLoggedOut":"You have been automatically logged out."
   },
   "settings": {
     "hideAmountGDD": "Your GDD amount is hidden.",

From 3c93b5a5b49b11070e0b7e75975e23268c4fe6a4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 17:03:23 +0100
Subject: [PATCH 10/20] fix lint

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4563db397..04d49ed82 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -276,7 +276,7 @@
     "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
     "logoutIn": "Abmelden in ",
     "warningText": "Bist du noch da?",
-    "automaticallyLoggedOut":"Du wurdest automatisch abgemeldet"
+    "automaticallyLoggedOut": "Du wurdest automatisch abgemeldet"
   },
   "settings": {
     "hideAmountGDD": "Dein GDD Betrag ist versteckt.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 50a8e45a1..360325c8f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -276,7 +276,7 @@
     "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
     "logoutIn": "Log out in ",
     "warningText": "Are you still there?",
-    "automaticallyLoggedOut":"You have been automatically logged out."
+    "automaticallyLoggedOut": "You have been automatically logged out."
   },
   "settings": {
     "hideAmountGDD": "Your GDD amount is hidden.",

From 1c8a9efc503a04bfccd2e6cea37355e323ffebe8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Feb 2023 17:03:41 +0100
Subject: [PATCH 11/20] 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 04d49ed82..016698abc 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -272,11 +272,11 @@
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
   "session": {
+    "automaticallyLoggedOut": "Du wurdest automatisch abgemeldet",
     "extend": "Angemeldet bleiben",
     "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
     "logoutIn": "Abmelden in ",
-    "warningText": "Bist du noch da?",
-    "automaticallyLoggedOut": "Du wurdest automatisch abgemeldet"
+    "warningText": "Bist du noch da?"
   },
   "settings": {
     "hideAmountGDD": "Dein GDD Betrag ist versteckt.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 360325c8f..d95187b41 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -272,11 +272,11 @@
   "send_gdd": "Send GDD",
   "send_per_link": "Send GDD via Link",
   "session": {
+    "automaticallyLoggedOut": "You have been automatically logged out.",
     "extend": "Stay logged in",
     "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
     "logoutIn": "Log out in ",
-    "warningText": "Are you still there?",
-    "automaticallyLoggedOut": "You have been automatically logged out."
+    "warningText": "Are you still there?"
   },
   "settings": {
     "hideAmountGDD": "Your GDD amount is hidden.",

From 218ad21e4f65afc02c05915db05a7448d2a8460c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 9 Feb 2023 17:29:17 +0100
Subject: [PATCH 12/20] raise coverage eliminate warnings

---
 .../Contributions/ContributionList.spec.js        | 10 ++++++++++
 frontend/src/pages/Community.spec.js              | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index a1dfc934d..de875cf74 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -116,5 +116,15 @@ describe('ContributionList', () => {
         expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 2 }]])
       })
     })
+
+    describe('update status', () => {
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
+      })
+
+      it('emits update status', () => {
+        expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
+      })
+    })
   })
 })
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index ecfc01716..b4d1677df 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -70,6 +70,8 @@ describe('Community', () => {
                 lastName: 'Bloxberg',
                 state: 'IN_PROGRESS',
                 messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
               },
               {
                 id: 1550,
@@ -84,6 +86,8 @@ describe('Community', () => {
                 lastName: 'Bloxberg',
                 state: 'CONFIRMED',
                 messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
               },
             ],
             contributionCount: 1,
@@ -112,6 +116,10 @@ describe('Community', () => {
                 confirmedAt: null,
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
               },
               {
                 id: 1550,
@@ -124,7 +132,10 @@ describe('Community', () => {
                 firstName: 'Bibi',
                 contributionDate: '2022-06-15T08:47:06.000Z',
                 lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
                 messagesCount: 0,
+                state: 'IN_PROGRESS',
               },
               {
                 id: 1556,
@@ -137,6 +148,10 @@ describe('Community', () => {
                 confirmedAt: null,
                 firstName: 'Bob',
                 lastName: 'der Baumeister',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
               },
             ],
             contributionCount: 3,

From 7469a3caac78f70c80f28f3843f6417dd37bfc81 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 9 Feb 2023 17:52:48 +0100
Subject: [PATCH 13/20] feat(release): version 1.18.0

---
 CHANGELOG.md          | 34 ++++++++++++++++++++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  6 ++++--
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358e4670a..706caed8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,42 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.18.0](https://github.com/gradido/gradido/compare/1.17.1...1.18.0)
+
+- refactor(frontend):  toast by automatically logged out [`#2681`](https://github.com/gradido/gradido/pull/2681)
+- refactor(frontend): change text for gdd_per_link.choose-amount [`#2638`](https://github.com/gradido/gradido/pull/2638)
+- fix(backend): emails for deny and delete contribution [`#2688`](https://github.com/gradido/gradido/pull/2688)
+- refactor(other): remove config version from `.env.dist` [`#2686`](https://github.com/gradido/gradido/pull/2686)
+- refactor(backend): use LogError on contributionMessageResolver [`#2663`](https://github.com/gradido/gradido/pull/2663)
+- refactor(backend): get last transaction by only one function [`#2668`](https://github.com/gradido/gradido/pull/2668)
+- refactor(other): don't rebuild modul if unit test file has been changed [`#2667`](https://github.com/gradido/gradido/pull/2667)
+- refactor(backend): use LogError on contributionLinkResolver [`#2662`](https://github.com/gradido/gradido/pull/2662)
+- refactor(backend): remove event protocol config switch [`#2670`](https://github.com/gradido/gradido/pull/2670)
+- refactor(backend): event protocol [`#2652`](https://github.com/gradido/gradido/pull/2652)
+- refactor(frontend): sidebar becomes smaller when critical phase [`#2649`](https://github.com/gradido/gradido/pull/2649)
+- refactor(backend): use LogError on sendEMailTranslated [`#2656`](https://github.com/gradido/gradido/pull/2656)
+- refactor(backend): log error class [`#2640`](https://github.com/gradido/gradido/pull/2640)
+- feat(backend): add filterState parameter to listAllContributions query [`#2619`](https://github.com/gradido/gradido/pull/2619)
+- refactor(frontend): there is no message when a month is fully created [`#2626`](https://github.com/gradido/gradido/pull/2626)
+- refactor(frontend): better text alignment on send via link [`#2637`](https://github.com/gradido/gradido/pull/2637)
+- refactor(frontend): text changed as indicated in the issues [`#2642`](https://github.com/gradido/gradido/pull/2642)
+- refactor(frontend): when you click on create, you will be directed to the form [`#2645`](https://github.com/gradido/gradido/pull/2645)
+- feat(backend): federation: separated dht-hub features in new dht-node modul [`#2510`](https://github.com/gradido/gradido/pull/2510)
+- refactor(backend): refine assembly of error message in user resolver [`#2636`](https://github.com/gradido/gradido/pull/2636)
+- fix(backend): unit tests creations for 31st day [`#2641`](https://github.com/gradido/gradido/pull/2641)
+- fix(workflow): properly lint pr - prevent requirement to restart linting [`#2635`](https://github.com/gradido/gradido/pull/2635)
+- feat(frontend): 'yes'-button shows which dialog is currently open with a different color  [`#2629`](https://github.com/gradido/gradido/pull/2629)
+- feat(backend): federation implement multiple apollo graphql endpoints [`#2459`](https://github.com/gradido/gradido/pull/2459)
+- refactor(frontend): add legend to all contribution tab, and add tests. [`#2625`](https://github.com/gradido/gradido/pull/2625)
+- feat(frontend): unit tests community page [`#2587`](https://github.com/gradido/gradido/pull/2587)
+- feat(backend): deny contributions [`#2461`](https://github.com/gradido/gradido/pull/2461)
+- refactor(admin): update yarn.lock file of admin. [`#2579`](https://github.com/gradido/gradido/pull/2579)
+
 #### [1.17.1](https://github.com/gradido/gradido/compare/1.17.0...1.17.1)
 
+> 20 January 2023
+
+- chore(release): v1.17.1 [`#2588`](https://github.com/gradido/gradido/pull/2588)
 - refactor(frontend): change contribution memo add word-break [`#2583`](https://github.com/gradido/gradido/pull/2583)
 - refactor(admin): add text-break on all table memo fields [`#2584`](https://github.com/gradido/gradido/pull/2584)
 - fix(frontend): throw proper frontend warning errors [`#2586`](https://github.com/gradido/gradido/pull/2586)
diff --git a/admin/package.json b/admin/package.json
index 5bb3d1cd3..c8cccefd5 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 9a36c2ff8..f58a1ddd3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
@@ -74,6 +74,8 @@
     "typescript": "^4.3.4"
   },
   "nodemonConfig": {
-    "ignore": ["**/*.test.ts"]
+    "ignore": [
+      "**/*.test.ts"
+    ]
   }
 }
diff --git a/database/package.json b/database/package.json
index f4e1c7e84..28790eae8 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index bf26c7529..041b5a8e2 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 7a01da338..3728e6283 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",

From 20ee334febe87b25c1f76c3cd137e6abb93d63f6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 12:41:59 +0100
Subject: [PATCH 14/20] fix(frontend): community link

---
 frontend/src/pages/InfoStatistic.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index b27166dc1..1bfb53d4a 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -6,9 +6,9 @@
         {{ CONFIG.COMMUNITY_DESCRIPTION }}
       </div>
       <div>
-        <router-link :to="CONFIG.COMMUNITY_URL">
+        <b-link :href="CONFIG.COMMUNITY_URL">
           {{ CONFIG.COMMUNITY_URL }}
-        </router-link>
+        </b-link>
       </div>
       <hr />
       <div class="h3">{{ $t('community.openContributionLinks') }}</div>

From 64930cfb3f2f2a8bc1e1618f9f72c9b9746b97df Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 12:58:30 +0100
Subject: [PATCH 15/20] fix(frontend): fix is last month for empty form date

---
 frontend/src/pages/Community.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 113bcd4e4..71fb9f552 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -188,6 +188,7 @@ export default {
       return new Date(date.setMonth(date.getMonth() - 1, 1))
     },
     isThisMonth() {
+      if (!this.form.date) return false
       const formDate = new Date(this.form.date)
       return (
         formDate.getFullYear() === this.maximalDate.getFullYear() &&

From 2e18ca41c9b008198a70c0b23c90b299380becd6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 13:33:38 +0100
Subject: [PATCH 16/20] get it working

---
 .../components/Contributions/ContributionForm.vue  | 14 ++++++++++----
 frontend/src/pages/Community.vue                   |  1 -
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 9a2ffb54b..3b631f63e 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -23,10 +23,7 @@
         <template #nav-next-year><span></span></template>
       </b-form-datepicker>
 
-      <div
-        v-if="(isThisMonth && maxGddThisMonth <= 0) || (!isThisMonth && maxGddLastMonth <= 0)"
-        class="p-3"
-      >
+      <div v-if="showMessage" class="p-3">
         {{ noOpenCreation }}
       </div>
       <div v-else>
@@ -135,6 +132,15 @@ export default {
     },
   },
   computed: {
+    showMessage() {
+      if (this.maxGddThisMonth <= 0 && this.maxGddLastMonth <= 0) return true
+      if (this.form.date)
+        return (
+          (this.isThisMonth && this.maxGddThisMonth <= 0) ||
+          (!this.isThisMonth && this.maxGddLastMonth <= 0)
+        )
+      return false
+    },
     disabled() {
       return (
         this.form.date === '' ||
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 71fb9f552..113bcd4e4 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -188,7 +188,6 @@ export default {
       return new Date(date.setMonth(date.getMonth() - 1, 1))
     },
     isThisMonth() {
-      if (!this.form.date) return false
       const formDate = new Date(this.form.date)
       return (
         formDate.getFullYear() === this.maximalDate.getFullYear() &&

From 04fd66dbc4f3b3b9a84fdbc7bfc00cf7129aac03 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 14:16:55 +0100
Subject: [PATCH 17/20] test to 100%

---
 .../Contributions/ContributionForm.spec.js    | 332 ++++++++----------
 .../Contributions/ContributionForm.vue        |   6 +-
 2 files changed, 152 insertions(+), 186 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 020e3f552..71ead88b9 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -24,11 +24,6 @@ describe('ContributionForm', () => {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
     $n: jest.fn((n) => n),
-    $store: {
-      state: {
-        creation: ['1000', '1000', '1000'],
-      },
-    },
     $i18n: {
       locale: 'en',
     },
@@ -61,7 +56,7 @@ describe('ContributionForm', () => {
       })
     })
 
-    describe('dates', () => {
+    describe('dates and max amounts', () => {
       beforeEach(async () => {
         await wrapper.setData({
           form: {
@@ -73,204 +68,176 @@ describe('ContributionForm', () => {
         })
       })
 
-      describe('actual date', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            const now = new Date().toISOString()
-            await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now)
+      describe('max amount reached for both months', () => {
+        beforeEach(() => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
+            maxGddThisMonth: 0,
           })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
+          wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-        describe.skip('month before', () => {
-          beforeEach(async () => {
-            await wrapper
-              .findComponent({ name: 'BFormDatepicker' })
-              .vm.$emit('input', wrapper.vm.minimalDate)
-          })
-
-          describe('isThisMonth', () => {
-            it('has false', () => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
-            })
-          })
+        it('shows message that no contributions are available', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
+            'contribution.noOpenCreation.allMonth',
+          )
         })
       })
 
-      describe.skip('date in middle of year', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            // jest.useFakeTimers('modern')
-            // jest.setSystemTime(new Date('2020-07-06'))
-            // await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now)
-            await wrapper.setData({
-              maximalDate: new Date(2020, 6, 6),
-              form: { date: new Date(2020, 6, 6) },
-            })
-          })
-
-          describe('minimalDate', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
+      describe('max amount reached for last month, no date selected', () => {
+        beforeEach(() => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
           })
         })
 
-        describe('month before', () => {
-          beforeEach(async () => {
-            // jest.useFakeTimers('modern')
-            // jest.setSystemTime(new Date('2020-07-06'))
-            // console.log('middle of year date – now:', wrapper.vm.minimalDate)
-            // await wrapper
-            //   .findComponent({ name: 'BFormDatepicker' })
-            //   .vm.$emit('input', wrapper.vm.minimalDate)
-            await wrapper.setData({
-              maximalDate: new Date(2020, 6, 6),
-              form: { date: new Date(2020, 5, 6) },
-            })
-          })
-
-          describe('minimalDate', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has false', () => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
-            })
-          })
+        it('shows no message', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
         })
       })
 
-      describe.skip('date in january', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            await wrapper.setData({
-              maximalDate: new Date(2020, 0, 6),
-              form: { date: new Date(2020, 0, 6) },
-            })
+      describe('max amount reached for last month, last month selected', () => {
+        beforeEach(async () => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
+            isThisMonth: false,
           })
-
-          describe('minimalDate', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-        describe('month before', () => {
-          beforeEach(async () => {
-            // jest.useFakeTimers('modern')
-            // jest.setSystemTime(new Date('2020-07-06'))
-            // console.log('middle of year date – now:', wrapper.vm.minimalDate)
-            // await wrapper
-            //   .findComponent({ name: 'BFormDatepicker' })
-            //   .vm.$emit('input', wrapper.vm.minimalDate)
-            await wrapper.setData({
-              maximalDate: new Date(2020, 0, 6),
-              form: { date: new Date(2019, 11, 6) },
-            })
-          })
-
-          describe('minimalDate', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has false', () => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
-            })
-          })
+        it('shows message that no contributions are available for last month', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
+            'contribution.noOpenCreation.lastMonth',
+          )
         })
       })
 
-      describe.skip('date with the 31st day of the month', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            await wrapper.setData({
-              maximalDate: new Date('2022-10-31T00:00:00.000Z'),
-              form: { date: new Date('2022-10-31T00:00:00.000Z') },
-            })
+      describe('max amount reached for last month, this month selected', () => {
+        beforeEach(async () => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
+            isThisMonth: true,
           })
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
+          })
+        })
 
-          describe('minimalDate', () => {
-            it('has "2022-09-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2022-09-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
+        it('shows no message', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
         })
       })
 
-      describe.skip('date with the 28th day of the month', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            await wrapper.setData({
-              maximalDate: new Date('2023-02-28T00:00:00.000Z'),
-              form: { date: new Date('2023-02-28T00:00:00.000Z') },
-            })
+      describe('max amount reached for this month, no date selected', () => {
+        beforeEach(() => {
+          wrapper.setProps({
+            maxGddThisMonth: 0,
           })
+        })
 
-          describe('minimalDate', () => {
-            it('has "2023-01-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2023-01-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
+        it('shows no message', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
         })
       })
 
-      describe.skip('date with 29.02.2024 leap year', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            await wrapper.setData({
-              maximalDate: new Date('2024-02-29T00:00:00.000Z'),
-              form: { date: new Date('2024-02-29T00:00:00.000Z') },
-            })
+      describe('max amount reached for this month, this month selected', () => {
+        beforeEach(async () => {
+          wrapper.setProps({
+            maxGddThisMonth: 0,
+            isThisMonth: true,
           })
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
+          })
+        })
 
-          describe('minimalDate', () => {
-            it('has "2024-01-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2024-01-01T00:00:00.000Z')
-            })
-          })
+        it('shows message that no contributions are available for last month', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
+            'contribution.noOpenCreation.thisMonth',
+          )
+        })
+      })
 
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
+      describe('max amount reached for this month, last month selected', () => {
+        beforeEach(async () => {
+          wrapper.setProps({
+            maxGddThisMonth: 0,
+            isThisMonth: false,
           })
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
+          })
+        })
+
+        it('shows no message', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
+        })
+      })
+    })
+
+    describe('default return message', () => {
+      it('returns an empty string', () => {
+        expect(wrapper.vm.noOpenCreation).toBe('')
+      })
+    })
+
+    describe('update amount', () => {
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'InputHour' }).vm.$emit('updateAmount', 20)
+      })
+
+      it('updates form amount', () => {
+        expect(wrapper.vm.form.amount).toBe('400.00')
+      })
+    })
+
+    describe('watch value', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          value: {
+            id: 42,
+            date: 'set',
+            memo: 'Some Memo',
+            amount: '400.00',
+          },
+        })
+      })
+
+      it('updates form', () => {
+        expect(wrapper.vm.form).toEqual({
+          id: 42,
+          date: 'set',
+          memo: 'Some Memo',
+          amount: '400.00',
         })
       })
     })
@@ -477,24 +444,23 @@ describe('ContributionForm', () => {
             })
           })
 
-          describe.skip('on trigger submit', () => {
+          describe('on trigger submit', () => {
             beforeEach(async () => {
               await wrapper.find('form').trigger('submit')
             })
 
             it('emits "update-contribution"', () => {
-              expect(wrapper.emitted('update-contribution')).toEqual(
-                expect.arrayContaining([
-                  expect.arrayContaining([
-                    {
-                      id: 2,
-                      date: now,
-                      memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
-                      amount: '200',
-                    },
-                  ]),
-                ]),
-              )
+              expect(wrapper.emitted('update-contribution')).toEqual([
+                [
+                  {
+                    id: 2,
+                    date: now,
+                    hours: 0,
+                    memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
+                    amount: '200',
+                  },
+                ],
+              ])
             })
           })
         })
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 3b631f63e..0d512ab63 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -23,7 +23,7 @@
         <template #nav-next-year><span></span></template>
       </b-form-datepicker>
 
-      <div v-if="showMessage" class="p-3">
+      <div v-if="showMessage" class="p-3" data-test="contribtion-message">
         {{ noOpenCreation }}
       </div>
       <div v-else>
@@ -115,8 +115,8 @@ export default {
     }
   },
   methods: {
-    updateAmount(amount) {
-      this.form.amount = (amount * 20).toFixed(2).toString()
+    updateAmount(hours) {
+      this.form.amount = (hours * 20).toFixed(2).toString()
     },
     submit() {
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })

From 05f9917ac773f58fb88ce93e931cedf0c216b630 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 14:42:16 +0100
Subject: [PATCH 18/20] feat(release): Version 1.18.1

---
 CHANGELOG.md          | 8 ++++++++
 admin/package.json    | 2 +-
 backend/package.json  | 2 +-
 database/package.json | 2 +-
 frontend/package.json | 2 +-
 package.json          | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 706caed8a..366339834 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.18.1](https://github.com/gradido/gradido/compare/1.18.0...1.18.1)
+
+- fix(frontend): fix is last month for empty form date [`#2697`](https://github.com/gradido/gradido/pull/2697)
+- fix(frontend): community link [`#2696`](https://github.com/gradido/gradido/pull/2696)
+
 #### [1.18.0](https://github.com/gradido/gradido/compare/1.17.1...1.18.0)
 
+> 9 February 2023
+
+- feat(release): version 1.18.0 [`#2690`](https://github.com/gradido/gradido/pull/2690)
 - refactor(frontend):  toast by automatically logged out [`#2681`](https://github.com/gradido/gradido/pull/2681)
 - refactor(frontend): change text for gdd_per_link.choose-amount [`#2638`](https://github.com/gradido/gradido/pull/2638)
 - fix(backend): emails for deny and delete contribution [`#2688`](https://github.com/gradido/gradido/pull/2688)
diff --git a/admin/package.json b/admin/package.json
index c8cccefd5..e443e7f9e 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index f58a1ddd3..5357a7217 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
diff --git a/database/package.json b/database/package.json
index 28790eae8..7fad11216 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 041b5a8e2..64fde2b19 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 3728e6283..2cb1b5dc5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",

From 25b1a6de447c21b6c836fcd25a68c6b362885853 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 15:55:16 +0100
Subject: [PATCH 19/20] fix(admin): deny contribution button to left

---
 admin/src/pages/CreationConfirm.spec.js | 2 +-
 admin/src/pages/CreationConfirm.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d47233ded..99dbda219 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -259,7 +259,7 @@ describe('CreationConfirm', () => {
 
       describe('deny creation', () => {
         beforeEach(async () => {
-          await wrapper.findAll('tr').at(1).findAll('button').at(2).trigger('click')
+          await wrapper.findAll('tr').at(1).findAll('button').at(1).trigger('click')
         })
 
         it('opens the overlay', () => {
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index e87dfc247..c6576e5ba 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -129,6 +129,7 @@ export default {
     fields() {
       return [
         { key: 'bookmark', label: this.$t('delete') },
+        { key: 'deny', label: this.$t('deny') },
         { key: 'email', label: this.$t('e_mail') },
         { key: 'firstName', label: this.$t('firstname') },
         { key: 'lastName', label: this.$t('lastname') },
@@ -149,7 +150,6 @@ export default {
         },
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
-        { key: 'deny', label: this.$t('deny') },
         { key: 'confirm', label: this.$t('save') },
       ]
     },

From ac250181ef3ed7f50a34be1f59386c1de403063c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Feb 2023 16:09:33 +0100
Subject: [PATCH 20/20] chore(release): version 1.18.2

---
 CHANGELOG.md          | 7 +++++++
 admin/package.json    | 2 +-
 backend/package.json  | 2 +-
 database/package.json | 2 +-
 frontend/package.json | 2 +-
 package.json          | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 366339834..4bfc66e39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.18.2](https://github.com/gradido/gradido/compare/1.18.1...1.18.2)
+
+- fix(admin): deny contribution button to left [`#2699`](https://github.com/gradido/gradido/pull/2699)
+
 #### [1.18.1](https://github.com/gradido/gradido/compare/1.18.0...1.18.1)
 
+> 10 February 2023
+
+- chore(release): version 1.18.1 [`#2698`](https://github.com/gradido/gradido/pull/2698)
 - fix(frontend): fix is last month for empty form date [`#2697`](https://github.com/gradido/gradido/pull/2697)
 - fix(frontend): community link [`#2696`](https://github.com/gradido/gradido/pull/2696)
 
diff --git a/admin/package.json b/admin/package.json
index e443e7f9e..941a9bf69 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 5357a7217..320f4ded6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
diff --git a/database/package.json b/database/package.json
index 7fad11216..5be01a5d5 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 64fde2b19..9aa457c19 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 2cb1b5dc5..2220c1a85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",