From fe1473a9a540bdb4cdc885d6f63964533e030250 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:55:56 +0100
Subject: [PATCH 01/31] Change reActive to reopen, add localize for it.

---
 admin/src/locales/de.json           | 1 +
 admin/src/locales/en.json           | 1 +
 admin/src/pages/CreationConfirm.vue | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 00eef1812..3271724ba 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -47,6 +47,7 @@
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
     "reset": "Zurücksetzen",
+    "reopen": "Reopen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
     "submit_creation": "Schöpfung einreichen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e318376b4..dfb4de745 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,6 +137,7 @@
   },
   "redeemed": "redeemed",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
+  "reopen": "Reopen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Active members",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55b819268..6ce4c7728 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -239,7 +239,7 @@ export default {
         ],
         [
           // denied contributions
-          { key: 'reActive', label: 'reActive' },
+          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -276,7 +276,7 @@ export default {
         ],
         [
           // deleted contributions
-          { key: 'reActive', label: 'reActive' },
+          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From d2927f11545b2d005d42c0b87669537a6709be9b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:58:54 +0100
Subject: [PATCH 02/31] Change label of editCreation to chat

---
 admin/src/pages/CreationConfirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6ce4c7728..fcb233a48 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -199,7 +199,7 @@ export default {
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
-          { key: 'editCreation', label: this.$t('edit') },
+          { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],
         [

From b476e84bc651c4229fd9fb1822d202f1feccded8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:59:28 +0100
Subject: [PATCH 03/31] Remove email for tab open

---
 admin/src/pages/CreationConfirm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index fcb233a48..75f2c6710 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -180,7 +180,6 @@ export default {
           // open contributions
           { 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') },
           {

From ed83e11ef19e85889ade8c419aba5ce2d977e1fe Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:46:49 +0100
Subject: [PATCH 04/31] Change reActive to reopen in OpenCreationsTable

---
 admin/src/components/Tables/OpenCreationsTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a4db8ac99..7ddabf323 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,10 +48,10 @@
           </b-button>
         </div>
       </template>
-      <template #cell(reActive)>
-        <b-button variant="warning" size="md" class="mr-2">
+      <template #cell(reopen)>
+        <!--b-button variant="warning" size="md" class="mr-2">
           <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
+        </b-button-->
       </template>
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">

From 0f1ec58febb12e5c3db06e8628758705c690787d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:47:25 +0100
Subject: [PATCH 05/31] Add icons on tabs of contribution

---
 admin/src/pages/CreationConfirm.vue | 38 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 75f2c6710..4df55ee55 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -5,25 +5,37 @@
       <b-tabs v-model="tabIndex" content-class="mt-3" fill>
         <b-tab active :title-link-attributes="{ 'data-test': 'open' }">
           <template #title>
+            <b-icon icon="bell-fill" variant="primary"></b-icon>
             {{ $t('contributions.open') }}
             <b-badge v-if="$store.state.openCreations > 0" variant="danger">
               {{ $store.state.openCreations }}
             </b-badge>
           </template>
         </b-tab>
-        <b-tab
-          :title="$t('contributions.confirms')"
-          :title-link-attributes="{ 'data-test': 'confirmed' }"
-        />
-        <b-tab
-          :title="$t('contributions.denied')"
-          :title-link-attributes="{ 'data-test': 'denied' }"
-        />
-        <b-tab
-          :title="$t('contributions.deleted')"
-          :title-link-attributes="{ 'data-test': 'deleted' }"
-        />
-        <b-tab :title="$t('contributions.all')" :title-link-attributes="{ 'data-test': 'all' }" />
+        <b-tab :title-link-attributes="{ 'data-test': 'confirmed' }">
+          <template #title>
+            <b-icon icon="check" variant="success"></b-icon>
+            {{ $t('contributions.confirms') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'denied' }">
+          <template #title>
+            <b-icon icon="x-circle" variant="warning"></b-icon>
+            {{ $t('contributions.denied') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'deleted' }">
+          <template #title>
+            <b-icon icon="trash" variant="danger"></b-icon>
+            {{ $t('contributions.deleted') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'all' }">
+          <template #title>
+            <b-icon icon="list"></b-icon>
+            {{ $t('contributions.all') }}
+          </template>
+        </b-tab>
       </b-tabs>
     </div>
     <open-creations-table

From 2dd4d8edeeba246f0906e95fd4e4320eec81aebb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:52:17 +0100
Subject: [PATCH 06/31] Localize state to Status & State

---
 admin/src/locales/de.json           | 1 +
 admin/src/locales/en.json           | 1 +
 admin/src/pages/CreationConfirm.vue | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 3271724ba..87a3c5f92 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -139,6 +139,7 @@
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "save": "Speichern",
+  "state": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index dfb4de745..2e32ecb36 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -139,6 +139,7 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
+  "state": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 4df55ee55..1af63175e 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -324,7 +324,7 @@ export default {
         ],
         [
           // all contributions
-          { key: 'state', label: 'state' },
+          { key: 'state', label: this.$t('state') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From cbac8caee2234362524304500b0494e1a9ded9b5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:06:18 +0100
Subject: [PATCH 07/31] Change local mod to moderator in contribution tab

---
 admin/src/pages/CreationConfirm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 1af63175e..6a9354d60 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -282,7 +282,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'deniedBy', label: this.$t('mod') },
+          { key: 'deniedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -319,7 +319,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'deletedBy', label: this.$t('mod') },
+          { key: 'deletedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -356,7 +356,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'confirmedBy', label: this.$t('mod') },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
       ][this.tabIndex]

From a14b9403b1a075b231641b956c2441a2fdfd6c38 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:06:44 +0100
Subject: [PATCH 08/31] Add messages to query of listAllContribution

---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ab177d759..2469f60ba 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -391,7 +391,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       true,
-      ['user'],
+      ['user', 'messages'],
       undefined,
       statusFilter,
     )

From d0c5d7aff0df6b9fc1e6b8e673b2c8d95ac7aae9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:11:34 +0100
Subject: [PATCH 09/31] Change position of reopen.

---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 87a3c5f92..be07ff1f4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -47,7 +47,6 @@
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
     "reset": "Zurücksetzen",
-    "reopen": "Reopen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
     "submit_creation": "Schöpfung einreichen",
@@ -138,6 +137,7 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
+  "reopen": "Reopen",
   "save": "Speichern",
   "state": "Status",
   "statistic": {

From 5cc58672130996e5db04f809cc3d0fc78432f6b1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:13:45 +0100
Subject: [PATCH 10/31] Revert "Add messages to query of listAllContribution"

This reverts commit a14b9403b1a075b231641b956c2441a2fdfd6c38.
---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2469f60ba..ab177d759 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -391,7 +391,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       true,
-      ['user', 'messages'],
+      ['user'],
       undefined,
       statusFilter,
     )

From 747c146bbf24d44497baaa293d143fb61c91898b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:33:15 +0100
Subject: [PATCH 11/31] Add to database query relation messages

---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ab177d759..2469f60ba 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -391,7 +391,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       true,
-      ['user'],
+      ['user', 'messages'],
       undefined,
       statusFilter,
     )

From dd44415099d9a7c85d44bd59f9eca9b4499dfc3d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 13:21:47 +0100
Subject: [PATCH 12/31] remove unused locale keys

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index be07ff1f4..b7a064b34 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -63,7 +63,6 @@
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
   "deny": "Ablehnen",
-  "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
   "expired": "abgelaufen",
@@ -101,7 +100,6 @@
   "message": {
     "request": "Die Anfrage wurde gesendet."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 2e32ecb36..30558822f 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -63,7 +63,6 @@
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
   "deny": "Reject",
-  "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
   "expired": "expired",
@@ -101,7 +100,6 @@
   "message": {
     "request": "Request has been sent."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {

From 775d29fb68700e7acc972e58a8103b4844f82e2a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 14:29:25 +0100
Subject: [PATCH 13/31] Add messageCount value to the contributions that got
 messages, order the objects in the same order as they are found.

---
 .../resolver/ContributionResolver.test.ts     | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index ed4cdffa0..27f6d1c2a 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -2745,15 +2745,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'CONFIRMED',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(100),
-              firstName: 'Bob',
-              id: expect.any(Number),
-              lastName: 'der Baumeister',
-              memo: 'Confirmed Contribution',
-              messagesCount: 0,
-              state: 'CONFIRMED',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(400),
               firstName: 'Peter',
@@ -2763,6 +2754,15 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'PENDING',
             }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(100),
+              firstName: 'Bob',
+              id: expect.any(Number),
+              lastName: 'der Baumeister',
+              memo: 'Confirmed Contribution',
+              messagesCount: 0,
+              state: 'CONFIRMED',
+            }),
             expect.objectContaining({
               amount: expect.decimalEqual(100),
               firstName: 'Peter',
@@ -2781,15 +2781,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'PENDING',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(10),
-              firstName: 'Bibi',
-              id: expect.any(Number),
-              lastName: 'Bloxberg',
-              memo: 'Test PENDING contribution update',
-              messagesCount: 0,
-              state: 'PENDING',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(200),
               firstName: 'Peter',
@@ -2799,15 +2790,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'DELETED',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(166),
-              firstName: 'Räuber',
-              id: expect.any(Number),
-              lastName: 'Hotzenplotz',
-              memo: 'Whatever contribution',
-              messagesCount: 0,
-              state: 'DELETED',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(166),
               firstName: 'Räuber',
@@ -2817,6 +2799,15 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'DENIED',
             }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(166),
+              firstName: 'Räuber',
+              id: expect.any(Number),
+              lastName: 'Hotzenplotz',
+              memo: 'Whatever contribution',
+              messagesCount: 0,
+              state: 'DELETED',
+            }),
             expect.objectContaining({
               amount: expect.decimalEqual(166),
               firstName: 'Räuber',
@@ -2831,18 +2822,9 @@ describe('ContributionResolver', () => {
               firstName: 'Bibi',
               id: expect.any(Number),
               lastName: 'Bloxberg',
-              memo: 'Test IN_PROGRESS contribution',
+              memo: 'Test contribution to delete',
               messagesCount: 0,
-              state: 'IN_PROGRESS',
-            }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(100),
-              firstName: 'Bibi',
-              id: expect.any(Number),
-              lastName: 'Bloxberg',
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-              state: 'CONFIRMED',
+              state: 'DELETED',
             }),
             expect.objectContaining({
               amount: expect.decimalEqual(100),
@@ -2858,9 +2840,27 @@ describe('ContributionResolver', () => {
               firstName: 'Bibi',
               id: expect.any(Number),
               lastName: 'Bloxberg',
-              memo: 'Test contribution to delete',
+              memo: 'Test contribution to confirm',
               messagesCount: 0,
-              state: 'DELETED',
+              state: 'CONFIRMED',
+            }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(100),
+              firstName: 'Bibi',
+              id: expect.any(Number),
+              lastName: 'Bloxberg',
+              memo: 'Test IN_PROGRESS contribution',
+              messagesCount: 1,
+              state: 'IN_PROGRESS',
+            }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(10),
+              firstName: 'Bibi',
+              id: expect.any(Number),
+              lastName: 'Bloxberg',
+              memo: 'Test PENDING contribution update',
+              messagesCount: 1,
+              state: 'PENDING',
             }),
             expect.objectContaining({
               amount: expect.decimalEqual(1000),

From 8d3f345d72b210368c03ed515878eef22291e7db Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:31:44 +0100
Subject: [PATCH 14/31] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 30558822f..93a324918 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,7 +137,7 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "state": "State",
+  "status": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",

From c8fea682bcc66fab2084fb648fc3ff989304bdc0 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:32:01 +0100
Subject: [PATCH 15/31] Update admin/src/locales/de.json

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b7a064b34..0be1808c0 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -137,7 +137,7 @@
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "state": "Status",
+  "status": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",

From e6fdf718d05ea6e06420f2bd16e33cd57046da11 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:32:26 +0100
Subject: [PATCH 16/31] Update admin/src/pages/CreationConfirm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/pages/CreationConfirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6a9354d60..56867e4ef 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -324,7 +324,7 @@ export default {
         ],
         [
           // all contributions
-          { key: 'state', label: this.$t('state') },
+          { key: 'state', label: this.$t('status') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From af5212d0c30f3cf91095b3348f9c458866718a22 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:36:09 +0100
Subject: [PATCH 17/31] Change german local ``reopen``

---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b7a064b34..46adb7ec2 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -135,7 +135,7 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
-  "reopen": "Reopen",
+  "reopen": "Öffnen",
   "save": "Speichern",
   "state": "Status",
   "statistic": {

From 8a808d994551959893c000475fe95e4bcbf29885 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:57:16 +0100
Subject: [PATCH 18/31] The locale status already existed

---
 admin/src/locales/de.json | 1 -
 admin/src/locales/en.json | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 396ec8df4..352c4b4a9 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -137,7 +137,6 @@
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "reopen": "Öffnen",
   "save": "Speichern",
-  "status": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 93a324918..0afe1a446 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,7 +137,6 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "status": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",
@@ -149,7 +148,7 @@
     "totalGradidoUnbookedDecayed": "Unbooked GDD decay",
     "totalUsers": "Members"
   },
-  "status": "Status",
+  "status": "State",
   "success": "Success",
   "text": "Text",
   "transactionlink": {

From acbbc45ec29f5d68fdb9e9989b0dcce4631d7b55 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 08:23:44 +0100
Subject: [PATCH 19/31] Change translation 'denied' to 'rejected'

---
 admin/src/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0afe1a446..ca64f0b98 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -34,7 +34,7 @@
     "all": "All",
     "confirms": "Confirmed",
     "deleted": "Deleted",
-    "denied": "Denied",
+    "denied": "Rejected",
     "open": "Open"
   },
   "created": "Confirmed",
@@ -53,7 +53,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
-    "toasted_denied": "Open creation has been denied",
+    "toasted_denied": "Open creation has been rejected",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -86,7 +86,7 @@
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "periods": "For what period was it submitted by the member.",
-      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
       "submitted": "When was it submitted by the member"
     }
   },

From 083f51c0d92e59d8ee3ee945693e8d1f46fd1134 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:05:08 +0100
Subject: [PATCH 20/31] Add moderator confirmedBy to confirmed.

---
 admin/src/pages/CreationConfirm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 56867e4ef..bad7489db 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -246,6 +246,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [

From ba42c282e4c661b0ed733a295a0ab0ba83d0284f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:05:31 +0100
Subject: [PATCH 21/31] Remove template for reopen.

---
 admin/src/components/Tables/OpenCreationsTable.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 7ddabf323..4e5563a59 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,11 +48,11 @@
           </b-button>
         </div>
       </template>
-      <template #cell(reopen)>
-        <!--b-button variant="warning" size="md" class="mr-2">
+      <!--template #cell(reopen)>
+        <b-button variant="warning" size="md" class="mr-2">
           <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button-->
-      </template>
+        </b-button>
+      </template-->
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>

From dc0e9c478e044b2e460c46b061b6fbf5cca3bd4b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:51:35 +0100
Subject: [PATCH 22/31] Date format if value null => '-'

---
 admin/src/pages/CreationConfirm.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index bad7489db..6747f8188 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -206,7 +206,7 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
@@ -229,21 +229,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },
@@ -266,21 +266,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'deniedAt',
             label: this.$t('contributions.denied'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'deniedBy', label: this.$t('moderator') },
@@ -303,21 +303,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'deletedAt',
             label: this.$t('contributions.deleted'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'deletedBy', label: this.$t('moderator') },
@@ -340,21 +340,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },

From c81013a70e9366f77470ef2a856c01dbdd9cfc80 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:55:01 +0100
Subject: [PATCH 23/31] Remove reopen since it is not used yet

---
 admin/src/components/Tables/OpenCreationsTable.vue | 5 -----
 admin/src/locales/de.json                          | 1 -
 admin/src/locales/en.json                          | 1 -
 admin/src/pages/CreationConfirm.vue                | 1 -
 4 files changed, 8 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 4e5563a59..2f0c8a611 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,11 +48,6 @@
           </b-button>
         </div>
       </template>
-      <!--template #cell(reopen)>
-        <b-button variant="warning" size="md" class="mr-2">
-          <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
-      </template-->
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 352c4b4a9..0d05eaa88 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -135,7 +135,6 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
-  "reopen": "Öffnen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index ca64f0b98..c46f563f5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -135,7 +135,6 @@
   },
   "redeemed": "redeemed",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
-  "reopen": "Reopen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Active members",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6747f8188..b9565a744 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -251,7 +251,6 @@ export default {
         ],
         [
           // denied contributions
-          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From 34def5fdbf533e93ca2d48495132849cb338649e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 12:49:12 +0100
Subject: [PATCH 24/31] Change info.svg to path

---
 frontend/public/img/svg/info.svg | 186 +++----------------------------
 1 file changed, 13 insertions(+), 173 deletions(-)

diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg
index 1d1b88c65..0510a5b60 100644
--- a/frontend/public/img/svg/info.svg
+++ b/frontend/public/img/svg/info.svg
@@ -3,180 +3,20 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;enable-background:new    ;}
-	.st2{fill:#72778F;}
-	.st3{display:inline;opacity:0.6;}
-	.st4{enable-background:new    ;}
-	.st5{fill:#CD5656;}
 	.st6{fill:#047006;}
-	.st7{fill:#FFFFFF;}
-	.st8{display:inline;}
-	.st9{clip-path:url(#SVGID_00000178163426027821014280000005828283979416336312_);}
 </style>
-<g id="Transaktionen" class="st0">
-	<g class="st1">
-		<path class="st2" d="M6.74,16.53L31.37,5.35c0.34-0.16,0.73-0.24,1.13-0.24c0.4,0,0.78,0.09,1.12,0.24l24.63,11.18
-			c1.75,0.79,1.75,3.44,0,4.23L33.62,31.94c-0.72,0.33-1.53,0.33-2.25,0L6.74,20.76C4.99,19.97,4.99,17.32,6.74,16.53z M58.26,34.33
-			L33.62,45.5c-0.72,0.33-1.53,0.33-2.25,0L6.74,34.33c-1.75-0.79-1.75-3.44,0-4.23l6.14-2.78l17.09,7.75
-			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.09-7.75l6.14,2.78C60.01,30.89,60.01,33.54,58.26,34.33z
-			 M58.26,47.85L33.62,59.01c-0.72,0.33-1.53,0.33-2.25,0L6.74,47.85c-1.75-0.79-1.75-3.44,0-4.23l6.12-2.77l17.12,7.76
-			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.12-7.76l6.12,2.77C60.01,44.41,60.01,47.05,58.26,47.85z"/>
+	<g id="info" fill-rule="evenodd" class="st6" transform="translate(0 -0.001)">
+	<!-- d="
+      CIRCLE:
+	  M (CX - R), CY
+      a R,R 0 1,0 (R * 2),0
+      a R,R 0 1,0 -(R * 2),0
+	  RECTANGLE
+	  MX YhHEIGHTvWIDTHh-HEIGHTz
+    " -->
+		<path d="M0,32 a32,32 0 1,0 64,0 a32,32 0 1,0 -64,0 
+		M28 28h8v24h-8z
+		M28,20 a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0"
+     fill="#72778F" fill-rule="evenodd" />
 	</g>
-</g>
-<g id="mein_x5F_profil" class="st0">
-	<g class="st1">
-		<path class="st2" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
-			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
-			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
-	</g>
-</g>
-<g id="Top_Stories" class="st0">
-	<g class="st1">
-		<path class="st2" d="M64,14.86v34.67c0,2.95-2.39,5.33-5.33,5.33H6.22C2.79,54.87,0,52.08,0,48.64V18.42
-			c0-1.47,1.19-2.67,2.67-2.67h4.44v-0.89c0-1.47,1.19-2.67,2.67-2.67h51.56C62.81,12.2,64,13.39,64,14.86z M7.11,48.64V21.09H5.33
-			v27.56c0,0.49,0.4,0.89,0.89,0.89C6.71,49.53,7.11,49.13,7.11,48.64z M56.89,25.09v-4.44c0-0.74-0.6-1.33-1.33-1.33h-40
-			c-0.74,0-1.33,0.6-1.33,1.33v4.44c0,0.74,0.6,1.33,1.33,1.33h40C56.29,26.42,56.89,25.82,56.89,25.09z M33.78,35.75v-0.89
-			c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
-			C33.18,37.09,33.78,36.49,33.78,35.75z M33.78,46.42v-0.89c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89
-			c0,0.74,0.6,1.33,1.33,1.33h16.89C33.18,47.75,33.78,47.16,33.78,46.42z M56.89,35.75v-0.89c0-0.74-0.6-1.33-1.33-1.33H38.67
-			c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89C56.29,37.09,56.89,36.49,56.89,35.75z M56.89,46.42v-0.89
-			c0-0.74-0.6-1.33-1.33-1.33H38.67c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
-			C56.29,47.75,56.89,47.16,56.89,46.42z"/>
-	</g>
-</g>
-<g id="settings" class="st0">
-	<g id="Settings" transform="translate(1)" class="st3">
-		<g class="st4">
-			<path class="st2" d="M53,20.34c-1.17,0.82-2.79,0.54-3.61-0.63c-4.31-6.14-11.36-9.87-18.86-9.98
-				c-6.09-0.09-11.77,2.17-15.95,6.36c-4.01,4.01-6.17,9.34-6.08,15.02l-0.02,2.56c-0.04,1.4-1.19,2.52-2.59,2.52
-				c-0.03,0-0.05,0-0.08,0c-1.43-0.04-2.56-1.24-2.51-2.67l0.01-2.32C3.2,24.09,5.9,17.43,10.9,12.41
-				c5.19-5.19,12.16-7.97,19.7-7.88c9.16,0.14,17.77,4.69,23.03,12.19C54.45,17.89,54.17,19.51,53,20.34z M19.29,23.79
-				c-2.03,2.49-3.08,5.52-3.02,8.75c0.07,4.39-0.29,8.8-1.07,13.1c-0.09,0.49-0.84,2.47-3.01,2.09c-1.41-0.26-2.34-1.6-2.09-3.01
-				c0.72-3.97,1.05-8.04,0.98-12.1c-0.07-4.4,1.42-8.7,4.19-12.1c0.91-1.11,2.53-1.28,3.65-0.38
-				C20.02,21.04,20.19,22.67,19.29,23.79z M42.2,33.37c0.08,5.5-0.32,11.03-1.22,16.43c-0.08,0.5-0.82,2.49-2.98,2.14
-				c-1.41-0.24-2.37-1.57-2.13-2.98c0.84-5.1,1.23-10.32,1.15-15.51c-0.05-3.25-2.84-5.94-6.22-5.99c-3.73-0.01-5.93,2.85-5.88,5.65
-				c0.09,5.56-0.44,11.12-1.55,16.53c-0.29,1.4-1.65,2.3-3.06,2.01c-1.4-0.29-2.3-1.66-2.01-3.06c1.04-5.04,1.52-10.22,1.44-15.4
-				c-0.09-5.83,4.53-10.93,11.14-10.92C37.02,22.36,42.11,27.34,42.2,33.37z M50.85,33.04c0.01,0.53,0.02,0.92,0.02,1.45
-				c0,3.89-0.22,7.72-0.65,11.49c-0.12,1-1.07,2.49-2.87,2.28c-1.42-0.16-2.44-1.45-2.28-2.87c0.46-4.05,0.67-8.18,0.6-12.28
-				c-0.12-7.89-6.85-14.41-15-14.54c-1.24-0.01-2.48,0.11-3.67,0.4c-1.39,0.32-2.79-0.53-3.12-1.93s0.53-2.79,1.93-3.12
-				c1.61-0.38,3.28-0.58,4.95-0.54C41.66,13.57,50.68,22.38,50.85,33.04z M33.55,33.7c0.17,10.7-1.72,19.08-3.18,24.25
-				c-0.32,1.15-1.36,1.89-2.49,1.89c-2.27,0-2.79-2.24-2.5-3.29c2.11-7.52,3.12-15.05,2.99-22.85c0-1.43,1.16-2.59,2.59-2.59
-				C32.39,31.1,33.55,32.27,33.55,33.7z M58.6,34.34c-0.01,1.42-1.17,2.57-2.59,2.57h-0.02c-1.43-0.01-2.58-1.18-2.57-2.62
-				c0.02-2.61,0-4.34-0.51-6.65c-0.31-1.4,0.58-2.78,1.97-3.09c1.41-0.32,2.78,0.58,3.09,1.97C58.64,29.57,58.62,31.94,58.6,34.34z"
-				/>
-		</g>
-	</g>
-</g>
-<g id="Senden" class="st0">
-	<g class="st1">
-		<path class="st2" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
-			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
-			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
-			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
-			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
-			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
-			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
-			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
-			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
-			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
-			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
-	</g>
-</g>
-<g id="logout" class="st0">
-	<g class="st1">
-		<path class="st5" d="M22.86,56.38H12.19C5.46,56.38,0,50.92,0,44.19V19.81C0,13.08,5.46,7.62,12.19,7.62h10.67
-			c0.84,0,1.52,0.69,1.52,1.52v5.08c0,0.84-0.69,1.52-1.52,1.52H12.19c-2.25,0-4.06,1.82-4.06,4.06v24.38
-			c0,2.25,1.82,4.06,4.06,4.06h10.67c0.84,0,1.52,0.69,1.52,1.52v5.08C24.38,55.69,23.7,56.38,22.86,56.38z M41.78,55.49
-			c-1.9,1.9-5.21,0.57-5.21-2.16V41.14H19.3c-1.69,0-3.05-1.36-3.05-3.05V25.9c0-1.69,1.36-3.05,3.05-3.05h17.27V10.66
-			c0-2.72,3.29-4.06,5.21-2.16l21.33,21.33c1.18,1.19,1.18,3.12,0,4.32L41.78,55.49z"/>
-	</g>
-</g>
-<g id="info">
-	<g id="Infobutton" transform="translate(0 -0.001)">
-		<circle id="Ellipse_4" class="st6" cx="32" cy="32" r="32"/>
-		<rect id="Rechteck_49" x="28" y="28" class="st7" width="8" height="24"/>
-		<circle id="Ellipse_5" class="st7" cx="32" cy="20" r="4"/>
-	</g>
-</g>
-<g id="Home" class="st0">
-	<g id="Haus" transform="translate(-319.046 -300.603)" class="st8">
-		<path id="Pfad_9173" class="st2" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
-			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
-			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
-			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
-		<path id="Pfad_9174" class="st2" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
-			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
-			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
-			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
-			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
-			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
-	</g>
-</g>
-<g id="Community" class="st0">
-	<g class="st1">
-		<path class="st2" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
-			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
-			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
-			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
-			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
-			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
-			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
-			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
-	</g>
-</g>
-<g id="coin_x5F_icon" class="st0">
-	<g class="st1">
-		<path class="st6" d="M46.41,30.2c0,4.98-9.68,9.01-21.62,9.01S3.17,35.18,3.17,30.2s9.68-9.01,21.62-9.01S46.41,25.22,46.41,30.2z
-			 M24.79,42.81c8.46,0,16.97-1.98,21.62-5.81v5.81c0,3.98-9.68,7.21-21.62,7.21S3.17,46.79,3.17,42.81V37
-			C7.82,40.83,16.34,42.81,24.79,42.81z M24.79,53.62c8.47,0,16.97-1.53,21.62-4.81v4.81c0,3.98-9.68,7.21-21.62,7.21
-			S3.17,57.6,3.17,53.62v-4.81C7.82,52.09,16.32,53.62,24.79,53.62z M17.59,10.38c0-3.98,9.68-7.21,21.62-7.21
-			s21.62,3.23,21.62,7.21s-9.68,7.21-21.62,7.21S17.59,14.35,17.59,10.38z M42.73,21.09c7.23-0.36,14.1-1.88,18.1-4.71v4.81
-			c0,2.74-4.58,5.12-11.34,6.34C48.5,24.86,46.06,22.7,42.73,21.09z M50.02,31.08c4.36-0.78,8.2-2.04,10.81-3.89V32
-			c0,2.67-4.36,4.99-10.81,6.24V31.08z"/>
-	</g>
-</g>
-<g id="Adressen" class="st0">
-	<g class="st8">
-		<defs>
-			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
-		</defs>
-		<clipPath id="SVGID_00000150784502249149970240000013189293628367867574_">
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-		</clipPath>
-		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000150784502249149970240000013189293628367867574_);">
-			<path id="Pfad_9157" class="st2" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
-				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
-				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
-				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
-			<path id="Pfad_9158" class="st2" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
-				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
-				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
-				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
-				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
-				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
-			<path id="Pfad_9159" class="st2" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
-				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
-				C10.79,15.92,9.85,15.92,8.9,15.93"/>
-			<path id="Pfad_9160" class="st2" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
-				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
-				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
-			<path id="Pfad_9161" class="st2" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
-				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
-				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
-			<path id="Pfad_9162" class="st2" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
-				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
-				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
-			<path id="Pfad_9163" class="st2" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
-				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
-				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
-				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
-			<path id="Pfad_9164" class="st2" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
-				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
-				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
-			<path id="Pfad_9165" class="st2" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
-				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
-		</g>
-	</g>
-</g>
 </svg>

From 53f48d0475f2a6ef79c49ae8f0bce339c4432001 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 12:59:17 +0100
Subject: [PATCH 25/31] Remove reopen from deleted tab

---
 admin/src/pages/CreationConfirm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index b9565a744..06c4e0797 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -287,7 +287,6 @@ export default {
         ],
         [
           // deleted contributions
-          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From 159d1f2a51a4a7012dc114e43c938a888ca8dc06 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 14:38:27 +0100
Subject: [PATCH 26/31] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index c46f563f5..70b42479e 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -147,7 +147,7 @@
     "totalGradidoUnbookedDecayed": "Unbooked GDD decay",
     "totalUsers": "Members"
   },
-  "status": "State",
+  "status": "Status",
   "success": "Success",
   "text": "Text",
   "transactionlink": {

From 923cc5d81edb148a1c17241d0ab1dd51252ebe33 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:14:16 +0100
Subject: [PATCH 27/31] Extract format date or - to a method.

---
 admin/src/pages/CreationConfirm.vue | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 06c4e0797..4d57ed417 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -184,6 +184,9 @@ export default {
       this.items.find((obj) => obj.id === id).messagesCount++
       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
     },
+    formatDateOrDash(value) {
+      return value ? this.$d(new Date(value), 'short') : '-'
+    },
   },
   computed: {
     fields() {
@@ -206,7 +209,7 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
@@ -229,21 +232,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },
@@ -265,21 +268,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'deniedAt',
             label: this.$t('contributions.denied'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'deniedBy', label: this.$t('moderator') },
@@ -301,21 +304,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'deletedAt',
             label: this.$t('contributions.deleted'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'deletedBy', label: this.$t('moderator') },
@@ -338,21 +341,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },

From 6bdf82c25eab24827552ae557100e6576c6723b4 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:18:26 +0100
Subject: [PATCH 28/31] Update admin/src/pages/CreationConfirm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/pages/CreationConfirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 4d57ed417..3f0b2d87f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -185,7 +185,7 @@ export default {
       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
     },
     formatDateOrDash(value) {
-      return value ? this.$d(new Date(value), 'short') : '-'
+      return value ? this.$d(new Date(value), 'short') : '—'
     },
   },
   computed: {

From 027376b3e00a039f8ad80e7d69d1a15bf3ee88a2 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:51:21 +0100
Subject: [PATCH 29/31] Add contributionState check for message form

---
 .../ContributionMessagesList.vue                | 17 +++++++++++------
 .../components/Tables/OpenCreationsTable.vue    |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 636627385..fab6b5e4a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,17 +1,18 @@
 <template>
   <div class="contribution-messages-list">
     <b-container>
-      {{ messages.lenght }}
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
 
-    <contribution-messages-formular
-      :contributionId="contributionId"
-      @get-list-contribution-messages="getListContributionMessages"
-      @update-state="updateState"
-    />
+    <div v-if="contributionState === 'PENDING' || contributionState === 'IN_PROGRESS'">
+      <contribution-messages-formular
+        :contributionId="contributionId"
+        @get-list-contribution-messages="getListContributionMessages"
+        @update-state="updateState"
+      />
+    </div>
   </div>
 </template>
 <script>
@@ -30,6 +31,10 @@ export default {
       type: Number,
       required: true,
     },
+    contributionState: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 2f0c8a611..55961d8c0 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -99,6 +99,7 @@
             <div v-else>
               <contribution-messages-list
                 :contributionId="row.item.id"
+                :contributionState="row.item.state"
                 @update-state="updateState"
                 @update-user-data="updateUserData"
               />

From 06186dd2d72690784b1cbfb62354c010691c8cd5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 16:12:37 +0100
Subject: [PATCH 30/31] Change messageCount to messagesCount

---
 admin/src/components/Tables/OpenCreationsTable.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 55961d8c0..a0270cb4c 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -36,14 +36,15 @@
           <b-button v-else @click="rowToggleDetails(row, 0)">
             <b-icon icon="chat-dots"></b-icon>
             <b-icon
-              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              v-if="row.item.state === 'PENDING' && row.item.messagesCount > 0"
               icon="exclamation-circle-fill"
               variant="warning"
             ></b-icon>
             <b-icon
-              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messagesCount > 0"
               icon="question-diamond"
-              variant="light"
+              variant="warning"
+              class="pl-1"
             ></b-icon>
           </b-button>
         </div>
@@ -160,7 +161,10 @@ export default {
     rowClass(item, type) {
       if (!item || type !== 'row') return
       if (item.state === 'CONFIRMED') return 'table-success'
-      if (item.state === 'DENIED') return 'table-info'
+      if (item.state === 'DENIED') return 'table-warning'
+      if (item.state === 'DELETED') return 'table-danger'
+      if (item.state === 'IN_PROGRESS') return 'table-primary'
+      if (item.state === 'PENDING') return 'table-primary'
     },
     updateCreationData(data) {
       const row = data.row

From 17e19debade9dc85a4b1c0c1a2acd1b0d3452062 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 16:18:37 +0100
Subject: [PATCH 31/31] Fix unit test.

---
 .../ContributionMessages/ContributionMessagesList.spec.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 0092751cc..f0b6ea821 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -10,6 +10,7 @@ describe('ContributionMessagesList', () => {
 
   const propsData = {
     contributionId: 42,
+    contributionState: 'PENDING',
   }
 
   const mocks = {