From 3f6862e04dfc50205c9ca560e72d5773518ebf09 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 29 Jun 2022 11:52:55 +0530
Subject: [PATCH] chore: Display API key in the configuration for WhatsApp
 Channel (#4944)

---
 app/javascript/dashboard/i18n/locale/en/inboxMgmt.json |  4 +++-
 .../routes/dashboard/settings/inbox/Settings.vue       |  3 ++-
 .../settings/inbox/settingsPage/ConfigurationPage.vue  | 10 ++++++++++
 app/javascript/survey/i18n/locale/ar.json              |  2 +-
 app/views/api/v1/models/_inbox.json.jbuilder           |  5 ++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index b1da92e2d..ed811a6e9 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -423,7 +423,9 @@
       "FORWARD_EMAIL_TITLE": "Forward to Email",
       "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
+      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used in the integration with the 360Dialog WhatsApp channel.",
+      "WHATSAPP_SECTION_TITLE": "API Key"
     },
     "AUTO_ASSIGNMENT":{
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 5f539c3e3..256f2b0c5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -413,7 +413,8 @@ export default {
         this.isATwilioChannel ||
         this.isALineChannel ||
         this.isAPIInbox ||
-        this.isAnEmailChannel
+        this.isAnEmailChannel ||
+        this.isAWhatsappChannel
       ) {
         return [
           ...visibleToAllChannelTabs,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 3a7a61760..a90c0d13c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -68,6 +68,16 @@
     <imap-settings :inbox="inbox" />
     <smtp-settings v-if="inbox.imap_enabled" :inbox="inbox" />
   </div>
+  <div v-else-if="isAWhatsappChannel && !isATwilioChannel">
+    <div v-if="inbox.provider_config" class="settings--content">
+      <settings-section
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_TITLE')"
+        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_SUBHEADER')"
+      >
+        <woot-code :script="inbox.provider_config.api_key" />
+      </settings-section>
+    </div>
+  </div>
 </template>
 
 <script>
diff --git a/app/javascript/survey/i18n/locale/ar.json b/app/javascript/survey/i18n/locale/ar.json
index 945c640a2..9cd0cc6d1 100644
--- a/app/javascript/survey/i18n/locale/ar.json
+++ b/app/javascript/survey/i18n/locale/ar.json
@@ -15,5 +15,5 @@
       "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
     }
   },
-  "POWERED_BY": "مدعوم بواسطة تشات وت"
+  "POWERED_BY": "مدعوم بواسطة Chatwoot"
 }
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index b91b04549..7fada86bd 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -82,4 +82,7 @@ if resource.api?
 end
 
 ### WhatsApp Channel
-json.message_templates resource.channel.try(:message_templates) if resource.whatsapp?
+if resource.whatsapp?
+  json.message_templates resource.channel.try(:message_templates)
+  json.provider_config resource.channel.try(:provider_config)
+end