From 70494a8e1186bc2ba64ffac268be236466424218 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 25 Jan 2023 13:10:46 +0100
Subject: [PATCH] Remove unused local key denyNow, change color of deny button
 to yellow, change order of confirm and deny buttons.

---
 .../components/Tables/OpenCreationsTable.vue  | 24 ++++++------
 admin/src/locales/de.json                     |  1 -
 admin/src/locales/en.json                     |  1 -
 admin/src/pages/CreationConfirm.vue           | 38 +++++++++----------
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 5b03d8970..d141fc0a5 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -37,6 +37,18 @@
           </b-button>
         </div>
       </template>
+      <template #cell(deny)="row">
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            variant="warning"
+            size="md"
+            @click="$emit('show-overlay', row.item, 'deny')"
+            class="mr-2"
+          >
+            <b-icon icon="x" variant="light"></b-icon>
+          </b-button>
+        </div>
+      </template>
       <template #cell(confirm)="row">
         <div v-if="$store.state.moderator.id !== row.item.userId">
           <b-button
@@ -49,18 +61,6 @@
           </b-button>
         </div>
       </template>
-      <template #cell(deny)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
-          <b-button
-            variant="danger"
-            size="md"
-            @click="$emit('deny-creation', row.item)"
-            class="mr-2"
-          >
-            <b-icon icon="x" variant="light"></b-icon>
-          </b-button>
-        </div>
-      </template>
       <template #row-details="row">
         <row-details
           :row="row"
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index cf0a8192a..9612e3247 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -34,7 +34,6 @@
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
-    "denyNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 2ac93f04b..f9598d006 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -34,7 +34,6 @@
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
-    "denyNow": "Do you really want to reject this contribution to the community?",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 3b4313fc9..08514752d 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -72,25 +72,23 @@ export default {
           this.toastError(error.message)
         })
     },
-    denyCreation(item) {
-      this.$bvModal.msgBoxConfirm(this.$t('creation_form.denyNow')).then(async (value) => {
-        if (value) {
-          await this.$apollo
-            .mutate({
-              mutation: denyContribution,
-              variables: {
-                id: item.id,
-              },
-            })
-            .then((result) => {
-              this.updatePendingCreations(item.id)
-              this.toastSuccess(this.$t('creation_form.toasted_denied'))
-            })
-            .catch((error) => {
-              this.toastError(error.message)
-            })
-        }
-      })
+    denyCreation() {
+      this.$apollo
+        .mutate({
+          mutation: denyContribution,
+          variables: {
+            id: this.item.id,
+          },
+        })
+        .then((result) => {
+          this.overlay = false
+          this.updatePendingCreations(this.item.id)
+          this.toastSuccess(this.$t('creation_form.toasted_denied'))
+        })
+        .catch((error) => {
+          this.overlay = false
+          this.toastError(error.message)
+        })
     },
     confirmCreation() {
       this.$apollo
@@ -148,8 +146,8 @@ export default {
         },
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
-        { key: 'confirm', label: this.$t('save') },
         { key: 'deny', label: this.$t('deny') },
+        { key: 'confirm', label: this.$t('save') },
       ]
     },
     overlayTitle() {