From 3de8f256cb0affd03a78279f4720b6cfc01ad87f Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:53:53 +0530
Subject: [PATCH 01/14] fix: Avoid overflowing submenus in conversation context
 menu (#5113)

* Scroll overflowing content inside submenus

* Disable submenus if options are not available
---
 .../conversation/contextMenu/Index.vue        | 15 ++++++++++---
 .../conversation/contextMenu/menuItem.vue     |  3 +--
 .../contextMenu/menuItemWithSubmenu.vue       | 21 +++++++++++++++++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
index 4a1713165..a8a5f3cb3 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
@@ -17,7 +17,10 @@
         @click="snoozeConversation(option.snoozedUntil)"
       />
     </menu-item-with-submenu>
-    <menu-item-with-submenu :option="labelMenuConfig">
+    <menu-item-with-submenu
+      :option="labelMenuConfig"
+      :sub-menu-available="!!labels.length"
+    >
       <template>
         <menu-item
           v-for="label in labels"
@@ -28,7 +31,10 @@
         />
       </template>
     </menu-item-with-submenu>
-    <menu-item-with-submenu :option="agentMenuConfig">
+    <menu-item-with-submenu
+      :option="agentMenuConfig"
+      :sub-menu-available="!!assignableAgents.length"
+    >
       <agent-loading-placeholder v-if="assignableAgentsUiFlags.isFetching" />
       <template v-else>
         <menu-item
@@ -40,7 +46,10 @@
         />
       </template>
     </menu-item-with-submenu>
-    <menu-item-with-submenu :option="teamMenuConfig">
+    <menu-item-with-submenu
+      :option="teamMenuConfig"
+      :sub-menu-available="!!teams.length"
+    >
       <menu-item
         v-for="team in teams"
         :key="team.id"
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
index 7534430d5..8cb02dc54 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
@@ -18,7 +18,7 @@
       size="20px"
       class="agent-thumbnail"
     />
-    <p class="menu-label truncate-text">{{ option.label }}</p>
+    <p class="menu-label text-truncate">{{ option.label }}</p>
   </div>
 </template>
 
@@ -50,7 +50,6 @@ export default {
   padding: var(--space-smaller);
   border-radius: var(--border-radius-small);
   overflow: hidden;
-
   .menu-label {
     margin: 0;
     font-size: var(--font-size-mini);
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
index 08922bc37..04870ccc1 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
@@ -1,11 +1,14 @@
 <template>
-  <div class="menu-with-submenu flex-between">
+  <div
+    class="menu-with-submenu flex-between"
+    :class="{ disabled: !subMenuAvailable }"
+  >
     <div class="menu-left">
       <fluent-icon :icon="option.icon" size="14" class="menu-icon" />
       <p class="menu-label">{{ option.label }}</p>
     </div>
     <fluent-icon icon="chevron-right" size="12" />
-    <div class="submenu">
+    <div v-if="subMenuAvailable" class="submenu">
       <slot />
     </div>
   </div>
@@ -18,6 +21,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    subMenuAvailable: {
+      type: Boolean,
+      default: true,
+    },
   },
 };
 </script>
@@ -55,6 +62,11 @@ export default {
     left: 100%;
     top: 0;
     display: none;
+    min-height: min-content;
+    max-height: var(--space-giga);
+    overflow-y: auto;
+    // Need this because Firefox adds a horizontal scrollbar, if a text is truncated inside.
+    overflow-x: hidden;
   }
 
   &:hover {
@@ -73,5 +85,10 @@ export default {
       clip-path: polygon(100% 0, 0% 0%, 100% 100%);
     }
   }
+
+  &.disabled {
+    opacity: 50%;
+    cursor: not-allowed;
+  }
 }
 </style>

From f7407271775486cbf8040a167ee77c11acb3e1b4 Mon Sep 17 00:00:00 2001
From: Nitin Ramnani <nitinramnani15@gmail.com>
Date: Thu, 20 Oct 2022 00:54:08 +0530
Subject: [PATCH 02/14] Added testcases for AddReminder Component (#5538)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../components/specs/AddReminder.spec.js      | 48 +++++++++++++++++++
 jest.config.js                                |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/specs/AddReminder.spec.js

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/specs/AddReminder.spec.js b/app/javascript/dashboard/routes/dashboard/contacts/components/specs/AddReminder.spec.js
new file mode 100644
index 000000000..e99fdb9ff
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/specs/AddReminder.spec.js
@@ -0,0 +1,48 @@
+import { shallowMount } from '@vue/test-utils';
+import AddReminder from '../AddReminder.vue';
+
+let wrapper;
+
+describe('AddReminder', () => {
+  beforeEach(() => {
+    wrapper = shallowMount(AddReminder, {
+      mocks: {
+        $t: x => x,
+        $store: {
+          getters: {},
+          state: {},
+        },
+      },
+    });
+  });
+
+  it('tests resetValue', () => {
+    const resetValue = jest.spyOn(wrapper.vm, 'resetValue');
+    wrapper.vm.content = 'test';
+    wrapper.vm.date = '08/11/2022';
+    wrapper.vm.resetValue();
+    expect(wrapper.vm.content).toEqual('');
+    expect(wrapper.vm.date).toEqual('');
+    expect(resetValue).toHaveBeenCalled();
+  });
+
+  it('tests optionSelected', () => {
+    const optionSelected = jest.spyOn(wrapper.vm, 'optionSelected');
+    wrapper.vm.label = '';
+    wrapper.vm.optionSelected({ target: { value: 'test' } });
+    expect(wrapper.vm.label).toEqual('test');
+    expect(optionSelected).toHaveBeenCalled();
+  });
+
+  it('tests onAdd', () => {
+    const onAdd = jest.spyOn(wrapper.vm, 'onAdd');
+    wrapper.vm.label = 'label';
+    wrapper.vm.content = 'content';
+    wrapper.vm.date = '08/11/2022';
+    wrapper.vm.onAdd();
+    expect(onAdd).toHaveBeenCalled();
+    expect(wrapper.emitted().add[0]).toEqual([
+      { content: 'content', date: '08/11/2022', label: 'label' },
+    ]);
+  });
+});
diff --git a/jest.config.js b/jest.config.js
index 135098515..604b5f694 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -15,7 +15,7 @@ module.exports = {
   cacheDirectory: '<rootDir>/.jest-cache',
   collectCoverage: false,
   coverageDirectory: 'buildreports',
-  collectCoverageFrom: ['**/app/javascript/**/*.js'],
+  collectCoverageFrom: ['**/app/javascript/**/*.{js,vue}'],
   reporters: ['default'],
   // setupTestFrameworkScriptFile: './tests/setup.ts',
   transformIgnorePatterns: ['node_modules/*'],

From 0343acdb7e185e7a77d04fe81d08a1d9f30fb96b Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 20 Oct 2022 01:26:39 +0530
Subject: [PATCH 03/14] fix: ensure contact_inbox if contact exists(#5667)

- Fixing Instagram issue for existing contacts in the inbox
---
 Gemfile.lock                              | 10 +++++-----
 app/jobs/webhooks/instagram_events_job.rb |  1 +
 app/services/instagram/message_text.rb    |  4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5b14d5b5e..686c3a37b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -427,14 +427,14 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.9.0)
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.7-arm64-darwin)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.7-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.7-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.10)
     orm_adapter (0.5.0)
@@ -808,4 +808,4 @@ RUBY VERSION
    ruby 3.0.4p208
 
 BUNDLED WITH
-   2.3.18
+   2.3.16
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index f0801fbc8..0f78c6277 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -13,6 +13,7 @@ class Webhooks::InstagramEventsJob < ApplicationJob
     @entries = entries
 
     @entries.each do |entry|
+      entry = entry.with_indifferent_access
       entry[:messaging].each do |messaging|
         send(@event_name, messaging) if event_name(messaging)
       end
diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index abcbe2d60..6ce8ec02b 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -53,8 +53,10 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
     @messaging[:message][:is_deleted].present?
   end
 
+  # if contact was present before find out contact_inbox to create message
   def contacts_first_message?(ig_scope_id)
-    @inbox.contact_inboxes.where(source_id: ig_scope_id).empty? && @inbox.channel.instagram_id.present?
+    @contact_inbox = @inbox.contact_inboxes.where(source_id: ig_scope_id).last
+    @contact_inbox.blank? && @inbox.channel.instagram_id.present?
   end
 
   def sent_via_test_webhook?

From 6bc34db932eb1cde8019cdef02fa20111d0c5073 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 20 Oct 2022 01:37:44 +0530
Subject: [PATCH 04/14] fix: Make links more accessible on helpcenter public
 views (#5681)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/portals/_category-block.html.erb   | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index de55d5398..cf8e342a9 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -1,7 +1,9 @@
 <section class="bg-white lg:container w-full py-6 px-4 flex flex-col h-full">
   <div class="flex justify-between items-center w-full">
-    <h3 class="text-xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed hover:underline"">
-     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"><%= category.name %> </a>
+    <h3 class="text-xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed hover:underline">
+      <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>">
+        <%= category.name %>
+      </a>
     </h3>
     <span class="text-slate-500">
       <%= category.articles.published.size %>
@@ -15,28 +17,27 @@
     </div>
     <% else %>
       <% category.articles.published.take(5).each do |article| %>
-      <div class="flex justify-between content-center my-1">
-        <a
-          class="text-slate-800 hover:underline leading-8"
-          href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
-        >
+      <a
+        class="text-slate-800 hover:underline leading-8"
+        href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
+      >
+        <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25">
           <%= article.title %>
-        </a>
-        <span class="flex items-center">
-          <svg
-            class="w-4 h-4 fill-current text-slate-700"
-            width="24"
-            height="24"
-            fill="none"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
-            />
-          </svg>
-        </span>
-      </div>
+          <span class="flex items-center">
+            <svg
+              class="w-4 h-4 fill-current text-slate-700"
+              width="24"
+              height="24"
+              fill="none"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg">
+              <path
+                d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
+              />
+            </svg>
+          </span>
+        </div>
+      </a>
       <% end %>
     <% end %>
   </div>

From c542d2e0fff943062fe532fd0ffb1b3427442e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Kube=C5=A1?=
 <46596180+KubesDavid@users.noreply.github.com>
Date: Wed, 19 Oct 2022 22:20:40 +0200
Subject: [PATCH 05/14] chore: Refactor urlParamsHelper.js (#5639)

---
 .../helpers/specs/urlParamsHelper.spec.js     |  2 +-
 .../widget/helpers/urlParamsHelper.js         | 26 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js b/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
index 826c35e99..87588616b 100644
--- a/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
+++ b/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
@@ -31,7 +31,7 @@ describe('#getLocale', () => {
     expect(getLocale('?test=1&cw_conv=2&website_token=3&locale=fr')).toEqual(
       'fr'
     );
-    expect(getLocale('')).toEqual(undefined);
+    expect(getLocale('')).toEqual(null);
   });
 });
 
diff --git a/app/javascript/widget/helpers/urlParamsHelper.js b/app/javascript/widget/helpers/urlParamsHelper.js
index ad7f896d1..1736c092e 100644
--- a/app/javascript/widget/helpers/urlParamsHelper.js
+++ b/app/javascript/widget/helpers/urlParamsHelper.js
@@ -1,22 +1,13 @@
 export const buildSearchParamsWithLocale = search => {
   const locale = window.WOOT_WIDGET.$root.$i18n.locale;
-  if (search) {
-    search = `${search}&locale=${locale}`;
-  } else {
-    search = `?locale=${locale}`;
-  }
-  return search;
+  const params = new URLSearchParams(search);
+  params.append('locale', locale);
+
+  return `?${params}`;
 };
 
 export const getLocale = (search = '') => {
-  const searchParamKeyValuePairs = search.split('&');
-  return searchParamKeyValuePairs.reduce((acc, keyValuePair) => {
-    const [key, value] = keyValuePair.split('=');
-    if (key === 'locale') {
-      return value;
-    }
-    return acc;
-  }, undefined);
+  return new URLSearchParams(search).get('locale');
 };
 
 export const buildPopoutURL = ({
@@ -25,5 +16,10 @@ export const buildPopoutURL = ({
   websiteToken,
   locale,
 }) => {
-  return `${origin}/widget?cw_conversation=${conversationCookie}&website_token=${websiteToken}&locale=${locale}`;
+  const popoutUrl = new URL('/widget', origin);
+  popoutUrl.searchParams.append('cw_conversation', conversationCookie);
+  popoutUrl.searchParams.append('website_token', websiteToken);
+  popoutUrl.searchParams.append('locale', locale);
+
+  return popoutUrl.toString();
 };

From 199f462af40d668368001a6f28ac21f8df8f9752 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 19 Oct 2022 13:27:10 -0700
Subject: [PATCH 06/14] chore: Update translations from Crowdin (#5663)

---
 .../dashboard/i18n/locale/ar/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ar/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ar/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ar/macros.json      |   5 +
 .../dashboard/i18n/locale/ar/settings.json    |   2 +
 .../dashboard/i18n/locale/bg/agentBots.json   |   5 +
 .../dashboard/i18n/locale/bg/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/bg/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/bg/macros.json      |   5 +
 .../dashboard/i18n/locale/bg/settings.json    |   2 +
 .../dashboard/i18n/locale/ca/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ca/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ca/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ca/macros.json      |   5 +
 .../dashboard/i18n/locale/ca/settings.json    |   2 +
 .../dashboard/i18n/locale/cs/agentBots.json   |   5 +
 .../dashboard/i18n/locale/cs/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/cs/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/cs/macros.json      |   5 +
 .../dashboard/i18n/locale/cs/settings.json    |   2 +
 .../dashboard/i18n/locale/da/agentBots.json   |   5 +
 .../dashboard/i18n/locale/da/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/da/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/da/macros.json      |   5 +
 .../dashboard/i18n/locale/da/settings.json    |   2 +
 .../dashboard/i18n/locale/de/agentBots.json   |   5 +
 .../dashboard/i18n/locale/de/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/de/macros.json      |   5 +
 .../dashboard/i18n/locale/de/settings.json    |   2 +
 .../dashboard/i18n/locale/es/agentBots.json   |   5 +
 .../dashboard/i18n/locale/es/bulkActions.json |   2 +
 .../dashboard/i18n/locale/es/helpCenter.json  |  24 ++---
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/es/macros.json      |   5 +
 .../dashboard/i18n/locale/es/settings.json    |   2 +
 .../dashboard/i18n/locale/fa/agentBots.json   |   5 +
 .../dashboard/i18n/locale/fa/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fa/macros.json      |   5 +
 .../dashboard/i18n/locale/fa/settings.json    |   2 +
 .../dashboard/i18n/locale/fi/agentBots.json   |   5 +
 .../dashboard/i18n/locale/fi/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/fi/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fi/macros.json      |   5 +
 .../dashboard/i18n/locale/fi/settings.json    |   2 +
 .../dashboard/i18n/locale/fr/agentBots.json   |   5 +
 .../dashboard/i18n/locale/fr/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/fr/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fr/macros.json      |   5 +
 .../dashboard/i18n/locale/fr/settings.json    |   2 +
 .../i18n/locale/he/advancedFilters.json       | 100 +++++++++---------
 .../dashboard/i18n/locale/he/agentBots.json   |   5 +
 .../i18n/locale/he/attributesMgmt.json        |  16 +--
 .../dashboard/i18n/locale/he/bulkActions.json |   4 +-
 .../i18n/locale/he/contactFilters.json        |  44 ++++----
 .../i18n/locale/he/conversation.json          |  10 +-
 .../dashboard/i18n/locale/he/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/he/macros.json      |   5 +
 .../dashboard/i18n/locale/he/settings.json    |   2 +-
 .../dashboard/i18n/locale/hi/agentBots.json   |   5 +
 .../dashboard/i18n/locale/hi/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/hi/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/hi/macros.json      |   5 +
 .../dashboard/i18n/locale/hi/settings.json    |   2 +
 .../dashboard/i18n/locale/hu/agentBots.json   |   5 +
 .../dashboard/i18n/locale/hu/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/hu/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/hu/macros.json      |   5 +
 .../dashboard/i18n/locale/hu/settings.json    |   2 +
 .../dashboard/i18n/locale/id/agentBots.json   |   5 +
 .../dashboard/i18n/locale/id/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/id/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/id/macros.json      |   5 +
 .../dashboard/i18n/locale/id/settings.json    |   2 +
 .../dashboard/i18n/locale/it/agentBots.json   |   5 +
 .../dashboard/i18n/locale/it/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/it/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/it/macros.json      |   5 +
 .../dashboard/i18n/locale/it/settings.json    |   2 +
 .../dashboard/i18n/locale/ja/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ja/agentMgmt.json   |   4 +-
 .../dashboard/i18n/locale/ja/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ja/contact.json     |   4 +-
 .../i18n/locale/ja/conversation.json          |  84 +++++++--------
 .../dashboard/i18n/locale/ja/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ja/macros.json      |   5 +
 .../dashboard/i18n/locale/ja/report.json      |   2 +-
 .../dashboard/i18n/locale/ja/settings.json    |   2 +
 .../dashboard/i18n/locale/ka/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ka/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ka/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ka/macros.json      |   5 +
 .../dashboard/i18n/locale/ka/settings.json    |   2 +
 .../dashboard/i18n/locale/ko/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ko/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ko/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ko/macros.json      |   5 +
 .../dashboard/i18n/locale/ko/settings.json    |   2 +
 .../dashboard/i18n/locale/lt/agentBots.json   |   5 +
 .../dashboard/i18n/locale/lt/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/lt/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/lt/macros.json      |   5 +
 .../dashboard/i18n/locale/lt/settings.json    |   2 +
 .../dashboard/i18n/locale/lv/agentBots.json   |   5 +
 .../dashboard/i18n/locale/lv/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/lv/macros.json      |   5 +
 .../dashboard/i18n/locale/ml/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ml/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ml/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ml/macros.json      |   5 +
 .../dashboard/i18n/locale/ml/settings.json    |   2 +
 .../dashboard/i18n/locale/ms/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ms/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ms/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ms/macros.json      |   5 +
 .../dashboard/i18n/locale/ms/settings.json    |   2 +
 .../dashboard/i18n/locale/ne/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ne/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ne/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ne/macros.json      |   5 +
 .../dashboard/i18n/locale/ne/settings.json    |   2 +
 .../dashboard/i18n/locale/nl/agentBots.json   |   5 +
 .../dashboard/i18n/locale/nl/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/nl/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/nl/macros.json      |   5 +
 .../dashboard/i18n/locale/nl/settings.json    |   2 +
 .../dashboard/i18n/locale/no/agentBots.json   |   5 +
 .../dashboard/i18n/locale/no/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/no/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/no/macros.json      |   5 +
 .../dashboard/i18n/locale/no/settings.json    |   2 +
 .../dashboard/i18n/locale/pl/agentBots.json   |   5 +
 .../dashboard/i18n/locale/pl/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/pl/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/pl/macros.json      |   5 +
 .../dashboard/i18n/locale/pl/settings.json    |   2 +
 .../dashboard/i18n/locale/pt/agentBots.json   |   5 +
 .../dashboard/i18n/locale/pt/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/pt/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/pt/macros.json      |   5 +
 .../dashboard/i18n/locale/pt/settings.json    |   2 +
 .../i18n/locale/pt_BR/agentBots.json          |   5 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |   6 +-
 .../dashboard/i18n/locale/pt_BR/macros.json   |   5 +
 .../dashboard/i18n/locale/pt_BR/settings.json |   2 +
 .../dashboard/i18n/locale/ro/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ro/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ro/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ro/macros.json      |   5 +
 .../dashboard/i18n/locale/ro/settings.json    |   2 +
 .../dashboard/i18n/locale/ru/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ru/bulkActions.json |   2 +
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ru/macros.json      |   5 +
 .../dashboard/i18n/locale/ru/settings.json    |   2 +
 .../dashboard/i18n/locale/sk/agentBots.json   |   5 +
 .../dashboard/i18n/locale/sk/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/sk/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/sk/macros.json      |   5 +
 .../dashboard/i18n/locale/sk/settings.json    |   2 +
 .../dashboard/i18n/locale/sr/agentBots.json   |   5 +
 .../dashboard/i18n/locale/sr/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/sr/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/sr/macros.json      |   5 +
 .../dashboard/i18n/locale/sr/settings.json    |   2 +
 .../dashboard/i18n/locale/sv/agentBots.json   |   5 +
 .../dashboard/i18n/locale/sv/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/sv/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/sv/macros.json      |   5 +
 .../dashboard/i18n/locale/sv/settings.json    |   2 +
 .../dashboard/i18n/locale/ta/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ta/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ta/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ta/macros.json      |   5 +
 .../dashboard/i18n/locale/ta/settings.json    |   2 +
 .../dashboard/i18n/locale/th/agentBots.json   |   5 +
 .../dashboard/i18n/locale/th/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/th/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/th/macros.json      |   5 +
 .../dashboard/i18n/locale/th/settings.json    |   2 +
 .../dashboard/i18n/locale/tr/agentBots.json   |   5 +
 .../dashboard/i18n/locale/tr/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/tr/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/tr/macros.json      |   5 +
 .../dashboard/i18n/locale/tr/settings.json    |   2 +
 .../dashboard/i18n/locale/uk/agentBots.json   |   5 +
 .../dashboard/i18n/locale/uk/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/uk/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/uk/macros.json      |   5 +
 .../dashboard/i18n/locale/uk/settings.json    |   2 +
 .../dashboard/i18n/locale/ur/agentBots.json   |   5 +
 .../dashboard/i18n/locale/ur/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/ur/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ur/macros.json      |   5 +
 .../dashboard/i18n/locale/ur/settings.json    |   2 +
 .../i18n/locale/ur_IN/agentBots.json          |   5 +
 .../i18n/locale/ur_IN/bulkActions.json        |   4 +-
 .../i18n/locale/ur_IN/helpCenter.json         |   2 +-
 .../i18n/locale/ur_IN/inboxMgmt.json          |   6 +-
 .../dashboard/i18n/locale/ur_IN/macros.json   |   5 +
 .../dashboard/i18n/locale/ur_IN/settings.json |   2 +
 .../dashboard/i18n/locale/vi/agentBots.json   |   5 +
 .../dashboard/i18n/locale/vi/bulkActions.json |   4 +-
 .../dashboard/i18n/locale/vi/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/vi/macros.json      |   5 +
 .../dashboard/i18n/locale/vi/settings.json    |   2 +
 .../i18n/locale/zh_CN/agentBots.json          |   5 +
 .../i18n/locale/zh_CN/bulkActions.json        |   4 +-
 .../i18n/locale/zh_CN/helpCenter.json         |   2 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |   6 +-
 .../dashboard/i18n/locale/zh_CN/macros.json   |   5 +
 .../dashboard/i18n/locale/zh_CN/settings.json |   2 +
 .../i18n/locale/zh_TW/agentBots.json          |   5 +
 .../i18n/locale/zh_TW/bulkActions.json        |   4 +-
 .../i18n/locale/zh_TW/helpCenter.json         |   2 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |   6 +-
 .../dashboard/i18n/locale/zh_TW/macros.json   |   5 +
 .../dashboard/i18n/locale/zh_TW/settings.json |   2 +
 config/locales/ja.yml                         |   2 +-
 252 files changed, 963 insertions(+), 301 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/macros.json

diff --git a/app/javascript/dashboard/i18n/locale/ar/agentBots.json b/app/javascript/dashboard/i18n/locale/ar/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
index 71954cf64..9bbd113a2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} المحادثات المحددة",
     "AGENT_SELECT_LABEL": "اختر وكيل",
-    "ASSIGN_CONFIRMATION_LABEL": "هل أنت متأكد من أنك تريد تعيين %{conversationCount} %{conversationLabel} إلى",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "العودة للخلف",
     "ASSIGN_LABEL": "تكليف",
+    "YES": "نعم",
     "ASSIGN_AGENT_TOOLTIP": "إسناد وكيل",
     "ASSIGN_SUCCESFUL": "تم تعيين المحادثات بنجاح",
     "ASSIGN_FAILED": "فشل في تعيين المحادثات، الرجاء المحاولة مرة أخرى",
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index b7ae33e35..4ad6d2a15 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "حدث خطأ أثناء نشر المقالة",
-        "SUCCESS": "تم نشر المقالة بنجاح"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 939a8c32b..333db0f35 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "عنوان Callback URL",
-          "SUBTITLE": "يجب عليك تكوين URL webhook في بوابة مطور فيسبوك مع عنوان URL المذكور هنا."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "رابط Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "إنشاء قناة واتساب",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "أصبحت قناة التواصل جاهزة الآن!",
-      "MESSAGE": "يمكنك الآن التواصل مع عملائك من خلال قناتك الجديدة ",
+      "MESSAGE": "يمكنك الآن التواصل مع عملائك من خلال قناتك الجديدة",
       "BUTTON_TEXT": "خذني إلى هناك",
       "MORE_SETTINGS": "المزيد من الإعدادات",
       "WEBSITE_SUCCESS": "لقد انتهيت بنجاح من إنشاء قناة دردشة مباشرة لموقعك. انسخ الرمز الموضح أدناه وقم بإضافته إلى موقع الويب الخاص بك. في المرة القادمة التي يستخدم فيها العميل الدردشة المباشرة، ستظهر المحادثة تلقائياً على صندوق الوارد الخاص بك."
diff --git a/app/javascript/dashboard/i18n/locale/ar/macros.json b/app/javascript/dashboard/i18n/locale/ar/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index d02371b78..2f5b01382 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "جهات الاتصال",
     "HOME": "الرئيسية",
     "AGENTS": "موظف الدعم",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "قنوات التواصل",
     "NOTIFICATIONS": "الإشعارات",
     "CANNED_RESPONSES": "الردود السريعة",
@@ -189,6 +190,7 @@
     "LABELS": "الوسوم",
     "CUSTOM_ATTRIBUTES": "سمات مخصصة",
     "AUTOMATION": "الأتمتة",
+    "MACROS": "Macros",
     "TEAMS": "الفرق",
     "BILLING": "الفواتير",
     "CUSTOM_VIEWS_FOLDER": "المجلدات",
diff --git a/app/javascript/dashboard/i18n/locale/bg/agentBots.json b/app/javascript/dashboard/i18n/locale/bg/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 1fb3179c2..c273ff4e1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 0593a6c43..697ec5f57 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/bg/macros.json b/app/javascript/dashboard/i18n/locale/bg/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index ac89d6090..8b80d3cad 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Контакти",
     "HOME": "Home",
     "AGENTS": "Агенти",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Готови отговори",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Персонализирани атрибути",
     "AUTOMATION": "Автоматизация",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentBots.json b/app/javascript/dashboard/i18n/locale/ca/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
index c1cb9d9fd..0b02e482a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Seleccionar Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assignar",
+    "YES": "Si",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 2de2fbd0f..921581fe3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 1ce7e853f..474e2f388 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL del webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "La vostra safata d'entrada està a punt!",
-      "MESSAGE": "Ja podeu interactuar amb els vostres clients a través del vostre canal nou. Feliç suport ",
+      "MESSAGE": "Ja podeu interactuar amb els vostres clients a través del vostre canal nou. Feliç suport",
       "BUTTON_TEXT": "Porta'm allà",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Heu finalitzat amb èxit la creació d'un canal web. Copieu el codi que es mostra a continuació i enganxeu-lo al lloc web. La propera vegada que un client utilitzi el xat en directe, la conversa apareixerà automàticament a la safata d'entrada."
diff --git a/app/javascript/dashboard/i18n/locale/ca/macros.json b/app/javascript/dashboard/i18n/locale/ca/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index a4d190bba..5e21f1ce9 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contactes",
     "HOME": "Inici",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Safates d'entrada",
     "NOTIFICATIONS": "Notificacions",
     "CANNED_RESPONSES": "Respostes predeterminades",
@@ -189,6 +190,7 @@
     "LABELS": "Etiquetes",
     "CUSTOM_ATTRIBUTES": "Atributs personalitzats",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Equips",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/cs/agentBots.json b/app/javascript/dashboard/i18n/locale/cs/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
index b752fdfa7..0207f4e41 100644
--- a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Vybrat agenta",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Přiřadit",
+    "YES": "Ano",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index dcea2beab..2f00102d7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 4cdc4fc21..cdba3ca77 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL webového háčku",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Vaše doručená pošta je připravena!",
-      "MESSAGE": "Nyní se můžete spojit se svými zákazníky prostřednictvím nového kanálu. Šťastná podpora ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Vezmi mě tam",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Úspěšně jste dokončili vytvoření webového kanálu. Zkopírujte kód zobrazený níže a vložte jej na vaše webové stránky. Když zákazník příště použije živý chat, konverzace se automaticky objeví ve vaší doručené poště."
diff --git a/app/javascript/dashboard/i18n/locale/cs/macros.json b/app/javascript/dashboard/i18n/locale/cs/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 56548f2a8..b74169a77 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakty",
     "HOME": "Domů",
     "AGENTS": "Agenti",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Schránky",
     "NOTIFICATIONS": "Oznámení",
     "CANNED_RESPONSES": "Konzervované odpovědi",
@@ -189,6 +190,7 @@
     "LABELS": "Štítky",
     "CUSTOM_ATTRIBUTES": "Vlastní atributy",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Týmy",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/da/agentBots.json b/app/javascript/dashboard/i18n/locale/da/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/bulkActions.json b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
index e3f58f562..69bf09603 100644
--- a/app/javascript/dashboard/i18n/locale/da/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} samtaler valgt",
     "AGENT_SELECT_LABEL": "Vælg Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Er du sikker på, at du vil tildele %{conversationCount} %{conversationLabel} til",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Gå tilbage",
     "ASSIGN_LABEL": "Tildel",
+    "YES": "Ja",
     "ASSIGN_AGENT_TOOLTIP": "Tildel Agent",
     "ASSIGN_SUCCESFUL": "Samtaler tildelt",
     "ASSIGN_FAILED": "Mislykkedes at tildele samtaler, prøv igen",
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index bafc23671..eeb3f766a 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Fejl under publicering af artikel",
-        "SUCCESS": "Artikel publiceret med succes"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 606dd4778..17e1af98b 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "Du skal konfigurere webhook URL i facebook udvikler portal med den URL, der er nævnt her."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Opret WhatsApp Kanal",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Din indbakke er klar!",
-      "MESSAGE": "Du kan nu engagere dig med dine kunder gennem din nye kanal. Glædelig supportering ",
+      "MESSAGE": "Du kan nu engagere dig med dine kunder gennem din nye kanal. Glædelig supportering",
       "BUTTON_TEXT": "Tag mig med dertil",
       "MORE_SETTINGS": "Flere indstillinger",
       "WEBSITE_SUCCESS": "Du er færdig med at oprette en hjemmeside kanal. Kopier koden vist nedenfor og indsæt den på din hjemmeside. Næste gang en kunde bruger live chat, vil samtalen automatisk vises i din indbakke."
diff --git a/app/javascript/dashboard/i18n/locale/da/macros.json b/app/javascript/dashboard/i18n/locale/da/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 11cf31267..72c6bbd0c 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakter",
     "HOME": "Hjem",
     "AGENTS": "Agenter",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Indbakker",
     "NOTIFICATIONS": "Notifikationer",
     "CANNED_RESPONSES": "Standardsvar Svar",
@@ -189,6 +190,7 @@
     "LABELS": "Etiketter",
     "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber",
     "AUTOMATION": "Automatisering",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Fakturering",
     "CUSTOM_VIEWS_FOLDER": "Mapper",
diff --git a/app/javascript/dashboard/i18n/locale/de/agentBots.json b/app/javascript/dashboard/i18n/locale/de/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/bulkActions.json b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
index 376a230ae..0934f68ed 100644
--- a/app/javascript/dashboard/i18n/locale/de/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} Konversationen ausgewählt",
     "AGENT_SELECT_LABEL": "Agent auswählen",
-    "ASSIGN_CONFIRMATION_LABEL": "Sind Sie sicher, dass Sie %{conversationCount} %{conversationLabel} zuweisen möchten",
+    "ASSIGN_CONFIRMATION_LABEL": "Sind Sie sicher, %{conversationCount} %{conversationLabel} zuzuweisen",
+    "UNASSIGN_CONFIRMATION_LABEL": "Möchten Sie die Zuweisung von %{conversationCount} %{conversationLabel} wirklich aufheben?",
     "GO_BACK_LABEL": "Zurück",
     "ASSIGN_LABEL": "Zuordnen",
+    "YES": "Ja",
     "ASSIGN_AGENT_TOOLTIP": "Agent zuweisen",
     "ASSIGN_SUCCESFUL": "Konversationen erfolgreich zugewiesen",
     "ASSIGN_FAILED": "Konversationen konnten nicht zugewiesen werden. Bitte versuchen Sie es erneut",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 47978112d..af98b2415 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "Sie müssen die Webhook-URL im Facebook-Entwicklerportal mit der hier genannten URL konfigurieren."
+          "SUBTITLE": "Sie müssen die Webhook-URL und das Verifizierungstoken im Facebook-Entwicklerportal mit den unten gezeigten Werten konfigurieren.",
+          "WEBHOOK_URL": "Webhook-URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook-Verifizierungstoken"
         },
         "SUBMIT_BUTTON": "WhatsApp-Kanal erstellen",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Ihr Posteingang ist fertig!",
-      "MESSAGE": "Sie können jetzt über Ihren neuen Kanal mit Ihren Kunden in Kontakt treten. Viel Spaß beim Unterstützen",
+      "MESSAGE": "Sie können jetzt über Ihren neuen Kanal mit Ihren Kunden in Kontakt treten. Fröhliches Unterstützen",
       "BUTTON_TEXT": "Bring mich dahin",
       "MORE_SETTINGS": "Weitere Einstellungen",
       "WEBSITE_SUCCESS": "Sie haben die Erstellung eines Website-Kanals erfolgreich abgeschlossen. Kopieren Sie den unten gezeigten Code und fügen Sie ihn in Ihre Website ein. Wenn ein Kunde das nächste Mal den Live-Chat verwendet, wird die Konversation automatisch in Ihrem Posteingang angezeigt."
diff --git a/app/javascript/dashboard/i18n/locale/de/macros.json b/app/javascript/dashboard/i18n/locale/de/macros.json
new file mode 100644
index 000000000..8dc20df61
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Makros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 4b59667b9..018ff02d1 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakte",
     "HOME": "Hauptseite",
     "AGENTS": "Agenten",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Posteingänge",
     "NOTIFICATIONS": "Push-Benachrichtigungen",
     "CANNED_RESPONSES": "Vorgefertigte Antworten",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute",
     "AUTOMATION": "Automatisierung",
+    "MACROS": "Makros",
     "TEAMS": "Teams",
     "BILLING": "Rechnungen",
     "CUSTOM_VIEWS_FOLDER": "Ordner",
diff --git a/app/javascript/dashboard/i18n/locale/es/agentBots.json b/app/javascript/dashboard/i18n/locale/es/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/bulkActions.json b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
index fd8a1448b..aac75b846 100644
--- a/app/javascript/dashboard/i18n/locale/es/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
@@ -3,8 +3,10 @@
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversaciones seleccionadas",
     "AGENT_SELECT_LABEL": "Seleccionar agente",
     "ASSIGN_CONFIRMATION_LABEL": "¿Está seguro que desea asignar %{conversationCount} %{conversationLabel} a",
+    "UNASSIGN_CONFIRMATION_LABEL": "¿Está seguro de desasignar %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Volver",
     "ASSIGN_LABEL": "Asignar",
+    "YES": "Si",
     "ASSIGN_AGENT_TOOLTIP": "Asignar agente",
     "ASSIGN_SUCCESFUL": "Conversaciones asignadas con éxito",
     "ASSIGN_FAILED": "Error al asignar conversaciones, inténtelo de nuevo",
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index dd2d48050..8bd2ad405 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -59,19 +59,19 @@
         }
       },
       "BUTTONS": {
-        "ARCHIVE": "Archive article",
-        "DELETE": "Delete article"
+        "ARCHIVE": "Archivar artículo",
+        "DELETE": "Eliminar artículo"
       }
     },
     "PORTAL": {
-      "HEADER": "Portals",
-      "DEFAULT": "Default",
-      "NEW_BUTTON": "New Portal",
+      "HEADER": "Portales",
+      "DEFAULT": "Predeterminado",
+      "NEW_BUTTON": "Nuevo Portal",
       "ACTIVE_BADGE": "activo",
-      "CHOOSE_LOCALE_LABEL": "Choose a locale",
-      "LOADING_MESSAGE": "Loading portals...",
-      "ARTICLES_LABEL": "articles",
-      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "CHOOSE_LOCALE_LABEL": "Elige un idioma",
+      "LOADING_MESSAGE": "Cargando portales...",
+      "ARTICLES_LABEL": "artículos",
+      "NO_PORTALS_MESSAGE": "No hay portales disponibles",
       "ADD_NEW_LOCALE": "Add a new locale",
       "POPOVER": {
         "TITLE": "Portals",
@@ -83,7 +83,7 @@
       "PORTAL_SETTINGS": {
         "LIST_ITEM": {
           "HEADER": {
-            "COUNT_LABEL": "articles",
+            "COUNT_LABEL": "artículos",
             "ADD": "Add locale",
             "VISIT": "Visit site",
             "SETTINGS": "Ajustes",
@@ -255,7 +255,7 @@
         "PORTAL": "Portal",
         "LOCALE": {
           "LABEL": "Locale",
-          "PLACEHOLDER": "Choose a locale",
+          "PLACEHOLDER": "Elige un idioma",
           "ERROR": "Locale is required"
         },
         "BUTTONS": {
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index c9386532d..659ca12bc 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL de devolución de llamada",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL de Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Crear canal de WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "¡Tu bandeja de entrada está lista!",
-      "MESSAGE": "Ahora puedes colaborar con tus clientes a través de tu nuevo canal. Feliz soporte ",
+      "MESSAGE": "Ahora puedes colaborar con tus clientes a través de tu nuevo canal. Feliz soporte",
       "BUTTON_TEXT": "Llévame allí",
       "MORE_SETTINGS": "Más ajustes",
       "WEBSITE_SUCCESS": "Has terminado de crear un canal del sitio web. Copia el código que se muestra a continuación y pégalo en tu sitio web. La próxima vez que un cliente use el chat en vivo, la conversación aparecerá automáticamente en su bandeja de entrada."
diff --git a/app/javascript/dashboard/i18n/locale/es/macros.json b/app/javascript/dashboard/i18n/locale/es/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 88bfa4f4d..72d8b3e09 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contactos",
     "HOME": "Inicio",
     "AGENTS": "Agentes",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Entradas",
     "NOTIFICATIONS": "Notificaciones",
     "CANNED_RESPONSES": "Respuestas predefinidas",
@@ -189,6 +190,7 @@
     "LABELS": "Etiquetas",
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automatización",
+    "MACROS": "Macros",
     "TEAMS": "Equipos",
     "BILLING": "Facturación",
     "CUSTOM_VIEWS_FOLDER": "Carpetas",
diff --git a/app/javascript/dashboard/i18n/locale/fa/agentBots.json b/app/javascript/dashboard/i18n/locale/fa/agentBots.json
new file mode 100644
index 000000000..7b3473fe1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "ربات‌ها"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
index 34c647507..4d9a00887 100644
--- a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} گفتگو انتخاب شده است",
     "AGENT_SELECT_LABEL": "انتخاب ایجنت",
-    "ASSIGN_CONFIRMATION_LABEL": "آیا مطمئن هستید که می‌خواهید %{conversationCount} %{conversationLabel} را به آن اختصاص دهید؟",
+    "ASSIGN_CONFIRMATION_LABEL": "آیا مطمئن هستید که به %{conversationCount} %{conversationLabel} اختصاص می‌دهید",
+    "UNASSIGN_CONFIRMATION_LABEL": "آیا مطمئنید که %{conversationCount} %{conversationLabel} را می‌خواهید اختصاص را لغو کنید؟",
     "GO_BACK_LABEL": "بازگشت",
     "ASSIGN_LABEL": "اختصاص دادن",
+    "YES": "بله",
     "ASSIGN_AGENT_TOOLTIP": "تعیین ایجنت",
     "ASSIGN_SUCCESFUL": "گفتگو با موفقیت اختصاص داده شده",
     "ASSIGN_FAILED": "گفتگو اختصاص داده نشد، لطفا دوباره امتحان کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index c5d2a6e47..d2ec71df9 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "آدرس URL مربوط به API",
-          "SUBTITLE": "شما باید URL webhook را در پورتال توسعه دهنده فیس بوک با URL ذکر شده در اینجا پیکربندی کنید."
+          "SUBTITLE": "شما باید URL webhook و رمز تأیید را در پورتال توسعه دهنده فیس بوک با مقادیر نشان داده شده در زیر پیکربندی کنید.",
+          "WEBHOOK_URL": "آدرس URL وب هوک",
+          "WEBHOOK_VERIFICATION_TOKEN": "توکن تایید Webhook"
         },
         "SUBMIT_BUTTON": "ایجاد کانال واتساپ",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "صندوق ورودی حاضره!",
-      "MESSAGE": "حالا از طریق این کانال جدید می‌توانید با مشتریان صحبت کنید. به امید موفقیت ",
+      "MESSAGE": "حالا از طریق این کانال جدید می‌توانید با مشتریان صحبت کنید. به امید موفقیت",
       "BUTTON_TEXT": "نشانم بده",
       "MORE_SETTINGS": "تنظیمات بیشتر",
       "WEBSITE_SUCCESS": "ساختن کانال وب سایت با موفقیت انجام شد. قطعه کد زیر را کپی کرده و در سایت خود قرار دهید. در صورتیکه مشتری از ویجت پشتیبانی آنلاین استفاده کند گفتگوی شما در این صندوق ورودی ظاهر می‌شود."
diff --git a/app/javascript/dashboard/i18n/locale/fa/macros.json b/app/javascript/dashboard/i18n/locale/fa/macros.json
new file mode 100644
index 000000000..15a8b2aac
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "ماکروها"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 1509fe102..50efa9bf5 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "مخاطبین",
     "HOME": "صفحه اصلی",
     "AGENTS": "ایجنت ها",
+    "AGENT_BOTS": "ربات‌ها",
     "INBOXES": "صندوق‌های ورودی",
     "NOTIFICATIONS": "اعلان ها",
     "CANNED_RESPONSES": "پاسخ‌های آماده",
@@ -189,6 +190,7 @@
     "LABELS": "برچسب‌ها",
     "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی",
     "AUTOMATION": "خودکارسازی",
+    "MACROS": "ماکروها",
     "TEAMS": "تیم‌ها",
     "BILLING": "صورتحساب",
     "CUSTOM_VIEWS_FOLDER": "پوشه‌ها",
diff --git a/app/javascript/dashboard/i18n/locale/fi/agentBots.json b/app/javascript/dashboard/i18n/locale/fi/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
index cdabb75b3..9db1cd3fd 100644
--- a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Valitse edustaja",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Mene takaisin",
     "ASSIGN_LABEL": "Delegoi",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index 8eb3b3dec..4ae2a207c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 544b82e24..e99f251d6 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhookin URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Postilaatikkosi on valmis!",
-      "MESSAGE": "Voit nyt sitoutua asiakkaisiisi uuden kanavan kautta. Hyvää asiakaspalveluhenkeä! ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Vie minut sinne",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Olet onnistuneesti lisännyt sivuston chat-widgetin. Kopioi alla näkyvä koodi ja liitä se verkkosivuillesi. Seuraavalla kerralla kun asiakas käyttää live-keskustelua, keskustelu ilmestyy automaattisesti saapuneet-kansioon."
diff --git a/app/javascript/dashboard/i18n/locale/fi/macros.json b/app/javascript/dashboard/i18n/locale/fi/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index bb2d658fb..67658e498 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Yhteystiedot",
     "HOME": "Koti",
     "AGENTS": "Edustajat",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Kansiot",
     "NOTIFICATIONS": "Ilmoitukset",
     "CANNED_RESPONSES": "Tallennetut vastaukset",
@@ -189,6 +190,7 @@
     "LABELS": "Tunnisteet",
     "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/fr/agentBots.json b/app/javascript/dashboard/i18n/locale/fr/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
index c462b31f9..bee42ca54 100644
--- a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Sélectionner un agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assigner",
+    "YES": "Oui",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index a2f5f6285..708814093 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 842382479..ff92c8ff9 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL de rappel (callback)",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL du Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Créer le canal WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Votre boîte de réception est prête !",
-      "MESSAGE": "Vous pouvez maintenant vous impliquer auprès de vos clients par le biais de votre nouveau canal. Bonne assistance ",
+      "MESSAGE": "Vous pouvez maintenant vous impliquer auprès de vos clients par le biais de votre nouveau canal. Bonne assistance",
       "BUTTON_TEXT": "Emmenez-moi là",
       "MORE_SETTINGS": "Plus de paramètres",
       "WEBSITE_SUCCESS": "Vous avez terminé avec succès la création d'un canal Web. Copiez le code affiché ci-dessous et collez-le sur votre site web. La prochaine fois qu'un client utilisera le chat en direct, la conversation apparaîtra automatiquement dans votre boîte de réception."
diff --git a/app/javascript/dashboard/i18n/locale/fr/macros.json b/app/javascript/dashboard/i18n/locale/fr/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 002b1f31e..f235c02fd 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Accueil",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Boîtes de réception",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Réponses standardisées",
@@ -189,6 +190,7 @@
     "LABELS": "Étiquettes",
     "CUSTOM_ATTRIBUTES": "Attributs personnalisés",
     "AUTOMATION": "Automatisations",
+    "MACROS": "Macros",
     "TEAMS": "Équipes",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Dossiers",
diff --git a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
index 4d435a084..99ad1eea8 100644
--- a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
@@ -1,90 +1,90 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "סינון שיחות",
+    "SUBTITLE": "הוסף מסננים למטה והקש על 'החל מסננים' כדי לסנן שיחות.",
+    "ADD_NEW_FILTER": "הוסף מסנן",
+    "FILTER_DELETE_ERROR": "צריך להיות לפחות מסנן אחד כדי לשמור",
+    "SUBMIT_BUTTON_LABEL": "שמור סננים",
     "CANCEL_BUTTON_LABEL": "ביטול",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "מחק סננים",
+    "EMPTY_VALUE_ERROR": "חובה ערך",
+    "TOOLTIP_LABEL": "סינון שיחות",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "ו/גם",
+      "OR": "או"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
-      "does_not_contain": "Does not contain",
-      "is_present": "Is present",
-      "is_not_present": "Is not present",
-      "is_greater_than": "Is greater than",
-      "is_less_than": "Is lesser than",
-      "days_before": "Is x days before"
+      "equal_to": "שווה ל",
+      "not_equal_to": "לא שווה ל",
+      "contains": "מכיל",
+      "does_not_contain": "לא מכיל",
+      "is_present": "נוכח",
+      "is_not_present": "לא נוכח",
+      "is_greater_than": "גדול מ",
+      "is_less_than": "קטן מ",
+      "days_before": "זה x ימים לפני"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "נכון",
+      "FALSE": "לא נכון"
     },
     "ATTRIBUTES": {
       "STATUS": "מצב",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "משויך ל",
       "INBOX_NAME": "שם תיבת הדואר הנכנס",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
-      "LABELS": "Labels",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
+      "TEAM_NAME": "שם צוות",
+      "CONVERSATION_IDENTIFIER": "מזהה שיחה",
+      "CAMPAIGN_NAME": "שם קמפיין",
+      "LABELS": "תוויות",
+      "BROWSER_LANGUAGE": "שפת דפדפן",
+      "COUNTRY_NAME": "שם המדינה",
+      "REFERER_LINK": "קישור מפנה",
+      "CUSTOM_ATTRIBUTE_LIST": "רשימה",
+      "CUSTOM_ATTRIBUTE_TEXT": "טקסט",
+      "CUSTOM_ATTRIBUTE_NUMBER": "מספר",
+      "CUSTOM_ATTRIBUTE_LINK": "קישור",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "תיבת סימון",
+      "CREATED_AT": "הוקם ב",
       "LAST_ACTIVITY": "פעילות אחרונה"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "סננים סטנדרטיים",
+      "ADDITIONAL_FILTERS": "סננים נוספים",
       "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
+        "TITLE": "האם אתה רוצה לשמור את המסנן הזה?",
+        "LABEL": "תן שם למסנן הזה",
+        "PLACEHOLDER": "תן שם למסנן הזה",
         "ERROR_MESSAGE": "שם שדה חובה",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "שמור מסנן",
         "CANCEL_BUTTON": "ביטול",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "התיקיה נשמרה בהצלחה",
+          "ERROR_MESSAGE": "שגיאה או תקלה בהקמת התיקיה"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "הסגמנט נשמר בהצלחה",
+          "ERROR_MESSAGE": "תקלה או שגיאה בהקמת הסגמנט"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "מחק מסנן",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "אשר מחיקה",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "האם אתה בטוח למחוק הסנן הזה ",
             "YES": "כן, מחק",
             "NO": "לא, השאר"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "תיקיה נמחקה בהצלחה",
+          "ERROR_MESSAGE": "שגיאה או תקלה במחיקת תיקיה"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "SUCCESS_MESSAGE": "סגמנט נמחק בהצלחה",
           "ERROR_MESSAGE": "Error while deleting segment"
         }
       }
diff --git a/app/javascript/dashboard/i18n/locale/he/agentBots.json b/app/javascript/dashboard/i18n/locale/he/agentBots.json
new file mode 100644
index 000000000..fb1a82e2c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "בוטים"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
index 31b888798..a60c05396 100644
--- a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
@@ -1,11 +1,11 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "מאפיינים בהתאמה אישית",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
+    "HEADER_BTN_TXT": "הוסף מאפיין מותאם אישית",
+    "LOADING": "שולף מאפיינים מותאמים אישית",
     "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "הוסף מאפיין מותאם אישית",
       "SUBMIT": "צור",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "FORM": {
@@ -31,14 +31,14 @@
           "LIST": {
             "LABEL": "List Values",
             "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "ERROR": "חובה להזין לפחות ערך אחד"
           }
         },
         "KEY": {
           "LABEL": "מפתח",
           "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "ERROR": "מפתח הוא שדה חובה",
+          "IN_VALID": "מפתח אינו חוקי"
         }
       },
       "API": {
@@ -50,7 +50,7 @@
       "BUTTON_TEXT": "מחק",
       "API": {
         "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "ERROR_MESSAGE": "לא ניתן למחוק את המאפיין המותאם אישית. נסה שנית."
       },
       "CONFIRM": {
         "TITLE": "האם אתה בטוח רוצה למחוק - %{attributeName}",
@@ -65,7 +65,7 @@
       "UPDATE_BUTTON_TEXT": "עדכן",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
+          "LABEL": "רשימת ערכים",
           "PLACEHOLDER": "Please enter values and press enter key"
         }
       },
diff --git a/app/javascript/dashboard/i18n/locale/he/bulkActions.json b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
index fa9986db2..63e5f11f6 100644
--- a/app/javascript/dashboard/i18n/locale/he/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "בחר סוכן",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "שייך",
+    "YES": "כן",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/he/contactFilters.json b/app/javascript/dashboard/i18n/locale/he/contactFilters.json
index cd5ce68a4..21b968262 100644
--- a/app/javascript/dashboard/i18n/locale/he/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/he/contactFilters.json
@@ -2,28 +2,28 @@
     "CONTACTS_FILTER": {
         "TITLE": "Filter Contacts",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
+        "ADD_NEW_FILTER": "הוסף מסנן",
         "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "FILTER_DELETE_ERROR": "צריך להיות לפחות מסנן אחד כדי לשמור",
         "SUBMIT_BUTTON_LABEL": "שלח",
         "CANCEL_BUTTON_LABEL": "ביטול",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
+        "CLEAR_BUTTON_LABEL": "מחק סננים",
+        "EMPTY_VALUE_ERROR": "חובה ערך",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "ו/גם",
+            "OR": "או"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present",
-            "is_greater_than": "Is greater than",
+            "equal_to": "שווה ל",
+            "not_equal_to": "לא שווה ל",
+            "contains": "מכיל",
+            "does_not_contain": "לא מכיל",
+            "is_present": "נוכח",
+            "is_not_present": "לא נוכח",
+            "is_greater_than": "גדול מ",
             "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
+            "days_before": "זה x ימים לפני"
         },
         "ATTRIBUTES": {
             "NAME": "שם",
@@ -32,18 +32,18 @@
             "IDENTIFIER": "Identifier",
             "CITY": "עיר",
             "COUNTRY": "מדינה",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-            "CREATED_AT": "Created At",
+            "CUSTOM_ATTRIBUTE_LIST": "רשימה",
+            "CUSTOM_ATTRIBUTE_TEXT": "טקסט",
+            "CUSTOM_ATTRIBUTE_NUMBER": "מספר",
+            "CUSTOM_ATTRIBUTE_LINK": "קישור",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "תיבת סימון",
+            "CREATED_AT": "הוקם ב",
             "LAST_ACTIVITY": "פעילות אחרונה",
             "REFERER_LINK": "Referrer link"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "סננים סטנדרטיים",
+            "ADDITIONAL_FILTERS": "סננים נוספים",
             "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 3a121e019..63f079386 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -66,19 +66,19 @@
       "RESOLVED": "סמן כפתור",
       "REOPEN": "פתח מחדש את השיחה",
       "SNOOZE": {
-        "TITLE": "Snooze",
+        "TITLE": "נודניק",
         "NEXT_REPLY": "עד תגובה הבאה",
         "TOMORROW": "עד מחר",
         "NEXT_WEEK": "עד שבוע הבא"
       },
       "ASSIGN_AGENT": "שייך סוכן",
-      "ASSIGN_LABEL": "Assign label",
+      "ASSIGN_LABEL": "ההקצה תווית",
       "AGENTS_LOADING": "טוען סוכנים...",
       "ASSIGN_TEAM": "שייך צוות",
       "API": {
         "AGENT_ASSIGNMENT": {
           "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
-          "FAILED": "Couldn't assign agent. Please try again."
+          "FAILED": "השמת הסוכן לא הצליחה. בבקשה נסה שנית."
         },
         "LABEL_ASSIGNMENT": {
           "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
@@ -91,12 +91,12 @@
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "MESSAGE_SIGN_TOOLTIP": "חתימת הודעה",
       "ENABLE_SIGN_TOOLTIP": "אפשר חתימה",
       "DISABLE_SIGN_TOOLTIP": "נטרל חתימה",
       "MSG_INPUT": "Shift + Enter עבור שורה חדשה. התחל עם '/' כדי לבחור תגובה מוכנה.",
       "PRIVATE_MSG_INPUT": "Shift + Enter עבור שורה חדשה. זה יהיה גלוי רק לסוכנים",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "חתימת הודעה אינה מוגדרת, נא הגדר אותה בהגדרות הפרופיל.",
       "CLICK_HERE": "לחץ כאן כדי לעדכן"
     },
     "REPLYBOX": {
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index de5bc68df..1f0bc6e86 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/he/macros.json b/app/javascript/dashboard/i18n/locale/he/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 3216cf128..0266fcdcb 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -179,7 +179,7 @@
     "CONTACTS": "איש קשר",
     "HOME": "בית",
     "AGENTS": "סוכנים",
-    "AGENT_BOTS": "Bots",
+    "AGENT_BOTS": "בוטים",
     "INBOXES": "תיבות דואר נכנס",
     "NOTIFICATIONS": "התראות",
     "CANNED_RESPONSES": "תגובות מוכנות",
diff --git a/app/javascript/dashboard/i18n/locale/hi/agentBots.json b/app/javascript/dashboard/i18n/locale/hi/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index 9c18b4c7f..19373d9ee 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 09a6210da..f9f97ea36 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/hi/macros.json b/app/javascript/dashboard/i18n/locale/hi/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 18e2c149b..c5f954b1c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentBots.json b/app/javascript/dashboard/i18n/locale/hu/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
index 268b2feb8..9a1e44390 100644
--- a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Ügynök kiválasztása",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Hozzárendelés",
+    "YES": "Igen",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index 901130d51..5dcd660cd 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index cdd6ebc6e..18d104ffb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Visszahívás URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "A fiókod elkészült!",
-      "MESSAGE": "Most már tudsz egyeztetni az ügyfeleiddel az új csatornán. Boldog támgoatást ",
+      "MESSAGE": "Most már tudsz egyeztetni az ügyfeleiddel az új csatornán. Boldog támgoatást",
       "BUTTON_TEXT": "Vigyél oda",
       "MORE_SETTINGS": "További beállítások",
       "WEBSITE_SUCCESS": "Sikeresen létrehoztad a website csatornát. Másold az itt látható kódot és helyezd el a weboldaladon. Legközelebb, mikor egy ügyfél az élő chatben van, a beszélgetés automatikusan megjelenik az inboxodban."
diff --git a/app/javascript/dashboard/i18n/locale/hu/macros.json b/app/javascript/dashboard/i18n/locale/hu/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index f32c65d5b..b04276753 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontaktok",
     "HOME": "Nyitólap",
     "AGENTS": "Ügynökök",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Bejövők",
     "NOTIFICATIONS": "Értesítések",
     "CANNED_RESPONSES": "Mentett válaszok",
@@ -189,6 +190,7 @@
     "LABELS": "Cimkék",
     "CUSTOM_ATTRIBUTES": "Egyedi atribútumok",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Csapatok",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/id/agentBots.json b/app/javascript/dashboard/i18n/locale/id/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/bulkActions.json b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
index 93ac7f420..7c3f6c2dc 100644
--- a/app/javascript/dashboard/i18n/locale/id/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Pilih Agen",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Tugaskan",
+    "YES": "Ya",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index 0c705ea16..88f165686 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index bd3c6003e..97b54fbe9 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL Callback",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Kotak Masuk anda sudah siap!",
-      "MESSAGE": "Anda sekarang dapat menangani pelanggan Anda melalui Channel baru Anda. Selamat mendukung ",
+      "MESSAGE": "Anda sekarang dapat menangani pelanggan Anda melalui Channel baru Anda. Selamat mendukung",
       "BUTTON_TEXT": "Pergi ke Kotak Masuk",
       "MORE_SETTINGS": "Pengaturan lebih lengkap",
       "WEBSITE_SUCCESS": "Anda telah berhasil menyelesaikan pembuatan channel website. Salin kode yang ditunjukkan di bawah ini dan tempelkan di website Anda. Saat pelanggan menggunakan live chat, percakapan tersebut secara otomatis akan muncul di kotak masuk Anda."
diff --git a/app/javascript/dashboard/i18n/locale/id/macros.json b/app/javascript/dashboard/i18n/locale/id/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 98ef217bf..e820579f6 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontak",
     "HOME": "Home",
     "AGENTS": "Agen",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Kotak masuk",
     "NOTIFICATIONS": "Notifikasi",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Label",
     "CUSTOM_ATTRIBUTES": "Atribut Kustom",
     "AUTOMATION": "Otomatisasi",
+    "MACROS": "Macros",
     "TEAMS": "Tim",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/it/agentBots.json b/app/javascript/dashboard/i18n/locale/it/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/bulkActions.json b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
index d5afa79e9..20d4e7190 100644
--- a/app/javascript/dashboard/i18n/locale/it/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversazioni selezionate",
     "AGENT_SELECT_LABEL": "Seleziona agente",
-    "ASSIGN_CONFIRMATION_LABEL": "Sei sicuro di voler assegnare %{conversationCount} %{conversationLabel} a",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Torna indietro",
     "ASSIGN_LABEL": "Assegna",
+    "YES": "Sì",
     "ASSIGN_AGENT_TOOLTIP": "Assegna agente",
     "ASSIGN_SUCCESFUL": "Conversazioni assegnate correttamente",
     "ASSIGN_FAILED": "Assegnazione delle conversazioni non riuscita, riprova",
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index 3a9736f27..a49f19665 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Errore durante la pubblicazione dell'articolo",
-        "SUCCESS": "Articolo pubblicato con successo"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 6a4f197ac..eadce20a4 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL di callback",
-          "SUBTITLE": "È necessario configurare l'URL del webhook nel portale sviluppatore di facebook con l'URL menzionato qui."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL del webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Crea un canale WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "La casella è pronta!",
-      "MESSAGE": "Ora puoi interagire con i tuoi clienti attraverso il nuovo canale. Buona assistenza ",
+      "MESSAGE": "Ora puoi interagire con i tuoi clienti attraverso il nuovo canale. Buona assistenza",
       "BUTTON_TEXT": "Portami lì",
       "MORE_SETTINGS": "Altre impostazioni",
       "WEBSITE_SUCCESS": "Hai completato la creazione di un canale sito web. Copia il codice mostrato qui sotto e incollalo sul tuo sito. La prossima volta che un cliente usa la live chat, la conversazione apparirà automaticamente nella tua casella."
diff --git a/app/javascript/dashboard/i18n/locale/it/macros.json b/app/javascript/dashboard/i18n/locale/it/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index cc0bde8ad..5f768aae4 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contatti",
     "HOME": "Home",
     "AGENTS": "Agenti",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Posta",
     "NOTIFICATIONS": "Notifiche",
     "CANNED_RESPONSES": "Risposte predefinite",
@@ -189,6 +190,7 @@
     "LABELS": "Etichette",
     "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
     "AUTOMATION": "Automazione",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Fatturazione",
     "CUSTOM_VIEWS_FOLDER": "Cartelle",
diff --git a/app/javascript/dashboard/i18n/locale/ja/agentBots.json b/app/javascript/dashboard/i18n/locale/ja/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
index 6af2bb98a..2bd7ccfbf 100644
--- a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
@@ -90,10 +90,10 @@
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No results found."
+      "NO_RESULTS": "該当結果が見つかりませんでした。"
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "該当なし",
       "TITLE": {
         "AGENT": "Select agent",
         "TEAM": "Select team"
diff --git a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 495b236b2..612846bd7 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -173,8 +173,8 @@
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
+        "LABEL": "件名",
+        "PLACEHOLDER": "件名",
         "ERROR": "Subject can't be empty"
       },
       "MESSAGE": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 3c0aa6d3e..091570063 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -4,43 +4,43 @@
     "CSAT_REPLY_MESSAGE": "Please rate the conversation",
     "404": "Sorry, we cannot find the conversation. Please try again",
     "SWITCH_VIEW_LAYOUT": "Switch the layout",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "DASHBOARD_APP_TAB_MESSAGES": "メッセージ",
+    "UNVERIFIED_SESSION": "このユーザーの身元は確認されていません",
     "NO_MESSAGE_1": "おっと！受信トレイに顧客からのメッセージがないようです。",
     "NO_MESSAGE_2": " to send a message to your page!",
     "NO_INBOX_1": "まだ受信トレイを追加していないようです。",
     "NO_INBOX_2": " 始めましょう",
     "NO_INBOX_AGENT": "あなたに受信トレイが設定されていないようです。管理者に問い合わせてください。",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "会話中のメッセージの検索",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
+      "TITLE": "メッセージを検索",
+      "RESULT_TITLE": "検索結果",
       "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "PLACEHOLDER": "テキストを入力してメッセージを検索します",
+      "NO_MATCHING_RESULTS": "該当結果が見つかりませんでした。"
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "未読メッセージ",
+    "UNREAD_MESSAGE": "未読メッセージ",
     "CLICK_HERE": "ここをクリック",
     "LOADING_INBOXES": "受信トレイを読み込み中",
     "LOADING_CONVERSATIONS": "会話データを読み込んでいます",
     "CANNOT_REPLY": "以下の理由で返信できません：",
     "24_HOURS_WINDOW": "24 hour message window restriction",
     "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "ASSIGN_TO_ME": "自分に割り当て",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "SELECT_A_TWEET_TO_REPLY": "返信するツイートを選択してください。",
     "REPLYING_TO": "以下に返信：",
     "REMOVE_SELECTION": "選択項目を削除",
     "DOWNLOAD": "ダウンロード",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "UNKNOWN_FILE_TYPE": "不明なファイル",
+    "UPLOADING_ATTACHMENTS": "添付ファイルをアップロード中...",
+    "SUCCESS_DELETE_MESSAGE": "メッセージの削除に成功",
+    "FAIL_DELETE_MESSSAGE": "メッセージを削除できませんでした！もう一度お試しください",
     "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "RATING_TITLE": "評価",
+    "FEEDBACK_TITLE": "フィードバック",
     "HEADER": {
       "RESOLVE_ACTION": "解決する",
       "REOPEN_ACTION": "再開する",
@@ -48,41 +48,41 @@
       "OPEN": "もっと見る",
       "CLOSE": "閉じる",
       "DETAILS": "詳細",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "明日までスヌーズしました",
+      "SNOOZED_UNTIL_NEXT_WEEK": "来週までスヌーズ",
+      "SNOOZED_UNTIL_NEXT_REPLY": "次の返信までうたた寝。"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "保留としてマークする",
       "SNOOZE": {
-        "TITLE": "Snooze until",
+        "TITLE": "までスヌーズする",
         "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TOMORROW": "明日",
+        "NEXT_WEEK": "次週"
       }
     },
     "CARD_CONTEXT_MENU": {
-      "PENDING": "Mark as pending",
-      "RESOLVED": "Mark as resolved",
+      "PENDING": "保留としてマークする",
+      "RESOLVED": "解決済みとしてマークする",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
-        "TITLE": "Snooze",
+        "TITLE": "スヌーズ",
         "NEXT_REPLY": "Until next reply",
-        "TOMORROW": "Until tomorrow",
-        "NEXT_WEEK": "Until next week"
+        "TOMORROW": "明日まで",
+        "NEXT_WEEK": "来週まで"
       },
-      "ASSIGN_AGENT": "Assign agent",
-      "ASSIGN_LABEL": "Assign label",
-      "AGENTS_LOADING": "Loading agents...",
-      "ASSIGN_TEAM": "Assign team",
+      "ASSIGN_AGENT": "エージェントを割り当てる",
+      "ASSIGN_LABEL": "ラベルを割り当てる",
+      "AGENTS_LOADING": "エージェントを読み込む...",
+      "ASSIGN_TEAM": "チームを割り当てる",
       "API": {
         "AGENT_ASSIGNMENT": {
-          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
-          "FAILED": "Couldn't assign agent. Please try again."
+          "SUCCESFUL": "会話 ID %{conversationId} が \"%{agentName}\" に割り当てられました",
+          "FAILED": "エージェントを割り当てられませんでした。もう一度お試しください。"
         },
         "LABEL_ASSIGNMENT": {
           "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
-          "FAILED": "Couldn't assign label. Please try again."
+          "FAILED": "ラベルを割り当てることができませんでした。もう一度やり直してください。"
         },
         "TEAM_ASSIGNMENT": {
           "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
@@ -166,7 +166,7 @@
       "SEND_TO_AGENT": "Send the transcript to the assigned agent",
       "SEND_TO_OTHER_EMAIL_ADDRESS": "会話の記録を別のEメールアドレスに転送する\n",
       "EMAIL": {
-        "PLACEHOLDER": "Eメールアドレスを入力してください",
+        "PLACEHOLDER": "メールアドレスを入力する",
         "ERROR": "正しいメールアドレスを入力してください"
       }
     }
@@ -233,10 +233,10 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
-    "BCC": "Bcc",
-    "CC": "Cc",
-    "SUBJECT": "Subject"
+    "FROM": "差出人:",
+    "TO": "宛先:",
+    "BCC": "ビーシーシー",
+    "CC": "シーシー",
+    "SUBJECT": "件名"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index 263545bf9..6b52e99e5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 408d72821..24b9c58be 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "コールバック URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "受信トレイの準備ができました！",
-      "MESSAGE": "新しいチャネルを通じてお客様と交流できるようになりました。 ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "ウェブサイトチャンネルの作成が正常に完了しました。以下のコードをコピーしてウェブサイトに貼り付けてください。 次回、お客様がライブチャットを使用すると、会話は自動的に受信トレイに表示されます。"
diff --git a/app/javascript/dashboard/i18n/locale/ja/macros.json b/app/javascript/dashboard/i18n/locale/ja/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index e9ce752ce..67bc172a4 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -397,7 +397,7 @@
       "HEADER": {
         "CONTACT_NAME": "Contact",
         "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
+        "RATING": "評価",
         "FEEDBACK_TEXT": "Feedback comment"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 3244fed87..c8bbe7662 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "ホーム",
     "AGENTS": "担当者",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "受信トレイ",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "定型文",
@@ -189,6 +190,7 @@
     "LABELS": "ラベル",
     "CUSTOM_ATTRIBUTES": "カスタム属性",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ka/agentBots.json b/app/javascript/dashboard/i18n/locale/ka/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
index 9c18b4c7f..19373d9ee 100644
--- a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index 09a6210da..f9f97ea36 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/ka/macros.json b/app/javascript/dashboard/i18n/locale/ka/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 18e2c149b..c5f954b1c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ko/agentBots.json b/app/javascript/dashboard/i18n/locale/ko/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
index ee83d0d2a..386a02d35 100644
--- a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "에이전트 선택",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "할당하다",
+    "YES": "예",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index 318e0550c..438d1d445 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 49bf52858..e2c228ae1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "콜백 URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "웹훅 URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "받은 메시지함이 준비됨!",
-      "MESSAGE": "이제 새로운 채널을 통해 고객과 대화할 수 있습니다. 행복한 지원 ",
+      "MESSAGE": "이제 새로운 채널을 통해 고객과 대화할 수 있습니다. 행복한 지원",
       "BUTTON_TEXT": "나를 그곳으로 데려주세요.",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "웹사이트 채널 만들기를 완료하셨습니다. 아래 표시된 코드를 복사하여 웹사이트에 붙여 넣으십시오. 다음에 고객이 라이브 채팅을 사용할 때 대화는 받은 편지함에 자동으로 표시됩니다."
diff --git a/app/javascript/dashboard/i18n/locale/ko/macros.json b/app/javascript/dashboard/i18n/locale/ko/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index ebbfed4a8..d2d07fa80 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "연락처",
     "HOME": "홈",
     "AGENTS": "에이전트",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "받은 메시지함",
     "NOTIFICATIONS": "알림",
     "CANNED_RESPONSES": "미리 준비된 답변",
@@ -189,6 +190,7 @@
     "LABELS": "라벨",
     "CUSTOM_ATTRIBUTES": "사용자 지정 특성",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "팀",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/lt/agentBots.json b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index 9c18b4c7f..19373d9ee 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 09a6210da..f9f97ea36 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/lt/macros.json b/app/javascript/dashboard/i18n/locale/lt/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index 18e2c149b..c5f954b1c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/lv/agentBots.json b/app/javascript/dashboard/i18n/locale/lv/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/bulkActions.json b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
index cb7b58ef9..0180ed0d7 100644
--- a/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "Izvēlētas %{conversationCount} sarunas",
     "AGENT_SELECT_LABEL": "Izvēlieties Aģentu",
-    "ASSIGN_CONFIRMATION_LABEL": "Vai tiešām vēlaties piešķirt %{conversationCount} %{conversationLabel}",
+    "ASSIGN_CONFIRMATION_LABEL": "Vai patiešām vēlaties piesaistīt %{conversationCount} %{conversationLabel} pie",
+    "UNASSIGN_CONFIRMATION_LABEL": "Vai patiešām vēlaties atsaistīt %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Atgriezties",
     "ASSIGN_LABEL": "Piešķirt",
+    "YES": "Jā",
     "ASSIGN_AGENT_TOOLTIP": "Piešķirt Aģentu",
     "ASSIGN_SUCCESFUL": "Sarunas ir veiksmīgi piešķirtas",
     "ASSIGN_FAILED": "Neizdevās piešķirt sarunas. Lūdzu, mēģiniet vēlreiz",
diff --git a/app/javascript/dashboard/i18n/locale/lv/macros.json b/app/javascript/dashboard/i18n/locale/lv/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/agentBots.json b/app/javascript/dashboard/i18n/locale/ml/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
index 74a4e54be..f077081df 100644
--- a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "ഏജന്റ് തിരഞ്ഞെടുക്കുക",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "നിയോഗിക്കുക",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index 3d7ad442e..b7bc6f038 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 06c54bdaf..a85db6de6 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "നിങ്ങളുടെ ഇൻ‌ബോക്സ് തയ്യാറാണ്!",
-      "MESSAGE": "നിങ്ങളുടെ പുതിയ ചാനലിലൂടെ നിങ്ങൾക്ക് ഇപ്പോൾ ഉപഭോക്താക്കളുമായി ഇടപഴകാൻ കഴിയും. പിന്തുണയ്ക്കുന്നതിൽ സന്തോഷിക്കൂ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "എന്നെ അവിടേക്ക് കൊണ്ടുപോകുക",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "നിങ്ങൾ ഒരു വെബ്‌സൈറ്റ് ചാനൽ സൃഷ്ടിക്കുന്നത് വിജയകരമായി പൂർത്തിയാക്കി. ചുവടെ കാണിച്ചിരിക്കുന്ന കോഡ് പകർത്തി നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ചേർക്കുക. അടുത്ത തവണ ഒരു ഉപഭോക്താവ് തത്സമയ ചാറ്റ് ഉപയോഗിക്കുമ്പോൾ, സംഭാഷണം ഓട്ടോമാറ്റിക് ആയി  നിങ്ങളുടെ ഇൻ‌ബോക്സിൽ ദൃശ്യമാകും."
diff --git a/app/javascript/dashboard/i18n/locale/ml/macros.json b/app/javascript/dashboard/i18n/locale/ml/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 54a50c076..5c5a77b57 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
     "HOME": "ഹോം",
     "AGENTS": "ഏജന്റുമാർ",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "ഇൻ‌ബോക്സുകൾ",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "ക്യാൻഡ് പ്രതികരണങ്ങൾ",
@@ -189,6 +190,7 @@
     "LABELS": "ലേബലുകൾ",
     "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "ഫോൾഡറുകൾ",
diff --git a/app/javascript/dashboard/i18n/locale/ms/agentBots.json b/app/javascript/dashboard/i18n/locale/ms/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
index b8facda9a..4e80a608a 100644
--- a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index ead2bce79..f4503577b 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/ms/macros.json b/app/javascript/dashboard/i18n/locale/ms/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index f80453711..190da056a 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Ejen",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ne/agentBots.json b/app/javascript/dashboard/i18n/locale/ne/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index 9c18b4c7f..19373d9ee 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index c8a4c04a7..dc7a6a4a6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/ne/macros.json b/app/javascript/dashboard/i18n/locale/ne/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 7ee46b61c..dea85ea48 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/nl/agentBots.json b/app/javascript/dashboard/i18n/locale/nl/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 99d969485..84cc240ec 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 874b17495..49faf6426 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Uw postvak is klaar!",
-      "MESSAGE": "Je kunt nu contact opnemen met je klanten via het nieuwe Kanaal. Gelukkige ondersteuning ",
+      "MESSAGE": "Je kunt nu contact opnemen met je klanten via het nieuwe Kanaal. Gelukkige ondersteuning",
       "BUTTON_TEXT": "Breng me ernaar toe",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Het aanmaken van een website kanaal is gelukt. Kopieer de code hieronder weergegeven en plak deze op uw website. De volgende keer dat een klant de live chat gebruikt, verschijnt het gesprek automatisch op uw inbox."
diff --git a/app/javascript/dashboard/i18n/locale/nl/macros.json b/app/javascript/dashboard/i18n/locale/nl/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 40f9433ba..7f44f8645 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Startpagina",
     "AGENTS": "Medewerkers",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxen",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Standaard antwoorden",
@@ -189,6 +190,7 @@
     "LABELS": "Labelen",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/no/agentBots.json b/app/javascript/dashboard/i18n/locale/no/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/bulkActions.json b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
index 04d00c929..30a9f2b35 100644
--- a/app/javascript/dashboard/i18n/locale/no/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Velg agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Tildel",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index 3f86a2673..66c8857ff 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 3a7e0b068..bc8d24e1e 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Innboksen din er klar!",
-      "MESSAGE": "Du kan nå kommunisere med kundene dine via den nye kanalen. Til lykke med kundeservicen!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Ta meg dit",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Du har nå fullført opprettingen av nettstedskanalen. Kopier koden nedenfor og lim den inn på nettstedet. Neste gang en kunde bruker live-chatten vil samtalen vises automatisk i innboksen din."
diff --git a/app/javascript/dashboard/i18n/locale/no/macros.json b/app/javascript/dashboard/i18n/locale/no/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 5940f4403..3ae8c24fc 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakter",
     "HOME": "Hjem",
     "AGENTS": "Agenter",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Innbokser",
     "NOTIFICATIONS": "Varsler",
     "CANNED_RESPONSES": "Forhåndslagde svar",
@@ -189,6 +190,7 @@
     "LABELS": "Etiketter",
     "CUSTOM_ATTRIBUTES": "Egendefinerte verdier",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentBots.json b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
index 661e4161c..d2911a884 100644
--- a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Wybierz Agenta",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Przypisz",
+    "YES": "Tak",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index fc748b800..7f721dc44 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 5f1783801..c8e9b003f 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL webhooka",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Twoja skrzynka odbiorcza jest gotowa!",
-      "MESSAGE": "Teraz możesz współpracować ze swoimi klientami poprzez swój nowy kanał. Szczęśliwego wsparcia ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Zabierz mnie tam",
       "MORE_SETTINGS": "Więcej ustawień",
       "WEBSITE_SUCCESS": "Pomyślnie zakończyłeś tworzenie kanału internetowego. Skopiuj poniższy kod i wklej go na swojej stronie. Następnym razem, gdy klient korzysta z czatu na żywo, konwersacja pojawi się automatycznie na twojej skrzynce odbiorczej."
diff --git a/app/javascript/dashboard/i18n/locale/pl/macros.json b/app/javascript/dashboard/i18n/locale/pl/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index f37e2ca18..f064c8335 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakty",
     "HOME": "Home",
     "AGENTS": "Agenci",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Skrzynki",
     "NOTIFICATIONS": "Powiadomienia",
     "CANNED_RESPONSES": "Gotowe odpowiedzi",
@@ -189,6 +190,7 @@
     "LABELS": "Etykiety",
     "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
     "AUTOMATION": "Automatyzacja",
+    "MACROS": "Macros",
     "TEAMS": "Zespoły",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/pt/agentBots.json b/app/javascript/dashboard/i18n/locale/pt/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
index 2335ac443..170641040 100644
--- a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Escolher Agente",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Atribuir",
+    "YES": "Sim",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 1778d9213..b5b84b430 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 0c420d926..b02e9f9e8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Link de retorno de ligação",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL do Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Criar Canal do WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Sua caixa de entrada está pronta!",
-      "MESSAGE": "Agora, você pode se envolver com seus clientes através do seu novo Canal. Feliz apoio ",
+      "MESSAGE": "Agora, você pode se envolver com seus clientes através do seu novo Canal. Feliz apoio",
       "BUTTON_TEXT": "Me leve lá",
       "MORE_SETTINGS": "Mais configurações",
       "WEBSITE_SUCCESS": "Você terminou de criar um canal de site. Copie o código mostrado abaixo e cole-o em seu site. Na próxima vez que um cliente usar o chat em tempo real, a conversa aparecerá automaticamente em sua caixa de entrada."
diff --git a/app/javascript/dashboard/i18n/locale/pt/macros.json b/app/javascript/dashboard/i18n/locale/pt/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 745eaf7ee..03ef2c628 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contactos",
     "HOME": "Principal",
     "AGENTS": "agentes",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificaçoes",
     "CANNED_RESPONSES": "Respostas Prontas",
@@ -189,6 +190,7 @@
     "LABELS": "Etiquetas",
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automatização",
+    "MACROS": "Macros",
     "TEAMS": "Equipas",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 2325cd722..198111aa8 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL de retorno",
-          "SUBTITLE": "Você tem que configurar a URL do webhook no portal de desenvolvedor do Facebook com a URL mencionada aqui."
+          "SUBTITLE": "Você deve configurar a URL do webhook e o token de verificação no portal do desenvolvedor do Facebook com os valores mostrados abaixo.",
+          "WEBHOOK_URL": "URL do Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Token de verificação Webhook"
         },
         "SUBMIT_BUTTON": "Criar canal do WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Sua caixa de entrada está pronta!",
-      "MESSAGE": "Agora você ja pode oferecer uma excelente experiência no atendimento de seus clientes através do seu novo Canal ",
+      "MESSAGE": "Agora você ja pode oferecer uma excelente experiência no atendimento de seus clientes através do seu novo Canal",
       "BUTTON_TEXT": "Leva-me lá",
       "MORE_SETTINGS": "Mais configurações",
       "WEBSITE_SUCCESS": "Você concluiu a criação de um canal de site. Copie o código mostrado abaixo e cole-o no seu site. Na próxima vez que um cliente usar o bate-papo ao vivo, a conversa aparecerá automaticamente na sua caixa de entrada."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 144bdcf4b..47c439fb1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contato",
     "HOME": "Principal",
     "AGENTS": "Agentes",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificações",
     "CANNED_RESPONSES": "Atalhos",
@@ -189,6 +190,7 @@
     "LABELS": "Marcadores",
     "CUSTOM_ATTRIBUTES": "Atributos Personalizados",
     "AUTOMATION": "Automação",
+    "MACROS": "Macros",
     "TEAMS": "Times",
     "BILLING": "Cobrança",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentBots.json b/app/javascript/dashboard/i18n/locale/ro/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
index b1905e603..120090d04 100644
--- a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Selectează agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Atribuiți",
+    "YES": "Da",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index 0372d4f90..f2ce40ec9 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 8ddb95a09..8327b0b6c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Creați canalul WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Inbox-ul este gata!",
-      "MESSAGE": "Acum poți intra în contact cu clienții tăi prin noul tău Canal. Suport fericit ",
+      "MESSAGE": "Acum poți intra în contact cu clienții tăi prin noul tău Canal. Suport fericit",
       "BUTTON_TEXT": "Du-mă acolo",
       "MORE_SETTINGS": "Mai multe setări",
       "WEBSITE_SUCCESS": "Ați finalizat cu succes crearea unui canal web. Copiați codul de mai jos și inserati-l pe site-ul dvs. Data viitoare când un client folosește conversația live, conversația va apărea automat pe căsuța poștală."
diff --git a/app/javascript/dashboard/i18n/locale/ro/macros.json b/app/javascript/dashboard/i18n/locale/ro/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index e8563111f..766b8d686 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacte",
     "HOME": "Acasa",
     "AGENTS": "Agenți",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Căsuțe",
     "NOTIFICATIONS": "Notificări",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
@@ -189,6 +190,7 @@
     "LABELS": "Etichete",
     "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
     "AUTOMATION": "Automatizare",
+    "MACROS": "Macros",
     "TEAMS": "Echipe",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Foldere",
diff --git a/app/javascript/dashboard/i18n/locale/ru/agentBots.json b/app/javascript/dashboard/i18n/locale/ru/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
index 4256d17d8..394e4d0f1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
@@ -3,8 +3,10 @@
     "CONVERSATIONS_SELECTED": "%{conversationCount} бесед выбрано",
     "AGENT_SELECT_LABEL": "Выбрать Агента",
     "ASSIGN_CONFIRMATION_LABEL": "Вы уверены, что хотите назначить %{conversationCount} %{conversationLabel}",
+    "UNASSIGN_CONFIRMATION_LABEL": "Вы уверены, что хотите отменить назначение %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Вернуться",
     "ASSIGN_LABEL": "Назначить",
+    "YES": "Да",
     "ASSIGN_AGENT_TOOLTIP": "Назначенный оператор",
     "ASSIGN_SUCCESFUL": "Беседы успешно назначены",
     "ASSIGN_FAILED": "Не удалось назначить беседы, попробуйте еще раз",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 2dcd87af6..c0acfd728 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL",
-          "SUBTITLE": "Вы должны настроить URL webhook в портале разработчиков Facebook с URL-адресом, указанным здесь."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL вебхука",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Создать канал WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Истоник готов!",
-      "MESSAGE": "Теперь вы можете взаимодействовать с вашими клиентами через ваш новый канал. Удачной поддержки ",
+      "MESSAGE": "Теперь вы можете взаимодействовать с вашими клиентами через ваш новый канал. Удачной поддержки",
       "BUTTON_TEXT": "Перейти",
       "MORE_SETTINGS": "Больше параметров",
       "WEBSITE_SUCCESS": "Вы успешно создали источник-сайт. Скопируйте указанный ниже код и вставьте его на ваш сайт. В следующий раз, когда клиент напишет в чат, диалог автоматически появится здесь."
diff --git a/app/javascript/dashboard/i18n/locale/ru/macros.json b/app/javascript/dashboard/i18n/locale/ru/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index d430972da..705814ae5 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Контакты",
     "HOME": "Главная",
     "AGENTS": "Операторы",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Источники",
     "NOTIFICATIONS": "Уведомления",
     "CANNED_RESPONSES": "Шаблонные ответы",
@@ -189,6 +190,7 @@
     "LABELS": "Категории",
     "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты",
     "AUTOMATION": "Автоматизация",
+    "MACROS": "Macros",
     "TEAMS": "Команды",
     "BILLING": "Платёж",
     "CUSTOM_VIEWS_FOLDER": "Папки",
diff --git a/app/javascript/dashboard/i18n/locale/sk/agentBots.json b/app/javascript/dashboard/i18n/locale/sk/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
index 462d98283..7a296fbcb 100644
--- a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Vybrat agenta",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Áno",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index fa40d12dd..d4fd02c3b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index c4f47252b..9632aebc9 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/sk/macros.json b/app/javascript/dashboard/i18n/locale/sk/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 57b554807..df1056007 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakty",
     "HOME": "Home",
     "AGENTS": "Agenti",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Upozornenia",
     "CANNED_RESPONSES": "Uložené odpovede",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/sr/agentBots.json b/app/javascript/dashboard/i18n/locale/sr/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
index 5734d33d9..f0bae941f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} razgovora je izabrano",
     "AGENT_SELECT_LABEL": "Izaberite agenta",
-    "ASSIGN_CONFIRMATION_LABEL": "Da li zaista želite da dodelite %{conversationCount} %{conversationLabel}",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Povratak",
     "ASSIGN_LABEL": "Dodeli",
+    "YES": "Da",
     "ASSIGN_AGENT_TOOLTIP": "Dodeli agenta",
     "ASSIGN_SUCCESFUL": "Razgovor je uspešno dodeljen",
     "ASSIGN_FAILED": "Neuspelo je dodeljivanje razgovora, molim vas pokušajte ponovo",
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index a7b22f600..a8ecd2c81 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index bbc71a992..ec5b799d8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Adresa povratnog poziva",
-          "SUBTITLE": "Morate da podesite adresu veb zakačke u fejsbuk portalu programera sa adresom pomenutom ovde."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Adresa veb zakačke",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Napravite WhatsApp kanal",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Vaše prijemno sanduče je spremno!",
-      "MESSAGE": "Možete se povezati sa vašim potrošačima kroz vaš novi kanal. Srećna podrška ",
+      "MESSAGE": "Možete se povezati sa vašim potrošačima kroz vaš novi kanal. Srećna podrška",
       "BUTTON_TEXT": "Odvedi me tamo",
       "MORE_SETTINGS": "Više podešavanja",
       "WEBSITE_SUCCESS": "Uspešno ste završili pravljenje kanala veb sajta. Iskopirajte kod prikazan ispod i nalepite ga u vaš vab sajt. Sledeći put kada potrošač koristi ćaskanje uživo, razgovor će se automatski pojaviti u prijemnom sandučetu."
diff --git a/app/javascript/dashboard/i18n/locale/sr/macros.json b/app/javascript/dashboard/i18n/locale/sr/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 6dda2090a..dd494453f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakti",
     "HOME": "Početak",
     "AGENTS": "Agenti",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Prijemni sandučići",
     "NOTIFICATIONS": "Obaveštenja",
     "CANNED_RESPONSES": "Gotovi odgovori",
@@ -189,6 +190,7 @@
     "LABELS": "Oznake",
     "CUSTOM_ATTRIBUTES": "Prilagođeni atributi",
     "AUTOMATION": "Automatizacija",
+    "MACROS": "Macros",
     "TEAMS": "Timovi",
     "BILLING": "Plaćanje",
     "CUSTOM_VIEWS_FOLDER": "Fascikle",
diff --git a/app/javascript/dashboard/i18n/locale/sv/agentBots.json b/app/javascript/dashboard/i18n/locale/sv/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
index b30697b3c..0b9d1d044 100644
--- a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Välj agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Tilldela",
+    "YES": "Ja",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index 521add151..d15a9d43c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 01099ac7d..649d2573e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback-URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Skapa WhatsApp-kanal",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Din inkorg är redo!",
-      "MESSAGE": "Du kan nu interagera med dina kunder genom din nya kanal. Supporta glatt ",
+      "MESSAGE": "Du kan nu interagera med dina kunder genom din nya kanal. Supporta glatt",
       "BUTTON_TEXT": "Ta mig dit",
       "MORE_SETTINGS": "Fler inställningar",
       "WEBSITE_SUCCESS": "Du har skapat en webbplatskanal. Kopiera koden som visas nedan och klistra in den på din webbplats. Nästa gång en kund använder livechatten visas konversationen automatiskt i din inkorg."
diff --git a/app/javascript/dashboard/i18n/locale/sv/macros.json b/app/javascript/dashboard/i18n/locale/sv/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 2fe6183f7..3f3a6f2d3 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kontakter",
     "HOME": "Hem",
     "AGENTS": "Agenter",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inkorgar",
     "NOTIFICATIONS": "Aviseringar",
     "CANNED_RESPONSES": "Svarsmallar",
@@ -189,6 +190,7 @@
     "LABELS": "Etiketter",
     "CUSTOM_ATTRIBUTES": "Egna egenskaper",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ta/agentBots.json b/app/javascript/dashboard/i18n/locale/ta/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index c3aa27ec6..6ee1dedc7 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 1ee90dc3e..d7cb26153 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "கால்பேக் URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "வெப்ஹூக் URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "உங்கள் இன்பாக்ஸ் தயாராக உள்ளது!",
-      "MESSAGE": "உங்கள் புதிய சேனல் மூலம் இப்போது உங்கள் வாடிக்கையாளர்களுடன் ஈடுபடலாம். மகிழ்ச்சியாய் ஆதரவு அளியுங்கள் ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "என்னை அங்கே அழைத்துச் செல்லுங்கள்",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "வலைத்தள சேனலை உருவாக்குவதை வெற்றிகரமாக முடித்துவிட்டீர்கள். கீழே காட்டப்பட்டுள்ள உங்கள் இணையதளத்தில் ஒட்டவும். அடுத்த முறை வாடிக்கையாளர் நேரடி சாட்டை பயன்படுத்தும்போது, உரையாடல் தானாகவே உங்கள் இன்பாக்ஸில் தோன்றும்."
diff --git a/app/javascript/dashboard/i18n/locale/ta/macros.json b/app/javascript/dashboard/i18n/locale/ta/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 01ef5efb3..8f671f4a5 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "முகப்பு",
     "AGENTS": "ஏஜென்ட்கள்",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "இன்பாக்ஸ்கள்",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "பதிவு செய்யப்பட்ட பதில்கள்",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/th/agentBots.json b/app/javascript/dashboard/i18n/locale/th/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/bulkActions.json b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
index d1accc46a..baa206928 100644
--- a/app/javascript/dashboard/i18n/locale/th/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "เลือกพนักงาน",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "มอบหมาย",
+    "YES": "ใช่",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index 766998582..83b641d5d 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 4c7a23fd3..de6ebd3f2 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "ลิ้งเรียกกลับ",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "ลิ้ง Webhook",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "สร้างช่องทาง WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "กล่องข้อความของคุณพร้อมใช้แล้ว!",
-      "MESSAGE": "ตอนนี้คุณสามารถมีส่วนร่วมกับลูกค้าของคุณผ่านช่องทางใหม่ได้แล้ว ขอให้มีความสุขกับการคุย ",
+      "MESSAGE": "ตอนนี้คุณสามารถมีส่วนร่วมกับลูกค้าของคุณผ่านช่องทางใหม่ได้แล้ว ขอให้มีความสุขกับการคุย",
       "BUTTON_TEXT": "พาฉันไปที่นั่น",
       "MORE_SETTINGS": "ตั้งค่าเพิ่มเติม",
       "WEBSITE_SUCCESS": "คุณได้สร้างช่องทางเว็บไซต์สำเร็จแล้ว คัดลอกโค้ดข้างล่างแล้วนำไปแปะที่เว็บไซต์ของคุณ ครั้งถัดไปที่ลูกค้าใช้ live chat การสนทนาจะปรากฎที่กล่องข้อความของคุณโดยอัตโนมัติ"
diff --git a/app/javascript/dashboard/i18n/locale/th/macros.json b/app/javascript/dashboard/i18n/locale/th/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index ad6d33e3a..4f2607dc5 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "ผู้ติดต่อ",
     "HOME": "หน้าหลัก",
     "AGENTS": "พนักงาน",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "กล่องข้อความ",
     "NOTIFICATIONS": "การแจ้งเตือน",
     "CANNED_RESPONSES": "คำตอบสำเร็จรูป",
@@ -189,6 +190,7 @@
     "LABELS": "ป้ายกำกับ",
     "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง",
     "AUTOMATION": "เงื่อนไขอัตโนมัติ",
+    "MACROS": "Macros",
     "TEAMS": "ทีม",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "โฟลเดอร์",
diff --git a/app/javascript/dashboard/i18n/locale/tr/agentBots.json b/app/javascript/dashboard/i18n/locale/tr/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
index 6af64bba9..b3657ce67 100644
--- a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} görüşme seçildi",
     "AGENT_SELECT_LABEL": "Temsilci Seçin",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Geri git",
     "ASSIGN_LABEL": "Atama yap",
+    "YES": "Evet",
     "ASSIGN_AGENT_TOOLTIP": "Temsilci Atama",
     "ASSIGN_SUCCESFUL": "Görüşmeler başarıyla atandı",
     "ASSIGN_FAILED": "Görüşmeler atanamadı, lütfen tekrar deneyin",
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index 649398f0e..e47c68991 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 28fbc6a71..f367ed38f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Geri arama URL'si",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Web kancası URL'si",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Gelen Kutunuz hazır!",
-      "MESSAGE": "Artık yeni Kanalınız üzerinden müşterilerinizle etkileşim kurabilirsiniz. Mutlu destek",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Beni oraya götür",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "Bir web sitesi kanalı oluşturmayı başarıyla tamamladınız. Aşağıda gösterilen kodu kopyalayın ve web sitenize yapıştırın. Bir müşteri canlı sohbeti bir dahaki sefere kullandığında, konuşma otomatik olarak gelen kutunuzda görünecektir."
diff --git a/app/javascript/dashboard/i18n/locale/tr/macros.json b/app/javascript/dashboard/i18n/locale/tr/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 6b6850d19..649cb1cb0 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Kişiler",
     "HOME": "Anasayfa",
     "AGENTS": "Kullanıcılar",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Gelen kutuları",
     "NOTIFICATIONS": "Bildirimler",
     "CANNED_RESPONSES": "Hazır Yanıtlar",
@@ -189,6 +190,7 @@
     "LABELS": "Etiketler",
     "CUSTOM_ATTRIBUTES": "Özel Nitelikler",
     "AUTOMATION": "Otomasyon",
+    "MACROS": "Macros",
     "TEAMS": "Ekipler",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Klasörler",
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentBots.json b/app/javascript/dashboard/i18n/locale/uk/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
index a17eb601b..e02b3cf87 100644
--- a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "Обрано %{conversationCount} розмов",
     "AGENT_SELECT_LABEL": "Виберіть агента",
-    "ASSIGN_CONFIRMATION_LABEL": "Ви впевнені, що бажаєте призначити %{conversationCount} %{conversationLabel} до",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Повернутися назад",
     "ASSIGN_LABEL": "Призначити",
+    "YES": "Так",
     "ASSIGN_AGENT_TOOLTIP": "Призначити агента",
     "ASSIGN_SUCCESFUL": "Розмови успішно призначені",
     "ASSIGN_FAILED": "Не вдалося призначити розмови, будь ласка, спробуйте ще раз",
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index e3f595752..09d5460db 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Помилка під час публікації статті",
-        "SUCCESS": "Стаття успішно опублікована"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 728b80b2c..7a0eb553e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "Необхідно налаштувати URL вебхука у панелі розробників facebook з URL-адресою, яку ви згадували."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "URL вебхука",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Створити канал WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Ваша поштова скринька готова!",
-      "MESSAGE": "Ви тепер можете взаємодіяти з вашими клієнтами через ваш новий канал. Щасливої підтримки ",
+      "MESSAGE": "Ви тепер можете взаємодіяти з вашими клієнтами через ваш новий канал. Щасливої підтримки",
       "BUTTON_TEXT": "Давай туди",
       "MORE_SETTINGS": "Додаткові налаштування",
       "WEBSITE_SUCCESS": "Ви успішно завершили створення каналу Веб-сайт. Скопіюйте наведений нижче код і вставте його на ваш сайт. Наступного разу коли клієнт скористається онлайн чатом, розмова автоматично з'явиться в вашій скриньці Вхідні."
diff --git a/app/javascript/dashboard/i18n/locale/uk/macros.json b/app/javascript/dashboard/i18n/locale/uk/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 9292b33c5..cefbde1b7 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Контакти",
     "HOME": "Головна",
     "AGENTS": "Агенти",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Вхідні",
     "NOTIFICATIONS": "Сповіщення",
     "CANNED_RESPONSES": "Швидкі відповіді",
@@ -189,6 +190,7 @@
     "LABELS": "Мітки",
     "CUSTOM_ATTRIBUTES": "Свої атрибути",
     "AUTOMATION": "Автоматизація",
+    "MACROS": "Macros",
     "TEAMS": "Команди",
     "BILLING": "Біллінг",
     "CUSTOM_VIEWS_FOLDER": "Папки",
diff --git a/app/javascript/dashboard/i18n/locale/ur/agentBots.json b/app/javascript/dashboard/i18n/locale/ur/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index a67d82407..c0a8e4590 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index 7c53a975b..baafed427 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/ur/macros.json b/app/javascript/dashboard/i18n/locale/ur/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 2dc879048..adbc8cb60 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "کانٹیکٹس",
     "HOME": "Home",
     "AGENTS": "ایجنٹ",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "محفوظ کردہ جوابات",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/agentBots.json b/app/javascript/dashboard/i18n/locale/ur_IN/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
index 7061e5e70..c42b50013 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index 9c18b4c7f..19373d9ee 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index 09a6210da..f9f97ea36 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
       "BUTTON_TEXT": "Take me there",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/macros.json b/app/javascript/dashboard/i18n/locale/ur_IN/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 18e2c149b..c5f954b1c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Contacts",
     "HOME": "Home",
     "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
@@ -189,6 +190,7 @@
     "LABELS": "Labels",
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/vi/agentBots.json b/app/javascript/dashboard/i18n/locale/vi/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
index 39268cdd2..9e21d48f3 100644
--- a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} cuộc hội thoại đã được chọn",
     "AGENT_SELECT_LABEL": "Chọn tổng đài viên",
-    "ASSIGN_CONFIRMATION_LABEL": "Bạn có chắc là muốn giao %{conversationCount} %{conversationLabel} cho",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Trở về",
     "ASSIGN_LABEL": "Gán",
+    "YES": "Có",
     "ASSIGN_AGENT_TOOLTIP": "Giao cho tổng đài viên",
     "ASSIGN_SUCCESFUL": "Cuộc hội thoại đã được phân công thành công",
     "ASSIGN_FAILED": "Không thể phân công các cuộc hội thoại, xin vui lòng thử lại",
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index 48f431b08..06ec49669 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index de61e2811..349762eab 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL gọi lại",
-          "SUBTITLE": "Bạn phải định cấu hình URL webhook trong cổng nhà phát triển facebook với URL được đề cập ở đây."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Tạo kênh WhatsApp",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "Hộp thư đến của bạn đã sẵn sàng!",
-      "MESSAGE": "Giờ đây, bạn có thể tương tác với khách hàng thông qua Kênh mới của mình. Chúc vui vẻ ủng hộ ",
+      "MESSAGE": "Giờ đây, bạn có thể tương tác với khách hàng thông qua Kênh mới của mình. Chúc vui vẻ ủng hộ",
       "BUTTON_TEXT": "Đưa cho tôi",
       "MORE_SETTINGS": "Nhiều tuỳ chọn hơn",
       "WEBSITE_SUCCESS": "Bạn đã hoàn thành việc tạo kênh trang web thành công. Sao chép mã được hiển thị bên dưới và dán vào trang web của bạn. Lần tới khi khách hàng sử dụng cuộc trò chuyện trực tiếp, cuộc trò chuyện sẽ tự động xuất hiện trong hộp thư đến của bạn."
diff --git a/app/javascript/dashboard/i18n/locale/vi/macros.json b/app/javascript/dashboard/i18n/locale/vi/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 011f28f9c..8ebb574ad 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "Liên hệ",
     "HOME": "Trang Chủ",
     "AGENTS": "Đại lý",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "Hộp thư đến",
     "NOTIFICATIONS": "Thông báo",
     "CANNED_RESPONSES": "Thư mẫu phẩn hồi",
@@ -189,6 +190,7 @@
     "LABELS": "Nhãn",
     "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
     "AUTOMATION": "Tự động hoá",
+    "MACROS": "Macros",
     "TEAMS": "Nhóm",
     "BILLING": "Phí",
     "CUSTOM_VIEWS_FOLDER": "Thư mục",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
index b0a12f0a9..70ecbfe4f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "选择代理",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "返回",
     "ASSIGN_LABEL": "分配",
+    "YES": "是",
     "ASSIGN_AGENT_TOOLTIP": "分配客服代表",
     "ASSIGN_SUCCESFUL": "对话分配成功",
     "ASSIGN_FAILED": "无法分配对话，请重新尝试",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 30cb60410..81016c409 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index ba663bba7..b696ed16d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "回调地址",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook 网址",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "您的收件箱已准备就绪！",
-      "MESSAGE": "您现在可以通过您的新频道与您的客户联系。快乐支持 ",
+      "MESSAGE": "您现在可以通过您的新频道与您的客户联系。快乐支持",
       "BUTTON_TEXT": "带我到这里",
       "MORE_SETTINGS": "More settings",
       "WEBSITE_SUCCESS": "您已成功完成创建网站频道。复制下面显示的代码并将其粘贴在您的网站上。 下次客户使用实时聊天时，对话将自动出现在您的收件箱中。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/macros.json b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 73a2bbced..3339f519e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "联系人",
     "HOME": "首页",
     "AGENTS": "客服代理们",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "收件箱",
     "NOTIFICATIONS": "消息通知",
     "CANNED_RESPONSES": "预设回复",
@@ -189,6 +190,7 @@
     "LABELS": "标签",
     "CUSTOM_ATTRIBUTES": "自定义属性",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
new file mode 100644
index 000000000..708b82173
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
@@ -0,0 +1,5 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
index f24db6a86..3ef9bc1d0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
@@ -2,9 +2,11 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
     "AGENT_SELECT_LABEL": "選擇客服",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "指派",
+    "YES": "是",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index 6655bccd8..fc254541a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -306,7 +306,7 @@
     "PUBLISH_ARTICLE": {
       "API": {
         "ERROR": "Error while publishing article",
-        "SUCCESS": "Article publishied successfully"
+        "SUCCESS": "Article published successfully"
       }
     },
     "ARCHIVE_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 909666cd0..ee6a70b36 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -239,7 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "回呼地址",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook 網址",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -357,7 +359,7 @@
     },
     "FINISH": {
       "TITLE": "您的收件匣已準備就緒！",
-      "MESSAGE": "您現在可以通過您的新頻道與您的客户聯繫。開心的支援客戶吧 ",
+      "MESSAGE": "您現在可以通過您的新頻道與您的客户聯繫。開心的支援客戶吧",
       "BUTTON_TEXT": "带我到這裡",
       "MORE_SETTINGS": "更多設定",
       "WEBSITE_SUCCESS": "您已成功完成建立網站頻道。複製下面顯示的代碼並將其黏貼在您的網站上。 下次客户使用即時聊天時，對話將自動出現在您的收件匣中。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/macros.json b/app/javascript/dashboard/i18n/locale/zh_TW/macros.json
new file mode 100644
index 000000000..3923e4374
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/macros.json
@@ -0,0 +1,5 @@
+{
+  "MACROS": {
+    "HEADER": "Macros"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 78b9df863..883196059 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -179,6 +179,7 @@
     "CONTACTS": "聯絡人",
     "HOME": "首頁",
     "AGENTS": "客服",
+    "AGENT_BOTS": "Bots",
     "INBOXES": "收件匣",
     "NOTIFICATIONS": "通知",
     "CANNED_RESPONSES": "預設回覆",
@@ -189,6 +190,7 @@
     "LABELS": "標籤",
     "CUSTOM_ATTRIBUTES": "自訂屬性",
     "AUTOMATION": "Automation",
+    "MACROS": "Macros",
     "TEAMS": "團隊",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a2adf4f7e..6fc5f1989 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -84,7 +84,7 @@ ja:
         contact_phone_number: Contact Phone Number
         link_to_the_conversation: Link to the conversation
         agent_name: 担当者名
-        rating: Rating
+        rating: 評価
         feedback: Feedback Comment
         recorded_at: Recorded date
   notifications:

From ceaffe862a4e87d1833248056d01182bc232a68d Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 20 Oct 2022 02:14:17 +0530
Subject: [PATCH 07/14] Fix: Handled IG unsupported file type (#5650)

We get 'unsupported_type' in the web-hook event only when Instagram faces issues processing the attachments. https://developers.facebook.com/docs/messenger-platform/instagram/features/webhook/ according to their document, we are handling the given types and are ignoring this one for now.

Fixes: #5428
---
 .../messages/instagram/message_builder.rb     |  8 ++++++
 .../messages/messenger/message_builder.rb     |  9 ++++++-
 .../instagram/message_builder_spec.rb         | 26 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 3b8ead18c..1be960d21 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -72,6 +72,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
 
   def build_message
     return if @outgoing_echo && already_sent_from_chatwoot?
+    return if message_content.blank? && all_unsupported_files?
 
     @message = conversation.messages.create!(message_params)
 
@@ -117,6 +118,13 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     cw_message.present?
   end
 
+  def all_unsupported_files?
+    return if attachments.empty?
+
+    attachments_type = attachments.pluck(:type).uniq.first
+    unsupported_file_type?(attachments_type)
+  end
+
   ### Sample response
   # {
   #   "object": "instagram",
diff --git a/app/builders/messages/messenger/message_builder.rb b/app/builders/messages/messenger/message_builder.rb
index 3c406f1e0..d3b5bf6b9 100644
--- a/app/builders/messages/messenger/message_builder.rb
+++ b/app/builders/messages/messenger/message_builder.rb
@@ -2,7 +2,8 @@ class Messages::Messenger::MessageBuilder
   include ::FileTypeHelper
 
   def process_attachment(attachment)
-    return if attachment['type'].to_sym == :template
+    # This check handles very rare case if there are multiple files to attach with only one usupported file
+    return if unsupported_file_type?(attachment['type'])
 
     attachment_obj = @message.attachments.new(attachment_params(attachment).except(:remote_file_url))
     attachment_obj.save!
@@ -80,4 +81,10 @@ class Messages::Messenger::MessageBuilder
     ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     {}
   end
+
+  private
+
+  def unsupported_file_type?(attachment_type)
+    [:template, :unsupported_type].include? attachment_type.to_sym
+  end
 end
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index 20b7d777d..b2e073fbd 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -70,5 +70,31 @@ describe  ::Messages::Instagram::MessageBuilder do
       expect(message.content).to eq('This story is no longer available.')
       expect(message.attachments.count).to eq(1)
     end
+
+    it 'does not create message for unsupported file type' do
+      allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+      allow(fb_object).to receive(:get_object).and_return(
+        {
+          name: 'Jane',
+          id: 'Sender-id-1',
+          account_id: instagram_inbox.account_id,
+          profile_pic: 'https://chatwoot-assets.local/sample.png'
+        }.with_indifferent_access
+      )
+      story_mention_params[:entry][0][:messaging][0]['message']['attachments'][0]['type'] = 'unsupported_type'
+      messaging = story_mention_params[:entry][0][:messaging][0]
+      contact_inbox
+      described_class.new(messaging, instagram_inbox, outgoing_echo: false).perform
+
+      instagram_inbox.reload
+
+      # we would have contact created but message and attachments won't be created
+      expect(instagram_inbox.conversations.count).to be 0
+      expect(instagram_inbox.messages.count).to be 0
+
+      contact = instagram_channel.inbox.contacts.first
+
+      expect(contact.name).to eq('Jane Dae')
+    end
   end
 end

From bce0bb8acbcf8dbefdd5428391c8f0646729bb9c Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 20 Oct 2022 02:15:32 +0530
Subject: [PATCH 08/14] chore: Improve pr and bug report templates (#5556)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md | 46 +++++++++++++++++++++-------
 .github/PULL_REQUEST_TEMPLATE.md     |  9 +++---
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d9409af96..26b053b5f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,6 +6,7 @@ labels: 'Bug'
 assignees: ''
 
 ---
+
 **Describe the bug**
 
 A clear and concise description of what the bug is.
@@ -16,11 +17,11 @@ Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See error
+4. See the error
 
 **Expected behavior**
 
-A clear and concise description of what you expected to happen.
+Share a clear and concise description of what you expected to happen.
 
 **Screenshots**
 
@@ -28,27 +29,50 @@ If applicable, add screenshots to help explain your problem.
 
 **Browser logs**
 
-Share the browser logs to debug the issue further
+Share the browser logs to debug the issue further.
 
 **Server logs**
 
-Share the server logs to debug the issue further
+Share the server logs to debug the issue further.
 
 **Environment**
 
-Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self hosted installation of Chatwoot. If you are using a self hosted installation of Chatwoot describe the type of deployment (Docker/Linux VM installation/Heroku)
+Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
+- [ ] app.chatwoot.com (Chatwoot Cloud)
+- [ ] Self-hosted
+- - [ ] Linux VM
+- - [ ] Docker
+- - [ ] Kubernetes
+- - [ ] Heroku
+- - [ ] Other (Please specify)
+
+
+**Desktop (please complete the following information)** (If applicable)
+ - OS: [e.g. Linux, Windows, MacOS]
+ - Browser [e.g. chrome, firefox, safari]
  - Version [e.g. 22]
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
+**Smartphone (please complete the following information)** (If applicable)
+ - Device: [e.g. iPhone6, Pixel7]
  - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
+ - Browser [e.g. stock browser, firefox, safari]
  - Version [e.g. 22]
 
+**Docker** (If applicable)
+
+Please share the output of the following.
+- `docker version`
+- `docker info`
+- `docker-compose version`
+
+**Cloud Provider** (If applicable)
+- [ ] AWS
+- [ ] GCP
+- [ ] Azure
+- [ ] DigitalOcean
+- [ ] Others
+
 **Additional context**
 
 Add any other context about the problem here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4ce1b084c..cd4d83b38 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,8 +2,7 @@
 
 ## Description
 
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
-
+Please include a summary of the change and issue(s) fixed. Also, mention relevant motivation, context, and any dependencies that this change requires.
 Fixes # (issue)
 
 ## Type of change
@@ -12,18 +11,18 @@ Please delete options that are not relevant.
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)
 - [ ] This change requires a documentation update
 
 ## How Has This Been Tested?
 
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration.
 
 
 ## Checklist:
 
 - [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
+- [ ] I have performed a self-review of my code
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings

From 1fb1be3ddc231f8760b84dd1109a3baae252e0ae Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 20 Oct 2022 05:39:32 +0530
Subject: [PATCH 09/14] feat: Add search functionality for public portal
 (#5683)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/portals/articles_controller.rb     |   4 +-
 app/javascript/packs/portal.js                |  21 ++-
 app/javascript/portal/api/article.js          |  14 ++
 .../portal/components/PublicArticleSearch.vue | 129 ++++++++++++++++++
 .../portal/components/PublicSearchInput.vue   |  60 ++++++++
 .../portal/components/SearchSuggestions.vue   | 103 ++++++++++++++
 app/javascript/portal/portalHelpers.js        |   5 +
 .../shared/components/FluentIcon/icons.json   |   3 +-
 app/views/layouts/portal.html.erb             |  13 ++
 .../api/v1/models/_article.json.jbuilder      |   8 ++
 .../public/api/v1/portals/_footer.html.erb    |   2 +-
 .../public/api/v1/portals/_header.html.erb    |   2 +-
 .../public/api/v1/portals/_hero.html.erb      |   9 +-
 .../api/v1/portals/articles/index.html.erb    |   9 +-
 config/locales/en.yml                         |   8 ++
 config/routes.rb                              |   1 +
 16 files changed, 378 insertions(+), 13 deletions(-)
 create mode 100644 app/javascript/portal/api/article.js
 create mode 100644 app/javascript/portal/components/PublicArticleSearch.vue
 create mode 100644 app/javascript/portal/components/PublicSearchInput.vue
 create mode 100644 app/javascript/portal/components/SearchSuggestions.vue

diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index 0dfa2ea9b..ae0fb2b6a 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -1,7 +1,7 @@
 class Public::Api::V1::Portals::ArticlesController < PublicController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
-  before_action :set_category
+  before_action :set_category, except: [:index]
   before_action :set_article, only: [:show]
   layout 'portal'
 
@@ -20,7 +20,7 @@ class Public::Api::V1::Portals::ArticlesController < PublicController
   end
 
   def set_category
-    @category = @portal.categories.find_by!(slug: params[:category_slug])
+    @category = @portal.categories.find_by!(slug: params[:category_slug]) if params[:category_slug].present?
   end
 
   def portal
diff --git a/app/javascript/packs/portal.js b/app/javascript/packs/portal.js
index 2f7736deb..5c1867658 100644
--- a/app/javascript/packs/portal.js
+++ b/app/javascript/packs/portal.js
@@ -3,8 +3,10 @@
 // a relevant structure within app/javascript and only use these pack files to reference
 // that code so that it will be compiled.
 
+import Vue from 'vue';
 import Rails from '@rails/ujs';
 import Turbolinks from 'turbolinks';
+import PublicArticleSearch from '../portal/components/PublicArticleSearch.vue';
 
 import { navigateToLocalePage } from '../portal/portalHelpers';
 
@@ -13,4 +15,21 @@ import '../portal/application.scss';
 Rails.start();
 Turbolinks.start();
 
-document.addEventListener('DOMContentLoaded', navigateToLocalePage);
+const initPageSetUp = () => {
+  navigateToLocalePage();
+  const isSearchContainerAvailable = document.querySelector('#search-wrap');
+  if (isSearchContainerAvailable) {
+    new Vue({
+      components: { PublicArticleSearch },
+      template: '<PublicArticleSearch />',
+    }).$mount('#search-wrap');
+  }
+};
+
+document.addEventListener('DOMContentLoaded', () => {
+  initPageSetUp();
+});
+
+document.addEventListener('turbolinks:load', () => {
+  initPageSetUp();
+});
diff --git a/app/javascript/portal/api/article.js b/app/javascript/portal/api/article.js
new file mode 100644
index 000000000..d28f53c88
--- /dev/null
+++ b/app/javascript/portal/api/article.js
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+class ArticlesAPI {
+  constructor() {
+    this.baseUrl = '';
+  }
+
+  searchArticles(portalSlug, locale, query) {
+    let baseUrl = `${this.baseUrl}/hc/${portalSlug}/${locale}/articles.json?query=${query}`;
+    return axios.get(baseUrl);
+  }
+}
+
+export default new ArticlesAPI();
diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue
new file mode 100644
index 000000000..4ced0665b
--- /dev/null
+++ b/app/javascript/portal/components/PublicArticleSearch.vue
@@ -0,0 +1,129 @@
+<template>
+  <div
+    v-on-clickaway="closeSearch"
+    class="mx-auto max-w-md w-full relative my-4"
+  >
+    <public-search-input
+      v-model="searchTerm"
+      :search-placeholder="searchTranslations.searchPlaceholder"
+      @focus="openSearch"
+    />
+    <div
+      v-if="shouldShowSearchBox"
+      class="absolute show-search-box w-full"
+      @mouseover="openSearch"
+    >
+      <search-suggestions
+        :items="searchResults"
+        :is-loading="isLoading"
+        :empty-placeholder="searchTranslations.emptyPlaceholder"
+        :results-title="searchTranslations.resultsTitle"
+        :loading-placeholder="searchTranslations.loadingPlaceholder"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+
+import SearchSuggestions from './SearchSuggestions';
+import PublicSearchInput from './PublicSearchInput';
+
+import ArticlesAPI from '../api/article';
+
+export default {
+  components: {
+    PublicSearchInput,
+    SearchSuggestions,
+  },
+  mixins: [clickaway],
+  props: {
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+  },
+  data() {
+    return {
+      searchTerm: '',
+      isLoading: false,
+      showSearchBox: false,
+      searchResults: [],
+    };
+  },
+
+  computed: {
+    portalSlug() {
+      return window.portalConfig.portalSlug;
+    },
+    localeCode() {
+      return window.portalConfig.localeCode;
+    },
+    shouldShowSearchBox() {
+      return this.searchTerm !== '' && this.showSearchBox;
+    },
+    searchTranslations() {
+      const { searchTranslations = {} } = window.portalConfig;
+      return searchTranslations;
+    },
+  },
+
+  watch: {
+    searchTerm() {
+      if (this.typingTimer) {
+        clearTimeout(this.typingTimer);
+      }
+
+      this.openSearch();
+      this.isLoading = true;
+      this.typingTimer = setTimeout(() => {
+        this.fetchArticlesByQuery();
+      }, 1000);
+    },
+    currentPage() {
+      this.clearSearchTerm();
+    },
+  },
+
+  methods: {
+    onChange(e) {
+      this.$emit('input', e.target.value);
+    },
+    onBlur(e) {
+      this.$emit('blur', e.target.value);
+    },
+    openSearch() {
+      this.showSearchBox = true;
+    },
+    closeSearch() {
+      this.showSearchBox = false;
+    },
+    clearSearchTerm() {
+      this.searchTerm = '';
+    },
+    async fetchArticlesByQuery() {
+      try {
+        this.isLoading = true;
+        this.searchResults = [];
+        const { data } = await ArticlesAPI.searchArticles(
+          this.portalSlug,
+          this.localeCode,
+          this.searchTerm
+        );
+        this.searchResults = data.payload;
+        this.isLoading = true;
+      } catch (error) {
+        // Show something wrong message
+      } finally {
+        this.isLoading = false;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.show-search-box {
+  top: 4rem;
+}
+</style>
diff --git a/app/javascript/portal/components/PublicSearchInput.vue b/app/javascript/portal/components/PublicSearchInput.vue
new file mode 100644
index 000000000..5183f3293
--- /dev/null
+++ b/app/javascript/portal/components/PublicSearchInput.vue
@@ -0,0 +1,60 @@
+<template>
+  <div
+    class="w-full flex items-center rounded-md border-solid  h-16 bg-white px-4 py-2 text-slate-600"
+    :class="{
+      'shadow border-2 border-woot-100': isFocused,
+      'border border-slate-50 shadow-sm': !isFocused,
+    }"
+  >
+    <fluent-icon icon="search" />
+    <input
+      :value="value"
+      type="text"
+      class="w-full search-input focus:outline-none text-base h-full bg-white px-2 py-2
+    text-slate-700 placeholder-slate-500 sm:text-sm"
+      :placeholder="searchPlaceholder"
+      role="search"
+      @input="onChange"
+      @focus="onFocus"
+      @blur="onBlur"
+    />
+  </div>
+</template>
+
+<script>
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+
+export default {
+  components: {
+    FluentIcon,
+  },
+  props: {
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+    searchPlaceholder: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      isFocused: false,
+    };
+  },
+  methods: {
+    onChange(e) {
+      this.$emit('input', e.target.value);
+    },
+    onFocus(e) {
+      this.isFocused = true;
+      this.$emit('focus', e.target.value);
+    },
+    onBlur(e) {
+      this.isFocused = false;
+      this.$emit('blur', e.target.value);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/portal/components/SearchSuggestions.vue b/app/javascript/portal/components/SearchSuggestions.vue
new file mode 100644
index 000000000..838d4ba7e
--- /dev/null
+++ b/app/javascript/portal/components/SearchSuggestions.vue
@@ -0,0 +1,103 @@
+<template>
+  <div
+    class="shadow-md bg-white mt-2 max-h-72 scroll-py-2 p-4 rounded overflow-y-auto text-sm text-slate-700"
+  >
+    <div v-if="isLoading" class="font-medium text-sm text-slate-400">
+      {{ loadingPlaceholder }}
+    </div>
+    <h3 v-if="shouldShowResults" class="font-medium text-sm text-slate-400">
+      {{ resultsTitle }}
+    </h3>
+    <ul
+      v-if="shouldShowResults"
+      class="bg-white mt-2 max-h-72 scroll-py-2 overflow-y-auto text-sm text-slate-700"
+      role="listbox"
+    >
+      <li
+        v-for="(article, index) in items"
+        :id="article.id"
+        :key="article.id"
+        class="group flex cursor-default select-none items-center rounded-md p-2 mb-1"
+        :class="{ 'bg-slate-25': index === selectedIndex }"
+        role="option"
+        tabindex="-1"
+        @mouseover="onHover(index)"
+      >
+        <a
+          :href="generateArticleUrl(article)"
+          class="flex-auto truncate text-base font-medium leading-6 w-full hover:underline"
+        >
+          {{ article.title }}
+        </a>
+      </li>
+    </ul>
+
+    <div v-if="showEmptyResults" class="font-medium text-sm text-slate-400">
+      {{ emptyPlaceholder }}
+    </div>
+  </div>
+</template>
+
+<script>
+import mentionSelectionKeyboardMixin from 'dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js';
+
+export default {
+  mixins: [mentionSelectionKeyboardMixin],
+  props: {
+    items: {
+      type: Array,
+      default: () => [],
+    },
+    isLoading: {
+      type: Boolean,
+      default: false,
+    },
+    emptyPlaceholder: {
+      type: String,
+      default: '',
+    },
+    searchPlaceholder: {
+      type: String,
+      default: '',
+    },
+    loadingPlaceholder: {
+      type: String,
+      default: '',
+    },
+    resultsTitle: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      selectedIndex: 0,
+    };
+  },
+
+  computed: {
+    showEmptyResults() {
+      return !this.items.length && !this.isLoading;
+    },
+    shouldShowResults() {
+      return this.items.length && !this.isLoading;
+    },
+  },
+
+  methods: {
+    generateArticleUrl(article) {
+      return `/hc/${article.portal.slug}/${article.category.locale}/${article.category.slug}/${article.id}`;
+    },
+    handleKeyboardEvent(e) {
+      this.processKeyDownEvent(e);
+      this.$el.scrollTop = 40 * this.selectedIndex;
+    },
+    onHover(index) {
+      this.selectedIndex = index;
+    },
+    onSelect() {
+      window.location = this.generateArticleUrl(this.items[this.selectedIndex]);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index d31d1b6ba..647059b73 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -1,8 +1,13 @@
 export const navigateToLocalePage = () => {
   const allLocaleSwitcher = document.querySelector('.locale-switcher');
 
+  if (!allLocaleSwitcher) {
+    return false;
+  }
+
   const { portalSlug } = allLocaleSwitcher.dataset;
   allLocaleSwitcher.addEventListener('change', event => {
     window.location = `/hc/${portalSlug}/${event.target.value}/`;
   });
+  return false;
 };
diff --git a/app/javascript/shared/components/FluentIcon/icons.json b/app/javascript/shared/components/FluentIcon/icons.json
index 20981ed5c..27a81344f 100644
--- a/app/javascript/shared/components/FluentIcon/icons.json
+++ b/app/javascript/shared/components/FluentIcon/icons.json
@@ -11,6 +11,7 @@
   "link-outline": "M9.25 7a.75.75 0 0 1 .11 1.492l-.11.008H7a3.5 3.5 0 0 0-.206 6.994L7 15.5h2.25a.75.75 0 0 1 .11 1.492L9.25 17H7a5 5 0 0 1-.25-9.994L7 7h2.25ZM17 7a5 5 0 0 1 .25 9.994L17 17h-2.25a.75.75 0 0 1-.11-1.492l.11-.008H17a3.5 3.5 0 0 0 .206-6.994L17 8.5h-2.25a.75.75 0 0 1-.11-1.492L14.75 7H17ZM7 11.25h10a.75.75 0 0 1 .102 1.493L17 12.75H7a.75.75 0 0 1-.102-1.493L7 11.25h10H7Z",
   "more-vertical-outline": "M12 7.75a1.75 1.75 0 1 1 0-3.5 1.75 1.75 0 0 1 0 3.5ZM12 13.75a1.75 1.75 0 1 1 0-3.5 1.75 1.75 0 0 1 0 3.5ZM10.25 18a1.75 1.75 0 1 0 3.5 0 1.75 1.75 0 0 0-3.5 0Z",
   "open-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .966.783 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75v-4a.75.75 0 0 1 1.5 0v4A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h4a.75.75 0 0 1 0 1.5h-4ZM13 3.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-1.5 0V5.56l-5.22 5.22a.75.75 0 0 1-1.06-1.06l5.22-5.22h-4.69a.75.75 0 0 1-.75-.75Z",
+  "search-outline": "M10 2.75a7.25 7.25 0 0 1 5.63 11.819l4.9 4.9a.75.75 0 0 1-.976 1.134l-.084-.073-4.901-4.9A7.25 7.25 0 1 1 10 2.75Zm0 1.5a5.75 5.75 0 1 0 0 11.5 5.75 5.75 0 0 0 0-11.5Z",
   "send-outline": "M5.694 12 2.299 3.272c-.236-.607.356-1.188.942-.982l.093.04 18 9a.75.75 0 0 1 .097 1.283l-.097.058-18 9c-.583.291-1.217-.244-1.065-.847l.03-.096L5.694 12 2.299 3.272 5.694 12ZM4.402 4.54l2.61 6.71h6.627a.75.75 0 0 1 .743.648l.007.102a.75.75 0 0 1-.649.743l-.101.007H7.01l-2.609 6.71L19.322 12 4.401 4.54Z",
-  "sign-out-outline": ["M8.502 11.5a1.002 1.002 0 1 1 0 2.004 1.002 1.002 0 0 1 0-2.004Z","M12 4.354v6.651l7.442-.001L17.72 9.28a.75.75 0 0 1-.073-.976l.073-.084a.75.75 0 0 1 .976-.073l.084.073 2.997 2.997a.75.75 0 0 1 .073.976l-.073.084-2.996 3.004a.75.75 0 0 1-1.134-.975l.072-.085 1.713-1.717-7.431.001L12 19.25a.75.75 0 0 1-.88.739l-8.5-1.502A.75.75 0 0 1 2 17.75V5.75a.75.75 0 0 1 .628-.74l8.5-1.396a.75.75 0 0 1 .872.74Zm-1.5.883-7 1.15V17.12l7 1.236V5.237Z","M13 18.501h.765l.102-.006a.75.75 0 0 0 .648-.745l-.007-4.25H13v5.001ZM13.002 10 13 8.725V5h.745a.75.75 0 0 1 .743.647l.007.102.007 4.251h-1.5Z"]
+  "sign-out-outline": ["M8.502 11.5a1.002 1.002 0 1 1 0 2.004 1.002 1.002 0 0 1 0-2.004Z", "M12 4.354v6.651l7.442-.001L17.72 9.28a.75.75 0 0 1-.073-.976l.073-.084a.75.75 0 0 1 .976-.073l.084.073 2.997 2.997a.75.75 0 0 1 .073.976l-.073.084-2.996 3.004a.75.75 0 0 1-1.134-.975l.072-.085 1.713-1.717-7.431.001L12 19.25a.75.75 0 0 1-.88.739l-8.5-1.502A.75.75 0 0 1 2 17.75V5.75a.75.75 0 0 1 .628-.74l8.5-1.396a.75.75 0 0 1 .872.74Zm-1.5.883-7 1.15V17.12l7 1.236V5.237Z", "M13 18.501h.765l.102-.006a.75.75 0 0 0 .648-.745l-.007-4.25H13v5.001ZM13.002 10 13 8.725V5h.745a.75.75 0 0 1 .743.647l.007.102.007 4.251h-1.5Z"]
 }
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index 533c32d10..071fde9ee 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -17,6 +17,7 @@ By default, it renders:
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1">
+    <meta name= "turbolinks-cache-control" content= "no-cache">
     <%= javascript_pack_tag 'portal' %>
     <%= stylesheet_pack_tag 'portal' %>
     <%= csrf_meta_tags %>
@@ -35,4 +36,16 @@ By default, it renders:
       </main>
     </div>
   </body>
+  <script>
+    window.portalConfig = {
+      portalSlug: '<%= @portal.slug %>',
+      localeCode: '<%= @locale %>',
+      searchTranslations: {
+        searchPlaceholder: '<%= I18n.t('public_portal.search.search_placeholder') %>',
+        emptyPlaceholder: '<%= I18n.t('public_portal.search.empty_placeholder') %>',
+        loadingPlaceholder: '<%= I18n.t('public_portal.search.loading_placeholder') %>',
+        resultsTitle: '<%= I18n.t('public_portal.search.results_title') %>'
+      }
+    };
+  </script>
 </html>
diff --git a/app/views/public/api/v1/models/_article.json.jbuilder b/app/views/public/api/v1/models/_article.json.jbuilder
index 994c6c029..f9f7c3694 100644
--- a/app/views/public/api/v1/models/_article.json.jbuilder
+++ b/app/views/public/api/v1/models/_article.json.jbuilder
@@ -13,6 +13,14 @@ if article.portal.present?
   end
 end
 
+if article.category.present?
+  json.category do
+    json.id article.category.id
+    json.slug article.category.slug
+    json.locale article.category.locale
+  end
+end
+
 json.views article.views
 
 if article.author.present?
diff --git a/app/views/public/api/v1/portals/_footer.html.erb b/app/views/public/api/v1/portals/_footer.html.erb
index cd69a4fe4..2d0533b78 100644
--- a/app/views/public/api/v1/portals/_footer.html.erb
+++ b/app/views/public/api/v1/portals/_footer.html.erb
@@ -2,7 +2,7 @@
 <footer class="pt-16 pb-8 flex flex-col items-center justify-center">
   <div class="mx-auto max-w-2xl">
     <p class="text-slate-700 py-2 text-center">
-      Made with <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a> 💙.
+      Made with <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a> 💙
     </p>
   </div>
 </footer>
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index b7b1cbad2..59065d012 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -22,7 +22,7 @@
       <div class="inline-flex relative w-24">
         <select
           data-portal-slug="<%= @portal.slug %>"
-          class="appearance-none w-full bg-white px-3 py-2 pr-8 rounded leading-tight focus:outline-none focus:shadow-outline locale-switcher"
+          class="appearance-none w-full bg-white px-3 py-2 pr-8 rounded leading-tight focus:outline-none focus:shadow-outline locale-switcher hover:bg-slate-75 cursor-pointer"
         >
           <% @portal.config["allowed_locales"].each do |locale| %>
             <option <%= locale == params[:locale] ? 'selected': '' %> value="<%= locale %>"><%= locale %></option>
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index d4f59da7d..7976f61e6 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,9 +1,10 @@
 
-<section class="bg-gradient-to-b from-white to-black-50 pt-8 pb-16 md:py-16 flex flex-col items-center justify-center">
-  <div class="mx-auto max-w-2xl">
-    <h1 class="text-2xl px-5 md:text-4xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed text-center">
+<section class="bg-gradient-to-b from-white to-slate-75 pt-8 pb-16 md:py-16 flex flex-col items-center justify-center">
+  <div class="mx-auto w-full max-w-2xl flex flex-col items-center">
+    <h1 class="text-2xl px-5 md:text-4xl text-slate-900 font-semibold subpixel-antialiased leading-normal text-center">
       <%= portal.header_text %>
     </h1>
-    <p class="text-slate-700 py-2 text-center mt-10">Browse the categories below</p>
+    <p class="text-slate-600 py-2 text-center my-2 max-w-sm leading-normal"><%= I18n.t('public_portal.hero.sub_title') %></p>
+    <div id="search-wrap"></div>
   </div>
 </section>
diff --git a/app/views/public/api/v1/portals/articles/index.html.erb b/app/views/public/api/v1/portals/articles/index.html.erb
index 2b85c7edd..6bea67b54 100644
--- a/app/views/public/api/v1/portals/articles/index.html.erb
+++ b/app/views/public/api/v1/portals/articles/index.html.erb
@@ -2,8 +2,12 @@
 	<div class="max-w-4xl px-6 py-16 mx-auto space-y-12 w-full">
 		<div class="space-y-4">
 		<div>
-				<a class="text-slate-800 hover:underline leading-8"
-        href="/hc/<%= @portal.slug %>/<%= @category.slug %>" class=""><%= @portal.name %> Home</a>
+			<a
+				class="text-slate-800 hover:underline leading-8"
+        href="/hc/<%= @portal.slug %>/<%= @category.present? ? @category.slug : '' %>"
+			>
+				<%= @portal.name %> Home
+			</a>
 		<span>/</span>
 		<span>/</span>
 		</div>
@@ -23,7 +27,6 @@
 			<% end %>
 		</div>
 	</div>
-
 </div>
 <div class="max-w-4xl flex-grow w-full px-6 py-16 mx-auto space-y-12">
 	<article class="space-y-8 ">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fcad0e47b..982a480a2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -165,3 +165,11 @@ en:
     fullcontact:
       name: "Fullcontact"
       description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+  public_portal:
+    search:
+      search_placeholder: Search for article by title or body...
+      empty_placeholder: No results found.
+      loading_placeholder: Searching...
+      results_title: Search results
+    hero:
+      sub_title: Search for the articles here or browse the categories below.
diff --git a/config/routes.rb b/config/routes.rb
index b5a5cbdc7..23c6f1f8a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -290,6 +290,7 @@ Rails.application.routes.draw do
 
   get 'hc/:slug', to: 'public/api/v1/portals#show'
   get 'hc/:slug/:locale', to: 'public/api/v1/portals#show'
+  get 'hc/:slug/:locale/articles', to: 'public/api/v1/portals/articles#index'
   get 'hc/:slug/:locale/categories', to: 'public/api/v1/portals/categories#index'
   get 'hc/:slug/:locale/:category_slug', to: 'public/api/v1/portals/categories#show'
   get 'hc/:slug/:locale/:category_slug/articles', to: 'public/api/v1/portals/articles#index'

From 22d5703b92828a0a13e392fdf91f5bf555effbf2 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 20 Oct 2022 05:43:13 +0530
Subject: [PATCH 10/14] feat: Macros listing and Editor (#5606)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .codeclimate.yml                              |   2 +
 .../widgets/AutomationActionInput.vue         |  28 ++-
 .../dashboard/helper/specs/macrosFixtures.js  |  71 +++++++
 .../helper/specs/macrosHelper.spec.js         |  17 ++
 .../dashboard/i18n/locale/en/macros.json      |  70 ++++++-
 .../dashboard/mixins/macrosMixin.js           |  20 ++
 .../dashboard/mixins/specs/macros.spec.js     |  41 +++++
 .../dashboard/settings/automation/Index.vue   |   2 +-
 .../settings/macros/ActionButton.vue          |  58 ++++++
 .../dashboard/settings/macros/Index.vue       | 118 +++++++++++-
 .../dashboard/settings/macros/MacroEditor.vue | 134 +++++++++++++-
 .../dashboard/settings/macros/MacroForm.vue   | 126 +++++++++++++
 .../dashboard/settings/macros/MacroNode.vue   | 149 +++++++++++++++
 .../dashboard/settings/macros/MacroNodes.vue  | 109 +++++++++++
 .../settings/macros/MacroProperties.vue       | 174 ++++++++++++++++++
 .../settings/macros/MacrosTableRow.vue        |  74 ++++++++
 .../routes/dashboard/settings/macros/Pill.vue |  30 +++
 .../dashboard/settings/macros/constants.js    |  42 +++++
 .../dashboard/settings/macros/macroHelper.js  |  10 +
 .../settings/macros/macros.routes.js          |  12 +-
 app/javascript/dashboard/store/index.js       |  18 +-
 .../assets/stylesheets/border-radius.scss     |  12 +-
 .../FluentIcon/dashboard-icons.json           |   1 +
 23 files changed, 1287 insertions(+), 31 deletions(-)
 create mode 100644 app/javascript/dashboard/helper/specs/macrosFixtures.js
 create mode 100644 app/javascript/dashboard/helper/specs/macrosHelper.spec.js
 create mode 100644 app/javascript/dashboard/mixins/macrosMixin.js
 create mode 100644 app/javascript/dashboard/mixins/specs/macros.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/ActionButton.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/MacroForm.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/MacroNodes.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/Pill.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/macros/macroHelper.js

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 974681a09..d8b8d985b 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -54,3 +54,5 @@ exclude_patterns:
   - 'app/javascript/widget/i18n/index.js'
   - 'app/javascript/survey/i18n/index.js'
   - 'app/javascript/shared/constants/locales.js'
+  - 'app/javascript/dashboard/helper/specs/macrosFixtures.js'
+  - 'app/javascript/dashboard/routes/dashboard/settings/macros/constants.js'
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index 248bb5b35..93a5e3e6c 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    class="filter"
-    :class="{ error: v.action_params.$dirty && v.action_params.$error }"
-  >
+  <div class="filter" :class="actionInputStyles">
     <div class="filter-inputs">
       <select
         v-model="action_name"
@@ -60,6 +57,7 @@
         </div>
       </div>
       <woot-button
+        v-if="!isMacro"
         icon="dismiss"
         variant="clear"
         color-scheme="secondary"
@@ -120,6 +118,10 @@ export default {
       type: String,
       default: '',
     },
+    isMacro: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     action_name: {
@@ -146,6 +148,12 @@ export default {
       return this.actionTypes.find(action => action.key === this.action_name)
         .inputType;
     },
+    actionInputStyles() {
+      return {
+        error: this.v.action_params.$dirty && this.v.action_params.$error,
+        'is-a-macro': this.isMacro,
+      };
+    },
   },
   methods: {
     removeAction() {
@@ -165,6 +173,18 @@ export default {
   border: 1px solid var(--color-border);
   border-radius: var(--border-radius-medium);
   margin-bottom: var(--space-small);
+
+  &.is-a-macro {
+    margin-bottom: 0;
+    background: var(--white);
+    padding: var(--space-zero);
+    border: unset;
+    border-radius: unset;
+  }
+}
+
+.no-margin-bottom {
+  margin-bottom: 0;
 }
 
 .filter.error {
diff --git a/app/javascript/dashboard/helper/specs/macrosFixtures.js b/app/javascript/dashboard/helper/specs/macrosFixtures.js
new file mode 100644
index 000000000..745168d40
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/macrosFixtures.js
@@ -0,0 +1,71 @@
+export const teams = [
+  {
+    id: 1,
+    name: '⚙️ sales team',
+    description: 'This is our internal sales team',
+    allow_auto_assign: true,
+    account_id: 1,
+    is_member: true,
+  },
+  {
+    id: 2,
+    name: '🤷‍♂️ fayaz',
+    description: 'Test',
+    allow_auto_assign: true,
+    account_id: 1,
+    is_member: true,
+  },
+  {
+    id: 3,
+    name: '🇮🇳 apac sales',
+    description: 'Sales team for France Territory',
+    allow_auto_assign: true,
+    account_id: 1,
+    is_member: true,
+  },
+];
+
+export const labels = [
+  {
+    id: 6,
+    title: 'sales',
+    description: 'sales team',
+    color: '#8EA20F',
+    show_on_sidebar: true,
+  },
+  {
+    id: 2,
+    title: 'billing',
+    description: 'billing',
+    color: '#4077DA',
+    show_on_sidebar: true,
+  },
+  {
+    id: 1,
+    title: 'snoozed',
+    description: 'Items marked for later',
+    color: '#D12F42',
+    show_on_sidebar: true,
+  },
+  {
+    id: 5,
+    title: 'mobile-app',
+    description: 'tech team',
+    color: '#2DB1CC',
+    show_on_sidebar: true,
+  },
+  {
+    id: 14,
+    title: 'human-resources-department-with-long-title',
+    description: 'Test',
+    color: '#FF6E09',
+    show_on_sidebar: true,
+  },
+  {
+    id: 22,
+    title: 'priority',
+    description: 'For important sales leads',
+    color: '#7E7CED',
+    show_on_sidebar: true,
+  },
+];
diff --git a/app/javascript/dashboard/helper/specs/macrosHelper.spec.js b/app/javascript/dashboard/helper/specs/macrosHelper.spec.js
new file mode 100644
index 000000000..26c731aa8
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/macrosHelper.spec.js
@@ -0,0 +1,17 @@
+import { emptyMacro } from '../../routes/dashboard/settings/macros/macroHelper';
+
+describe('#emptyMacro', () => {
+  const defaultMacro = {
+    name: '',
+    actions: [
+      {
+        action_name: 'assign_team',
+        action_params: [],
+      },
+    ],
+    visibility: 'global',
+  };
+  it('returns the default macro', () => {
+    expect(emptyMacro).toEqual(defaultMacro);
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/macros.json b/app/javascript/dashboard/i18n/locale/en/macros.json
index 3923e4374..132151241 100644
--- a/app/javascript/dashboard/i18n/locale/en/macros.json
+++ b/app/javascript/dashboard/i18n/locale/en/macros.json
@@ -1,5 +1,73 @@
 {
   "MACROS": {
-    "HEADER": "Macros"
+    "HEADER": "Macros",
+    "HEADER_BTN_TXT": "Add a new macro",
+    "HEADER_BTN_TXT_SAVE": "Save macro",
+    "LOADING": "Fetching macros",
+    "SIDEBAR_TXT": "<p><b>Macros</b><p>A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click. When the agents run the macro, the actions would be performed sequentially in the order they are defined. Macros improve productivity and increase consistency in actions. </p><p>A macro can be helpful in 2 ways. </p><p><b>As an agent assist:</b> If an agent performs a set of actions multiple times, they can save it as a macro and execute all the actions together using a single click.</p><p><b>As an option to onboard a team member:</b> Every agent has to perform many different checks/actions during each conversation. Onboarding a new support team member will be easy if pre-defined macros are available on the account. Instead of describing each step in detail, the manager/team lead can point to the macros used in different scenarios.</p>",
+    "ERROR": "Something went wrong. Please try again",
+    "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
+    "ADD": {
+      "FORM": {
+        "NAME": {
+          "LABEL": "Macro name",
+          "PLACEHOLDER": "Enter a name for your macro",
+          "ERROR": "Name is required for creating a macro"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Macro added successfully",
+        "ERROR_MESSAGE": "Unable to create macro, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Created by",
+        "Last updated by",
+        "Visibility"
+      ],
+      "404": "No macros found"
+    },
+    "DELETE": {
+      "TOOLTIP": "Delete macro",
+      "CONFIRM": {
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete",
+        "NO": "No"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Macro deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the macro. Please try again later"
+      }
+    },
+    "EDIT": {
+      "TOOLTIP": "Edit macro",
+      "API": {
+        "SUCCESS_MESSAGE": "Macro updated successfully",
+        "ERROR_MESSAGE": "Could not update Macro, Please try again later"
+      }
+    },
+    "EDITOR": {
+      "START_FLOW": "Start Flow",
+      "END_FLOW": "End Flow",
+      "LOADING": "Fetching macro",
+      "ADD_BTN_TOOLTIP": "Add new action",
+      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "VISIBILITY": {
+        "LABEL": "Macro Visibility",
+        "GLOBAL": {
+          "LABEL": "Public",
+          "DESCRIPTION": "This macro is available publicly for all agents in this account."
+        },
+        "PERSONAL": {
+          "LABEL": "Private",
+          "DESCRIPTION": "This macro will be private to you and not be available to others."
+        }
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/mixins/macrosMixin.js b/app/javascript/dashboard/mixins/macrosMixin.js
new file mode 100644
index 000000000..d28f82ab5
--- /dev/null
+++ b/app/javascript/dashboard/mixins/macrosMixin.js
@@ -0,0 +1,20 @@
+export default {
+  methods: {
+    getDropdownValues(type) {
+      switch (type) {
+        case 'assign_team':
+        case 'send_email_to_team':
+          return this.teams;
+        case 'add_label':
+          return this.labels.map(i => {
+            return {
+              id: i.title,
+              name: i.title,
+            };
+          });
+        default:
+          return [];
+      }
+    },
+  },
+};
diff --git a/app/javascript/dashboard/mixins/specs/macros.spec.js b/app/javascript/dashboard/mixins/specs/macros.spec.js
new file mode 100644
index 000000000..5c9804ee9
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/macros.spec.js
@@ -0,0 +1,41 @@
+import { createWrapper } from '@vue/test-utils';
+import macrosMixin from '../macrosMixin';
+import Vue from 'vue';
+import { teams, labels } from '../../helper/specs/macrosFixtures';
+describe('webhookMixin', () => {
+  describe('#getEventLabel', () => {
+    it('returns correct i18n translation:', () => {
+      const Component = {
+        render() {},
+        title: 'MyComponent',
+        mixins: [macrosMixin],
+        data: () => {
+          return {
+            teams,
+            labels,
+          };
+        },
+        methods: {
+          $t(text) {
+            return text;
+          },
+        },
+      };
+
+      const resolvedLabels = labels.map(i => {
+        return {
+          id: i.title,
+          name: i.title,
+        };
+      });
+
+      const Constructor = Vue.extend(Component);
+      const vm = new Constructor().$mount();
+      const wrapper = createWrapper(vm);
+      expect(wrapper.vm.getDropdownValues('assign_team')).toEqual(teams);
+      expect(wrapper.vm.getDropdownValues('send_email_to_team')).toEqual(teams);
+      expect(wrapper.vm.getDropdownValues('add_label')).toEqual(resolvedLabels);
+      expect(wrapper.vm.getDropdownValues()).toEqual([]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index a6feb1346..248aa884b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -225,7 +225,7 @@ export default {
           mode === 'EDIT'
             ? this.$t('AUTOMATION.EDIT.API.SUCCESS_MESSAGE')
             : this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE');
-        await await this.$store.dispatch(action, payload);
+        await this.$store.dispatch(action, payload);
         this.showAlert(this.$t(successMessage));
         this.hideAddPopup();
         this.hideEditPopup();
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/ActionButton.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/ActionButton.vue
new file mode 100644
index 000000000..ce5645961
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/ActionButton.vue
@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <button
+      v-tooltip="tooltip"
+      class="macros__action-button"
+      :class="type"
+      @click="$emit('click')"
+    >
+      <fluent-icon :icon="icon" aria-hidden="true" />
+    </button>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      type: String,
+      default: 'add',
+    },
+    tooltip: {
+      type: String,
+      default: '',
+    },
+    icon: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.macros__action-button {
+  height: var(--space-three);
+  width: var(--space-three);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  font-size: var(--font-size-default);
+  border-radius: var(--border-radius-rounded);
+  position: relative;
+  margin-left: var(--space-one);
+
+  &.add {
+    background-color: var(--g-100);
+    color: var(--g-600);
+  }
+  &.delete {
+    position: absolute;
+    top: calc(var(--space-three) / -2);
+    right: calc(var(--space-three) / -2);
+    background-color: var(--r-100);
+    color: var(--r-600);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
index 39f017fef..31f661a55 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
@@ -1,11 +1,121 @@
 <template>
-  <div>
-    Macros
+  <div class="column content-box">
+    <router-link
+      :to="addAccountScoping('settings/macros/new')"
+      class="button success button--fixed-right-top"
+    >
+      <fluent-icon icon="add-circle" />
+      <span class="button__content">
+        {{ $t('MACROS.HEADER_BTN_TXT') }}
+      </span>
+    </router-link>
+    <div class="row">
+      <div class="small-8 columns with-right-space">
+        <div
+          v-if="!uiFlags.isFetching && !records.length"
+          class="macros__empty-state"
+        >
+          <p class="no-items-error-message">
+            {{ $t('MACROS.LIST.404') }}
+          </p>
+        </div>
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('MACROS.LOADING')"
+        />
+        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
+          <thead>
+            <th
+              v-for="thHeader in $t('MACROS.LIST.TABLE_HEADER')"
+              :key="thHeader"
+            >
+              {{ thHeader }}
+            </th>
+          </thead>
+          <tbody>
+            <macros-table-row
+              v-for="(macro, index) in records"
+              :key="index"
+              :macro="macro"
+              @delete="openDeletePopup(macro, index)"
+            />
+          </tbody>
+        </table>
+      </div>
+      <div class="small-4 columns">
+        <span v-dompurify-html="$t('MACROS.SIDEBAR_TXT')" />
+      </div>
+    </div>
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="$t('LABEL_MGMT.DELETE.CONFIRM.TITLE')"
+      :message="$t('MACROS.DELETE.CONFIRM.MESSAGE')"
+      :message-value="deleteMessage"
+      :confirm-text="$t('MACROS.DELETE.CONFIRM.YES')"
+      :reject-text="$t('MACROS.DELETE.CONFIRM.NO')"
+    />
   </div>
 </template>
 
 <script>
-export default {};
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import accountMixin from 'dashboard/mixins/account.js';
+import MacrosTableRow from './MacrosTableRow';
+export default {
+  components: {
+    MacrosTableRow,
+  },
+  mixins: [alertMixin, accountMixin],
+  data() {
+    return {
+      showDeleteConfirmationPopup: false,
+      selectedResponse: {},
+      loading: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      records: ['macros/getMacros'],
+      uiFlags: 'macros/getUIFlags',
+    }),
+    deleteMessage() {
+      return ` ${this.selectedResponse.name}?`;
+    },
+  },
+  mounted() {
+    this.$store.dispatch('macros/get');
+  },
+  methods: {
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
+      this.selectedResponse = response;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    confirmDeletion() {
+      this.loading[this.selectedResponse.id] = true;
+      this.closeDeletePopup();
+      this.deleteMacro(this.selectedResponse.id);
+    },
+    async deleteMacro(id) {
+      try {
+        await this.$store.dispatch('macros/delete', id);
+        this.showAlert(this.$t('MACROS.DELETE.API.SUCCESS_MESSAGE'));
+        this.loading[this.selectedResponse.id] = false;
+      } catch (error) {
+        this.showAlert(this.$t('MACROS.DELETE.API.ERROR_MESSAGE'));
+      }
+    },
+  },
+};
 </script>
 
-<style></style>
+<style scoped>
+.macros__empty-state {
+  padding: var(--space-slab);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
index 2de1f787c..b3ead6750 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
@@ -1,9 +1,137 @@
 <template>
-  <div>MacrosEditor</div>
+  <div class="column content-box">
+    <woot-loading-state
+      v-if="uiFlags.isFetchingItem"
+      :message="$t('MACROS.EDITOR.LOADING')"
+    />
+    <macro-form
+      v-if="macro && !uiFlags.isFetchingItem"
+      :macro-data.sync="macro"
+      @submit="saveMacro"
+    />
+  </div>
 </template>
 
 <script>
-export default {};
+import MacroForm from './MacroForm';
+import { MACRO_ACTION_TYPES } from './constants';
+import { mapGetters } from 'vuex';
+import { emptyMacro } from './macroHelper';
+import actionQueryGenerator from 'dashboard/helper/actionQueryGenerator.js';
+import alertMixin from 'shared/mixins/alertMixin';
+import macrosMixin from 'dashboard/mixins/macrosMixin';
+
+export default {
+  components: {
+    MacroForm,
+  },
+  mixins: [alertMixin, macrosMixin],
+  provide() {
+    return {
+      macroActionTypes: this.macroActionTypes,
+    };
+  },
+  data() {
+    return {
+      macro: null,
+      mode: 'CREATE',
+      macroActionTypes: MACRO_ACTION_TYPES,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'macros/getUIFlags',
+      labels: 'labels/getLabels',
+      teams: 'teams/getTeams',
+    }),
+    macroId() {
+      return this.$route.params.macroId;
+    },
+  },
+  watch: {
+    $route: {
+      handler() {
+        if (this.$route.params.macroId) {
+          this.fetchMacro();
+        } else {
+          this.initNewMacro();
+        }
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    fetchMacro() {
+      this.mode = 'EDIT';
+      this.$store.dispatch('agents/get');
+      this.$store.dispatch('teams/get');
+      this.$store.dispatch('labels/get');
+      this.manifestMacro();
+    },
+    async manifestMacro() {
+      await this.$store.dispatch('macros/getSingleMacro', this.macroId);
+      const singleMacro = this.$store.getters['macros/getMacro'](this.macroId);
+      this.macro = this.formatMacro(singleMacro);
+    },
+    formatMacro(macro) {
+      const formattedActions = macro.actions.map(action => {
+        let actionParams = [];
+        if (action.action_params.length) {
+          const inputType = this.macroActionTypes.find(
+            item => item.key === action.action_name
+          ).inputType;
+          if (inputType === 'multi_select') {
+            actionParams = [
+              ...this.getDropdownValues(action.action_name, this.$store),
+            ].filter(item => [...action.action_params].includes(item.id));
+          } else if (inputType === 'team_message') {
+            actionParams = {
+              team_ids: [
+                ...this.getDropdownValues(action.action_name, this.$store),
+              ].filter(item =>
+                [...action.action_params[0].team_ids].includes(item.id)
+              ),
+              message: action.action_params[0].message,
+            };
+          } else actionParams = [...action.action_params];
+        }
+        return {
+          ...action,
+          action_params: actionParams,
+        };
+      });
+      return {
+        ...macro,
+        actions: formattedActions,
+      };
+    },
+    initNewMacro() {
+      this.mode = 'CREATE';
+      this.macro = emptyMacro;
+    },
+    async saveMacro(macro) {
+      try {
+        const action = this.mode === 'EDIT' ? 'macros/update' : 'macros/create';
+        let successMessage =
+          this.mode === 'EDIT'
+            ? this.$t('MACROS.EDIT.API.SUCCESS_MESSAGE')
+            : this.$t('MACROS.ADD.API.SUCCESS_MESSAGE');
+        let serializedMacro = JSON.parse(JSON.stringify(macro));
+        serializedMacro.actions = actionQueryGenerator(serializedMacro.actions);
+        await this.$store.dispatch(action, serializedMacro);
+        this.showAlert(successMessage);
+        this.$router.push({ name: 'macros_wrapper' });
+      } catch (error) {
+        this.showAlert(this.$t('MACROS.ERROR'));
+      }
+    },
+  },
+};
 </script>
 
-<style></style>
+<style scoped>
+.content-box {
+  padding: 0;
+  height: 100vh;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroForm.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroForm.vue
new file mode 100644
index 000000000..36162db3a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroForm.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="row">
+    <div class="small-8 columns with-right-space macros-canvas">
+      <macro-nodes
+        v-model="macro.actions"
+        @addNewNode="appendNode"
+        @deleteNode="deleteNode"
+        @resetAction="resetNode"
+      />
+    </div>
+    <div class="small-4 columns">
+      <macro-properties
+        :macro-name="macro.name"
+        :macro-visibility="macro.visibility"
+        @update:name="updateName"
+        @update:visibility="updateVisibility"
+        @submit="submit"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import MacroNodes from './MacroNodes';
+import MacroProperties from './MacroProperties';
+import { required, requiredIf } from 'vuelidate/lib/validators';
+
+export default {
+  components: {
+    MacroNodes,
+    MacroProperties,
+  },
+  provide() {
+    return {
+      $v: this.$v,
+    };
+  },
+  props: {
+    macroData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      macro: this.macroData,
+    };
+  },
+  watch: {
+    macroData: {
+      handler() {
+        this.macro = this.macroData;
+      },
+      immediate: true,
+    },
+  },
+  validations: {
+    macro: {
+      name: {
+        required,
+      },
+      visibility: {
+        required,
+      },
+      actions: {
+        required,
+        $each: {
+          action_params: {
+            required: requiredIf(prop => {
+              if (prop.action_name === 'send_email_to_team') return true;
+              return !(
+                prop.action_name === 'mute_conversation' ||
+                prop.action_name === 'snooze_conversation' ||
+                prop.action_name === 'resolve_conversation'
+              );
+            }),
+          },
+        },
+      },
+    },
+  },
+  mounted() {
+    this.$v.$reset();
+  },
+  methods: {
+    updateName(value) {
+      this.macro.name = value;
+    },
+    updateVisibility(value) {
+      this.macro.visibility = value;
+    },
+    appendNode() {
+      this.macro.actions.push({
+        action_name: 'assign_team',
+        action_params: [],
+      });
+    },
+    deleteNode(index) {
+      this.macro.actions.splice(index, 1);
+    },
+    submit() {
+      this.$v.$touch();
+      if (this.$v.$invalid) return;
+      this.$emit('submit', this.macro);
+    },
+    resetNode(index) {
+      this.macro.actions[index].action_params = [];
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.row {
+  height: 100%;
+}
+.macros-canvas {
+  background-image: radial-gradient(var(--s-100) 1.2px, transparent 0);
+  background-size: var(--space-normal) var(--space-normal);
+  height: 100%;
+  max-height: 100%;
+  padding: var(--space-normal) var(--space-three);
+  max-height: 100vh;
+  overflow-y: auto;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
new file mode 100644
index 000000000..533512c87
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
@@ -0,0 +1,149 @@
+<template>
+  <div class="macro__node-action-container">
+    <fluent-icon
+      v-if="!singleNode"
+      size="20"
+      icon="navigation"
+      class="macros__node-drag-handle"
+    />
+    <div
+      class="macro__node-action-item"
+      :class="{
+        'has-error': hasError($v.macro.actions.$each[index]),
+      }"
+    >
+      <action-input
+        v-model="actionData"
+        :action-types="macroActionTypes"
+        :dropdown-values="dropdownValues()"
+        :show-action-input="showActionInput"
+        :show-remove-button="false"
+        :is-macro="true"
+        :v="$v.macro.actions.$each[index]"
+        @resetAction="$emit('resetAction')"
+      />
+      <macro-action-button
+        v-if="!singleNode"
+        icon="dismiss-circle"
+        class="macro__node macro__node-action-button-delete"
+        type="delete"
+        :tooltip="$t('MACROS.EDITOR.DELETE_BTN_TOOLTIP')"
+        @click="$emit('deleteNode')"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import ActionInput from 'dashboard/components/widgets/AutomationActionInput';
+import MacroActionButton from './ActionButton.vue';
+import macrosMixin from 'dashboard/mixins/macrosMixin';
+import { mapGetters } from 'vuex';
+
+export default {
+  components: {
+    ActionInput,
+    MacroActionButton,
+  },
+  mixins: [macrosMixin],
+  inject: ['macroActionTypes', '$v'],
+  props: {
+    singleNode: {
+      type: Boolean,
+      default: false,
+    },
+    value: {
+      type: Object,
+      default: () => ({}),
+    },
+    index: {
+      type: Number,
+      default: 0,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      labels: 'labels/getLabels',
+      teams: 'teams/getTeams',
+    }),
+    actionData: {
+      get() {
+        return this.value;
+      },
+      set(value) {
+        this.$emit('input', value);
+      },
+    },
+    showActionInput() {
+      if (
+        this.actionData.action_name === 'send_email_to_team' ||
+        this.actionData.action_name === 'send_message'
+      )
+        return false;
+      const type = this.macroActionTypes.find(
+        action => action.key === this.actionData.action_name
+      ).inputType;
+      return !!type;
+    },
+  },
+  methods: {
+    dropdownValues() {
+      return this.getDropdownValues(this.value.action_name, this.$store);
+    },
+    hasError(v) {
+      return !!(v.action_params.$dirty && v.action_params.$error);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.macro__node-action-container {
+  position: relative;
+  .macros__node-drag-handle {
+    position: absolute;
+    left: var(--space-minus-medium);
+    top: var(--space-smaller);
+    cursor: move;
+    color: var(--s-400);
+  }
+  .macro__node-action-item {
+    background-color: var(--white);
+    padding: var(--space-slab);
+    border-radius: var(--border-radius-medium);
+    box-shadow: rgb(0 0 0 / 3%) 0px 6px 24px 0px,
+      rgb(0 0 0 / 6%) 0px 0px 0px 1px;
+
+    .macro__node-action-button-delete {
+      display: none;
+    }
+    &:hover {
+      .macro__node-action-button-delete {
+        display: flex;
+      }
+    }
+    &.has-error {
+      animation: shake 0.3s ease-in-out 0s 2;
+      background-color: var(--r-50);
+    }
+  }
+}
+
+@keyframes shake {
+  0% {
+    transform: translateX(0);
+  }
+  25% {
+    transform: translateX(0.375rem);
+  }
+  50% {
+    transform: translateX(-0.375rem);
+  }
+  75% {
+    transform: translateX(0.375rem);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNodes.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNodes.vue
new file mode 100644
index 000000000..6e8b82007
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNodes.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="macros__nodes">
+    <macros-pill :label="$t('MACROS.EDITOR.START_FLOW')" class="macro__node" />
+    <draggable
+      :list="actionData"
+      animation="200"
+      ghost-class="ghost"
+      tag="div"
+      class="macros__nodes-draggable"
+      handle=".macros__node-drag-handle"
+      @start="dragging = true"
+      @end="dragging = false"
+    >
+      <div v-for="(action, i) in actionData" :key="i" class="macro__node">
+        <macro-node
+          v-model="actionData[i]"
+          class="macros__node-action"
+          type="add"
+          :index="i"
+          :single-node="actionData.length === 1"
+          @resetAction="$emit('resetAction', i)"
+          @deleteNode="$emit('deleteNode', i)"
+        />
+      </div>
+    </draggable>
+    <macro-action-button
+      icon="add-circle"
+      class="macro__node"
+      :tooltip="$t('MACROS.EDITOR.ADD_BTN_TOOLTIP')"
+      type="add"
+      @click="$emit('addNewNode')"
+    />
+    <macros-pill :label="$t('MACROS.EDITOR.END_FLOW')" class="macro__node" />
+  </div>
+</template>
+
+<script>
+import MacrosPill from './Pill.vue';
+import Draggable from 'vuedraggable';
+import MacroNode from './MacroNode.vue';
+import MacroActionButton from './ActionButton.vue';
+
+export default {
+  components: {
+    Draggable,
+    MacrosPill,
+    MacroNode,
+    MacroActionButton,
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      dragging: false,
+    };
+  },
+  computed: {
+    actionData: {
+      get() {
+        return this.value;
+      },
+      set(value) {
+        this.$emit('input', value);
+      },
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.macros__nodes {
+  max-width: 800px;
+}
+
+.macro__node:not(:last-child) {
+  position: relative;
+  padding-bottom: var(--space-three);
+}
+
+.macro__node:not(:last-child):not(.sortable-chosen):after,
+.macros__nodes-draggable:after {
+  content: '';
+  position: absolute;
+  height: var(--space-three);
+  width: var(--space-smaller);
+  margin-left: var(--space-medium);
+  background-image: url("data:image/svg+xml,%3Csvg width='4' height='30' viewBox='0 0 4 30' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cline x1='1.50098' y1='0.579529' x2='1.50098' y2='30.5795' stroke='%2393afc8' stroke-width='2' stroke-dasharray='5 5'/%3E%3C/svg%3E%0A");
+}
+
+.macros__nodes-draggable {
+  position: relative;
+  padding-bottom: var(--space-three);
+}
+
+.macros__node-action-container {
+  position: relative;
+  .drag-handle {
+    position: absolute;
+    left: var(--space-minus-medium);
+    top: var(--space-smaller);
+    cursor: move;
+    color: var(--s-400);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
new file mode 100644
index 000000000..ec8588ef8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="macros__properties-panel">
+    <div>
+      <woot-input
+        :value="macroName"
+        :label="$t('MACROS.ADD.FORM.NAME.LABEL')"
+        :placeholder="$t('MACROS.ADD.FORM.NAME.PLACEHOLDER')"
+        :error="$v.macro.name.$error ? $t('MACROS.ADD.FORM.NAME.ERROR') : null"
+        :class="{ error: $v.macro.name.$error }"
+        @input="onUpdateName($event)"
+      />
+    </div>
+    <div>
+      <p class="title">{{ $t('MACROS.EDITOR.VISIBILITY.LABEL') }}</p>
+      <div class="macros__form-visibility">
+        <button
+          class="card"
+          :class="isActive('global')"
+          @click="onUpdateVisibility('global')"
+        >
+          <fluent-icon
+            v-if="macroVisibility === 'global'"
+            icon="checkmark-circle"
+            type="solid"
+            class="visibility-check"
+          />
+          <p class="title">
+            {{ $t('MACROS.EDITOR.VISIBILITY.GLOBAL.LABEL') }}
+          </p>
+          <p class="subtitle">
+            {{ $t('MACROS.EDITOR.VISIBILITY.GLOBAL.DESCRIPTION') }}
+          </p>
+        </button>
+        <button
+          class="card"
+          :class="isActive('personal')"
+          @click="onUpdateVisibility('personal')"
+        >
+          <fluent-icon
+            v-if="macroVisibility === 'personal'"
+            icon="checkmark-circle"
+            type="solid"
+            class="visibility-check"
+          />
+          <p class="title">
+            {{ $t('MACROS.EDITOR.VISIBILITY.PERSONAL.LABEL') }}
+          </p>
+          <p class="subtitle">
+            {{ $t('MACROS.EDITOR.VISIBILITY.PERSONAL.DESCRIPTION') }}
+          </p>
+        </button>
+      </div>
+      <div class="macros__info-panel">
+        <fluent-icon icon="info" size="20" />
+        <p>
+          {{ $t('MACROS.ORDER_INFO') }}
+        </p>
+      </div>
+    </div>
+    <div class="macros__submit-button">
+      <woot-button
+        size="expanded"
+        color-scheme="success"
+        @click="$emit('submit')"
+      >
+        {{ $t('MACROS.HEADER_BTN_TXT_SAVE') }}
+      </woot-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  inject: ['$v'],
+  props: {
+    macroName: {
+      type: String,
+      default: '',
+    },
+    macroVisibility: {
+      type: String,
+      default: 'global',
+    },
+  },
+  methods: {
+    isActive(key) {
+      return { active: this.macroVisibility === key };
+    },
+    onUpdateName(value) {
+      this.$emit('update:name', value);
+    },
+    onUpdateVisibility(value) {
+      this.$emit('update:visibility', value);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.macros__properties-panel {
+  padding: var(--space-slab);
+  background-color: var(--white);
+  // full screen height subtracted by the height of the header
+  height: calc(100vh - 5.6rem);
+  display: flex;
+  flex-direction: column;
+  border-left: 1px solid var(--s-50);
+}
+
+.macros__submit-button {
+  margin-top: auto;
+}
+
+.macros__form-visibility {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: var(--space-slab);
+
+  .card {
+    padding: var(--space-small);
+    border-radius: var(--border-radius-normal);
+    border: 1px solid var(--s-200);
+    text-align: left;
+    cursor: pointer;
+    position: relative;
+
+    &.active {
+      background-color: var(--w-25);
+      border: 1px solid var(--w-300);
+    }
+
+    .subtitle {
+      font-size: var(--font-size-mini);
+      color: var(--s-500);
+    }
+
+    .title {
+      display: block;
+      margin: 0;
+      font-size: var(--font-size-small);
+      font-weight: var(--font-weight-medium);
+      line-height: 1.8;
+      color: var(--color-body);
+    }
+
+    .visibility-check {
+      position: absolute;
+      color: var(--w-500);
+      top: var(--space-small);
+      right: var(--space-small);
+    }
+  }
+}
+
+.macros__info-panel {
+  margin-top: var(--space-small);
+  display: flex;
+  background-color: var(--s-50);
+  padding: var(--space-small);
+  border-radius: var(--border-radius-normal);
+  align-items: flex-start;
+  svg {
+    flex-shrink: 0;
+  }
+  p {
+    margin-left: var(--space-small);
+    color: var(--s-600);
+  }
+}
+
+::v-deep input[type='text'] {
+  margin-bottom: var(--space-small);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
new file mode 100644
index 000000000..29419db85
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
@@ -0,0 +1,74 @@
+<template>
+  <tr>
+    <td>{{ macro.name }}</td>
+    <td>
+      <div class="avatar-container">
+        <thumbnail :username="macro.created_by.name" size="24px" />
+        <span class="ml-2">{{ macro.created_by.name }}</span>
+      </div>
+    </td>
+    <td>
+      <div class="avatar-container">
+        <thumbnail :username="macro.updated_by.name" size="24px" />
+        <span class="ml-2">{{ macro.updated_by.name }}</span>
+      </div>
+    </td>
+    <td>{{ visibilityLabel }}</td>
+    <td class="button-wrapper">
+      <router-link :to="addAccountScoping(`settings/macros/${macro.id}/edit`)">
+        <woot-button
+          v-tooltip.top="$t('MACROS.EDIT.TOOLTIP')"
+          variant="smooth"
+          size="tiny"
+          color-scheme="secondary"
+          class-names="grey-btn"
+          icon="edit"
+        />
+      </router-link>
+      <woot-button
+        v-tooltip.top="$t('MACROS.DELETE.TOOLTIP')"
+        variant="smooth"
+        color-scheme="alert"
+        size="tiny"
+        icon="dismiss-circle"
+        class-names="grey-btn"
+        @click="$emit('delete')"
+      />
+    </td>
+  </tr>
+</template>
+
+<script>
+import Thumbnail from 'dashboard/components/widgets/Thumbnail';
+import accountMixin from 'dashboard/mixins/account.js';
+export default {
+  components: {
+    Thumbnail,
+  },
+  mixins: [accountMixin],
+  props: {
+    macro: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    visibilityLabel() {
+      return this.macro.visibility === 'global'
+        ? this.$t('MACROS.EDITOR.VISIBILITY.GLOBAL.LABEL')
+        : this.$t('MACROS.EDITOR.VISIBILITY.PERSONAL.LABEL');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.avatar-container {
+  display: flex;
+  align-items: center;
+
+  span {
+    margin-left: var(--space-one);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/Pill.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/Pill.vue
new file mode 100644
index 000000000..d17afe774
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/Pill.vue
@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <div class="macros-item macros-pill">
+      <span>{{ label }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    label: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<style scoped>
+.macros-pill {
+  padding: var(--space-slab);
+  background-color: var(--w-500);
+  max-width: max-content;
+  color: var(--white);
+  font-size: var(--font-size-small);
+  border-radius: var(--border-radius-full);
+  position: relative;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
new file mode 100644
index 000000000..d0638d414
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
@@ -0,0 +1,42 @@
+export const MACRO_ACTION_TYPES = [
+  {
+    key: 'assign_team',
+    label: 'Assign a team',
+    inputType: 'multi_select',
+  },
+  {
+    key: 'add_label',
+    label: 'Add a label',
+    inputType: 'multi_select',
+  },
+  {
+    key: 'send_email_transcript',
+    label: 'Send an email transcript',
+    inputType: 'email',
+  },
+  {
+    key: 'mute_conversation',
+    label: 'Mute conversation',
+    inputType: null,
+  },
+  {
+    key: 'snooze_conversation',
+    label: 'Snooze conversation',
+    inputType: null,
+  },
+  {
+    key: 'resolve_conversation',
+    label: 'Resolve conversation',
+    inputType: null,
+  },
+  {
+    key: 'send_attachment',
+    label: 'Send Attachment',
+    inputType: 'attachment',
+  },
+  {
+    key: 'send_message',
+    label: 'Send a message',
+    inputType: 'textarea',
+  },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/macroHelper.js b/app/javascript/dashboard/routes/dashboard/settings/macros/macroHelper.js
new file mode 100644
index 000000000..134e0d943
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/macroHelper.js
@@ -0,0 +1,10 @@
+export const emptyMacro = {
+  name: '',
+  actions: [
+    {
+      action_name: 'assign_team',
+      action_params: [],
+    },
+  ],
+  visibility: 'global',
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/macros.routes.js b/app/javascript/dashboard/routes/dashboard/settings/macros/macros.routes.js
index 9752b79fb..23306a8bf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/macros.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/macros.routes.js
@@ -8,10 +8,14 @@ export default {
     {
       path: frontendURL('accounts/:accountId/settings/macros'),
       component: SettingsContent,
-      props: {
-        headerTitle: 'MACROS.HEADER',
-        icon: 'flash-settings',
-        showNewButton: false,
+      props: params => {
+        const showBackButton = params.name !== 'macros_wrapper';
+        return {
+          headerTitle: 'MACROS.HEADER',
+          headerButtonText: 'MACROS.HEADER_BTN_TXT',
+          icon: 'flash-settings',
+          showBackButton,
+        };
       },
       children: [
         {
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index f2fe95b50..481c6f107 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -2,14 +2,16 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 
 import accounts from './modules/accounts';
-import agents from './modules/agents';
 import agentBots from './modules/agentBots';
+import agents from './modules/agents';
+import articles from './modules/helpCenterArticles';
 import attributes from './modules/attributes';
 import auth from './modules/auth';
 import automations from './modules/automations';
 import bulkActions from './modules/bulkActions';
 import campaigns from './modules/campaigns';
 import cannedResponse from './modules/cannedResponse';
+import categories from './modules/helpCenterCategories';
 import contactConversations from './modules/contactConversations';
 import contactLabels from './modules/contactLabels';
 import contactNotes from './modules/contactNotes';
@@ -30,28 +32,29 @@ import inboxes from './modules/inboxes';
 import inboxMembers from './modules/inboxMembers';
 import integrations from './modules/integrations';
 import labels from './modules/labels';
+import macros from './modules/macros';
 import notifications from './modules/notifications';
+import portals from './modules/helpCenterPortals';
 import reports from './modules/reports';
 import teamMembers from './modules/teamMembers';
 import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
-import articles from './modules/helpCenterArticles';
-import portals from './modules/helpCenterPortals';
-import categories from './modules/helpCenterCategories';
 
 Vue.use(Vuex);
 export default new Vuex.Store({
   modules: {
     accounts,
-    agents,
     agentBots,
+    agents,
+    articles,
     attributes,
     auth,
     automations,
     bulkActions,
     campaigns,
     cannedResponse,
+    categories,
     contactConversations,
     contactLabels,
     contactNotes,
@@ -72,14 +75,13 @@ export default new Vuex.Store({
     inboxMembers,
     integrations,
     labels,
+    macros,
     notifications,
+    portals,
     reports,
     teamMembers,
     teams,
     userNotificationSettings,
     webhooks,
-    articles,
-    portals,
-    categories,
   },
 });
diff --git a/app/javascript/shared/assets/stylesheets/border-radius.scss b/app/javascript/shared/assets/stylesheets/border-radius.scss
index 69a2a804a..76ea3c731 100644
--- a/app/javascript/shared/assets/stylesheets/border-radius.scss
+++ b/app/javascript/shared/assets/stylesheets/border-radius.scss
@@ -1,8 +1,8 @@
 :root {
-    // border-radius
-    --border-radius-small: 0.3rem;
-    --border-radius-normal: 0.5rem;
-    --border-radius-medium: 0.7rem;
-    --border-radius-large: 0.9rem;
-    --border-radius-rounded: 50%;
+  --border-radius-small: 0.3rem;
+  --border-radius-normal: 0.5rem;
+  --border-radius-medium: 0.7rem;
+  --border-radius-large: 0.9rem;
+  --border-radius-full: 10rem;
+  --border-radius-rounded: 50%;
 }
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index bf6f4127d..5b6cda950 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -107,6 +107,7 @@
   "microphone-stop-outline": "M18,18H6V6H18V18Z",
   "microphone-pause-outline": "M14,19H18V5H14M6,19H10V5H6V19Z",
   "microphone-play-outline": "M8,5.14V19.14L19,12.14L8,5.14Z",
+  "navigation-outline": "M3 17h18a1 1 0 0 1 .117 1.993L21 19H3a1 1 0 0 1-.117-1.993L3 17h18H3Zm0-6l18-.002a1 1 0 0 1 .117 1.993l-.117.007L3 13a1 1 0 0 1-.117-1.993L3 11l18-.002L3 11Zm0-6h18a1 1 0 0 1 .117 1.993L21 7H3a1 1 0 0 1-.117-1.993L3 5h18H3Z",
   "number-symbol-outline": "M10.987 2.89a.75.75 0 1 0-1.474-.28L8.494 7.999 3.75 8a.75.75 0 1 0 0 1.5l4.46-.002-.946 5-4.514.002a.75.75 0 0 0 0 1.5l4.23-.002-.967 5.116a.75.75 0 1 0 1.474.278l1.02-5.395 5.474-.002-.968 5.119a.75.75 0 1 0 1.474.278l1.021-5.398 4.742-.002a.75.75 0 1 0 0-1.5l-4.458.002.946-5 4.512-.002a.75.75 0 1 0 0-1.5l-4.229.002.966-5.104a.75.75 0 0 0-1.474-.28l-1.018 5.385-5.474.002.966-5.107Zm-1.25 6.608 5.474-.003-.946 5-5.474.002.946-5Z",
   "open-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .966.783 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75v-4a.75.75 0 0 1 1.5 0v4A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h4a.75.75 0 0 1 0 1.5h-4ZM13 3.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-1.5 0V5.56l-5.22 5.22a.75.75 0 0 1-1.06-1.06l5.22-5.22h-4.69a.75.75 0 0 1-.75-.75Z",
   "panel-sidebar-outline": "M4.75 4A2.75 2.75 0 0 0 2 6.75v10.5A2.75 2.75 0 0 0 4.75 20h14.5A2.75 2.75 0 0 0 22 17.25V6.75A2.75 2.75 0 0 0 19.25 4H4.75ZM9 18.5v-13h10.25c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H9ZM5.5 3.5h4M5.5 5.5h4M5.5 7.5h4M5.5 9.5h4",

From 10d86fbb35e87369778a494b7776db920e9018f8 Mon Sep 17 00:00:00 2001
From: Nusret Ozates <m.nusret.ozates@gmail.com>
Date: Thu, 20 Oct 2022 03:25:16 +0300
Subject: [PATCH 11/14] chore: Ability to Remove password info from sentinel
 config (#4550)

Introduce the REDIS_SENTINEL_PASSWORD environment variable to customize the behaviour of sentinel passwords.

Co-authored-by: EXT02D22861 <nusret.ozates@consultant.turkcell.com.tr>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .env.example                  |  5 ++++
 lib/redis/config.rb           | 11 ++++++--
 spec/lib/redis/config_spec.rb | 53 ++++++++++++++++++++++++++++-------
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/.env.example b/.env.example
index 12262576e..830ee7bce 100644
--- a/.env.example
+++ b/.env.example
@@ -34,6 +34,11 @@ REDIS_SENTINELS=
 # You can find list of master using "SENTINEL masters" command
 REDIS_SENTINEL_MASTER_NAME=
 
+# By default Chatwoot will pass REDIS_PASSWORD as the password value for sentinels
+# Use the following environment variable to customize passwords for sentinels. 
+# Use empty string if sentinels are configured with out passwords
+# REDIS_SENTINEL_PASSWORD=
+
 # Redis premium breakage in heroku fix
 # enable the following configuration
 # ref: https://github.com/chatwoot/chatwoot/issues/2420
diff --git a/lib/redis/config.rb b/lib/redis/config.rb
index 8e91b5bb0..f35c32c24 100644
--- a/lib/redis/config.rb
+++ b/lib/redis/config.rb
@@ -23,13 +23,20 @@ module Redis::Config
       ENV.fetch('REDIS_SENTINELS', nil).presence
     end
 
+    def sentinel_url_config(sentinel_url)
+      host, port = sentinel_url.split(':').map(&:strip)
+      sentinel_url_config = { host: host, port: port || DEFAULT_SENTINEL_PORT }
+      password = ENV.fetch('REDIS_SENTINEL_PASSWORD', base_config[:password])
+      sentinel_url_config[:password] = password if password.present?
+      sentinel_url_config
+    end
+
     def sentinel_config
       redis_sentinels = ENV.fetch('REDIS_SENTINELS', nil)
 
       # expected format for REDIS_SENTINELS url string is host1:port1, host2:port2
       sentinels = redis_sentinels.split(',').map do |sentinel_url|
-        host, port = sentinel_url.split(':').map(&:strip)
-        { host: host, port: port.presence || DEFAULT_SENTINEL_PORT, password: base_config[:password] }
+        sentinel_url_config(sentinel_url)
       end
 
       # over-write redis url as redis://:<your-redis-password>@<master-name>/ when using sentinel
diff --git a/spec/lib/redis/config_spec.rb b/spec/lib/redis/config_spec.rb
index a9093c341..02e31339c 100644
--- a/spec/lib/redis/config_spec.rb
+++ b/spec/lib/redis/config_spec.rb
@@ -7,11 +7,9 @@ describe ::Redis::Config do
 
     before do
       described_class.instance_variable_set(:@config, nil)
-      allow(ENV).to receive(:fetch).with('REDIS_URL', 'redis://127.0.0.1:6379').and_return(redis_url)
-      allow(ENV).to receive(:fetch).with('REDIS_PASSWORD', nil).and_return(redis_pasword)
-      allow(ENV).to receive(:fetch).with('REDIS_SENTINELS', nil).and_return('')
-      allow(ENV).to receive(:fetch).with('REDIS_SENTINEL_MASTER_NAME', 'mymaster').and_return('')
-      described_class.config
+      with_modified_env REDIS_URL: redis_url, REDIS_PASSWORD: redis_pasword, REDIS_SENTINELS: '', REDIS_SENTINEL_MASTER_NAME: '' do
+        described_class.config
+      end
     end
 
     it 'checks for app redis config' do
@@ -38,11 +36,10 @@ describe ::Redis::Config do
 
     before do
       described_class.instance_variable_set(:@config, nil)
-      allow(ENV).to receive(:fetch).with('REDIS_URL', 'redis://127.0.0.1:6379').and_return(redis_url)
-      allow(ENV).to receive(:fetch).with('REDIS_PASSWORD', nil).and_return(redis_pasword)
-      allow(ENV).to receive(:fetch).with('REDIS_SENTINELS', nil).and_return(redis_sentinels)
-      allow(ENV).to receive(:fetch).with('REDIS_SENTINEL_MASTER_NAME', 'mymaster').and_return(redis_master_name)
-      described_class.config
+      with_modified_env REDIS_URL: redis_url, REDIS_PASSWORD: redis_pasword, REDIS_SENTINELS: redis_sentinels,
+                        REDIS_SENTINEL_MASTER_NAME: redis_master_name do
+        described_class.config
+      end
     end
 
     it 'checks for app redis config' do
@@ -50,5 +47,41 @@ describe ::Redis::Config do
       expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
       expect(described_class.app[:sentinels]).to match_array(expected_sentinels)
     end
+
+    context 'when redis sentinel is used with REDIS_SENTINEL_PASSWORD empty string' do
+      let(:redis_sentinel_password) { '' }
+
+      before do
+        described_class.instance_variable_set(:@config, nil)
+        with_modified_env REDIS_URL: redis_url, REDIS_PASSWORD: redis_pasword, REDIS_SENTINELS: redis_sentinels,
+                          REDIS_SENTINEL_MASTER_NAME: redis_master_name, REDIS_SENTINEL_PASSWORD: redis_sentinel_password do
+          described_class.config
+        end
+      end
+
+      it 'checks for app redis config and sentinel passwords will be empty' do
+        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :network_timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
+        expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.except(:password) })
+      end
+    end
+
+    context 'when redis sentinel is used with REDIS_SENTINEL_PASSWORD' do
+      let(:redis_sentinel_password) { 'sentinel_password' }
+
+      before do
+        described_class.instance_variable_set(:@config, nil)
+        with_modified_env REDIS_URL: redis_url, REDIS_PASSWORD: redis_pasword, REDIS_SENTINELS: redis_sentinels,
+                          REDIS_SENTINEL_MASTER_NAME: redis_master_name, REDIS_SENTINEL_PASSWORD: redis_sentinel_password do
+          described_class.config
+        end
+      end
+
+      it 'checks for app redis config and redis password is replaced in sentinel config' do
+        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :network_timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
+        expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.merge(password: redis_sentinel_password) })
+      end
+    end
   end
 end

From a3277b45af1b8bd88fb0b32274b11613df2cff06 Mon Sep 17 00:00:00 2001
From: DanielGannage <45047880+DanielGannage@users.noreply.github.com>
Date: Wed, 19 Oct 2022 20:26:10 -0400
Subject: [PATCH 12/14] feat: Update conversation attributes in realtime when
 they changed (#5542)

Co-authored-by: daniel gannage <daniel@pxdel.com>
Co-authored-by: Tejaswini Chile <tejaswini@chatwoot.com>
---
 app/javascript/dashboard/helper/actionCable.js |  6 ++++++
 app/listeners/action_cable_listener.rb         |  7 +++++++
 spec/listeners/action_cable_listener_spec.rb   | 16 ++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index e00cf283f..ba21a3e6a 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -25,6 +25,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'notification.created': this.onNotificationCreated,
       'first.reply.created': this.onFirstReplyCreated,
       'conversation.read': this.onConversationRead,
+      'conversation.updated': this.onConversationUpdated,
     };
   }
 
@@ -85,6 +86,11 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.fetchConversationStats();
   };
 
+  onConversationUpdated = data => {
+    this.app.$store.dispatch('updateConversation', data);
+    this.fetchConversationStats();
+  };
+
   onTypingOn = ({ conversation, user }) => {
     const conversationId = conversation.id;
 
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 3d3bbdf83..e7c025600 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -52,6 +52,13 @@ class ActionCableListener < BaseListener
     broadcast(account, tokens, CONVERSATION_STATUS_CHANGED, conversation.push_event_data)
   end
 
+  def conversation_updated(event)
+    conversation, account = extract_conversation_and_account(event)
+    tokens = user_tokens(account, conversation.inbox.members) + contact_inbox_tokens(conversation.contact_inbox)
+
+    broadcast(account, tokens, CONVERSATION_UPDATED, conversation.push_event_data)
+  end
+
   def conversation_typing_on(event)
     conversation = event.data[:conversation]
     account = conversation.account
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index d1bad487f..b0c14c4d0 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -128,4 +128,20 @@ describe ActionCableListener do
       listener.contact_deleted(event)
     end
   end
+
+  describe '#conversation_updated' do
+    let(:event_name) { :'conversation.updated' }
+    let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: agent, is_private: false) }
+
+    it 'sends update to inbox members' do
+      expect(conversation.inbox.reload.inbox_members.count).to eq(1)
+
+      expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+        [agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token],
+        'conversation.updated',
+        conversation.push_event_data.merge(account_id: account.id)
+      )
+      listener.conversation_updated(event)
+    end
+  end
 end

From fa73b5290c39e6fefc1fb8b2821b73fdb23e8542 Mon Sep 17 00:00:00 2001
From: smartdev58 <30475578+smartdev58@users.noreply.github.com>
Date: Thu, 20 Oct 2022 06:16:36 +0200
Subject: [PATCH 13/14] chore: Allow feature flag parameters in platform API
 for account creation (#5589)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../platform/api/v1/accounts_controller.rb    | 16 +++---
 .../api/v1/accounts/create.json.jbuilder      |  1 +
 .../api/v1/accounts/show.json.jbuilder        |  1 +
 .../api/v1/accounts/update.json.jbuilder      |  1 +
 .../api/v1/models/_account.json.jbuilder      |  9 ++++
 .../api/v1/accounts_controller_spec.rb        | 50 +++++++++++++++++--
 6 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 app/views/platform/api/v1/accounts/create.json.jbuilder
 create mode 100644 app/views/platform/api/v1/accounts/show.json.jbuilder
 create mode 100644 app/views/platform/api/v1/accounts/update.json.jbuilder
 create mode 100644 app/views/platform/api/v1/models/_account.json.jbuilder

diff --git a/app/controllers/platform/api/v1/accounts_controller.rb b/app/controllers/platform/api/v1/accounts_controller.rb
index 9c8f60f38..78143410f 100644
--- a/app/controllers/platform/api/v1/accounts_controller.rb
+++ b/app/controllers/platform/api/v1/accounts_controller.rb
@@ -3,16 +3,12 @@ class Platform::Api::V1::AccountsController < PlatformController
     @resource = Account.new(account_params)
     @resource.save!
     @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
-    render json: @resource
   end
 
-  def show
-    render json: @resource
-  end
+  def show; end
 
   def update
     @resource.update!(account_params)
-    render json: @resource
   end
 
   def destroy
@@ -27,6 +23,14 @@ class Platform::Api::V1::AccountsController < PlatformController
   end
 
   def account_params
-    params.permit(:name, :locale)
+    if permitted_params[:enabled_features]
+      return permitted_params.except(:enabled_features).merge(selected_feature_flags: permitted_params[:enabled_features].map(&:to_sym))
+    end
+
+    permitted_params
+  end
+
+  def permitted_params
+    params.permit(:name, :locale, enabled_features: [], limits: {})
   end
 end
diff --git a/app/views/platform/api/v1/accounts/create.json.jbuilder b/app/views/platform/api/v1/accounts/create.json.jbuilder
new file mode 100644
index 000000000..449293eb6
--- /dev/null
+++ b/app/views/platform/api/v1/accounts/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/account', formats: [:json], resource: @resource
diff --git a/app/views/platform/api/v1/accounts/show.json.jbuilder b/app/views/platform/api/v1/accounts/show.json.jbuilder
new file mode 100644
index 000000000..449293eb6
--- /dev/null
+++ b/app/views/platform/api/v1/accounts/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/account', formats: [:json], resource: @resource
diff --git a/app/views/platform/api/v1/accounts/update.json.jbuilder b/app/views/platform/api/v1/accounts/update.json.jbuilder
new file mode 100644
index 000000000..449293eb6
--- /dev/null
+++ b/app/views/platform/api/v1/accounts/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/account', formats: [:json], resource: @resource
diff --git a/app/views/platform/api/v1/models/_account.json.jbuilder b/app/views/platform/api/v1/models/_account.json.jbuilder
new file mode 100644
index 000000000..9a22e6518
--- /dev/null
+++ b/app/views/platform/api/v1/models/_account.json.jbuilder
@@ -0,0 +1,9 @@
+json.id resource.id
+json.name resource.name
+json.locale resource.locale
+json.domain resource.domain
+json.support_email resource.support_email
+json.enabled_features resource.enabled_features
+json.custom_attributes resource.custom_attributes
+json.limits resource.limits
+json.status resource.status
diff --git a/spec/controllers/platform/api/v1/accounts_controller_spec.rb b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
index addb3c885..b854e44d4 100644
--- a/spec/controllers/platform/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
@@ -32,12 +32,49 @@ RSpec.describe 'Platform Accounts API', type: :request do
       end
 
       it 'creates an account with locale' do
+        InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').first_or_create!(value: [{ 'name' => 'agent_management',
+                                                                                                    'enabled' => true }])
         post '/platform/api/v1/accounts', params: { name: 'Test Account', locale: 'es' },
                                           headers: { api_access_token: platform_app.access_token.token }, as: :json
 
+        expect(response).to have_http_status(:success)
+
+        json_response = JSON.parse(response.body)
+        expect(json_response['name']).to eq('Test Account')
+        expect(json_response['locale']).to eq('es')
+        expect(json_response['enabled_features']).to eq(
+          {
+            'agent_management' => true
+          }
+        )
+      end
+
+      it 'creates an account with feature flags' do
+        InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').first_or_create!(value: [{ 'name' => 'inbox_management',
+                                                                                                    'enabled' => true }])
+
+        post '/platform/api/v1/accounts', params: { name: 'Test Account', enabled_features: %w[feature_ip_lookup feature_help_center] },
+                                          headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        json_response = JSON.parse(response.body)
+        expect(json_response['name']).to include('Test Account')
+        expect(json_response['enabled_features']).to eq(
+          {
+            'inbox_management' => true,
+            'ip_lookup' => true,
+            'help_center' => true
+          }
+        )
+      end
+
+      it 'creates an account with limits settings' do
+        post '/platform/api/v1/accounts', params: { name: 'Test Account', limits: { agents: 5, inboxes: 10 } },
+                                          headers: { api_access_token: platform_app.access_token.token }, as: :json
+
         expect(response).to have_http_status(:success)
         expect(response.body).to include('Test Account')
-        expect(response.body).to include('es')
+        expect(response.body).to include('5')
+        expect(response.body).to include('10')
       end
     end
   end
@@ -105,11 +142,18 @@ RSpec.describe 'Platform Accounts API', type: :request do
       it 'updates an account when its permissible object' do
         create(:platform_app_permissible, platform_app: platform_app, permissible: account)
 
-        patch "/platform/api/v1/accounts/#{account.id}", params: { name: 'Test Account' },
-                                                         headers: { api_access_token: platform_app.access_token.token }, as: :json
+        patch "/platform/api/v1/accounts/#{account.id}", params: {
+          name: 'Test Account',
+          enabled_features: %w[feature_ip_lookup feature_help_center],
+          limits: { agents: 5, inboxes: 10 }
+        }, headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
         expect(account.reload.name).to eq('Test Account')
+        expect(account.reload.enabled_features['ip_lookup']).to be(true)
+        expect(account.reload.enabled_features['help_center']).to be(true)
+        expect(account.reload.limits['agents']).to eq(5)
+        expect(account.reload.limits['inboxes']).to eq(10)
       end
     end
   end

From a8561cd798626e9c675a042a00e232819da064ed Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 19 Oct 2022 21:49:34 -0700
Subject: [PATCH 14/14] fix: Add portal pack to tailwind config (#5686)

---
 tailwind.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tailwind.config.js b/tailwind.config.js
index 90408a779..1076ae315 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,6 +3,7 @@ const { colors } = require('tailwindcss/defaultTheme');
 module.exports = {
   purge: [
     './app/javascript/widget/**/*.vue',
+    './app/javascript/portal/**/*.vue',
     './app/javascript/shared/**/*.vue',
     './app/javascript/survey/**/*.vue',
     './app/views/**/*.html.erb',