From 578414d788233fa441769dcf2f3275599ea7d830 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 11 Mar 2022 17:00:55 +0530
Subject: [PATCH] feat: Adds ability to delete contact without having to type
 name (#4155)

---
 .../dashboard/i18n/locale/en/contact.json     |  5 ++--
 .../conversation/contact/ContactInfo.vue      | 23 ++++---------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 3824d9593..037f6f769 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -77,9 +77,8 @@
     "CONFIRM": {
       "TITLE": "Confirm Deletion",
       "MESSAGE": "Are you sure to delete ",
-      "PLACE_HOLDER": "Please type {contactName} to confirm",
-      "YES": "Yes, Delete ",
-      "NO": "No, Keep "
+      "YES": "Yes, Delete",
+      "NO": "No, Keep"
     },
     "API": {
       "SUCCESS_MESSAGE": "Contact deleted successfully",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 90aeb43ee..24aeeff88 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -126,17 +126,15 @@
         @close="toggleMergeModal"
       />
     </div>
-    <woot-confirm-delete-modal
+    <woot-delete-modal
       v-if="showDeleteModal"
       :show.sync="showDeleteModal"
+      :on-close="closeDelete"
+      :on-confirm="confirmDeletion"
       :title="$t('DELETE_CONTACT.CONFIRM.TITLE')"
       :message="confirmDeleteMessage"
-      :confirm-text="deleteConfirmText"
-      :reject-text="deleteRejectText"
-      :confirm-value="contact.name"
-      :confirm-place-holder-text="confirmPlaceHolderText"
-      @on-confirm="confirmDeletion"
-      @on-close="closeDelete"
+      :confirm-text="$t('DELETE_CONTACT.CONFIRM.YES')"
+      :reject-text="$t('DELETE_CONTACT.CONFIRM.NO')"
     />
   </div>
 </template>
@@ -221,22 +219,11 @@ export default {
       return { twitter: twitterScreenName, ...(socialProfiles || {}) };
     },
     // Delete Modal
-    deleteConfirmText() {
-      return `${this.$t('DELETE_CONTACT.CONFIRM.YES')} ${this.contact.name}`;
-    },
-    deleteRejectText() {
-      return `${this.$t('DELETE_CONTACT.CONFIRM.NO')} ${this.contact.name}`;
-    },
     confirmDeleteMessage() {
       return `${this.$t('DELETE_CONTACT.CONFIRM.MESSAGE')} ${
         this.contact.name
       } ?`;
     },
-    confirmPlaceHolderText() {
-      return `${this.$t('DELETE_CONTACT.CONFIRM.PLACE_HOLDER', {
-        contactName: this.contact.name,
-      })}`;
-    },
   },
   methods: {
     toggleMergeModal() {