From 71d1f229f086f5035877cef97f344495a292773c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 16:37:05 +0530
Subject: [PATCH 01/67] chore: Bump nokogiri from 1.11.3 to 1.11.4 (#2293)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e3061c705..222f28ec5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,7 +350,7 @@ GEM
       connection_pool (~> 2.2)
     netrc (0.11.0)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth (0.5.6)

From af8e681f2a9730272ff1d95400a36c994328eef0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 17:14:15 +0530
Subject: [PATCH 02/67] chore: Bump puma from 4.3.6 to 4.3.8 (#2294)

Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 4.3.8.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.6...v4.3.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 222f28ec5..abb305465 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -368,7 +368,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (4.3.6)
+    puma (4.3.8)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)

From c681e8a01bd226c4f513211159305ee733fa92d0 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Thu, 20 May 2021 13:51:46 +0530
Subject: [PATCH 03/67] chore: Refactor button styles (#2259)

---
 .../assets/scss/_foundation-custom.scss       |  10 +-
 .../assets/scss/_foundation-settings.scss     |   4 +-
 .../dashboard/assets/scss/_woot.scss          |  23 ++-
 app/javascript/dashboard/assets/scss/app.scss |  19 --
 .../dashboard/assets/scss/storybook.scss      |   2 +
 .../assets/scss/widgets/_buttons.scss         |  87 +++++---
 .../assets/scss/widgets/_conv-header.scss     |   3 +-
 .../scss/widgets/_conversation-view.scss      |   1 -
 .../dashboard/components/ChatList.vue         |   9 +-
 .../components/layout/AvailabilityStatus.vue  |   2 +
 .../dashboard/components/layout/Sidebar.vue   |   6 -
 .../layout/sidebarComponents/OptionsMenu.vue  |  30 ++-
 .../dashboard/components/ui/WootButton.vue    |  47 +++--
 .../components/widgets/TableFooter.vue        |  64 ++----
 .../widgets/conversation/ConversationBox.vue  |   2 +-
 .../conversation/ConversationHeader.vue       |   8 +-
 .../widgets/conversation/bubble/Actions.vue   |   2 +-
 .../contacts/components/ContactsTable.vue     |   7 +-
 .../dashboard/contacts/components/Header.vue  |   3 +-
 .../conversation/contact/ContactInfoRow.vue   |  14 +-
 .../dashboard/settings/SettingsHeader.vue     |   6 +-
 .../dashboard/settings/agents/EditAgent.vue   |   9 +-
 .../dashboard/settings/agents/Index.vue       |  38 ++--
 .../dashboard/settings/canned/Index.vue       |  44 +++--
 .../routes/dashboard/settings/inbox/Index.vue |  28 +--
 .../inbox/components/CampaignsTable.vue       |   6 +-
 .../settings/integrations/Webhook.vue         |  10 +-
 .../dashboard/settings/labels/Index.vue       |  39 ++--
 .../dashboard/settings/reports/Index.vue      |   9 +-
 .../routes/dashboard/settings/teams/Index.vue |  29 +--
 .../components/ui/dropdown/DropdownItem.vue   |   4 +-
 stories/Sections/Button.stories.mdx           | 185 ++++++++++++++++++
 32 files changed, 490 insertions(+), 260 deletions(-)
 create mode 100644 stories/Sections/Button.stories.mdx

diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index 9c398e078..61ead3492 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -6,13 +6,11 @@
     border-radius: 1000px;
   }
 
-  &.grey-btn {
-    color: $color-gray;
 
-    &:hover {
-      color: $color-light-gray;
-    }
-  }
+}
+
+.button-wrapper .button.link.grey-btn {
+  margin-left: var(--space-normal);
 }
 
 .tooltip {
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index dbdb630c0..56d82896b 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -238,7 +238,7 @@ $breadcrumbs-item-slash: true;
 // 11. Button
 // ----------
 
-$button-padding: var(--space-one) var(--space-slab);
+$button-padding: var(--space-smaller) 1em;
 $button-margin: 0 0 $global-margin 0;
 $button-fill: solid;
 $button-background: $primary-color;
@@ -246,7 +246,7 @@ $button-background-hover: scale-color($button-background, $lightness: -15%);
 $button-color: $white;
 $button-color-alt: $white;
 $button-radius: var(--border-radius-normal);
-$button-sizes: (tiny: var(--font-size-nano),
+$button-sizes: (tiny: var(--font-size-micro),
   small: var(--font-size-mini),
   default: var(--font-size-small),
   large: var(--font-size-medium));
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index e53ceef73..7ecec198b 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -1,8 +1,28 @@
+@import 'shared/assets/fonts/inter';
+@import 'shared/assets/stylesheets/colors';
+@import 'shared/assets/stylesheets/spacing';
+@import 'shared/assets/stylesheets/font-size';
+@import 'shared/assets/stylesheets/font-weights';
+@import 'shared/assets/stylesheets/shadows';
+@import 'shared/assets/stylesheets/border-radius';
+
+@import 'variables';
+
+@import 'mixins';
+@import 'foundation-settings';
+@import 'helper-classes';
+
+@import 'foundation-sites/scss/foundation';
+@import '~bourbon/core/bourbon';
+
+@include foundation-everything($flex: true);
+
+
 @import 'typography';
 @import 'layout';
 @import 'animations';
-
 @import 'foundation-custom';
+
 @import 'widgets/buttons';
 @import 'widgets/conv-header';
 @import 'widgets/conversation-card';
@@ -27,3 +47,4 @@
 @import 'plugins/multiselect';
 @import 'plugins/dropdown';
 @import '@chatwoot/prosemirror-schema/src/woot-editor.css';
+@import '~shared/assets/stylesheets/ionicons';
diff --git a/app/javascript/dashboard/assets/scss/app.scss b/app/javascript/dashboard/assets/scss/app.scss
index dbf3a6e78..13c3dd557 100644
--- a/app/javascript/dashboard/assets/scss/app.scss
+++ b/app/javascript/dashboard/assets/scss/app.scss
@@ -1,20 +1 @@
-@import 'shared/assets/fonts/inter';
-@import 'shared/assets/stylesheets/colors';
-@import 'shared/assets/stylesheets/spacing';
-@import 'shared/assets/stylesheets/font-size';
-@import 'shared/assets/stylesheets/font-weights';
-@import 'shared/assets/stylesheets/shadows';
-@import 'shared/assets/stylesheets/border-radius';
-@import 'variables';
-
-@import '~spinkit/scss/spinners/7-three-bounce';
-@import '~shared/assets/stylesheets/ionicons';
-
-@import 'mixins';
-@import 'foundation-settings';
-@import 'helper-classes';
-@import 'foundation-sites/scss/foundation';
-@import '~bourbon/core/bourbon';
-
-@include foundation-everything($flex: true);
 @import 'woot';
diff --git a/app/javascript/dashboard/assets/scss/storybook.scss b/app/javascript/dashboard/assets/scss/storybook.scss
index fbe88bc3f..f6a9d5eb3 100644
--- a/app/javascript/dashboard/assets/scss/storybook.scss
+++ b/app/javascript/dashboard/assets/scss/storybook.scss
@@ -14,6 +14,8 @@
 @import 'foundation-settings';
 @import 'helper-classes';
 @import 'foundation-sites/scss/foundation';
+
+@include foundation-prototype-spacing;
 @import '~bourbon/core/bourbon';
 
 @include foundation-everything($flex: true);
diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index a599721c2..1d6b12631 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -1,4 +1,7 @@
 .button {
+  align-items: center;
+  display: inline-flex;
+  height: 4.0rem;
   margin-bottom: 0;
 
   &.button--emoji {
@@ -19,52 +22,76 @@
     }
   }
 
-
-
-  &.icon {
-    padding-left: $space-normal;
-    padding-right: $space-normal;
-
-    i {
-      padding-right: $space-small;
-    }
+  .spinner {
+    padding: 0 var(--space-small);
   }
 
-  &.nice {
-    border-radius: $space-smaller;
+  .icon+.button__content {
+    padding-left: var(--space-small);
   }
 
-  &.hollow {
-    &.link {
-      border-color: transparent;
-      padding-left: 0;
-
-      &:hover,
-      &:focus {
-        border-color: transparent;
-      }
-    }
-  }
-
-  >.icon {
-    font-size: $font-size-default;
-  }
-
-  &.tiny {
-    font-size: $font-size-mini;
-    padding: $space-small $space-slab;
+  &.expanded {
+    display: flex;
+    justify-content: center;
   }
 
   &.round {
     border-radius: $space-larger;
   }
 
+  // @TODO Use with link
+
   &.compact {
     padding-bottom: 0;
     padding-top: 0;
   }
+
+  // Smooth style
+  &.smooth {
+    @include button-style(var(--w-100), var(--w-50), var(--w-700));
+
+
+    &.secondary {
+      @include button-style(var(--s-100), var(--s-50), var(--s-700));
+    }
+
+    &.success {
+      @include button-style(var(--g-100), var(--g-50), var(--g-700));
+    }
+
+    &.alert {
+      @include button-style(var(--r-100), var(--r-50), var(--r-700));
+    }
+
+    &.warning {
+      @include button-style(var(--y-200), var(--y-100), var(--y-900));
+    }
+  }
+
+  // Sizes
+  &.tiny {
+    height: var(--space-medium);
+  }
+
+  &.small {
+    height: var(--space-large);
+  }
+
+  &.large {
+    height: var(--space-larger);
+  }
+
+  &.link {
+    height: auto;
+    margin: 0;
+    padding: 0;
+  }
+
+
 }
 
+
+// @TDOD move to utility file
 .button--fixed-right-top {
   position: fixed;
   right: $space-small;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index 1c081c089..f286c7bc0 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -2,11 +2,11 @@ $resolve-button-width: 13.2rem;
 
 // Conversation header - Light BG
 .conv-header {
-  @include padding($space-small $space-normal);
   @include background-white;
   @include flex;
   @include flex-align($x: justify, $y: middle);
   @include border-normal-bottom;
+  padding: var(--space-small) var(--space-normal);
 
   .multiselect-box {
     @include flex;
@@ -70,6 +70,7 @@ $resolve-button-width: 13.2rem;
 
 
 .header-actions-wrap {
+  align-items: center;
   display: flex;
   flex-direction: row;
   flex-grow: 1;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index bc3e20254..d79cfe80d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -76,7 +76,6 @@
 
     .status--filter {
       @include padding($zero null $zero $space-normal);
-      @include round-corner;
       @include margin($space-smaller $space-slab $zero $zero);
       background-color: $color-background-light;
       border: 1px solid $color-border;
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 3b7fe0b8c..0aba2739f 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -32,13 +32,14 @@
         <span class="spinner"></span>
       </div>
 
-      <div
+      <woot-button
         v-if="!hasCurrentPageEndReached && !chatListLoading"
-        class="clear button load-more-conversations"
+        variant="clear"
+        size="expanded"
         @click="fetchConversations"
       >
         {{ $t('CHAT_LIST.LOAD_MORE_CONVERSATIONS') }}
-      </div>
+      </woot-button>
 
       <p
         v-if="
@@ -217,7 +218,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '~dashboard/assets/scss/app.scss';
+@import '~dashboard/assets/scss/woot';
 .spinner {
   margin-top: var(--space-normal);
   margin-bottom: var(--space-normal);
diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index 72488b82e..8587bacc8 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -22,6 +22,8 @@
             >
               <woot-button
                 variant="clear"
+                size="small"
+                color-scheme="secondary"
                 class-names="status-change--dropdown-button"
                 :is-disabled="status.disabled"
                 @click="changeAvailabilityStatus(status.value)"
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 79bef628a..d448eac22 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -270,12 +270,6 @@ export default {
   }
 }
 
-.change-accounts--button.button {
-  font-weight: $font-weight-normal;
-  font-size: $font-size-small;
-  padding: $space-small $space-one;
-}
-
 .account-selector {
   cursor: pointer;
   padding: $space-small $space-large;
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
index 292e4df4e..c19d0c50f 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
@@ -7,30 +7,42 @@
     >
       <woot-dropdown-menu>
         <woot-dropdown-item v-if="showChangeAccountOption">
-          <button
-            class="button clear change-accounts--button"
+          <woot-button
+            variant="clear"
+            size="small"
+            class=" change-accounts--button"
             @click="$emit('toggle-accounts')"
           >
             {{ $t('SIDEBAR_ITEMS.CHANGE_ACCOUNTS') }}
-          </button>
+          </woot-button>
         </woot-dropdown-item>
         <woot-dropdown-item v-if="globalConfig.chatwootInboxToken">
-          <button
-            class="button clear change-accounts--button"
+          <woot-button
+            variant="clear"
+            size="small"
+            class=" change-accounts--button"
             @click="$emit('show-support-chat-window')"
           >
             Contact Support
-          </button>
+          </woot-button>
         </woot-dropdown-item>
         <woot-dropdown-item>
-          <router-link :to="`/app/accounts/${accountId}/profile/settings`">
+          <router-link
+            :to="`/app/accounts/${accountId}/profile/settings`"
+            class="button clear small change-accounts--button"
+          >
             {{ $t('SIDEBAR_ITEMS.PROFILE_SETTINGS') }}
           </router-link>
         </woot-dropdown-item>
         <woot-dropdown-item>
-          <a href="#" @click.prevent="logout">
+          <woot-button
+            variant="clear"
+            size="small"
+            class=" change-accounts--button"
+            @click="logout"
+          >
             {{ $t('SIDEBAR_ITEMS.LOGOUT') }}
-          </a>
+          </woot-button>
         </woot-dropdown-item>
       </woot-dropdown-menu>
     </div>
diff --git a/app/javascript/dashboard/components/ui/WootButton.vue b/app/javascript/dashboard/components/ui/WootButton.vue
index 4df156f3a..a71e5388e 100644
--- a/app/javascript/dashboard/components/ui/WootButton.vue
+++ b/app/javascript/dashboard/components/ui/WootButton.vue
@@ -1,13 +1,7 @@
 <template>
   <button
     class="button"
-    :class="[
-      variant,
-      size,
-      colorScheme,
-      classNames,
-      isDisabled ? 'disabled' : '',
-    ]"
+    :class="buttonClasses"
     :disabled="isDisabled || isLoading"
     @click="handleClick"
   >
@@ -51,6 +45,28 @@ export default {
       type: Boolean,
       default: false,
     },
+    isExpanded: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    variantClasses() {
+      if (this.variant.includes('link')) {
+        return `clear ${this.variant}`;
+      }
+      return this.variant;
+    },
+    buttonClasses() {
+      return [
+        this.variantClasses,
+        this.size,
+        this.colorScheme,
+        this.classNames,
+        this.isDisabled ? 'disabled' : '',
+        this.isExpanded ? 'expanded' : '',
+      ];
+    },
   },
   methods: {
     handleClick(evt) {
@@ -59,20 +75,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.button {
-  display: flex;
-  align-items: center;
-
-  &.link {
-    padding: 0;
-    margin: 0;
-  }
-}
-.spinner {
-  padding: 0 var(--space-small);
-}
-.icon + .button__content {
-  padding-left: var(--space-small);
-}
-</style>
diff --git a/app/javascript/dashboard/components/widgets/TableFooter.vue b/app/javascript/dashboard/components/widgets/TableFooter.vue
index c951aad60..b9faa2f6e 100644
--- a/app/javascript/dashboard/components/widgets/TableFooter.vue
+++ b/app/javascript/dashboard/components/widgets/TableFooter.vue
@@ -14,6 +14,8 @@
       >
         <woot-button
           size="small"
+          variant="clear"
+          color-scheme="secondary"
           class-names="goto-first"
           :is-disabled="hasFirstPage"
           @click="onFirstPage"
@@ -23,16 +25,25 @@
         </woot-button>
         <woot-button
           size="small"
+          variant="clear"
+          color-scheme="secondary"
           :is-disabled="hasPrevPage"
           @click="onPrevPage"
         >
           <i class="ion-chevron-left" />
         </woot-button>
-        <woot-button @click.prevent>
+        <woot-button
+          size="small"
+          variant="clear"
+          color-scheme="secondary"
+          @click.prevent
+        >
           {{ currentPage }}
         </woot-button>
         <woot-button
           size="small"
+          variant="clear"
+          color-scheme="secondary"
           :is-disabled="hasNextPage"
           @click="onNextPage"
         >
@@ -40,6 +51,8 @@
         </woot-button>
         <woot-button
           size="small"
+          variant="clear"
+          color-scheme="secondary"
           class-names="goto-last"
           :is-disabled="hasLastPage"
           @click="onLastPage"
@@ -147,52 +160,11 @@ export default {
 .page-meta {
   font-size: var(--font-size-mini);
 }
-.pagination-button-group {
-  margin: 0;
 
-  .button {
-    background: transparent;
-    border-color: var(--color-border);
-    color: var(--color-body);
-    margin-bottom: 0;
-    margin-left: -2px;
-    font-size: var(--font-size-small);
-    padding: var(--space-small) var(--space-normal);
-    border-radius: 0;
-
-    &:hover,
-    &:focus,
-    &:active {
-      background: var(--s-200);
-      color: white;
-    }
-
-    &:first-child {
-      border-top-left-radius: var(--space-smaller);
-      border-bottom-left-radius: var(--space-smaller);
-    }
-
-    &:last-child {
-      border-top-right-radius: var(--space-smaller);
-      border-bottom-right-radius: var(--space-smaller);
-    }
-
-    &.small {
-      font-size: var(--font-size-micro);
-    }
-
-    &.disabled {
-      background: var(--s-200);
-      border-color: var(--s-200);
-      color: var(--b-900);
-    }
-
-    &.goto-first,
-    &.goto-last {
-      i:last-child {
-        margin-left: var(--space-minus-smaller);
-      }
-    }
+.goto-first,
+.goto-last {
+  i:last-child {
+    margin-left: var(--space-minus-smaller);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 0174076ba..4b143dc83 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -75,7 +75,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/app.scss';
+@import '~dashboard/assets/scss/woot';
 
 .conversation-details-wrap {
   display: flex;
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 0b2057a61..dd35fe927 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -12,8 +12,10 @@
         <h3 class="user--name text-truncate">
           {{ currentContact.name }}
         </h3>
-        <button
-          class="user--profile__button clear button small"
+        <woot-button
+          class="user--profile__button"
+          size="small"
+          variant="link"
           @click="$emit('contact-panel-toggle')"
         >
           {{
@@ -23,7 +25,7 @@
                 : $t('CONVERSATION.HEADER.OPEN')
             } ${$t('CONVERSATION.HEADER.DETAILS')}`
           }}
-        </button>
+        </woot-button>
       </div>
     </div>
     <div
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 9c96d44a5..8c6954672 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -95,7 +95,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/app.scss';
+@import '~dashboard/assets/scss/woot';
 
 .right {
   .message-text--metadata {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index a631c2d15..67faaac22 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -114,13 +114,12 @@ export default {
           renderBodyCell: ({ row }) => (
             <woot-button
               variant="clear"
-              size="expanded"
               onClick={() => this.onClickContact(row.id)}
             >
               <div class="row--user-block">
                 <Thumbnail
                   src={row.thumbnail}
-                  size="36px"
+                  size="32px"
                   username={row.name}
                   status={row.availability_status}
                 />
@@ -128,7 +127,7 @@ export default {
                   <h6 class="sub-block-title user-name text-truncate">
                     {row.name}
                   </h6>
-                  <span class="button clear small">
+                  <span class="button clear small link">
                     {this.$t('CONTACTS_PAGE.LIST.VIEW_DETAILS')}
                   </span>
                 </div>
@@ -292,7 +291,7 @@ export default {
   }
 
   .ve-table-body-td {
-    padding: var(--space-slab) var(--space-two) !important;
+    padding: var(--space-small) var(--space-two) !important;
   }
 
   .ve-table-header-th {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index f96e75077..826f0f827 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -80,7 +80,7 @@ export default {
   display: flex;
   justify-content: space-between;
   width: 100%;
-  padding: var(--space-small) var(--space-small) var(--space-small)
+  padding: var(--space-small) var(--space-normal) var(--space-small)
     var(--space-normal);
 }
 
@@ -96,7 +96,6 @@ export default {
 
 .search-wrap {
   width: 400px;
-  height: 3.8rem;
   display: flex;
   align-items: center;
   position: relative;
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index 880142f44..3cdc48d6b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -7,14 +7,15 @@
         $t('CONTACT_PANEL.NOT_AVAILABLE')
       }}</span>
 
-      <button
+      <woot-button
         v-if="showCopy"
         type="submit"
-        class="button nice link hollow grey-btn compact"
+        variant="link"
+        color-scheme="secondary"
+        icon="ion-clipboard"
+        class-names="icon copy-icon"
         @click="onCopy"
-      >
-        <i class="icon copy-icon ion-clipboard"></i>
-      </button>
+      />
     </a>
 
     <div v-else class="contact-info--details">
@@ -85,9 +86,6 @@ export default {
 
   .copy-icon {
     margin-left: $space-one;
-    &:hover {
-      color: $color-woot;
-    }
   }
 
   &.a {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 37374f03b..c43577a96 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -9,10 +9,12 @@
     <router-link
       v-if="showNewButton && isAdmin"
       :to="buttonRoute"
-      class="button icon success nice button--fixed-right-top"
+      class="button success button--fixed-right-top"
     >
       <i class="icon ion-android-add-circle"></i>
-      {{ buttonText }}
+      <span class="button__content">
+        {{ buttonText }}
+      </span>
     </router-link>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/EditAgent.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/EditAgent.vue
index 71ef35a65..f0b88bc4e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/EditAgent.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/EditAgent.vue
@@ -44,10 +44,13 @@
             </button>
           </div>
           <div class="medium-6 columns text-right">
-            <button class="button clear" @click.prevent="resetPassword">
-              <i class="ion-locked"></i>
+            <woot-button
+              icon="ion-locked"
+              variant="clear"
+              @click.prevent="resetPassword"
+            >
               {{ $t('AGENT_MGMT.EDIT.PASSWORD_RESET.ADMIN_RESET_BUTTON') }}
-            </button>
+            </woot-button>
           </div>
         </div>
       </form>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index fa56985b2..ac3d78946 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="column content-box">
-    <button
-      class="button nice icon success button--fixed-right-top"
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-add-circle"
       @click="openAddPopup()"
     >
-      <i class="icon ion-android-add-circle"></i>
       {{ $t('AGENT_MGMT.HEADER_BTN_TXT') }}
-    </button>
-    <!-- Canned Response API Status -->
+    </woot-button>
 
     <!-- List Agents -->
     <div class="row">
@@ -55,21 +55,27 @@
                 <!-- Actions -->
                 <td>
                   <div class="button-wrapper">
-                    <woot-submit-button
+                    <woot-button
                       v-if="showEditAction(agent)"
-                      :button-text="$t('AGENT_MGMT.EDIT.BUTTON_TEXT')"
-                      icon-class="ion-edit"
-                      button-class="link hollow grey-btn"
+                      variant="link"
+                      color-scheme="secondary"
+                      icon="ion-edit"
+                      class-names="grey-btn"
                       @click="openEditPopup(agent)"
-                    />
-                    <woot-submit-button
+                    >
+                      {{ $t('AGENT_MGMT.EDIT.BUTTON_TEXT') }}
+                    </woot-button>
+                    <woot-button
                       v-if="showDeleteAction(agent)"
-                      :button-text="$t('AGENT_MGMT.DELETE.BUTTON_TEXT')"
-                      :loading="loading[agent.id]"
-                      icon-class="ion-close-circled"
-                      button-class="link hollow grey-btn"
+                      variant="link"
+                      color-scheme="secondary"
+                      icon="ion-close-circled"
+                      class-names="grey-btn"
+                      :is-loading="loading[agent.id]"
                       @click="openDeletePopup(agent, index)"
-                    />
+                    >
+                      {{ $t('AGENT_MGMT.DELETE.BUTTON_TEXT') }}
+                    </woot-button>
                   </div>
                 </td>
               </tr>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index c3f192c3b..a6a694cb9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="column content-box">
-    <button
-      class="button nice icon success button--fixed-right-top"
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-add-circle"
       @click="openAddPopup()"
     >
-      <i class="icon ion-android-add-circle"></i>
       {{ $t('CANNED_MGMT.HEADER_BTN_TXT') }}
-    </button>
+    </woot-button>
+
     <!-- List Canned Response -->
     <div class="row">
       <div class="small-8 columns">
@@ -47,21 +49,25 @@
               <td>{{ cannedItem.content }}</td>
               <!-- Action Buttons -->
               <td class="button-wrapper">
-                <div @click="openEditPopup(cannedItem)">
-                  <woot-submit-button
-                    :button-text="$t('CANNED_MGMT.EDIT.BUTTON_TEXT')"
-                    icon-class="ion-edit"
-                    button-class="link hollow grey-btn"
-                  />
-                </div>
-                <div @click="openDeletePopup(cannedItem, index)">
-                  <woot-submit-button
-                    :button-text="$t('CANNED_MGMT.DELETE.BUTTON_TEXT')"
-                    :loading="loading[cannedItem.id]"
-                    icon-class="ion-close-circled"
-                    button-class="link hollow grey-btn"
-                  />
-                </div>
+                <woot-button
+                  variant="link"
+                  color-scheme="secondary"
+                  icon="ion-edit"
+                  class-names="grey-btn"
+                  @click="openEditPopup(cannedItem)"
+                >
+                  {{ $t('CANNED_MGMT.EDIT.BUTTON_TEXT') }}
+                </woot-button>
+                <woot-button
+                  variant="link"
+                  color-scheme="secondary"
+                  icon="ion-close-circled"
+                  class-names="grey-btn"
+                  :is-loading="loading[cannedItem.id]"
+                  @click="openDeletePopup(cannedItem, index)"
+                >
+                  {{ $t('CANNED_MGMT.DELETE.BUTTON_TEXT') }}
+                </woot-button>
               </td>
             </tr>
           </tbody>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index c2f28d150..9eccee913 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -59,22 +59,28 @@
                   <router-link
                     :to="addAccountScoping(`settings/inboxes/${item.id}`)"
                   >
-                    <woot-submit-button
+                    <woot-button
                       v-if="isAdmin"
-                      :button-text="$t('INBOX_MGMT.SETTINGS')"
-                      icon-class="ion-gear-b"
-                      button-class="link hollow grey-btn"
-                    />
+                      icon="ion-gear-b"
+                      variant="link"
+                      color-scheme="secondary"
+                      class-names="grey-btn"
+                    >
+                      {{ $t('INBOX_MGMT.SETTINGS') }}
+                    </woot-button>
                   </router-link>
 
-                  <woot-submit-button
+                  <woot-button
                     v-if="isAdmin"
-                    :button-text="$t('INBOX_MGMT.DELETE.BUTTON_TEXT')"
-                    :loading="loading[item.id]"
-                    icon-class="ion-close-circled"
-                    button-class="link hollow grey-btn"
+                    variant="link"
+                    color-scheme="secondary"
+                    class-names="grey-btn"
+                    :is-loading="loading[item.id]"
+                    icon="ion-close-circled"
                     @click="openDelete(item)"
-                  />
+                  >
+                    {{ $t('INBOX_MGMT.DELETE.BUTTON_TEXT') }}
+                  </woot-button>
                 </div>
               </td>
             </tr>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
index a37aa65ce..9c903183f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
@@ -133,13 +133,13 @@ export default {
           key: 'buttons',
           title: '',
           align: 'left',
-          renderBodyCell: (row) => (
+          renderBodyCell: row => (
             <div class="button-wrapper">
               <WootButton
                 variant="clear"
                 icon="ion-edit"
                 color-scheme="secondary"
-                classNames="hollow grey-btn"
+                classNames="grey-btn"
                 onClick={() => this.onEditClick(row)}
               >
                 {this.$t('CAMPAIGN.LIST.BUTTONS.EDIT')}
@@ -155,7 +155,7 @@ export default {
       if (this.isLoading) {
         return [];
       }
-      return this.campaigns.map((item) => {
+      return this.campaigns.map(item => {
         return {
           ...item,
           url: item.trigger_rules.url,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
index bc55316a0..87cee8e80 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="row content-box full-height">
-    <button
-      class="button nice icon success button--fixed-right-top"
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-add-circle"
       @click="openAddPopup()"
     >
-      <i class="icon ion-android-add-circle"></i>
       {{ $t('INTEGRATION_SETTINGS.WEBHOOK.HEADER_BTN_TXT') }}
-    </button>
+    </woot-button>
+
     <div class="row">
       <div class="small-8 columns">
         <p
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index a28362c5a..f254152a7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="column content-box">
-    <button
-      class="button nice icon success button--fixed-right-top"
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-add-circle"
       @click="openAddPopup"
     >
-      <i class="icon ion-android-add-circle"></i>
       {{ $t('LABEL_MGMT.HEADER_BTN_TXT') }}
-    </button>
+    </woot-button>
     <div class="row">
       <div class="small-8 columns">
         <p
@@ -42,20 +43,26 @@
                 </div>
               </td>
               <td class="button-wrapper">
-                <woot-submit-button
-                  :button-text="$t('LABEL_MGMT.FORM.EDIT')"
-                  icon-class="ion-edit"
-                  button-class="link hollow grey-btn"
+                <woot-button
+                  variant="link"
+                  color-scheme="secondary"
+                  class-names="grey-btn"
+                  :is-loading="loading[label.id]"
+                  icon="ion-edit"
                   @click="openEditPopup(label)"
-                />
-
-                <woot-submit-button
-                  :button-text="$t('LABEL_MGMT.FORM.DELETE')"
-                  :loading="loading[label.id]"
-                  icon-class="ion-close-circled"
-                  button-class="link hollow grey-btn"
+                >
+                  {{ $t('LABEL_MGMT.FORM.EDIT') }}
+                </woot-button>
+                <woot-button
+                  variant="link"
+                  color-scheme="secondary"
+                  icon="ion-close-circled"
+                  class-names="grey-btn"
+                  :is-loading="loading[label.id]"
                   @click="openDeletePopup(label, index)"
-                />
+                >
+                  {{ $t('LABEL_MGMT.FORM.DELETE') }}
+                </woot-button>
               </td>
             </tr>
           </tbody>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index f7136c712..4d830d856 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="column content-box">
-    <button
-      class="button nice icon success button--fixed-right-top"
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-download"
       @click="downloadAgentReports"
     >
-      <i class="icon ion-android-download"></i>
       {{ $t('REPORT.DOWNLOAD_AGENT_REPORTS') }}
-    </button>
+    </woot-button>
     <div class="small-3 pull-right">
       <multiselect
         v-model="currentDateRangeSelection"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
index ac74ed1ae..655898ee3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -25,22 +25,27 @@
                   <router-link
                     :to="addAccountScoping(`settings/teams/${item.id}/edit`)"
                   >
-                    <woot-submit-button
+                    <woot-button
                       v-if="isAdmin"
-                      :button-text="$t('TEAMS_SETTINGS.LIST.EDIT_TEAM')"
-                      icon-class="ion-gear-b"
-                      button-class="link hollow grey-btn"
-                    />
+                      variant="link"
+                      color-scheme="secondary"
+                      class-names="grey-btn"
+                      icon="ion-gear-b"
+                    >
+                      {{ $t('TEAMS_SETTINGS.LIST.EDIT_TEAM') }}
+                    </woot-button>
                   </router-link>
-
-                  <woot-submit-button
+                  <woot-button
                     v-if="isAdmin"
-                    :button-text="$t('TEAMS_SETTINGS.DELETE.BUTTON_TEXT')"
-                    :loading="loading[item.id]"
-                    icon-class="ion-close-circled"
-                    button-class="link hollow grey-btn"
+                    variant="link"
+                    color-scheme="secondary"
+                    icon="ion-close-circled"
+                    class-names="grey-btn"
+                    :is-loading="loading[item.id]"
                     @click="openDelete(item)"
-                  />
+                  >
+                    {{ $t('TEAMS_SETTINGS.DELETE.BUTTON_TEXT') }}
+                  </woot-button>
                 </div>
               </td>
             </tr>
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownItem.vue b/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
index b791fd937..ac7367f48 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
@@ -36,11 +36,11 @@ export default {
       width: 100%;
       text-align: left;
       white-space: nowrap;
-      padding: var(--space-small) var(--space-one);
+      display: inline-flex;
+      border-radius: var(--border-radius-normal);
 
       &:hover {
         background: var(--color-background);
-        border-radius: var(--border-radius-normal);
       }
     }
   }
diff --git a/stories/Sections/Button.stories.mdx b/stories/Sections/Button.stories.mdx
new file mode 100644
index 000000000..ee20ce082
--- /dev/null
+++ b/stories/Sections/Button.stories.mdx
@@ -0,0 +1,185 @@
+import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
+
+import WootButton from '../../app/javascript/dashboard/components/ui/WootButton.vue';
+
+<Meta title="Styleguide/Buttons" />
+
+# Buttons
+
+Buttons can be used by `woot-button` component in `vue`. You can play with all the props here 👉 [woot-button](/story/components-button--primary). The button component is made on top of [foundation button](https://get.foundation/sites/docs/button.html)
+so the style of button can be used outside of vue with `button` class.
+
+Other than declred props the `woot-button` can be customised by providing custom classnames through `class-names` prop.
+
+<Story name="default">
+  {{
+    template: `<woot-button size="" title="Press me">Default</woot-button>`,
+  }}
+</Story>
+
+- While naming button labels make sure to describe the action with some context.
+- For HTML forms use `<woot-button type="submit">` instead of `<input type="submit" />`
+- Provide title or tooltip if possible.
+
+## Button sizes
+
+Size of the buttons can be set with `size` to `woot-button`. By default medium is the default size of a button. Other sizes are `tiny, small, medium, large`.
+
+<Canvas>
+  <Story name="sizes">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button size="tiny">Tiny</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button size="small">Small</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button size="">Default</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button size="large">Large</woot-button> 
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+Buttons can expanded to full width by setting the `is-expanded` prop. For with by screen size or to make it responsive try with the classnames on
+[Responsive Expanded buttons](https://get.foundation/sites/docs/button.html#responsive-expanded-buttons) with foundation.
+
+<Canvas>
+  <Story name="expanded">
+    {{
+      template: `<div class="row">
+          <div class="columns">
+              <woot-button size="large" is-expanded title="Micheal Scott said the rest">This is buttons is very long</woot-button> 
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+## Button colors
+
+Chatwoot comes with predefined set of colors for buttons. The color of the button can be set with `color-scheme` to `woot-button`.
+Default color scheme is `primary`, other color-schemes are `secondary, success, alert, warning`.
+
+<Canvas>
+  <Story name="colors">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button >Primary</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="secondary">Secondary</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="success">Success</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="alert">Alert</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="warning">Warning</woot-button> 
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+## Button style variations
+
+There are diffrent styles that comes with chatwoot buttons. This can set with `variants` prop for `woot-button`. By deault the filled will be the style, other variations are `smooth, hollow, clear, link`
+
+- Primary form actions like Save details, Create campaign etc should use default style.
+- The Cancel action has to use the smooth style.
+
+<Canvas>
+  <Story name="variants">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button >Default</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button variant="smooth" color-scheme="alert">Smooth</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="secondary" variant="hollow">Hollow</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="success" variant="clear">Success</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="alert" variant="link">Link</woot-button> 
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+## Button states
+
+The button can be disbaled with `is-disabled` which accepts a boolean value. The button can set to a loading state with `is-loading` which accepts a boolean value.
+
+These are states other than the default interaction states like hover, active, focused.
+
+<Canvas>
+  <Story name="states">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="alert" is-disabled>disabled :/</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button variant="smooth" color-scheme="primary" is-loading>Loading...</woot-button> 
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+## Button with icon and text
+
+Chatwoot currently use [IonIcons version 2](https://ionic.io/ionicons/v2) which are font-icons. The button position is fixed on the left.
+The prop `icon` can be used to pass the **ion icon classname** to render the icon.
+
+<Canvas>
+  <Story name="icons">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="alert" icon="ion-stop">Stop</woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button icon="ion-person" variant="hollow">Hollow man</woot-button>
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>
+
+#### Buttons with only icon
+
+The `woot-button` can be used as an icon only button by keeping the button text empty.
+
+<Canvas>
+  <Story name="icononly">
+    {{
+      template: `<div class="row">
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="success" icon="ion-plus" size="tiny"></woot-button> 
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button color-scheme="secondary" icon="ion-plus" size="small" variant="smooth"></woot-button>
+          </div>
+          <div class="margin-horizontal-2">
+              <woot-button icon="ion-plus" variant="hollow"></woot-button>
+          </div>
+        </div>`,
+    }}
+  </Story>
+</Canvas>

From 46356d0bf9d2547d66eb7845917cc132ec01fead Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 20 May 2021 20:46:45 +0530
Subject: [PATCH 04/67] docs: Add documentation for integration APIs (#2300)

---
 app/views/api/v1/models/_app.json.jbuilder    |   6 +-
 app/views/api/v1/models/_hook.json.jbuilder   |   7 +-
 .../integrations/hooks_controller_spec.rb     |   4 +-
 swagger/definitions/index.yml                 |  10 +
 .../integrations/hook_create_payload.yml      |  11 +
 .../integrations/hook_update_payload.yml      |   5 +
 .../definitions/resource/integrations/app.yml |  23 ++
 .../resource/integrations/hook.yml            |  23 ++
 swagger/definitions/resource/team.yml         |   4 +-
 swagger/parameters/hook_id.yml                |   6 +
 swagger/parameters/index.yml                  |   3 +
 swagger/parameters/team_id.yml                |   2 +-
 swagger/paths/contact/conversations.yml       |   2 +-
 swagger/paths/contact/crud.yml                |   4 +-
 swagger/paths/contact_inboxes/create.yml      |   2 +-
 .../paths/conversation/update_last_seen.yml   |   2 +-
 swagger/paths/index.yml                       |  17 ++
 swagger/paths/integrations/apps/show.yml      |  14 +
 swagger/paths/integrations/hooks/create.yml   |  19 ++
 swagger/paths/integrations/hooks/delete.yml   |  15 ++
 swagger/paths/integrations/hooks/update.yml   |  20 ++
 swagger/paths/teams/show.yml                  |   2 +-
 swagger/swagger.json                          | 242 +++++++++++++++++-
 23 files changed, 421 insertions(+), 22 deletions(-)
 create mode 100644 swagger/definitions/request/integrations/hook_create_payload.yml
 create mode 100644 swagger/definitions/request/integrations/hook_update_payload.yml
 create mode 100644 swagger/definitions/resource/integrations/app.yml
 create mode 100644 swagger/definitions/resource/integrations/hook.yml
 create mode 100644 swagger/parameters/hook_id.yml
 create mode 100644 swagger/paths/integrations/apps/show.yml
 create mode 100644 swagger/paths/integrations/hooks/create.yml
 create mode 100644 swagger/paths/integrations/hooks/delete.yml
 create mode 100644 swagger/paths/integrations/hooks/update.yml

diff --git a/app/views/api/v1/models/_app.json.jbuilder b/app/views/api/v1/models/_app.json.jbuilder
index 6fce9fee2..33a2bfc88 100644
--- a/app/views/api/v1/models/_app.json.jbuilder
+++ b/app/views/api/v1/models/_app.json.jbuilder
@@ -3,4 +3,8 @@ json.name resource.name
 json.description resource.description
 json.enabled resource.enabled?(@current_account)
 json.button resource.action
-json.hooks @current_account.hooks.where(app_id: resource.id)
+json.hooks do
+  json.array! @current_account.hooks.where(app_id: resource.id) do |hook|
+    json.partial! 'api/v1/models/hook.json.jbuilder', resource: hook
+  end
+end
diff --git a/app/views/api/v1/models/_hook.json.jbuilder b/app/views/api/v1/models/_hook.json.jbuilder
index d9860b8a2..e9c921516 100644
--- a/app/views/api/v1/models/_hook.json.jbuilder
+++ b/app/views/api/v1/models/_hook.json.jbuilder
@@ -1,4 +1,7 @@
 json.id resource.id
-json.app resource.app.params.to_h
-json.enabled resource.enabled?
+json.app_id resource.app_id
+json.status resource.enabled?
 json.inbox_id resource.inbox_id
+json.account_id resource.account_id
+json.hook_type resource.hook_type
+json.settings resource.settings
diff --git a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
index 3c92f9026..63c31d98a 100644
--- a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe 'Integration Hooks API', type: :request do
 
         expect(response).to have_http_status(:success)
         data = JSON.parse(response.body)
-        expect(data['app']['id']).to eq params[:app_id]
+        expect(data['app_id']).to eq params[:app_id]
       end
     end
   end
@@ -72,7 +72,7 @@ RSpec.describe 'Integration Hooks API', type: :request do
 
         expect(response).to have_http_status(:success)
         data = JSON.parse(response.body)
-        expect(data['app']['id']).to eq 'slack'
+        expect(data['app_id']).to eq 'slack'
       end
     end
   end
diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index e72c1743d..7317ff2b0 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -27,6 +27,10 @@ account:
   $ref: ./resource/account.yml
 team:
   $ref: ./resource/team.yml
+integrations_app:
+   $ref: ./resource/integrations/app.yml
+integrations_hook:
+   $ref: ./resource/integrations/hook.yml
 
 # RESPONSE
 
@@ -87,3 +91,9 @@ conversation_message_create:
 
 team_create_update_payload:
   $ref: ./request/team/create_update_payload.yml
+
+integrations_hook_create_payload:
+  $ref: ./request/integrations/hook_create_payload.yml
+
+integrations_hook_update_payload:
+  $ref: ./request/integrations/hook_update_payload.yml
\ No newline at end of file
diff --git a/swagger/definitions/request/integrations/hook_create_payload.yml b/swagger/definitions/request/integrations/hook_create_payload.yml
new file mode 100644
index 000000000..d1bf518d8
--- /dev/null
+++ b/swagger/definitions/request/integrations/hook_create_payload.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  app_id:
+    type: string
+    description: The ID of app for which integration hook is being created
+  inbox_id:
+    type: string
+    description: The inbox ID, if the hook is an inbox hook
+  settings:
+    type: object
+    description: The settings required by the integration
diff --git a/swagger/definitions/request/integrations/hook_update_payload.yml b/swagger/definitions/request/integrations/hook_update_payload.yml
new file mode 100644
index 000000000..5b91024db
--- /dev/null
+++ b/swagger/definitions/request/integrations/hook_update_payload.yml
@@ -0,0 +1,5 @@
+type: object
+properties:
+  settings:
+    type: object
+    description: The settings required by the integration
diff --git a/swagger/definitions/resource/integrations/app.yml b/swagger/definitions/resource/integrations/app.yml
new file mode 100644
index 000000000..ce7fb1e75
--- /dev/null
+++ b/swagger/definitions/resource/integrations/app.yml
@@ -0,0 +1,23 @@
+type: object
+properties:
+  id:
+    type: string
+    description: The ID of the integration
+  name:
+    type: string
+    description: The name of the integration
+  description:
+    type: string
+    description: The description about the team
+  hook_type:
+    type: string
+    description: Whether the integration is an account or inbox integration
+  enabled:
+    type: boolean
+    description: Whether the integration is enabled for the account
+  allow_multiple_hooks:
+    type: boolean
+    description: Whether multiple hooks can be created for the integration
+  hooks:
+    type: array
+    description: If there are any hooks created for this integration
diff --git a/swagger/definitions/resource/integrations/hook.yml b/swagger/definitions/resource/integrations/hook.yml
new file mode 100644
index 000000000..197c8d858
--- /dev/null
+++ b/swagger/definitions/resource/integrations/hook.yml
@@ -0,0 +1,23 @@
+type: object
+properties:
+  id:
+    type: string
+    description: The ID of the integration hook
+  app_id:
+    type: string
+    description: The ID of the integration app
+  inbox_id:
+    type: string
+    description: Inbox ID if its an Inbox integration
+  account_id:
+    type: string
+    description: Account ID of the integration
+  status:
+    type: boolean
+    description: Whether the integration hook is enabled for the account
+  hook_type:
+    type: boolean
+    description: Whether its an account or inbox integration hook
+  settings:
+    type: object
+    description: The associated settings for the integration
\ No newline at end of file
diff --git a/swagger/definitions/resource/team.yml b/swagger/definitions/resource/team.yml
index ad74be943..eda41ed3e 100644
--- a/swagger/definitions/resource/team.yml
+++ b/swagger/definitions/resource/team.yml
@@ -2,7 +2,7 @@ type: object
 properties:
   id:
     type: number
-    description: The id of the team
+    description: The ID of the team
   name:
     type: string
     description: The name of the team
@@ -14,7 +14,7 @@ properties:
     description: If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team
   account_id:
     type: number
-    description: The id of the account with the team is a part of
+    description: The ID of the account with the team is a part of
   is_member:
     type: boolean
     description: This field shows whether the current user is a part of the team
diff --git a/swagger/parameters/hook_id.yml b/swagger/parameters/hook_id.yml
new file mode 100644
index 000000000..f1c50c3d4
--- /dev/null
+++ b/swagger/parameters/hook_id.yml
@@ -0,0 +1,6 @@
+in: path
+name: hook_id
+schema:
+  type: integer
+required: true
+description: The numeric ID of the integration hook
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index 6acf0f37d..ac9c9a37b 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -4,6 +4,9 @@ account_id:
 team_id:
   $ref: ./team_id.yml
 
+hook_id:
+  $ref: ./hook_id.yml
+
 source_id:
   $ref: ./source_id.yml
 
diff --git a/swagger/parameters/team_id.yml b/swagger/parameters/team_id.yml
index 096656d2a..e71d32d6e 100644
--- a/swagger/parameters/team_id.yml
+++ b/swagger/parameters/team_id.yml
@@ -3,4 +3,4 @@ name: id
 schema:
   type: integer
 required: true
-description: The id of the team to be updated
+description: The ID of the team to be updated
diff --git a/swagger/paths/contact/conversations.yml b/swagger/paths/contact/conversations.yml
index 525ef56d6..83ef815e3 100644
--- a/swagger/paths/contact/conversations.yml
+++ b/swagger/paths/contact/conversations.yml
@@ -7,7 +7,7 @@ get:
     - name: id
       in: path
       type: number
-      description: id of the contact
+      description: ID of the contact
       required: true
   responses:
     200:
diff --git a/swagger/paths/contact/crud.yml b/swagger/paths/contact/crud.yml
index eee353a74..09f02d886 100644
--- a/swagger/paths/contact/crud.yml
+++ b/swagger/paths/contact/crud.yml
@@ -7,7 +7,7 @@ get:
     - name: id
       in: path
       type: number
-      description: id of the contact
+      description: ID of the contact
       required: true
   responses:
     200:
@@ -28,7 +28,7 @@ put:
     - name: id
       in: path
       type: number
-      description: id of the contact
+      description: ID of the contact
       required: true
     - name: data
       in: body
diff --git a/swagger/paths/contact_inboxes/create.yml b/swagger/paths/contact_inboxes/create.yml
index a0f641867..a8069b4b6 100644
--- a/swagger/paths/contact_inboxes/create.yml
+++ b/swagger/paths/contact_inboxes/create.yml
@@ -13,7 +13,7 @@ post:
         properties:
           inbox_id:
             type: number
-            description: The id of the inbox
+            description: The ID of the inbox
             required: true
           source_id:
             $ref: '#/parameters/source_id'
diff --git a/swagger/paths/conversation/update_last_seen.yml b/swagger/paths/conversation/update_last_seen.yml
index ee5a9bf14..2f26df879 100644
--- a/swagger/paths/conversation/update_last_seen.yml
+++ b/swagger/paths/conversation/update_last_seen.yml
@@ -8,7 +8,7 @@ post:
     - name: id
       in: path
       type: number
-      description: id of the conversation
+      description: ID of the conversation
       required: true
   responses:
     200:
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index b47d6cb9c..c8fd3be03 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -113,3 +113,20 @@
     $ref: ./teams/update.yml
   delete:
     $ref: ./teams/delete.yml
+
+
+# Integrations
+/accounts/{account_id}/integrations/apps:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: './integrations/apps/show.yml'
+  
+ 
+/accounts/{account_id}/integrations/hooks:
+  post:
+    $ref: './integrations/hooks/create.yml'
+  patch:
+    $ref: ./integrations/hooks/update.yml
+  delete:
+    $ref: ./integrations/hooks/delete.yml
\ No newline at end of file
diff --git a/swagger/paths/integrations/apps/show.yml b/swagger/paths/integrations/apps/show.yml
new file mode 100644
index 000000000..6d5f8332f
--- /dev/null
+++ b/swagger/paths/integrations/apps/show.yml
@@ -0,0 +1,14 @@
+tags:
+  - Integrations
+operationId: get-details-of-all-integrations
+summary: List all the Integrations
+description: Get the details of all Integrations available for the account
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/integrations_app'
+  401:
+    description: Unauthorized
+  404:
+    description: Url not found
diff --git a/swagger/paths/integrations/hooks/create.yml b/swagger/paths/integrations/hooks/create.yml
new file mode 100644
index 000000000..42bcb002e
--- /dev/null
+++ b/swagger/paths/integrations/hooks/create.yml
@@ -0,0 +1,19 @@
+tags:
+  - Integrations
+operationId: create-an-integration-hook
+summary: Create an integration hook
+description: Create an integration hook
+parameters:
+  - $ref: '#/parameters/account_id'
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/integrations_hook_create_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/integrations_hook'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/integrations/hooks/delete.yml b/swagger/paths/integrations/hooks/delete.yml
new file mode 100644
index 000000000..3e616613b
--- /dev/null
+++ b/swagger/paths/integrations/hooks/delete.yml
@@ -0,0 +1,15 @@
+tags:
+  -  Integrations
+operationId: delete-an-integration-hook
+summary: Delete an Integration Hook
+description: Delete an Integration Hook
+parameters:
+  - $ref: '#/parameters/account_id'
+  - $ref: '#/parameters/hook_id'
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The hook does not exist in the account
diff --git a/swagger/paths/integrations/hooks/update.yml b/swagger/paths/integrations/hooks/update.yml
new file mode 100644
index 000000000..2cfd6877a
--- /dev/null
+++ b/swagger/paths/integrations/hooks/update.yml
@@ -0,0 +1,20 @@
+tags:
+  - Integrations
+operationId: update-an-integrations-hook
+summary: Update an Integration Hook
+description: Update an Integration Hook
+parameters:
+  - $ref: '#/parameters/account_id'
+  - $ref: '#/parameters/hook_id'
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/integrations_hook_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/integrations_hook'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/teams/show.yml b/swagger/paths/teams/show.yml
index d7ccdbb04..485b4730b 100644
--- a/swagger/paths/teams/show.yml
+++ b/swagger/paths/teams/show.yml
@@ -11,4 +11,4 @@ responses:
   401:
     description: Unauthorized
   404:
-    description: The given team id does not exist in the account
+    description: The given team ID does not exist in the account
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 2007a76cc..ff823ed84 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -957,7 +957,7 @@
             "name": "id",
             "in": "path",
             "type": "number",
-            "description": "id of the contact",
+            "description": "ID of the contact",
             "required": true
           }
         ],
@@ -987,7 +987,7 @@
             "name": "id",
             "in": "path",
             "type": "number",
-            "description": "id of the contact",
+            "description": "ID of the contact",
             "required": true
           },
           {
@@ -1027,7 +1027,7 @@
             "name": "id",
             "in": "path",
             "type": "number",
-            "description": "id of the contact",
+            "description": "ID of the contact",
             "required": true
           }
         ],
@@ -1107,7 +1107,7 @@
               "properties": {
                 "inbox_id": {
                   "type": "number",
-                  "description": "The id of the inbox",
+                  "description": "The ID of the inbox",
                   "required": true
                 },
                 "source_id": {
@@ -1269,7 +1269,7 @@
             "description": "Unauthorized"
           },
           "404": {
-            "description": "The given team id does not exist in the account"
+            "description": "The given team ID does not exist in the account"
           }
         }
       },
@@ -1321,6 +1321,131 @@
           }
         }
       }
+    },
+    "/accounts/{account_id}/integrations/apps": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Integrations"
+        ],
+        "operationId": "get-details-of-all-integrations",
+        "summary": "List all the Integrations",
+        "description": "Get the details of all Integrations available for the account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/integrations_app"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Url not found"
+          }
+        }
+      }
+    },
+    "/accounts/{account_id}/integrations/hooks": {
+      "post": {
+        "tags": [
+          "Integrations"
+        ],
+        "operationId": "create-an-integration-hook",
+        "summary": "Create an integration hook",
+        "description": "Create an integration hook",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/integrations_hook_create_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/integrations_hook"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Integrations"
+        ],
+        "operationId": "update-an-integrations-hook",
+        "summary": "Update an Integration Hook",
+        "description": "Update an Integration Hook",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "$ref": "#/parameters/hook_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/integrations_hook_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/integrations_hook"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Integrations"
+        ],
+        "operationId": "delete-an-integration-hook",
+        "summary": "Delete an Integration Hook",
+        "description": "Delete an Integration Hook",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "$ref": "#/parameters/hook_id"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The hook does not exist in the account"
+          }
+        }
+      }
     }
   },
   "definitions": {
@@ -1662,7 +1787,7 @@
       "properties": {
         "id": {
           "type": "number",
-          "description": "The id of the team"
+          "description": "The ID of the team"
         },
         "name": {
           "type": "string",
@@ -1678,7 +1803,7 @@
         },
         "account_id": {
           "type": "number",
-          "description": "The id of the account with the team is a part of"
+          "description": "The ID of the account with the team is a part of"
         },
         "is_member": {
           "type": "boolean",
@@ -1686,6 +1811,72 @@
         }
       }
     },
+    "integrations_app": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The ID of the integration"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the integration"
+        },
+        "description": {
+          "type": "string",
+          "description": "The description about the team"
+        },
+        "hook_type": {
+          "type": "string",
+          "description": "Whether the integration is an account or inbox integration"
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Whether the integration is enabled for the account"
+        },
+        "allow_multiple_hooks": {
+          "type": "boolean",
+          "description": "Whether multiple hooks can be created for the integration"
+        },
+        "hooks": {
+          "type": "array",
+          "description": "If there are any hooks created for this integration"
+        }
+      }
+    },
+    "integrations_hook": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The ID of the integration hook"
+        },
+        "app_id": {
+          "type": "string",
+          "description": "The ID of the integration app"
+        },
+        "inbox_id": {
+          "type": "string",
+          "description": "Inbox ID if its an Inbox integration"
+        },
+        "account_id": {
+          "type": "string",
+          "description": "Account ID of the integration"
+        },
+        "status": {
+          "type": "boolean",
+          "description": "Whether the integration hook is enabled for the account"
+        },
+        "hook_type": {
+          "type": "boolean",
+          "description": "Whether its an account or inbox integration hook"
+        },
+        "settings": {
+          "type": "object",
+          "description": "The associated settings for the integration"
+        }
+      }
+    },
     "extended_contact": {
       "allOf": [
         {
@@ -2048,6 +2239,32 @@
           "description": "If this setting is turned on, the system would automatically assign the conversation to an agent in the team while assigning the conversation to a team"
         }
       }
+    },
+    "integrations_hook_create_payload": {
+      "type": "object",
+      "properties": {
+        "app_id": {
+          "type": "string",
+          "description": "The ID of app for which integration hook is being created"
+        },
+        "inbox_id": {
+          "type": "string",
+          "description": "The inbox ID, if the hook is an inbox hook"
+        },
+        "settings": {
+          "type": "object",
+          "description": "The settings required by the integration"
+        }
+      }
+    },
+    "integrations_hook_update_payload": {
+      "type": "object",
+      "properties": {
+        "settings": {
+          "type": "object",
+          "description": "The settings required by the integration"
+        }
+      }
     }
   },
   "parameters": {
@@ -2067,7 +2284,16 @@
         "type": "integer"
       },
       "required": true,
-      "description": "The id of the team to be updated"
+      "description": "The ID of the team to be updated"
+    },
+    "hook_id": {
+      "in": "path",
+      "name": "hook_id",
+      "schema": {
+        "type": "integer"
+      },
+      "required": true,
+      "description": "The numeric ID of the integration hook"
     },
     "source_id": {
       "type": "string",

From 047617713e993c8d475f700bf4cb43ca895f8fcd Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Thu, 20 May 2021 23:08:05 +0530
Subject: [PATCH 05/67] Chore: Refactor add note to use foundation card classes
 (#2308)

---
 .../assets/scss/_foundation-settings.scss     |  8 +--
 .../dashboard/contacts/components/AddNote.vue | 60 +++++--------------
 2 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 56d82896b..dc39751f0 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -285,10 +285,10 @@ $callout-link-tint: 30%;
 $card-background: $white;
 $card-font-color: $body-font-color;
 $card-divider-background: $light-gray;
-$card-border: 1px solid $light-gray;
-$card-shadow: none;
-$card-border-radius: $global-radius;
-$card-padding: $global-padding;
+$card-border: 1px solid var(--color-border);
+$card-shadow: var(--shadow-small);
+$card-border-radius: var(--border-radius-medium);
+$card-padding: var(--space-small);
 $card-margin: $global-margin;
 
 // 15. Close Button
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
index 1b416c2a3..0e5fd334f 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
@@ -1,21 +1,17 @@
 <template>
-  <div class="wrap">
-    <div class="input-wrap">
-      <textarea
-        v-model="inputText"
-        :placeholder="$t('NOTES.ADD.PLACEHOLDER')"
-        class="input--note"
-        @keydown.enter.shift.exact="onAdd"
-      >
-      </textarea>
-    </div>
+  <div class="card">
+    <textarea
+      v-model="inputText"
+      :placeholder="$t('NOTES.ADD.PLACEHOLDER')"
+      class="input--note"
+      @keydown.enter.shift.exact="onAdd"
+    />
     <div class="footer">
       <woot-button
         size="tiny"
         color-scheme="warning"
         :title="$t('NOTES.ADD.TITLE')"
         :is-disabled="buttonDisabled"
-        class="button-wrap"
         @click="onAdd"
       >
         {{ $t('NOTES.ADD.BUTTON') }}
@@ -25,12 +21,7 @@
 </template>
 
 <script>
-import WootButton from 'dashboard/components/ui/WootButton.vue';
 export default {
-  components: {
-    WootButton,
-  },
-
   data() {
     return {
       inputText: '',
@@ -56,41 +47,20 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  display: flex;
-  flex-direction: column;
-  border: 1px solid var(--color-border);
-  border-radius: var(--border-radius-small);
-  margin-bottom: var(--space-smaller);
-  width: 100%;
-
-  .input-wrap {
-    display: flex;
-    flex: 0 0 auto;
-    width: 100%;
-
-    .input--note {
-      font-size: var(--font-size-mini);
-      border-color: transparent;
-      padding: var(--space-small) var(--space-small) 0 var(--space-small);
-      resize: none;
-      box-sizing: border-box;
-      min-height: var(--space-larger);
-      margin-bottom: var(--space-small);
-    }
+  .input--note {
+    font-size: var(--font-size-mini);
+    border-color: transparent;
+    margin: 0;
+    resize: none;
+    min-height: var(--space-larger);
   }
 
   .footer {
     display: flex;
     justify-content: flex-end;
-    flex: 1 1 auto;
-    overflow: auto;
     width: 100%;
-
-    .button-wrap {
-      float: right;
-      margin-bottom: var(--space-small);
-      margin-right: var(--space-small);
-    }
+    padding: var(--space-small);
+    padding-top: 0;
   }
 }
 </style>

From 2a492b416231b3c7e6483d2dea3f9b2935470d07 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Thu, 20 May 2021 23:41:15 +0530
Subject: [PATCH 06/67] Chore: Refactors view note component (#2310)

---
 .../assets/scss/_foundation-custom.scss       |  4 +-
 .../assets/scss/_foundation-settings.scss     |  2 +-
 .../dashboard/contacts/components/AddNote.vue | 27 ++++++-------
 .../contacts/components/ContactNote.vue       | 39 +++++++------------
 4 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index 61ead3492..d8909a181 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -5,8 +5,10 @@
   &.round {
     border-radius: 1000px;
   }
+}
 
-
+.card {
+  padding: var(--space-small);
 }
 
 .button-wrapper .button.link.grey-btn {
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index dc39751f0..0cd3f66d3 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -287,7 +287,7 @@ $card-font-color: $body-font-color;
 $card-divider-background: $light-gray;
 $card-border: 1px solid var(--color-border);
 $card-shadow: var(--shadow-small);
-$card-border-radius: var(--border-radius-medium);
+$card-border-radius: var(--border-radius-normal);
 $card-padding: var(--space-small);
 $card-margin: $global-margin;
 
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
index 0e5fd334f..2fe918924 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
@@ -46,21 +46,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.wrap {
-  .input--note {
-    font-size: var(--font-size-mini);
-    border-color: transparent;
-    margin: 0;
-    resize: none;
-    min-height: var(--space-larger);
-  }
+.input--note {
+  font-size: var(--font-size-mini);
+  border-color: transparent;
+  margin-bottom: var(--space-small);
+  padding: 0;
+  resize: none;
+  min-height: var(--space-larger);
+}
 
-  .footer {
-    display: flex;
-    justify-content: flex-end;
-    width: 100%;
-    padding: var(--space-small);
-    padding-top: 0;
-  }
+.footer {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
index 9be5649b3..f3e718464 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="note-wrap">
-    <div class="text">
+  <div class="card note-wrap">
+    <p class="note__content">
       {{ note }}
-    </div>
+    </p>
     <div class="footer">
       <div class="meta">
         <div :title="userName">
@@ -19,7 +19,6 @@
           icon="ion-compose"
           color-scheme="secondary"
           class-names="button--emoji"
-          class="button-wrap"
           @click="onEdit"
         />
         <woot-button
@@ -28,7 +27,6 @@
           icon="ion-trash-b"
           color-scheme="secondary"
           class-names="button--emoji"
-          class="button-wrap"
           @click="onDelete"
         />
       </div>
@@ -90,17 +88,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.note-wrap {
-  padding: var(--space-small);
-  border: 1px solid var(--color-border);
-  border-radius: var(--border-radius-small);
-  margin-bottom: var(--space-smaller);
-
-  .text {
-    padding-bottom: var(--space-small);
-    font-size: var(--font-size-mini);
-    color: var(--color-body);
-  }
+.note__content {
+  font-size: var(--font-size-mini);
+  margin-bottom: var(--space-small);
 }
 
 .footer {
@@ -119,19 +109,20 @@ export default {
     }
   }
   .actions {
-    display: none;
+    display: flex;
+    visibility: hidden;
+  }
+
+  .button--emoji {
+    margin-left: var(--space-small);
+    height: var(--space-medium);
+    width: var(--space-medium);
   }
 }
 
 .note-wrap:hover {
   .actions {
-    display: flex;
-
-    .button-wrap {
-      margin-right: var(--space-small);
-      height: var(--space-medium);
-      width: var(--space-medium);
-    }
+    visibility: visible;
   }
 }
 </style>

From bb1c02892689476c24e15397069b36e181d01e6a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 21 May 2021 00:03:09 +0530
Subject: [PATCH 07/67] fix: Slack integration redirect url missing the client
 ID (#2309)

Fixes: #2304
---
 app/views/api/v1/models/_app.json.jbuilder        |  1 +
 .../accounts/integrations/apps_controller_spec.rb | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/views/api/v1/models/_app.json.jbuilder b/app/views/api/v1/models/_app.json.jbuilder
index 33a2bfc88..a38745e7a 100644
--- a/app/views/api/v1/models/_app.json.jbuilder
+++ b/app/views/api/v1/models/_app.json.jbuilder
@@ -2,6 +2,7 @@ json.call(resource.params, *resource.params.keys)
 json.name resource.name
 json.description resource.description
 json.enabled resource.enabled?(@current_account)
+json.action resource.action
 json.button resource.action
 json.hooks do
   json.array! @current_account.hooks.where(app_id: resource.id) do |hook|
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index b1ac377bb..c86163ccf 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -25,6 +25,21 @@ RSpec.describe 'Integration Apps API', type: :request do
         expect(apps['id']).to eql(first_app.id)
         expect(apps['name']).to eql(first_app.name)
       end
+
+      it 'returns slack app with appropriate redirect url when configured' do
+        ENV['SLACK_CLIENT_ID'] = 'client_id'
+        ENV['SLACK_CLIENT_SECRET'] = 'client_secret'
+        get api_v1_account_integrations_apps_url(account),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        apps = JSON.parse(response.body)['payload']
+        slack_app = apps.find { |app| app['id'] == 'slack' }
+        expect(slack_app['action']).to include('client_id=client_id')
+        ENV['SLACK_CLIENT_ID'] = nil
+        ENV['SLACK_CLIENT_SECRET'] = nil
+      end
     end
   end
 

From 64718eb879898609536bfaf7b6462ea29ae0c3d8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 21 May 2021 18:55:42 +0530
Subject: [PATCH 08/67] fix: Broken Docker production config (#2319)

fixes: #2110
---
 docker-compose.production.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index 129c93ff4..bda73a089 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -44,6 +44,8 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: ["sh", "-c", "redis-server --requirepass \"$REDIS_PASSWORD\""]
+    env_file: .env
     volumes:
       - /data/redis:/data
     ports:

From 26ba8e6ff7ab41210f262b2adeb007fe0070f7b8 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 21 May 2021 19:22:47 +0530
Subject: [PATCH 09/67] feat: Create custom attributes for a contact from CRM
 (#2299)

* feat: Creates cutom attributes for a contact from CRM

* Review fixes

* Change inline forms edit icon size

* Review fixes

* Fix validation labels color

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .storybook/preview.js                         |  2 +
 .../dashboard/i18n/locale/en/contact.json     | 24 ++++-
 .../contact/components/AddCustomAttribute.vue | 97 +++++++++++++++++++
 .../contact/components/ContactAttribute.vue   |  2 +-
 .../contact/components/ContactFields.vue      | 39 +++++++-
 .../contact/components/ContactPanel.vue       | 49 +++++++++-
 .../contact/components/ManageLayout.vue       |  8 +-
 .../stories/AddCustomAttribute.stories.js     | 32 ++++++
 .../contact/stories/ContactFields.stories.js  |  3 +-
 .../contacts/pages/ContactManageView.vue      |  3 +
 10 files changed, 248 insertions(+), 11 deletions(-)
 create mode 100644 app/javascript/dashboard/modules/contact/components/AddCustomAttribute.vue
 create mode 100644 app/javascript/dashboard/modules/contact/stories/AddCustomAttribute.stories.js

diff --git a/.storybook/preview.js b/.storybook/preview.js
index 40a2ce3ea..c62c3ef00 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -2,6 +2,7 @@ import { addDecorator } from '@storybook/vue';
 import Vue from 'vue';
 import Vuex from 'vuex';
 import VueI18n from 'vue-i18n';
+import Vuelidate from 'vuelidate';
 
 import WootUiKit from '../app/javascript/dashboard/components';
 import i18n from '../app/javascript/dashboard/i18n';
@@ -9,6 +10,7 @@ import i18n from '../app/javascript/dashboard/i18n';
 import '../app/javascript/dashboard/assets/scss/storybook.scss';
 
 Vue.use(VueI18n);
+Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
 
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 6a94011a5..80a33f25a 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
       "TITLE": "Previous Conversations"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Conversation Labels",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/modules/contact/components/AddCustomAttribute.vue b/app/javascript/dashboard/modules/contact/components/AddCustomAttribute.vue
new file mode 100644
index 000000000..36540a341
--- /dev/null
+++ b/app/javascript/dashboard/modules/contact/components/AddCustomAttribute.vue
@@ -0,0 +1,97 @@
+<template>
+  <modal :show.sync="show" :on-close="onClose">
+    <woot-modal-header
+      :header-title="$t('CUSTOM_ATTRIBUTES.ADD.TITLE')"
+      :header-content="$t('CUSTOM_ATTRIBUTES.ADD.DESC')"
+    />
+    <form class="row" @submit.prevent="addCustomAttribute">
+      <woot-input
+        v-model.trim="attributeName"
+        :class="{ error: $v.attributeName.$error }"
+        class="medium-12 columns"
+        :error="attributeNameError"
+        :label="$t('CUSTOM_ATTRIBUTES.FORM.NAME.LABEL')"
+        :placeholder="$t('CUSTOM_ATTRIBUTES.FORM.NAME.PLACEHOLDER')"
+        @input="$v.attributeName.$touch"
+      />
+      <woot-input
+        v-model.trim="attributeValue"
+        class="medium-12 columns"
+        :label="$t('CUSTOM_ATTRIBUTES.FORM.VALUE.LABEL')"
+        :placeholder="$t('CUSTOM_ATTRIBUTES.FORM.VALUE.PLACEHOLDER')"
+      />
+      <div class="modal-footer">
+        <woot-button
+          :is-disabled="$v.attributeName.$invalid || isCreating"
+          :is-loading="isCreating"
+        >
+          {{ $t('CUSTOM_ATTRIBUTES.FORM.CREATE') }}
+        </woot-button>
+        <woot-button variant="clear" @click.prevent="onClose">
+          {{ $t('CUSTOM_ATTRIBUTES.FORM.CANCEL') }}
+        </woot-button>
+      </div>
+    </form>
+  </modal>
+</template>
+
+<script>
+import Modal from 'dashboard/components/Modal';
+import alertMixin from 'shared/mixins/alertMixin';
+import { required, minLength } from 'vuelidate/lib/validators';
+
+export default {
+  components: {
+    Modal,
+  },
+  mixins: [alertMixin],
+  props: {
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    isCreating: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      attributeValue: '',
+      attributeName: '',
+    };
+  },
+  validations: {
+    attributeName: {
+      required,
+      minLength: minLength(2),
+    },
+  },
+  computed: {
+    attributeNameError() {
+      if (this.$v.attributeName.$error) {
+        return this.$t('CUSTOM_ATTRIBUTES.FORM.NAME.ERROR');
+      }
+      return '';
+    },
+  },
+  methods: {
+    addCustomAttribute() {
+      this.$emit('create', {
+        attributeValue: this.attributeValue,
+        attributeName: this.attributeName || '',
+      });
+      this.reset();
+      this.$emit('cancel');
+    },
+    onClose() {
+      this.reset();
+      this.$emit('cancel');
+    },
+    reset() {
+      this.attributeValue = '';
+      this.attributeName = '';
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
index dd02ac338..74b92ba32 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
@@ -34,7 +34,7 @@
       <woot-button
         v-if="showEdit"
         variant="clear link"
-        size="tiny"
+        size="small"
         color-scheme="secondary"
         icon="ion-compose"
         class-names="edit-button"
diff --git a/app/javascript/dashboard/modules/contact/components/ContactFields.vue b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
index 0e1f6d306..3f3b75a7d 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactFields.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
@@ -26,6 +26,27 @@
       :show-edit="true"
       @update="onLocationUpdate"
     />
+    <div
+      v-for="attribute in customAttributekeys"
+      :key="attribute"
+      class="custom-attribute--row"
+    >
+      <attribute
+        :label="attribute"
+        icon="ion-arrow-right-c"
+        :value="customAttributes[attribute]"
+        :show-edit="true"
+        @update="value => onCustomAttributeUpdate(attribute, value)"
+      />
+    </div>
+    <woot-button
+      size="small"
+      variant="link"
+      icon="ion-plus"
+      @click="handleCustomCreate"
+    >
+      {{ $t('CUSTOM_ATTRIBUTES.ADD.TITLE') }}
+    </woot-button>
   </div>
 </template>
 <script>
@@ -48,17 +69,33 @@ export default {
       const { company = {} } = this.contact;
       return company;
     },
+    customAttributes() {
+      const { custom_attributes: customAttributes = {} } = this.contact;
+      return customAttributes;
+    },
+    customAttributekeys() {
+      return Object.keys(this.customAttributes).filter(key => {
+        const value = this.customAttributes[key];
+        return value !== null && value !== undefined;
+      });
+    },
   },
   methods: {
     onEmailUpdate(value) {
       this.$emit('update', { email: value });
     },
     onPhoneUpdate(value) {
-      this.$emit('update', { phone: value });
+      this.$emit('update', { phone_number: value });
     },
     onLocationUpdate(value) {
       this.$emit('update', { location: value });
     },
+    handleCustomCreate() {
+      this.$emit('create-attribute');
+    },
+    onCustomAttributeUpdate(key, value) {
+      this.$emit('update', { custom_attributes: { [key]: value } });
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/modules/contact/components/ContactPanel.vue b/app/javascript/dashboard/modules/contact/components/ContactPanel.vue
index 3deeee7ff..7ce914ce9 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactPanel.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactPanel.vue
@@ -5,7 +5,11 @@
       @message="toggleConversationModal"
       @edit="toggleEditModal"
     />
-    <contact-fields :contact="contact" :edit="null" />
+    <contact-fields
+      :contact="contact"
+      @update="updateField"
+      @create-attribute="toggleCustomAttributeModal"
+    />
     <edit-contact
       v-if="showEditModal"
       :show="showEditModal"
@@ -13,24 +17,32 @@
       @cancel="toggleEditModal"
     />
     <new-conversation
+      v-if="enableNewConversation"
       :show="showConversationModal"
       :contact="contact"
       @cancel="toggleConversationModal"
     />
+    <add-custom-attribute
+      :show="showCustomAttributeModal"
+      @cancel="toggleCustomAttributeModal"
+      @create="createCustomAttribute"
+    />
   </div>
 </template>
 <script>
 import EditContact from 'dashboard/routes/dashboard/conversation/contact/EditContact';
 import NewConversation from 'dashboard/routes/dashboard/conversation/contact/NewConversation';
+import AddCustomAttribute from 'dashboard/modules/contact/components/AddCustomAttribute';
 import ContactIntro from './ContactIntro';
 import ContactFields from './ContactFields';
 
 export default {
   components: {
+    AddCustomAttribute,
+    ContactFields,
+    ContactIntro,
     EditContact,
     NewConversation,
-    ContactIntro,
-    ContactFields,
   },
   props: {
     contact: {
@@ -40,17 +52,48 @@ export default {
   },
   data() {
     return {
+      showCustomAttributeModal: false,
       showEditModal: false,
       showConversationModal: false,
     };
   },
+  computed: {
+    enableNewConversation() {
+      return this.contact && this.contact.id;
+    },
+  },
   methods: {
+    toggleCustomAttributeModal() {
+      this.showCustomAttributeModal = !this.showCustomAttributeModal;
+    },
     toggleEditModal() {
       this.showEditModal = !this.showEditModal;
     },
     toggleConversationModal() {
       this.showConversationModal = !this.showConversationModal;
     },
+    createCustomAttribute(data) {
+      const { id } = this.contact;
+      const { attributeValue, attributeName } = data;
+      const updatedFields = {
+        id,
+        custom_attributes: {
+          [attributeName]: attributeValue,
+        },
+      };
+      this.updateContact(updatedFields);
+    },
+    updateField(data) {
+      const { id } = this.contact;
+      const updatedFields = {
+        id,
+        ...data,
+      };
+      this.updateContact(updatedFields);
+    },
+    updateContact(contactItem) {
+      this.$store.dispatch('contacts/update', contactItem);
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/modules/contact/components/ManageLayout.vue b/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
index 87884e14e..363ed19df 100644
--- a/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
+++ b/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
@@ -55,10 +55,14 @@ export default {
 
 .wrap {
   @include three-column-grid(27.2rem);
-  background: var(--color-background);
+  min-height: 0;
+
+  background: var(--color-background-light);
   border-top: 1px solid var(--color-border);
 }
-
+.left {
+  overflow: auto;
+}
 .center {
   border-right: 1px solid var(--color-border);
   border-left: 1px solid var(--color-border);
diff --git a/app/javascript/dashboard/modules/contact/stories/AddCustomAttribute.stories.js b/app/javascript/dashboard/modules/contact/stories/AddCustomAttribute.stories.js
new file mode 100644
index 000000000..603cb5167
--- /dev/null
+++ b/app/javascript/dashboard/modules/contact/stories/AddCustomAttribute.stories.js
@@ -0,0 +1,32 @@
+import AddCustomAttribute from '../components/AddCustomAttribute';
+import { action } from '@storybook/addon-actions';
+
+export default {
+  title: 'Components/Contact/AddCustomAttribute',
+  component: AddCustomAttribute,
+  argTypes: {
+    show: {
+      defaultValue: true,
+      control: {
+        type: 'boolean',
+      },
+    },
+    isCreating: {
+      defaultValue: false,
+      control: {
+        type: 'boolean',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { AddCustomAttribute },
+  template: '<add-custom-attribute v-bind="$props" @create="onCreate" />',
+});
+
+export const DefaultAttribute = Template.bind({});
+DefaultAttribute.args = {
+  onCreate: action('edit'),
+};
diff --git a/app/javascript/dashboard/modules/contact/stories/ContactFields.stories.js b/app/javascript/dashboard/modules/contact/stories/ContactFields.stories.js
index 01a99f254..3b0b02be5 100644
--- a/app/javascript/dashboard/modules/contact/stories/ContactFields.stories.js
+++ b/app/javascript/dashboard/modules/contact/stories/ContactFields.stories.js
@@ -10,7 +10,7 @@ const Template = (args, { argTypes }) => ({
   props: Object.keys(argTypes),
   components: { ContactFields },
   template:
-    '<contact-fields v-bind="$props" :contact="contact" @update="onUpdate" />',
+    '<contact-fields v-bind="$props" :contact="contact" @update="onUpdate" @create-attribute="onCreate" />',
 });
 
 export const DefaultContactFields = Template.bind({});
@@ -39,4 +39,5 @@ DefaultContactFields.args = {
     },
   },
   onUpdate: action('update'),
+  onCreate: action('create'),
 };
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index 8b7707b3c..a94068801 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -73,6 +73,9 @@ export default {
 
 <style lang="scss" scoped>
 .contact-manage-view {
+  display: flex;
+  flex-direction: column;
   width: 100%;
+  flex: 1 1 0;
 }
 </style>

From ac2c5c93b9b7fb76dac60c85d30d5bf24d6a4713 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 21 May 2021 19:49:57 +0530
Subject: [PATCH 10/67] chore: Update webhook delete button styles(#2322)

* Chore: Fixes style issue of webhook button

* Review fixes
---
 .../dashboard/settings/integrations/Webhook.vue  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
index 87cee8e80..b64f5140e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
@@ -43,14 +43,14 @@
               </td>
               <td class="button-wrapper">
                 <div @click="openDeletePopup(webHookItem, index)">
-                  <woot-submit-button
-                    :button-text="
-                      $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT')
-                    "
-                    :loading="loading[webHookItem.id]"
-                    icon-class="ion-close-circled"
-                    button-class="link hollow grey-btn"
-                  />
+                  <woot-button
+                    :is-loading="loading[webHookItem.id]"
+                    icon="ion-close-circled"
+                    variant="link"
+                    color-scheme="secondary"
+                  >
+                    {{ $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT') }}
+                  </woot-button>
                 </div>
               </td>
             </tr>

From 58dd6d37e0db747199c58137c2140d6a7c574689 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 21 May 2021 23:52:38 +0530
Subject: [PATCH 11/67] chore: Update language translations (#2321)

---
 .../dashboard/i18n/locale/ar/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ca/contact.json     |  24 +++-
 .../dashboard/i18n/locale/cs/contact.json     |  24 +++-
 .../dashboard/i18n/locale/da/contact.json     |  24 +++-
 .../dashboard/i18n/locale/de/contact.json     |  24 +++-
 .../dashboard/i18n/locale/el/campaign.json    |   4 +-
 .../dashboard/i18n/locale/el/contact.json     |  32 +++--
 .../dashboard/i18n/locale/es/contact.json     |  24 +++-
 .../dashboard/i18n/locale/fa/contact.json     |  24 +++-
 .../dashboard/i18n/locale/fi/contact.json     |  24 +++-
 .../dashboard/i18n/locale/fr/contact.json     |  24 +++-
 .../dashboard/i18n/locale/hi/contact.json     |  24 +++-
 .../dashboard/i18n/locale/hu/contact.json     |  24 +++-
 .../dashboard/i18n/locale/id/contact.json     |  24 +++-
 .../dashboard/i18n/locale/it/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ja/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ko/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ml/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ne/contact.json     |  24 +++-
 .../dashboard/i18n/locale/nl/contact.json     |  24 +++-
 .../dashboard/i18n/locale/no/contact.json     |  24 +++-
 .../dashboard/i18n/locale/pl/contact.json     |  24 +++-
 .../dashboard/i18n/locale/pt/contact.json     |  24 +++-
 .../dashboard/i18n/locale/pt_BR/contact.json  |  24 +++-
 .../dashboard/i18n/locale/ro/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ru/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ru/report.json      |   6 +-
 .../dashboard/i18n/locale/sk/contact.json     |  24 +++-
 .../dashboard/i18n/locale/sv/contact.json     |  24 +++-
 .../dashboard/i18n/locale/ta/contact.json     |  24 +++-
 .../dashboard/i18n/locale/th/campaign.json    |  74 ++++++------
 .../dashboard/i18n/locale/th/chatlist.json    |   4 +-
 .../dashboard/i18n/locale/th/contact.json     | 110 ++++++++++--------
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   2 +-
 .../dashboard/i18n/locale/th/settings.json    |   2 +-
 .../dashboard/i18n/locale/tr/contact.json     |  24 +++-
 .../dashboard/i18n/locale/uk/contact.json     |  24 +++-
 .../dashboard/i18n/locale/vi/contact.json     |  24 +++-
 .../dashboard/i18n/locale/zh_CN/contact.json  |  24 +++-
 .../dashboard/i18n/locale/zh_TW/contact.json  |  24 +++-
 app/javascript/widget/i18n/locale/ar.json     |   3 +-
 app/javascript/widget/i18n/locale/ca.json     |   3 +-
 app/javascript/widget/i18n/locale/cs.json     |   3 +-
 app/javascript/widget/i18n/locale/da.json     |   3 +-
 app/javascript/widget/i18n/locale/de.json     |   3 +-
 app/javascript/widget/i18n/locale/el.json     |   3 +-
 app/javascript/widget/i18n/locale/es.json     |   3 +-
 app/javascript/widget/i18n/locale/fa.json     |   3 +-
 app/javascript/widget/i18n/locale/fi.json     |   3 +-
 app/javascript/widget/i18n/locale/fr.json     |   3 +-
 app/javascript/widget/i18n/locale/hi.json     |   3 +-
 app/javascript/widget/i18n/locale/hu.json     |   3 +-
 app/javascript/widget/i18n/locale/id.json     |   3 +-
 app/javascript/widget/i18n/locale/it.json     |   3 +-
 app/javascript/widget/i18n/locale/ja.json     |   3 +-
 app/javascript/widget/i18n/locale/ko.json     |   3 +-
 app/javascript/widget/i18n/locale/ml.json     |   3 +-
 app/javascript/widget/i18n/locale/ne.json     |   3 +-
 app/javascript/widget/i18n/locale/nl.json     |   3 +-
 app/javascript/widget/i18n/locale/no.json     |   3 +-
 app/javascript/widget/i18n/locale/pl.json     |   3 +-
 app/javascript/widget/i18n/locale/pt.json     |   3 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |   3 +-
 app/javascript/widget/i18n/locale/ro.json     |   3 +-
 app/javascript/widget/i18n/locale/ru.json     |   3 +-
 app/javascript/widget/i18n/locale/sk.json     |   3 +-
 app/javascript/widget/i18n/locale/sv.json     |   3 +-
 app/javascript/widget/i18n/locale/ta.json     |   3 +-
 app/javascript/widget/i18n/locale/th.json     |   3 +-
 app/javascript/widget/i18n/locale/tr.json     |   3 +-
 app/javascript/widget/i18n/locale/uk.json     |   3 +-
 app/javascript/widget/i18n/locale/vi.json     |   3 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |   3 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |   3 +-
 74 files changed, 875 insertions(+), 229 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 2218c93c4..51bd4e9d8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "لا توجد محادثات سابقة مرتبطة بجهة الاتصال هذه.",
       "TITLE": "المحادثات السابقة"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "سمات مخصصة"
-    },
     "LABELS": {
       "TITLE": "وسوم المحادثة",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "سمات مخصصة",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "إلغاء",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 996adbfc2..2e13eabcd 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "No hi han converses prèvies associades a aquest contacte.",
       "TITLE": "Converses prèvies"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Atributs personalitzats"
-    },
     "LABELS": {
       "TITLE": "Etiquetes de converses",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Atributs personalitzats",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel·la",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 46bb54580..958167be3 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "K tomuto kontaktu nejsou přiřazeny žádné předchozí konverzace.",
       "TITLE": "Předchozí konverzace"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Vlastní atributy"
-    },
     "LABELS": {
       "TITLE": "Štítky konverzace",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Vlastní atributy",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Zrušit",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index ef1f5595e..e1712ed49 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Der er ingen tidligere samtaler tilknyttet denne kontakt.",
       "TITLE": "Tidligere Samtaler"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Brugerdefinerede Egenskaber"
-    },
     "LABELS": {
       "TITLE": "Samtale Etiketter",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Brugerdefinerede Egenskaber",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Annuller",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 341d905cb..82ced872a 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Es sind keine vorherigen Gespräche mit diesem Kontakt verbunden.",
       "TITLE": "Vorherige Gespräche"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Benutzerdefinierte Attribute"
-    },
     "LABELS": {
       "TITLE": "Konversationsetiketten",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "Alle Notizen anzeigen"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Benutzerdefinierte Attribute",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Stornieren",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/campaign.json b/app/javascript/dashboard/i18n/locale/el/campaign.json
index b44520dd4..7e027454e 100644
--- a/app/javascript/dashboard/i18n/locale/el/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/el/campaign.json
@@ -43,10 +43,10 @@
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
+      "TITLE": "Επεξεργασία καμπάνιας",
       "UPDATE_BUTTON_TEXT": "Ενημέρωση",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "Η ετικέτα ενημερώθηκε επιτυχώς",
         "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 03af6312f..199080639 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Δεν υπάρχουν προηγούμενες συνομιλίες που σχετίζονται με αυτήν την επαφή.",
       "TITLE": "Προηγούμενες συνομιλίες"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Προσαρμοζόμενες Ιδιότητες"
-    },
     "LABELS": {
       "TITLE": "Ετικέτες συνομιλίας",
       "MODAL": {
@@ -28,16 +25,16 @@
         "INACTIVE_LABELS": "Υπάρχουν διαθέσιμες ετικέτες στον λογαριασμό",
         "REMOVE": "Πατήστε στο εικονίδιο X για να απομακρύνετε την ετικέτα",
         "ADD": "Πατήστε στο εικονίδιο + για να προσθέστε την ετικέτα",
-        "ADD_BUTTON": "Add Labels",
+        "ADD_BUTTON": "Προσθήκη Ετικετών",
         "UPDATE_BUTTON": "Ενημέρωση Ετικετών",
         "UPDATE_ERROR": "Δεν μπορούν να ενημερωθούν οι ετικέτες, προσπαθήστε ξανά."
       },
       "NO_LABELS_TO_ADD": "Δεν υπάρχουν άλλες ετικέτες στον λογαριασμό.",
       "NO_AVAILABLE_LABELS": "Δεν υπάρχουν προστεθεί ετικέτες στην συνομιλία.",
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Προσθήκη Ετικετών",
+        "PLACEHOLDER": "Αναζήτηση ετικετών",
+        "NO_RESULT": "Δεν βρέθηκαν ετικέτες"
       }
     },
     "MUTE_CONTACT": "Σίγαση Συνομιλίας",
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "Εμφάνιση όλων των σημειώσεων"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Προσαρμοζόμενες Ιδιότητες",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Άκυρο",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 4b795bac1..b8f1b2ccb 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "No hay conversaciones previas asociadas a este contacto.",
       "TITLE": "Conversaciones anteriores"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Atributos personalizados"
-    },
     "LABELS": {
       "TITLE": "Etiquetas de conversación",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "Ver todas las notas"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Atributos personalizados",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancelar",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index c95629749..bbe09162c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "این اولین گفتگوی این کاربر است.",
       "TITLE": "گفتگوهای قبلی"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "ویژگی‌های سفارشی"
-    },
     "LABELS": {
       "TITLE": "برچسب‌های گفتگو",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "ویژگی‌های سفارشی",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "انصراف",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 9f4783221..48db74762 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Tähän yhteystietoon ei liity aikaisempia keskusteluja.",
       "TITLE": "Edelliset keskustelut"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Mukautetut attribuutit"
-    },
     "LABELS": {
       "TITLE": "Keskustelutunnisteet",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Mukautetut attribuutit",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Peruuta",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 715eda37d..dff214bed 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Il n'y a aucune conversation précédente associée à ce contact.",
       "TITLE": "Conversations précédentes"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Attributs personnalisés"
-    },
     "LABELS": {
       "TITLE": "Étiquettes de conversation",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Attributs personnalisés",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Annuler",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 6a94011a5..80a33f25a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
       "TITLE": "Previous Conversations"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Conversation Labels",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 378a2413a..c91e66fdb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Nincs megelőző beszélgetés ezzel a kontakttal.",
       "TITLE": "Korábbi beszélgetések"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Egyedi atribútumok"
-    },
     "LABELS": {
       "TITLE": "Beszélgetés cimkék",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Egyedi atribútumok",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Mégse",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 56f590502..3cf9c5872 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Tidak ada percakapan sebelumnya yang terkait dengan kontak ini.",
       "TITLE": "Percakapan Sebelumnya"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Atribut Kustom"
-    },
     "LABELS": {
       "TITLE": "Label Percakapan",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Atribut Kustom",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Batalkan",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 1bb13b561..23beb5c9f 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Non ci sono precedenti conversazioni associate a questo contatto.",
       "TITLE": "Conversazioni precedenti"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Etichette conversazione",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "annulla",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 4975d8f6d..ed8639c1b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "この連絡先に関連付けられている以前の会話はありません。",
       "TITLE": "前の会話"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "カスタム属性"
-    },
     "LABELS": {
       "TITLE": "会話のラベル",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "カスタム属性",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "キャンセル",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 52ac02c1b..7af037f32 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "이 연락처와 관련된 이전 대화가 없습니다.",
       "TITLE": "이전 대화"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "사용자 지정 특성"
-    },
     "LABELS": {
       "TITLE": "대화 라벨",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "사용자 지정 특성",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "취소",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index d2af1ebb6..cb96143b5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "ഈ കോൺടാക്റ്റുമായി മുമ്പത്തെ സംഭാഷണങ്ങളൊന്നും ബന്ധപ്പെടുത്തിയിട്ടില്ല.",
       "TITLE": "മുമ്പത്തെ സംഭാഷണങ്ങൾ"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ"
-    },
     "LABELS": {
       "TITLE": "സംഭാഷണ ലേബലുകൾ",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "റദ്ദാക്കുക",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index b00c7c3d4..755bc1969 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
       "TITLE": "Previous Conversations"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Conversation Labels",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 848a1523c..8bee921d3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Er zijn geen eerdere gesprekken gekoppeld aan dit contact.",
       "TITLE": "Vorige gesprekken"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Labels voor gesprekken",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Annuleren",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 2da471d42..5bff9e747 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Det er ingen tidligere samtaler knyttet til denne kontakten.",
       "TITLE": "Tidligere samtaler"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Egendefinerte verdier"
-    },
     "LABELS": {
       "TITLE": "Samtaleetiketter",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Egendefinerte verdier",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Avbryt",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index f761ab4fc..bcdabc21c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Brak poprzednich rozmów powiązanych z tym kontaktem.",
       "TITLE": "Poprzednie rozmowy"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Niestandardowe atrybuty"
-    },
     "LABELS": {
       "TITLE": "Etykiety konwersacji",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "Wyświetl wszystkie notatki"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Niestandardowe atrybuty",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Anuluj",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index b167c9f50..71cd996f0 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Não há conversas anteriores associadas a este contato.",
       "TITLE": "Conversas anteriores"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Rótulos da conversa",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "cancelar",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 813542830..8e9936a4c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Não há conversas anteriores associadas a este contato.",
       "TITLE": "Conversas anteriores"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Atributos Personalizados"
-    },
     "LABELS": {
       "TITLE": "Marcador da conversa",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Atributos Personalizados",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancelar",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 95c92cc76..eeadba0a3 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Nu există conversații anterioare asociate cu acest contact.",
       "TITLE": "Conversații anterioare"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Etichete conversație",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Renunță",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index c85c67794..e903118c7 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Нет предыдущих диалогов, связанных с этим контактом.",
       "TITLE": "Предыдущие диалоги"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Пользовательские атрибуты"
-    },
     "LABELS": {
       "TITLE": "Категории Диалога",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "Показать все заметки"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Пользовательские атрибуты",
+    "BUTTON": "Добавить пользовательский атрибут",
+    "ADD": {
+      "TITLE": "Создать пользовательский атрибут",
+      "DESC": "Добавить пользовательскую информацию этому контакту."
+    },
+    "FORM": {
+      "CREATE": "Добавить параметр",
+      "CANCEL": "Отменить",
+      "NAME": {
+        "LABEL": "Имя пользовательского параметра",
+        "PLACEHOLDER": "Например: id shopify",
+        "ERROR": "Неверное название пользовательского параметра"
+      },
+      "VALUE": {
+        "LABEL": "Значение параметра",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 9ab726c09..6851601c0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -41,15 +41,15 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Последние 3 месяца"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Последние 6 месяцев"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "За прошлый год"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 6a94011a5..80a33f25a 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
       "TITLE": "Previous Conversations"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Conversation Labels",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index e522d6958..bea85ece1 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Det finns inga tidigare konversationer kopplade till denna kontakt.",
       "TITLE": "Tidigare konversationer"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Egna egenskaper"
-    },
     "LABELS": {
       "TITLE": "Etiketter för konversation",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Egna egenskaper",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Avbryt",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 567af1644..dd14b68e9 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "இந்த தொடர்புடன் முந்தைய உரையாடல்கள் எதுவும் இல்லை.",
       "TITLE": "முந்தைய உரையாடல்கள்"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "உரையாடல் லேபிள்கள்",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "ரத்துசெய்",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/campaign.json b/app/javascript/dashboard/i18n/locale/th/campaign.json
index 2550d305c..68e699fcf 100644
--- a/app/javascript/dashboard/i18n/locale/th/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/th/campaign.json
@@ -1,69 +1,69 @@
 {
   "CAMPAIGN": {
-    "HEADER": "Campaigns",
-    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
-    "HEADER_BTN_TXT": "Create a campaign",
+    "HEADER": "แคมเปญ",
+    "SIDEBAR_TXT": "ข้อความที่ช่วยให้ลูกค้าสามารถส่งข้อควาไปยังผู้ติดต่อซึ่งจะทำให้เกิดการสนทนามากขึ้น คลิกที่ <b> เพิ่มแคมเปญ </b> เพื่อสร้างแคมเปญใหม่ คุณยังสามารถแก้ไขหรือลบแคมเปญที่มีอยู่ได้โดยคลิกที่ปุ่มแก้ไขหรือลบ",
+    "HEADER_BTN_TXT": "สร้างแคมเปญใหม่",
     "ADD": {
-      "TITLE": "Create a campaign",
-      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "TITLE": "สร้างแคมเปญใหม่",
+      "DESC": "ข้อความที่จะทำให้ลูกค้าส่งไปยังผู้ติดต่อที่จะได้รับข้อความมากขึ้น",
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
-      "CREATE_BUTTON_TEXT": "Create",
+      "CREATE_BUTTON_TEXT": "สร้าง",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
-          "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "LABEL": "หัวข้อ",
+          "PLACEHOLDER": "กรุณาใส่หัวข้อแคมเปญ",
+          "ERROR": "โปรดระบุหัวข้อด้วย"
         },
         "MESSAGE": {
-          "LABEL": "Message",
-          "PLACEHOLDER": "Please enter the message of campaign",
-          "ERROR": "Message is required"
+          "LABEL": "ข้อความ",
+          "PLACEHOLDER": "โปรดระบุข้อความของแคมเปญด้วย",
+          "ERROR": "โปรดระบุข้อความด้วย"
         },
         "SENT_BY": {
-          "LABEL": "Sent by",
-          "PLACEHOLDER": "Please select the the content of campaign",
-          "ERROR": "Sender is required"
+          "LABEL": "ส่งโดย",
+          "PLACEHOLDER": "กรุณาเลือกเนื้อหาด้วย",
+          "ERROR": "โปรดระบุชื่อผู้ส่ง"
         },
         "END_POINT": {
-          "LABEL": "URL",
-          "PLACEHOLDER": "Please enter the URL",
-          "ERROR": "Please enter a valid URL"
+          "LABEL": "ลิ้ง",
+          "PLACEHOLDER": "โปรดระบุลิ้งด้วย",
+          "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
         },
         "TIME_ON_PAGE": {
-          "LABEL": "Time on page(Seconds)",
-          "PLACEHOLDER": "Please enter the time",
-          "ERROR": "Time on page is required"
+          "LABEL": "เวลาของหน้า (วินาที)",
+          "PLACEHOLDER": "โปรดระบุเวลาด้วย",
+          "ERROR": "กรุณาระบุเวลาที่อยู่ในหน้านั้นด้วย"
         },
-        "ENABLED": "Enable campaign",
-        "SUBMIT": "Add Campaign"
+        "ENABLED": "เปิดเเคมเปญ",
+        "SUBMIT": "เพิ่มเเคมเปญ"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign created successfully",
-        "ERROR_MESSAGE": "There was an error. Please try again."
+        "SUCCESS_MESSAGE": "สร้างเเคมเปญเสร็จสิ้น",
+        "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง."
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
-      "UPDATE_BUTTON_TEXT": "Update",
+      "TITLE": "เเก้ไขเเคมเปญ",
+      "UPDATE_BUTTON_TEXT": "อัพเดท",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "อัพเดทเเคมเปญเรียบร้อยเเล้ว",
         "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
-      "404": "There are no campaigns created for this inbox.",
+      "LOADING_MESSAGE": "กำลังโหลดแคมเปญ",
+      "404": "ไม่มีเเคมเปณลญในกล่องข้อความนี้",
       "TABLE_HEADER": {
-        "TITLE": "Title",
-        "MESSAGE": "Message",
+        "TITLE": "หัวข้อ",
+        "MESSAGE": "ข้อความ",
         "STATUS": "สถานะ",
-        "SENDER": "Sender",
-        "URL": "URL",
-        "TIME_ON_PAGE": "Time(Seconds)",
-        "CREATED_AT": "Created at"
+        "SENDER": "ผู้ส่ง",
+        "URL": "ลิ้ง",
+        "TIME_ON_PAGE": "เวลา (วินาที)",
+        "CREATED_AT": "สร้างเมื่อ"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "เพิ่ม",
         "EDIT": "เเก้ไข",
         "DELETE": "ลบ"
       },
diff --git a/app/javascript/dashboard/i18n/locale/th/chatlist.json b/app/javascript/dashboard/i18n/locale/th/chatlist.json
index 914b66ada..e62c9bb0f 100644
--- a/app/javascript/dashboard/i18n/locale/th/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/th/chatlist.json
@@ -80,7 +80,7 @@
     "RECEIVED_VIA_EMAIL": "ได้รับทางอีเมลล์",
     "VIEW_TWEET_IN_TWITTER": "ดูทวิตในทวิตเตอร์",
     "REPLY_TO_TWEET": "ตอบกลับทวิตนี้",
-    "NO_MESSAGES": "No Messages",
-    "NO_CONTENT": "No content available"
+    "NO_MESSAGES": "ไม่มีข้อความ",
+    "NO_CONTENT": "ไม่มีเนื้อหา"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 17044bcc6..60da05a91 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -3,7 +3,7 @@
     "NOT_AVAILABLE": "ไม่พร้อมใช้งาน",
     "EMAIL_ADDRESS": "ที่อยู่อีเมล์",
     "PHONE_NUMBER": "หมายเลขโทรศัพท์",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COPY_SUCCESSFUL": "คัดลอกไปยังคริปบอร์ดเเล้ว",
     "COMPANY": "บริษัท",
     "LOCATION": "สถานที่",
     "CONVERSATION_TITLE": "รายละเอียดการสนทนา",
@@ -11,15 +11,12 @@
     "OS": "ระบบปฏิบัติการ",
     "INITIATED_FROM": "Initiated from",
     "INITIATED_AT": "Initiated at",
-    "IP_ADDRESS": "IP Address",
-    "NEW_MESSAGE": "New message",
+    "IP_ADDRESS": "ที่อยู่ไอพี",
+    "NEW_MESSAGE": "ข้อความใหม่",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "ไม่มีการสนทนาก่อนหน้านี้ที่เชื่อมโยงกับผู้ติดต่อนี้",
       "TITLE": "การสนทนาก่อนหน้า"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "แอตทริบิวต์ที่กำหนดเอง"
-    },
     "LABELS": {
       "TITLE": "ป้ายกำกับการสนทนา",
       "MODAL": {
@@ -28,22 +25,22 @@
         "INACTIVE_LABELS": "ป้ายกำกับที่ใช้ได้ในบัญชีนี้",
         "REMOVE": "คลิกที่ X เพื่อลบป้ายกำกับ",
         "ADD": "คลิกที่ + เพื่อเพิ่มป้ายกำกับ",
-        "ADD_BUTTON": "Add Labels",
+        "ADD_BUTTON": "เพิ่มหัวข้อ",
         "UPDATE_BUTTON": "อัพเดทป้ายกำกับ",
         "UPDATE_ERROR": "ไม่สามารถอัพเดทป้านกำกับได้กรุณาลองใหม่"
       },
       "NO_LABELS_TO_ADD": "ไม่มีป้ายกำกับที่กำหนดให้บัญชีนี้",
       "NO_AVAILABLE_LABELS": "ไม่มีป้ายกำกับที่เพิ่มให้การสนทนานี้",
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "เพิ่มหัวข้อ",
+        "PLACEHOLDER": "ค้นหาหัวข้อ",
+        "NO_RESULT": "ไม่พบหัวข้อ"
       }
     },
     "MUTE_CONTACT": "ระงับการสนทนา",
-    "UNMUTE_CONTACT": "Unmute Conversation",
+    "UNMUTE_CONTACT": "เลิกใบ้การสนทนา",
     "MUTED_SUCCESS": "การสนทนานี้ถูกระงับ 6 ชั่วโมง",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "UNMUTED_SUCCESS": "การสนทนานี้เลิกใบ้เเล้ว",
     "SEND_TRANSCRIPT": "ส่งประวัติเเชท",
     "EDIT_LABEL": "เเก้ไข"
   },
@@ -53,9 +50,9 @@
     "DESC": "เเห้ไขรายละเอียดผู้ติดต่อ"
   },
   "CREATE_CONTACT": {
-    "BUTTON_LABEL": "New Contact",
-    "TITLE": "Create new contact",
-    "DESC": "Add basic information details about the contact."
+    "BUTTON_LABEL": "การติดต่อใหม่",
+    "TITLE": "สร้างการติดต่อใหม่",
+    "DESC": "เพิ่าข้อความพื้นฐานเกี่ยวกับการติดต่อนี้"
   },
   "CONTACT_FORM": {
     "FORM": {
@@ -79,8 +76,8 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "กรอกหมายเลขโทรศัพท์ผู้ติดต่อ",
         "LABEL": "หมายเลขโทรศัพท์",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
-        "ERROR": "Phone number should be either empty or of E.164 format"
+        "HELP": "เบอร์โทรศัพท์ควรจะเป็นเเบบนี้เช่น +663990214 [+][หรัสประเทศ][หรัสพื้นที่][เลขโทรศัพท์]",
+        "ERROR": "หมายเลขโทรศัพท์ควรจะว่างปล่าวหรืออยู่ในรู้เเบบ E.164"
       },
       "LOCATION": {
         "PLACEHOLDER": "กรอกที่อยู่ผู้ติดต่อ",
@@ -109,66 +106,87 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "SUCCESS_MESSAGE": "สร้างการติดต่อเรียบร้อยเเล้ว",
     "CONTACT_ALREADY_EXIST": "อีเมล์นี้ถูกใช้ในผู้ติดต่อคนอื่นเเล้ว",
     "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
-    "TITLE": "New conversation",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "BUTTON_LABEL": "เริ่มการสนทนา",
+    "TITLE": "สร้างการสนทนาใหม่",
+    "DESC": "สร้างการสนทนาใหม่โดยการส่งข้อความ",
+    "NO_INBOX": "ไม่พบกล่องข้อความเพื่อเริ่มการสนทนากับผู้ติดต่อนี้ได้",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "ถึง"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "กล่องข้อความ",
+        "ERROR": "เลือกกล่องข้อความ"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "LABEL": "ข้อความ",
+        "PLACEHOLDER": "เขียนข้อความของคุณที่นี่",
+        "ERROR": "ไม่สามารถปล่อยให่ข้อความว่างได้"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "ส่วข้อความ",
       "CANCEL": "ยกเลิก",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUCCESS_MESSAGE": "ส่งข้อความเเล้ว",
+      "ERROR_MESSAGE": "ไม่สามารถส่งข้อความได้กรุณาลองอีกครั้ง"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "HEADER": "ผู้ติดต่อ",
+    "SEARCH_BUTTON": "ค้นหา",
+    "SEARCH_INPUT_PLACEHOLDER": "ค้อนหาผู้ติดต่อ",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
+      "LOADING_MESSAGE": "กำลังโหลดรายชื่อผู้ติดต่อ",
+      "404": "ไม่มีผู้ติดต่อที่ตรงกัน 🔍",
       "TABLE_HEADER": {
         "NAME": "ชื่อ",
         "PHONE_NUMBER": "หมายเลขโทรศัพท์",
         "CONVERSATIONS": "การสนทนา",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "LAST_ACTIVITY": "ล่าสุดเมื่อ",
+        "COUNTRY": "ประเทศ",
+        "CITY": "เมือง",
+        "SOCIAL_PROFILES": "โปรไฟล์โซเชียล",
         "COMPANY": "บริษัท",
         "EMAIL_ADDRESS": "ที่อยู่อีเมล์"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "ดูรายละเอียด"
     }
   },
   "NOTES": {
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "โน้ต"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "เพิ่ม",
+      "PLACEHOLDER": "เพิ่มโน็ต",
+      "TITLE": "Shift + Enter เพื่อสร้างโน็ต"
     },
     "FOOTER": {
-      "BUTTON": "View all notes"
+      "BUTTON": "ดูโน็ตทั้งหมด"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "แอตทริบิวต์ที่กำหนดเอง",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "ยกเลิก",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index c91e4d2e2..93ea16b9d 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -227,7 +227,7 @@
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
       "CONFIGURATION": "Configuration",
-      "CAMPAIGN": "Campaigns",
+      "CAMPAIGN": "แคมเปญ",
       "PRE_CHAT_FORM": "Pre Chat Form",
       "BUSINESS_HOURS": "Business Hours"
     },
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 16ba5f97f..60b2d1c30 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -123,7 +123,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "การสนทนา",
     "REPORTS": "Reports",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "ผู้ติดต่อ",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "พนักงาน",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index cc6055f3b..78782d064 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Bu kişiyle ilişkilendirilmiş önceki görüşme yok.",
       "TITLE": "Önceki Sohbetler"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Özel Nitelikler"
-    },
     "LABELS": {
       "TITLE": "Konuşma Etiketleri",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Özel Nitelikler",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "İptal Et",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 4afbf67ff..ab9bed67e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Не було попередніх бесід, пов'язаних з цим контактом.",
       "TITLE": "Попередні бесіди"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
-    },
     "LABELS": {
       "TITLE": "Мітки бесіди",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Скасувати",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index a101e7b01..d22a350ed 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "Không có cuộc trò chuyện trước đó được liên kết với liên hệ này.",
       "TITLE": "Cuộc trò chuyện trước đó"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Thuộc tính tùy chỉnh"
-    },
     "LABELS": {
       "TITLE": "Nhãn hội thoại",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Thuộc tính tùy chỉnh",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Huỷ",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 468689530..36b463c4d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "此联系人没有关联到以前的会话。",
       "TITLE": "上一次对话"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "自定义属性"
-    },
     "LABELS": {
       "TITLE": "对话标记",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "View all notes"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "自定义属性",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "取消",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index b1b4e6e43..d11179d55 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -17,9 +17,6 @@
       "NO_RECORDS_FOUND": "此聯絡人没有關聯到以前的對話。",
       "TITLE": "上一次對話"
     },
-    "CUSTOM_ATTRIBUTES": {
-      "TITLE": "自訂屬性"
-    },
     "LABELS": {
       "TITLE": "對話標記",
       "MODAL": {
@@ -170,5 +167,26 @@
     "FOOTER": {
       "BUTTON": "查看所有筆記"
     }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "自訂屬性",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "取消",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
   }
 }
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 8b07ae71e..775cf0d3b 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "عرض الرسائل الجديدة",
     "CLOSE_MESSAGES_BUTTON": "أغلق",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "رد آلي"
   },
   "BUBBLE": {
     "LABEL": "تحدث الينا"
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 6c9c9b1a8..31bc0eea3 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Veure missatges nous",
     "CLOSE_MESSAGES_BUTTON": "Tanca",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Xateja amb nosaltres"
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index ebe3d633c..e15395cc1 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Zobrazit nové zprávy",
     "CLOSE_MESSAGES_BUTTON": "Zavřít",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Napiště nám"
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 8677b9d0b..0189260aa 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nye beskeder",
     "CLOSE_MESSAGES_BUTTON": "Luk",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat med os"
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index b5a1ccff3..ea2dd7987 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Neue Nachrichten anzeigen",
     "CLOSE_MESSAGES_BUTTON": "Schließen",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chatten Sie mit uns"
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index 91cf78970..bb678a457 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Δείτε τα νέα μηνύματα",
     "CLOSE_MESSAGES_BUTTON": "Κλείσιμο",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "από",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Συνομιλήστε μαζί μας"
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 4335ea072..2ca5d1e9b 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver nuevos mensajes",
     "CLOSE_MESSAGES_BUTTON": "Cerrar",
-    "COMPANY_FROM": "De"
+    "COMPANY_FROM": "De",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chatea con nosotros"
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 199421ab9..4b0ddd988 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "مشاهده پیام‌های جدید",
     "CLOSE_MESSAGES_BUTTON": "بستن",
-    "COMPANY_FROM": "از"
+    "COMPANY_FROM": "از",
+    "BOT": "ربات"
   },
   "BUBBLE": {
     "LABEL": "با ما گفتگو کنید"
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index cb8d9b3a9..de9bd4131 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Näytä uudet viestit",
     "CLOSE_MESSAGES_BUTTON": "Sulje",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Botti"
   },
   "BUBBLE": {
     "LABEL": "Keskustele kanssamme"
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 9482b6370..0b7146c3c 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Voir les nouveaux messages",
     "CLOSE_MESSAGES_BUTTON": "Fermer",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Discutez avec nous"
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 10228d7ff..4e22e35e6 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index d0f3ca792..22f124905 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Új üzenetek",
     "CLOSE_MESSAGES_BUTTON": "Bezárás",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chatelj velünk"
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index a643b6db5..93e85d860 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Lihat pesan baru",
     "CLOSE_MESSAGES_BUTTON": "Tutup",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat dengan kami"
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index b9e5b4208..3416fa1dc 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vedi nuovi messaggi",
     "CLOSE_MESSAGES_BUTTON": "Chiudi",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chatta con noi"
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index c477dc41c..9a6c16832 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "新しいメッセージを見る",
     "CLOSE_MESSAGES_BUTTON": "閉じる",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "チャットをする"
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index 4b0cd8d7a..19e31da12 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "새 메시지 보기",
     "CLOSE_MESSAGES_BUTTON": "닫기",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "봇"
   },
   "BUBBLE": {
     "LABEL": "채팅하기"
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index 283491f72..a049fc670 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "പുതിയ സന്ദേശങ്ങൾ കാണുക",
     "CLOSE_MESSAGES_BUTTON": "അടയ്ക്കുക",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "ബോട്ട്"
   },
   "BUBBLE": {
     "LABEL": "ഞങ്ങളുമായി ചാറ്റുചെയ്യുക"
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index aed47cc34..541e859c3 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "नयाँ सन्देशहरू हेर्नुहोस्",
     "CLOSE_MESSAGES_BUTTON": "बन्दा गार्नुहोस्",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "हामीसँग कुराकानी गर्नुहोस्"
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index b12a8c143..d2934d7c7 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Bekijk nieuwe berichten",
     "CLOSE_MESSAGES_BUTTON": "Sluiten",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat met ons"
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 6f01f2f48..9454bafc5 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nye meldinger",
     "CLOSE_MESSAGES_BUTTON": "Lukk",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat med oss"
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index fdd1302e1..22a2f6bd6 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Pokaż nowe wiadomości",
     "CLOSE_MESSAGES_BUTTON": "Zamknij",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Porozmawiaj z nami"
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 542b20b3a..e6cc0dd70 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "FECHAR",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 3e6d9ecc4..404f75f3b 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
     "CLOSE_MESSAGES_BUTTON": "Fechar",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Fale conosco no chat"
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 18270dd14..f64451399 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vezi mesajele noi",
     "CLOSE_MESSAGES_BUTTON": "Închide",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 0e8255755..4c91a2783 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Посмотреть новые сообщения",
     "CLOSE_MESSAGES_BUTTON": "Закрыть",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "от",
+    "BOT": "Бот"
   },
   "BUBBLE": {
     "LABEL": "Пообщайтесь с нами"
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 10228d7ff..4e22e35e6 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 13b29267a..2947e8db0 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nya meddelanden",
     "CLOSE_MESSAGES_BUTTON": "Stäng",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chatta med oss"
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index 2b623f3e6..0a9527cd7 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "மூடு",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 3b0de7943..87c601143 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "ปิด",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "บอท"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index fda4fe17b..3088e332d 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Yeni mesajları gör",
     "CLOSE_MESSAGES_BUTTON": "Kapat",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Sohbet et"
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index ea9c47586..328977c54 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Закрити",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 50164b1bf..95bcea754 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Xem tin nhắn mới",
     "CLOSE_MESSAGES_BUTTON": "Đóng",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Trò chuyện với chúng tôi"
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index fb6c6ddbd..61018995a 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "查看新消息",
     "CLOSE_MESSAGES_BUTTON": "关闭",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "机器人"
   },
   "BUBBLE": {
     "LABEL": "联系我们"
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index ea4945a60..21e78e4e6 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -21,7 +21,8 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "關閉",
-    "COMPANY_FROM": "from"
+    "COMPANY_FROM": "from",
+    "BOT": "機器人"
   },
   "BUBBLE": {
     "LABEL": "與我們對話"

From 62d19911bead15c20e7b7a12f58ca8f5fea2ce34 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 24 May 2021 12:43:03 +0530
Subject: [PATCH 12/67] chore: Add chatwoot utils package (#2307)

* add chatwoot utils package

* remove color helper

* replace contrasting text color  with chatwoot util
---
 app/javascript/dashboard/components/ui/Label.vue      | 2 +-
 app/javascript/shared/helpers/ColorHelper.js          | 8 --------
 app/javascript/widget/components/PreChat/Form.vue     | 2 +-
 app/javascript/widget/components/TeamAvailability.vue | 2 +-
 package.json                                          | 1 +
 yarn.lock                                             | 5 +++++
 6 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 app/javascript/shared/helpers/ColorHelper.js

diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index a6c09e562..14376d530 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -7,7 +7,7 @@
   </div>
 </template>
 <script>
-import { getContrastingTextColor } from 'shared/helpers/ColorHelper';
+import { getContrastingTextColor } from '@chatwoot/utils';
 export default {
   props: {
     title: {
diff --git a/app/javascript/shared/helpers/ColorHelper.js b/app/javascript/shared/helpers/ColorHelper.js
deleted file mode 100644
index 50e3296ac..000000000
--- a/app/javascript/shared/helpers/ColorHelper.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const getContrastingTextColor = bgColor => {
-  const color = bgColor.replace('#', '');
-  const r = parseInt(color.slice(0, 2), 16);
-  const g = parseInt(color.slice(2, 4), 16);
-  const b = parseInt(color.slice(4, 6), 16);
-  // http://stackoverflow.com/a/3943023/112731
-  return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? '#000000' : '#FFFFFF';
-};
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index dcb11c7bb..448c33ba5 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -56,7 +56,7 @@ import FormInput from '../Form/Input';
 import FormTextArea from '../Form/TextArea';
 import Spinner from 'shared/components/Spinner';
 import { mapGetters } from 'vuex';
-import { getContrastingTextColor } from 'shared/helpers/ColorHelper';
+import { getContrastingTextColor } from '@chatwoot/utils';
 import { required, minLength, email } from 'vuelidate/lib/validators';
 export default {
   components: {
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index a2889ec4c..41c389ae2 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -29,8 +29,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { getContrastingTextColor } from '@chatwoot/utils';
 import AvailableAgents from 'widget/components/AvailableAgents.vue';
-import { getContrastingTextColor } from 'shared/helpers/ColorHelper';
 import CustomButton from 'shared/components/Button';
 import configMixin from 'widget/mixins/configMixin';
 import availabilityMixin from 'widget/mixins/availability';
diff --git a/package.json b/package.json
index 43766f3de..bf7f18e04 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git#7e8acadd10d7b932c0dc0bd0a18f804434f83517",
+    "@chatwoot/utils": "^0.0.3",
     "@rails/actioncable": "6.1.3",
     "@rails/webpacker": "5.3.0",
     "@sentry/vue": "^5.30.0",
diff --git a/yarn.lock b/yarn.lock
index c1ba0a607..600a23f0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1096,6 +1096,11 @@
     prosemirror-state "^1.3.3"
     prosemirror-view "^1.17.2"
 
+"@chatwoot/utils@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.3.tgz#40fbb6c6d1aed853b3c5189d0f4979d3ca185a2f"
+  integrity sha512-2KbA1r34IM2U58CUvsC9dEN3gsx5Dcc6uD1iHPFNC3zTsg8Tb+K7IQXxfZt+VAvV0fbniLzCuXt6h81Ds0aj6Q==
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"

From 652d988993cc3095ea03af6cf73d04e69d4636b8 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Tue, 25 May 2021 12:53:00 +0530
Subject: [PATCH 13/67] fix: Fixes email overflow issue in conversation.
 (#2331)

---
 .../dashboard/components/widgets/conversation/MessagesView.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 0b89fb8c4..d825e4634 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -339,5 +339,6 @@ export default {
 .view-box.fill-height {
   height: auto;
   flex-grow: 1;
+  min-width: 0;
 }
 </style>

From cfdf4a12c864bacaead59b4e495198334157a3d7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 25 May 2021 14:00:21 +0530
Subject: [PATCH 14/67] chore: Add missing frontend specs (#2329)

* complete dshboard api specs

* code cleanup

* add conversation mixin spec

* add isadmin mixin spec

* add agent details component spec

* add notification badge spec

* spec for thumbnail exist in agent details

* fix the deprecation warnings

* add agent details spec

* add account selector specs

* code cleanup

* refactor contact spec

* review fixes

* review fixes

* add shared spec helper

* update api spec helper

* review fixes
---
 .../dashboard/api/specs/account.spec.js       |  26 +++
 .../dashboard/api/specs/apiSpecHelper.js      |  26 +++
 .../api/specs/channel/fbChannel.spec.js       |  26 +++
 .../api/specs/channel/twilioChannel.spec.js   |  13 ++
 .../api/specs/channel/twitterClient.spec.js   |  11 +-
 .../api/specs/channel/webChannel.spec.js      |  13 ++
 .../dashboard/api/specs/contacts.spec.js      |  46 ++++-
 .../dashboard/api/specs/conversations.spec.js |  39 +++-
 .../dashboard/api/specs/endPoints.spec.js     |  13 ++
 .../api/specs/inbox/conversation.spec.js      | 143 ++++++++++++--
 .../dashboard/api/specs/inbox/message.spec.js |  32 +++
 .../dashboard/api/specs/inboxes.spec.js       |  32 ++-
 .../dashboard/api/specs/notifications.spec.js |  55 +++++-
 .../dashboard/api/specs/reports.spec.js       |  68 +++++--
 .../dashboard/api/specs/teams.spec.js         |  53 ++++-
 .../dashboard/api/specs/webhook.spec.js       |  13 ++
 .../specs/AccountSelector.spec.js             |  90 +++++++++
 .../specs/AgentDetails.spec.js                |  64 ++++++
 .../specs/NotificationBell.spec.js            |  67 +++++++
 .../components/widgets/Thumbnail.spec.js      |   8 +-
 .../mixins/specs/conversationFixtures.js      | 185 ++++++++++++++++++
 .../mixins/specs/conversaton.spec.js          |  29 +++
 .../dashboard/mixins/specs/isAdmin.spec.js    |  28 +++
 23 files changed, 1009 insertions(+), 71 deletions(-)
 create mode 100644 app/javascript/dashboard/api/specs/account.spec.js
 create mode 100644 app/javascript/dashboard/api/specs/apiSpecHelper.js
 create mode 100644 app/javascript/dashboard/api/specs/channel/twilioChannel.spec.js
 create mode 100644 app/javascript/dashboard/api/specs/channel/webChannel.spec.js
 create mode 100644 app/javascript/dashboard/api/specs/endPoints.spec.js
 create mode 100644 app/javascript/dashboard/api/specs/inbox/message.spec.js
 create mode 100644 app/javascript/dashboard/api/specs/webhook.spec.js
 create mode 100644 app/javascript/dashboard/components/layout/sidebarComponents/specs/AccountSelector.spec.js
 create mode 100644 app/javascript/dashboard/components/layout/sidebarComponents/specs/AgentDetails.spec.js
 create mode 100644 app/javascript/dashboard/components/layout/sidebarComponents/specs/NotificationBell.spec.js
 create mode 100644 app/javascript/dashboard/mixins/specs/conversationFixtures.js
 create mode 100644 app/javascript/dashboard/mixins/specs/conversaton.spec.js
 create mode 100644 app/javascript/dashboard/mixins/specs/isAdmin.spec.js

diff --git a/app/javascript/dashboard/api/specs/account.spec.js b/app/javascript/dashboard/api/specs/account.spec.js
new file mode 100644
index 000000000..3d37c4206
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/account.spec.js
@@ -0,0 +1,26 @@
+import accountAPI from '../account';
+import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
+
+describe('#accountAPI', () => {
+  it('creates correct instance', () => {
+    expect(accountAPI).toBeInstanceOf(ApiClient);
+    expect(accountAPI).toHaveProperty('get');
+    expect(accountAPI).toHaveProperty('show');
+    expect(accountAPI).toHaveProperty('create');
+    expect(accountAPI).toHaveProperty('update');
+    expect(accountAPI).toHaveProperty('delete');
+    expect(accountAPI).toHaveProperty('createAccount');
+  });
+
+  describeWithAPIMock('API calls', context => {
+    it('#createAccount', () => {
+      accountAPI.createAccount({
+        name: 'Chatwoot',
+      });
+      expect(context.axiosMock.post).toHaveBeenCalledWith('/api/v1/accounts', {
+        name: 'Chatwoot',
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/apiSpecHelper.js b/app/javascript/dashboard/api/specs/apiSpecHelper.js
new file mode 100644
index 000000000..aedea13f8
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/apiSpecHelper.js
@@ -0,0 +1,26 @@
+function apiSpecHelper() {
+  beforeEach(() => {
+    this.originalAxios = window.axios;
+    this.axiosMock = {
+      post: jest.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
+    };
+    window.axios = this.axiosMock;
+  });
+
+  afterEach(() => {
+    window.axios = this.originalAxios;
+  });
+}
+// https://stackoverflow.com/a/59344023/3901856
+const sharedWrapper = describe('sharedWrapper', () => {});
+export default function describeWithAPIMock(skillName, testFn) {
+  return describe(skillName, function configureContext() {
+    function Context() {}
+    Context.prototype = sharedWrapper.ctx;
+    this.ctx = new Context();
+    apiSpecHelper.call(this);
+    testFn.call(this, this);
+  });
+}
diff --git a/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js b/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
index 03f1cb649..67697f827 100644
--- a/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
+++ b/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
@@ -1,5 +1,6 @@
 import fbChannel from '../../channel/fbChannel';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';
 
 describe('#FBChannel', () => {
   it('creates correct instance', () => {
@@ -10,4 +11,29 @@ describe('#FBChannel', () => {
     expect(fbChannel).toHaveProperty('update');
     expect(fbChannel).toHaveProperty('delete');
   });
+  describeWithAPIMock('API calls', context => {
+    it('#create', () => {
+      fbChannel.create({ omniauthToken: 'ASFM131CSF@#@$', appId: 'chatwoot' });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/callbacks/register_facebook_page',
+        {
+          omniauthToken: 'ASFM131CSF@#@$',
+          appId: 'chatwoot',
+        }
+      );
+    });
+    it('#reauthorize', () => {
+      fbChannel.reauthorizeFacebookPage({
+        omniauthToken: 'ASFM131CSF@#@$',
+        inboxId: 1,
+      });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/callbacks/reauthorize_page',
+        {
+          omniauth_token: 'ASFM131CSF@#@$',
+          inbox_id: 1,
+        }
+      );
+    });
+  });
 });
diff --git a/app/javascript/dashboard/api/specs/channel/twilioChannel.spec.js b/app/javascript/dashboard/api/specs/channel/twilioChannel.spec.js
new file mode 100644
index 000000000..5025de44f
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/channel/twilioChannel.spec.js
@@ -0,0 +1,13 @@
+import twilioChannel from '../../channel/twilioChannel';
+import ApiClient from '../../ApiClient';
+
+describe('#twilioChannel', () => {
+  it('creates correct instance', () => {
+    expect(twilioChannel).toBeInstanceOf(ApiClient);
+    expect(twilioChannel).toHaveProperty('get');
+    expect(twilioChannel).toHaveProperty('show');
+    expect(twilioChannel).toHaveProperty('create');
+    expect(twilioChannel).toHaveProperty('update');
+    expect(twilioChannel).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/channel/twitterClient.spec.js b/app/javascript/dashboard/api/specs/channel/twitterClient.spec.js
index 0480aeb82..0768ee53e 100644
--- a/app/javascript/dashboard/api/specs/channel/twitterClient.spec.js
+++ b/app/javascript/dashboard/api/specs/channel/twitterClient.spec.js
@@ -1,9 +1,14 @@
-import TwitterClient from '../../channel/twitterClient';
+import twitterClient from '../../channel/twitterClient';
 import ApiClient from '../../ApiClient';
 
 describe('#TwitterClient', () => {
   it('creates correct instance', () => {
-    expect(TwitterClient).toBeInstanceOf(ApiClient);
-    expect(TwitterClient).toHaveProperty('generateAuthorization');
+    expect(twitterClient).toBeInstanceOf(ApiClient);
+    expect(twitterClient).toHaveProperty('get');
+    expect(twitterClient).toHaveProperty('show');
+    expect(twitterClient).toHaveProperty('create');
+    expect(twitterClient).toHaveProperty('update');
+    expect(twitterClient).toHaveProperty('delete');
+    expect(twitterClient).toHaveProperty('generateAuthorization');
   });
 });
diff --git a/app/javascript/dashboard/api/specs/channel/webChannel.spec.js b/app/javascript/dashboard/api/specs/channel/webChannel.spec.js
new file mode 100644
index 000000000..c14e79ea7
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/channel/webChannel.spec.js
@@ -0,0 +1,13 @@
+import webChannelClient from '../../channel/webChannel';
+import ApiClient from '../../ApiClient';
+
+describe('#webChannelClient', () => {
+  it('creates correct instance', () => {
+    expect(webChannelClient).toBeInstanceOf(ApiClient);
+    expect(webChannelClient).toHaveProperty('get');
+    expect(webChannelClient).toHaveProperty('show');
+    expect(webChannelClient).toHaveProperty('create');
+    expect(webChannelClient).toHaveProperty('update');
+    expect(webChannelClient).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/contacts.spec.js b/app/javascript/dashboard/api/specs/contacts.spec.js
index 2cc89ccc8..ae1e1e0e1 100644
--- a/app/javascript/dashboard/api/specs/contacts.spec.js
+++ b/app/javascript/dashboard/api/specs/contacts.spec.js
@@ -1,14 +1,44 @@
-import contacts from '../contacts';
+import contactAPI from '../contacts';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#ContactsAPI', () => {
   it('creates correct instance', () => {
-    expect(contacts).toBeInstanceOf(ApiClient);
-    expect(contacts).toHaveProperty('get');
-    expect(contacts).toHaveProperty('show');
-    expect(contacts).toHaveProperty('create');
-    expect(contacts).toHaveProperty('update');
-    expect(contacts).toHaveProperty('delete');
-    expect(contacts).toHaveProperty('getConversations');
+    expect(contactAPI).toBeInstanceOf(ApiClient);
+    expect(contactAPI).toHaveProperty('get');
+    expect(contactAPI).toHaveProperty('show');
+    expect(contactAPI).toHaveProperty('create');
+    expect(contactAPI).toHaveProperty('update');
+    expect(contactAPI).toHaveProperty('delete');
+    expect(contactAPI).toHaveProperty('getConversations');
+  });
+
+  describeWithAPIMock('API calls', context => {
+    it('#get', () => {
+      contactAPI.get(1, 'name');
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts?page=1&sort=name'
+      );
+    });
+
+    it('#getConversations', () => {
+      contactAPI.getConversations(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/conversations'
+      );
+    });
+
+    it('#getContactableInboxes', () => {
+      contactAPI.getContactableInboxes(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/contactable_inboxes'
+      );
+    });
+    it('#search', () => {
+      contactAPI.search('leads', 1, 'date');
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts/search?q=leads&page=1&sort=date'
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/conversations.spec.js b/app/javascript/dashboard/api/specs/conversations.spec.js
index 2ac815459..4b1a0a030 100644
--- a/app/javascript/dashboard/api/specs/conversations.spec.js
+++ b/app/javascript/dashboard/api/specs/conversations.spec.js
@@ -1,15 +1,36 @@
-import conversations from '../conversations';
+import conversationsAPI from '../conversations';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#ConversationApi', () => {
   it('creates correct instance', () => {
-    expect(conversations).toBeInstanceOf(ApiClient);
-    expect(conversations).toHaveProperty('get');
-    expect(conversations).toHaveProperty('show');
-    expect(conversations).toHaveProperty('create');
-    expect(conversations).toHaveProperty('update');
-    expect(conversations).toHaveProperty('delete');
-    expect(conversations).toHaveProperty('getLabels');
-    expect(conversations).toHaveProperty('updateLabels');
+    expect(conversationsAPI).toBeInstanceOf(ApiClient);
+    expect(conversationsAPI).toHaveProperty('get');
+    expect(conversationsAPI).toHaveProperty('show');
+    expect(conversationsAPI).toHaveProperty('create');
+    expect(conversationsAPI).toHaveProperty('update');
+    expect(conversationsAPI).toHaveProperty('delete');
+    expect(conversationsAPI).toHaveProperty('getLabels');
+    expect(conversationsAPI).toHaveProperty('updateLabels');
+  });
+
+  describeWithAPIMock('API calls', context => {
+    it('#getLabels', () => {
+      conversationsAPI.getLabels(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations/1/labels'
+      );
+    });
+
+    it('#updateLabels', () => {
+      const labels = ['support-query'];
+      conversationsAPI.updateLabels(1, labels);
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/conversations/1/labels',
+        {
+          labels,
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/endPoints.spec.js b/app/javascript/dashboard/api/specs/endPoints.spec.js
new file mode 100644
index 000000000..8c46735a9
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/endPoints.spec.js
@@ -0,0 +1,13 @@
+import endPoints from '../endPoints';
+
+describe('#endPoints', () => {
+  it('it should return register url details if register page passed  ', () => {
+    expect(endPoints('register')).toEqual({ url: 'api/v1/accounts.json' });
+  });
+  it('it should inbox url details if getInbox page passed', () => {
+    expect(endPoints('getInbox')).toEqual({
+      url: 'api/v1/conversations.json',
+      params: { inbox_id: null },
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
index 6d4cdeec4..b4951804a 100644
--- a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -1,5 +1,6 @@
 import conversationAPI from '../../inbox/conversation';
 import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';
 
 describe('#ConversationAPI', () => {
   it('creates correct instance', () => {
@@ -20,27 +21,143 @@ describe('#ConversationAPI', () => {
     expect(conversationAPI).toHaveProperty('sendEmailTranscript');
   });
 
-  describe('API calls', () => {
-    let originalAxios = null;
-    let axiosMock = null;
-
-    beforeEach(() => {
-      originalAxios = window.axios;
-      axiosMock = { post: jest.fn(() => Promise.resolve()) };
-
-      window.axios = axiosMock;
+  describeWithAPIMock('API calls', context => {
+    it('#get conversations', () => {
+      conversationAPI.get({
+        inboxId: 1,
+        status: 'open',
+        assigneeType: 'me',
+        page: 1,
+        labels: [],
+        teamId: 1,
+      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations',
+        {
+          params: {
+            inbox_id: 1,
+            team_id: 1,
+            status: 'open',
+            assignee_type: 'me',
+            page: 1,
+            labels: [],
+          },
+        }
+      );
     });
 
-    afterEach(() => {
-      window.axios = originalAxios;
+    it('#search', () => {
+      conversationAPI.search({
+        q: 'leads',
+        page: 1,
+      });
+
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations/search',
+        {
+          params: {
+            q: 'leads',
+            page: 1,
+          },
+        }
+      );
+    });
+
+    it('#toggleStatus', () => {
+      conversationAPI.toggleStatus({ conversationId: 12, status: 'online' });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/toggle_status`,
+        {
+          status: 'online',
+        }
+      );
+    });
+
+    it('#assignAgent', () => {
+      conversationAPI.assignAgent({ conversationId: 12, agentId: 34 });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/assignments?assignee_id=34`,
+        {}
+      );
+    });
+
+    it('#assignTeam', () => {
+      conversationAPI.assignTeam({ conversationId: 12, teamId: 1 });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/assignments`,
+        {
+          team_id: 1,
+        }
+      );
+    });
+
+    it('#markMessageRead', () => {
+      conversationAPI.markMessageRead({ id: 12 });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/update_last_seen`
+      );
+    });
+
+    it('#toggleTyping', () => {
+      conversationAPI.toggleTyping({
+        conversationId: 12,
+        status: 'typing_on',
+      });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/toggle_typing_status`,
+        {
+          typing_status: 'typing_on',
+        }
+      );
+    });
+
+    it('#mute', () => {
+      conversationAPI.mute(45);
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/conversations/45/mute'
+      );
     });
 
     it('#unmute', () => {
       conversationAPI.unmute(45);
-
-      expect(axiosMock.post).toHaveBeenCalledWith(
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
         '/api/v1/conversations/45/unmute'
       );
     });
+
+    it('#meta', () => {
+      conversationAPI.meta({
+        inboxId: 1,
+        status: 'open',
+        assigneeType: 'me',
+        labels: [],
+        teamId: 1,
+      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations/meta',
+        {
+          params: {
+            inbox_id: 1,
+            team_id: 1,
+            status: 'open',
+            assignee_type: 'me',
+            labels: [],
+          },
+        }
+      );
+    });
+
+    it('#sendEmailTranscript', () => {
+      conversationAPI.sendEmailTranscript({
+        conversationId: 45,
+        email: 'john@acme.inc',
+      });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/conversations/45/transcript',
+        {
+          email: 'john@acme.inc',
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/inbox/message.spec.js b/app/javascript/dashboard/api/specs/inbox/message.spec.js
new file mode 100644
index 000000000..dd4814f23
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/inbox/message.spec.js
@@ -0,0 +1,32 @@
+import messageAPI from '../../inbox/message';
+import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../apiSpecHelper';
+
+describe('#ConversationAPI', () => {
+  it('creates correct instance', () => {
+    expect(messageAPI).toBeInstanceOf(ApiClient);
+    expect(messageAPI).toHaveProperty('get');
+    expect(messageAPI).toHaveProperty('show');
+    expect(messageAPI).toHaveProperty('create');
+    expect(messageAPI).toHaveProperty('update');
+    expect(messageAPI).toHaveProperty('delete');
+    expect(messageAPI).toHaveProperty('getPreviousMessages');
+  });
+
+  describeWithAPIMock('API calls', context => {
+    it('#getPreviousMessages', () => {
+      messageAPI.getPreviousMessages({
+        conversationId: 12,
+        before: 4573,
+      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        `/api/v1/conversations/12/messages`,
+        {
+          params: {
+            before: 4573,
+          },
+        }
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inboxes.spec.js b/app/javascript/dashboard/api/specs/inboxes.spec.js
index c4927e2bb..6c5cf38ea 100644
--- a/app/javascript/dashboard/api/specs/inboxes.spec.js
+++ b/app/javascript/dashboard/api/specs/inboxes.spec.js
@@ -1,13 +1,31 @@
-import inboxes from '../inboxes';
+import inboxesAPI from '../inboxes';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#InboxesAPI', () => {
   it('creates correct instance', () => {
-    expect(inboxes).toBeInstanceOf(ApiClient);
-    expect(inboxes).toHaveProperty('get');
-    expect(inboxes).toHaveProperty('show');
-    expect(inboxes).toHaveProperty('create');
-    expect(inboxes).toHaveProperty('update');
-    expect(inboxes).toHaveProperty('delete');
+    expect(inboxesAPI).toBeInstanceOf(ApiClient);
+    expect(inboxesAPI).toHaveProperty('get');
+    expect(inboxesAPI).toHaveProperty('show');
+    expect(inboxesAPI).toHaveProperty('create');
+    expect(inboxesAPI).toHaveProperty('update');
+    expect(inboxesAPI).toHaveProperty('delete');
+    expect(inboxesAPI).toHaveProperty('getAssignableAgents');
+    expect(inboxesAPI).toHaveProperty('getCampaigns');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#getAssignableAgents', () => {
+      inboxesAPI.getAssignableAgents(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/inboxes/1/assignable_agents'
+      );
+    });
+
+    it('#getCampaigns', () => {
+      inboxesAPI.getCampaigns(2);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/inboxes/2/campaigns'
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/notifications.spec.js b/app/javascript/dashboard/api/specs/notifications.spec.js
index 14f472ce9..d20c0d526 100644
--- a/app/javascript/dashboard/api/specs/notifications.spec.js
+++ b/app/javascript/dashboard/api/specs/notifications.spec.js
@@ -1,13 +1,54 @@
-import notifications from '../notifications';
+import notificationsAPI from '../notifications';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#NotificationAPI', () => {
   it('creates correct instance', () => {
-    expect(notifications).toBeInstanceOf(ApiClient);
-    expect(notifications).toHaveProperty('get');
-    expect(notifications).toHaveProperty('getNotifications');
-    expect(notifications).toHaveProperty('getUnreadCount');
-    expect(notifications).toHaveProperty('read');
-    expect(notifications).toHaveProperty('readAll');
+    expect(notificationsAPI).toBeInstanceOf(ApiClient);
+    expect(notificationsAPI).toHaveProperty('get');
+    expect(notificationsAPI).toHaveProperty('getNotifications');
+    expect(notificationsAPI).toHaveProperty('getUnreadCount');
+    expect(notificationsAPI).toHaveProperty('read');
+    expect(notificationsAPI).toHaveProperty('readAll');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#get', () => {
+      notificationsAPI.get(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/notifications?page=1'
+      );
+    });
+
+    it('#getNotifications', () => {
+      notificationsAPI.getNotifications(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/notifications/1/notifications'
+      );
+    });
+
+    it('#getUnreadCount', () => {
+      notificationsAPI.getUnreadCount();
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/notifications/unread_count'
+      );
+    });
+
+    it('#read', () => {
+      notificationsAPI.read(48670, 'Conversation');
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/notifications/read_all',
+        {
+          primary_actor_id: 'Conversation',
+          primary_actor_type: 48670,
+        }
+      );
+    });
+
+    it('#readAll', () => {
+      notificationsAPI.readAll();
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/notifications/read_all'
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index fabe22c94..0ca5f4be7 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -1,17 +1,63 @@
-import reports from '../reports';
+import reportsAPI from '../reports';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#Reports API', () => {
   it('creates correct instance', () => {
-    expect(reports).toBeInstanceOf(ApiClient);
-    expect(reports.apiVersion).toBe('/api/v2');
-    expect(reports).toHaveProperty('get');
-    expect(reports).toHaveProperty('show');
-    expect(reports).toHaveProperty('create');
-    expect(reports).toHaveProperty('update');
-    expect(reports).toHaveProperty('delete');
-    expect(reports).toHaveProperty('getAccountReports');
-    expect(reports).toHaveProperty('getAccountSummary');
-    expect(reports).toHaveProperty('getAgentReports');
+    expect(reportsAPI).toBeInstanceOf(ApiClient);
+    expect(reportsAPI.apiVersion).toBe('/api/v2');
+    expect(reportsAPI).toHaveProperty('get');
+    expect(reportsAPI).toHaveProperty('show');
+    expect(reportsAPI).toHaveProperty('create');
+    expect(reportsAPI).toHaveProperty('update');
+    expect(reportsAPI).toHaveProperty('delete');
+    expect(reportsAPI).toHaveProperty('getAccountReports');
+    expect(reportsAPI).toHaveProperty('getAccountSummary');
+    expect(reportsAPI).toHaveProperty('getAgentReports');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#getAccountReports', () => {
+      reportsAPI.getAccountReports(
+        'conversations_count',
+        1621103400,
+        1621621800
+      );
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/account',
+        {
+          params: {
+            metric: 'conversations_count',
+            since: 1621103400,
+            until: 1621621800,
+          },
+        }
+      );
+    });
+
+    it('#getAccountSummary', () => {
+      reportsAPI.getAccountSummary(1621103400, 1621621800);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/account_summary',
+        {
+          params: {
+            since: 1621103400,
+            until: 1621621800,
+          },
+        }
+      );
+    });
+
+    it('#getAgentReports', () => {
+      reportsAPI.getAgentReports(1621103400, 1621621800);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/agents',
+        {
+          params: {
+            since: 1621103400,
+            until: 1621621800,
+          },
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/teams.spec.js b/app/javascript/dashboard/api/specs/teams.spec.js
index 6b01ab359..4f29af554 100644
--- a/app/javascript/dashboard/api/specs/teams.spec.js
+++ b/app/javascript/dashboard/api/specs/teams.spec.js
@@ -1,16 +1,49 @@
-import teams from '../teams';
+import teamsAPI from '../teams';
 import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
 
 describe('#TeamsAPI', () => {
   it('creates correct instance', () => {
-    expect(teams).toBeInstanceOf(ApiClient);
-    expect(teams).toHaveProperty('get');
-    expect(teams).toHaveProperty('show');
-    expect(teams).toHaveProperty('create');
-    expect(teams).toHaveProperty('update');
-    expect(teams).toHaveProperty('delete');
-    expect(teams).toHaveProperty('getAgents');
-    expect(teams).toHaveProperty('addAgents');
-    expect(teams).toHaveProperty('updateAgents');
+    expect(teamsAPI).toBeInstanceOf(ApiClient);
+    expect(teamsAPI).toHaveProperty('get');
+    expect(teamsAPI).toHaveProperty('show');
+    expect(teamsAPI).toHaveProperty('create');
+    expect(teamsAPI).toHaveProperty('update');
+    expect(teamsAPI).toHaveProperty('delete');
+    expect(teamsAPI).toHaveProperty('getAgents');
+    expect(teamsAPI).toHaveProperty('addAgents');
+    expect(teamsAPI).toHaveProperty('updateAgents');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#getAgents', () => {
+      teamsAPI.getAgents({ teamId: 1 });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/teams/1/team_members'
+      );
+    });
+
+    it('#addAgents', () => {
+      teamsAPI.addAgents({ teamId: 1, agentsList: { user_ids: [1, 10, 21] } });
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/teams/1/team_members',
+        {
+          user_ids: { user_ids: [1, 10, 21] },
+        }
+      );
+    });
+
+    it('#updateAgents', () => {
+      const agentsList = { user_ids: [1, 10, 21] };
+      teamsAPI.updateAgents({
+        teamId: 1,
+        agentsList,
+      });
+      expect(context.axiosMock.patch).toHaveBeenCalledWith(
+        '/api/v1/teams/1/team_members',
+        {
+          user_ids: agentsList,
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/api/specs/webhook.spec.js b/app/javascript/dashboard/api/specs/webhook.spec.js
new file mode 100644
index 000000000..5a1db9db6
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/webhook.spec.js
@@ -0,0 +1,13 @@
+import webhooksAPI from '../webhooks';
+import ApiClient from '../ApiClient';
+
+describe('#webhooksAPI', () => {
+  it('creates correct instance', () => {
+    expect(webhooksAPI).toBeInstanceOf(ApiClient);
+    expect(webhooksAPI).toHaveProperty('get');
+    expect(webhooksAPI).toHaveProperty('show');
+    expect(webhooksAPI).toHaveProperty('create');
+    expect(webhooksAPI).toHaveProperty('update');
+    expect(webhooksAPI).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/specs/AccountSelector.spec.js b/app/javascript/dashboard/components/layout/sidebarComponents/specs/AccountSelector.spec.js
new file mode 100644
index 000000000..09bd6f120
--- /dev/null
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/specs/AccountSelector.spec.js
@@ -0,0 +1,90 @@
+import AccountSelector from '../AccountSelector';
+import { createLocalVue, mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueI18n from 'vue-i18n';
+
+import i18n from 'dashboard/i18n';
+
+import WootModal from 'dashboard/components/Modal';
+import WootModalHeader from 'dashboard/components/ModalHeader';
+
+const localVue = createLocalVue();
+localVue.component('woot-modal', WootModal);
+localVue.component('woot-modal-header', WootModalHeader);
+
+localVue.use(Vuex);
+localVue.use(VueI18n);
+
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+describe('accountSelctor', () => {
+  let accountSelector = null;
+  const currentUser = {
+    accounts: [
+      {
+        id: 1,
+        name: 'Chatwoot',
+        role: 'administrator',
+      },
+      {
+        id: 2,
+        name: 'GitX',
+        role: 'agent',
+      },
+    ],
+  };
+  const accountId = 1;
+  const globalConfig = { createNewAccountFromDashboard: false };
+  let store = null;
+  let actions = null;
+  let modules = null;
+
+  beforeEach(() => {
+    actions = {};
+    modules = {
+      auth: {
+        getters: {
+          getCurrentAccountId: () => accountId,
+          getCurrentUser: () => currentUser,
+        },
+      },
+      globalConfig: {
+        getters: {
+          'globalConfig/get': () => globalConfig,
+        },
+      },
+    };
+
+    store = new Vuex.Store({
+      actions,
+      modules,
+    });
+    accountSelector = mount(AccountSelector, {
+      store,
+      localVue,
+      i18n: i18nConfig,
+      propsData: {
+        showAccountModal: true,
+      },
+    });
+  });
+
+  it('title and sub title exist', () => {
+    const headerComponent = accountSelector.findComponent(WootModalHeader);
+    const topBar = headerComponent.find('.page-top-bar');
+    const titleComponent = topBar.find('.page-sub-title');
+    expect(titleComponent.text()).toBe('Switch Account');
+    const subTitleComponent = topBar.find('p');
+    expect(subTitleComponent.text()).toBe(
+      'Select an account from the following list'
+    );
+  });
+
+  it('first account item is checked', () => {
+    const accountFirstItem = accountSelector.find('.account-selector .ion');
+    expect(accountFirstItem.exists()).toBe(true);
+  });
+});
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/specs/AgentDetails.spec.js b/app/javascript/dashboard/components/layout/sidebarComponents/specs/AgentDetails.spec.js
new file mode 100644
index 000000000..142bbedfa
--- /dev/null
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/specs/AgentDetails.spec.js
@@ -0,0 +1,64 @@
+import AgentDetails from '../AgentDetails';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueI18n from 'vue-i18n';
+
+import i18n from 'dashboard/i18n';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail';
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(VueI18n);
+localVue.component('thumbnail', Thumbnail);
+
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+describe('agentDetails', () => {
+  const currentUser = { name: 'Neymar Junior', avatar_url: '' };
+  const currentRole = 'agent';
+  let store = null;
+  let actions = null;
+  let modules = null;
+  let agentDetails = null;
+
+  beforeEach(() => {
+    actions = {};
+
+    modules = {
+      auth: {
+        getters: {
+          getCurrentUser: () => currentUser,
+          getCurrentRole: () => currentRole,
+        },
+      },
+    };
+
+    store = new Vuex.Store({
+      actions,
+      modules,
+    });
+
+    agentDetails = shallowMount(AgentDetails, {
+      store,
+      localVue,
+      i18n: i18nConfig,
+    });
+  });
+
+  it('shows the agent name', () => {
+    const agentTitle = agentDetails.find('.current-user--name');
+    expect(agentTitle.text()).toBe('Neymar Junior');
+  });
+
+  it('shows the agent role', () => {
+    const agentTitle = agentDetails.find('.current-user--role');
+    expect(agentTitle.text()).toBe('Agent');
+  });
+
+  it('agent thumbnail exists', () => {
+    const thumbnailComponent = agentDetails.findComponent(Thumbnail);
+    expect(thumbnailComponent.exists()).toBe(true);
+  });
+});
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/specs/NotificationBell.spec.js b/app/javascript/dashboard/components/layout/sidebarComponents/specs/NotificationBell.spec.js
new file mode 100644
index 000000000..947e5976b
--- /dev/null
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/specs/NotificationBell.spec.js
@@ -0,0 +1,67 @@
+import NotificationBell from '../NotificationBell';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueI18n from 'vue-i18n';
+
+import i18n from 'dashboard/i18n';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(VueI18n);
+
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+describe('notificationBell', () => {
+  const accountId = 1;
+  const notificationMetadata = { unreadCount: 19 };
+  let store = null;
+  let actions = null;
+  let modules = null;
+
+  beforeEach(() => {
+    actions = {
+      showNotification: jest.fn(),
+    };
+    modules = {
+      auth: {
+        getters: {
+          getCurrentAccountId: () => accountId,
+        },
+      },
+      notifications: {
+        getters: {
+          'notifications/getMeta': () => notificationMetadata,
+        },
+      },
+    };
+
+    store = new Vuex.Store({
+      actions,
+      modules,
+    });
+  });
+
+  it('it should return unread count 19 ', () => {
+    const notificationBell = shallowMount(NotificationBell, {
+      store,
+      localVue,
+      i18n: i18nConfig,
+    });
+    const statusViewTitle = notificationBell.find('.unread-badge');
+    expect(statusViewTitle.text()).toBe('19');
+  });
+
+  it('it should return unread count 99+ ', async () => {
+    notificationMetadata.unreadCount = 101;
+    const notificationBell = shallowMount(NotificationBell, {
+      store,
+      localVue,
+      i18n: i18nConfig,
+    });
+    const statusViewTitle = notificationBell.find('.unread-badge');
+    expect(statusViewTitle.text()).toBe('99+');
+  });
+});
diff --git a/app/javascript/dashboard/components/widgets/Thumbnail.spec.js b/app/javascript/dashboard/components/widgets/Thumbnail.spec.js
index 5de534dbe..c10cd3d16 100644
--- a/app/javascript/dashboard/components/widgets/Thumbnail.spec.js
+++ b/app/javascript/dashboard/components/widgets/Thumbnail.spec.js
@@ -15,7 +15,8 @@ describe(`when there are NO errors loading the thumbnail`, () => {
       },
     });
     expect(wrapper.find('#image').exists()).toBe(true);
-    expect(wrapper.contains(Avatar)).toBe(false);
+    const avatarComponent = wrapper.findComponent(Avatar);
+    expect(avatarComponent.exists()).toBe(false);
   });
 });
 
@@ -31,8 +32,9 @@ describe(`when there ARE errors loading the thumbnail`, () => {
         };
       },
     });
-    expect(wrapper.contains('#image')).toBe(false);
-    expect(wrapper.contains(Avatar)).toBe(true);
+    expect(wrapper.find('#image').exists()).toBe(false);
+    const avatarComponent = wrapper.findComponent(Avatar);
+    expect(avatarComponent.exists()).toBe(true);
   });
 });
 
diff --git a/app/javascript/dashboard/mixins/specs/conversationFixtures.js b/app/javascript/dashboard/mixins/specs/conversationFixtures.js
new file mode 100644
index 000000000..3602ef95d
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/conversationFixtures.js
@@ -0,0 +1,185 @@
+export default {
+  conversation: {
+    meta: {
+      sender: {
+        additional_attributes: {
+          created_at_ip: '127.0.0.1',
+        },
+        availability_status: 'offline',
+        email: null,
+        id: 5017687,
+        name: 'long-flower-143',
+        phone_number: null,
+        thumbnail: '',
+        custom_attributes: {},
+      },
+      channel: 'Channel::WebWidget',
+      assignee: {
+        account_id: 1,
+        availability_status: 'offline',
+        confirmed: true,
+        email: 'muhsin@chatwoot.com',
+        available_name: 'Muhsin Keloth',
+        id: 21,
+        name: 'Muhsin Keloth',
+        role: 'administrator',
+        thumbnail:
+          'http://0.0.0.0:3000/rails/active_storage/representations/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBEQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--7b95641540fadebc733ec9b42117d00bc09600be/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaDdCam9MY21WemFYcGxTU0lNTWpVd2VESTFNQVk2QmtWVSIsImV4cCI6bnVsbCwicHVyIjoidmFyaWF0aW9uIn19--c13bd5229b2a2a692444606e22f76ad61c634661/me.jpg',
+      },
+    },
+    id: 5815,
+    messages: [
+      {
+        id: 438072,
+        content: 'Campaign after 5 seconds',
+        account_id: 1,
+        inbox_id: 37,
+        conversation_id: 5811,
+        message_type: 1,
+        created_at: 1620980262,
+        updated_at: '2021-05-14T08:17:42.041Z',
+        private: false,
+        status: 'sent',
+        source_id: null,
+        content_type: null,
+        content_attributes: {},
+        sender_type: 'User',
+        sender_id: 1,
+        external_source_ids: {},
+      },
+      {
+        id: 4382131101,
+        content: 'Hello',
+        account_id: 1,
+        inbox_id: 37,
+        conversation_id: 5815,
+        message_type: 0,
+        created_at: 1621145476,
+        updated_at: '2021-05-16T05:48:43.910Z',
+        private: false,
+        status: 'sent',
+        source_id: null,
+        content_type: 'text',
+        content_attributes: {},
+        sender_type: null,
+        sender_id: null,
+        external_source_ids: {},
+      },
+      {
+        id: 438100,
+        content: 'Hey',
+        account_id: 1,
+        inbox_id: 37,
+        conversation_id: 5815,
+        message_type: 0,
+        created_at: 1621145476,
+        updated_at: '2021-05-16T05:48:43.910Z',
+        private: false,
+        status: 'sent',
+        source_id: null,
+        content_type: 'text',
+        content_attributes: {},
+        sender_type: null,
+        sender_id: null,
+        external_source_ids: {},
+      },
+    ],
+    inbox_id: 37,
+    status: 'open',
+    muted: false,
+    can_reply: true,
+    timestamp: 1621144123,
+    contact_last_seen_at: 0,
+    agent_last_seen_at: 1621144123,
+    unread_count: 0,
+    additional_attributes: {
+      browser: {
+        device_name: 'Unknown',
+        browser_name: 'Chrome',
+        platform_name: 'macOS',
+        browser_version: '90.0.4430.212',
+        platform_version: '10.15.7',
+      },
+      widget_language: null,
+      browser_language: 'en',
+    },
+    account_id: 1,
+    labels: [],
+  },
+  lastMessage: {
+    id: 438100,
+    content: 'Hey',
+    account_id: 1,
+    inbox_id: 37,
+    conversation_id: 5815,
+    message_type: 0,
+    created_at: 1621145476,
+    updated_at: '2021-05-16T05:48:43.910Z',
+    private: false,
+    status: 'sent',
+    source_id: null,
+    content_type: 'text',
+    content_attributes: {},
+    sender_type: null,
+    sender_id: null,
+    external_source_ids: {},
+  },
+  readMessages: [
+    {
+      id: 438072,
+      content: 'Campaign after 5 seconds',
+      account_id: 1,
+      inbox_id: 37,
+      conversation_id: 5811,
+      message_type: 1,
+      created_at: 1620980262,
+      updated_at: '2021-05-14T08:17:42.041Z',
+      private: false,
+      status: 'sent',
+      source_id: null,
+      content_type: null,
+      content_attributes: {},
+      sender_type: 'User',
+      sender_id: 1,
+      external_source_ids: {},
+    },
+  ],
+  unReadMessages: [
+    {
+      id: 4382131101,
+      content: 'Hello',
+      account_id: 1,
+      inbox_id: 37,
+      conversation_id: 5815,
+      message_type: 0,
+      created_at: 1621145476,
+      updated_at: '2021-05-16T05:48:43.910Z',
+      private: false,
+      status: 'sent',
+      source_id: null,
+      content_type: 'text',
+      content_attributes: {},
+      sender_type: null,
+      sender_id: null,
+      external_source_ids: {},
+    },
+    {
+      id: 438100,
+      content: 'Hey',
+      account_id: 1,
+      inbox_id: 37,
+      conversation_id: 5815,
+      message_type: 0,
+      created_at: 1621145476,
+      updated_at: '2021-05-16T05:48:43.910Z',
+      private: false,
+      status: 'sent',
+      source_id: null,
+      content_type: 'text',
+      content_attributes: {},
+      sender_type: null,
+      sender_id: null,
+      external_source_ids: {},
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/mixins/specs/conversaton.spec.js b/app/javascript/dashboard/mixins/specs/conversaton.spec.js
new file mode 100644
index 000000000..eaa9aab97
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/conversaton.spec.js
@@ -0,0 +1,29 @@
+import conversationMixin from '../conversations';
+import conversationFixture from './conversationFixtures';
+import commonHelpers from '../../helper/commons';
+commonHelpers();
+
+describe('#conversationMixin', () => {
+  it('should return unread message count 2 if conversation is passed', () => {
+    expect(
+      conversationMixin.methods.unreadMessagesCount(
+        conversationFixture.conversation
+      )
+    ).toEqual(2);
+  });
+  it('should return last message if conversation is passed', () => {
+    expect(
+      conversationMixin.methods.lastMessage(conversationFixture.conversation)
+    ).toEqual(conversationFixture.lastMessage);
+  });
+  it('should return read messages if conversation is passed', () => {
+    expect(
+      conversationMixin.methods.readMessages(conversationFixture.conversation)
+    ).toEqual(conversationFixture.readMessages);
+  });
+  it('should return read messages if conversation is passed', () => {
+    expect(
+      conversationMixin.methods.unReadMessages(conversationFixture.conversation)
+    ).toEqual(conversationFixture.unReadMessages);
+  });
+});
diff --git a/app/javascript/dashboard/mixins/specs/isAdmin.spec.js b/app/javascript/dashboard/mixins/specs/isAdmin.spec.js
new file mode 100644
index 000000000..50fd63d8f
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/isAdmin.spec.js
@@ -0,0 +1,28 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import isAdminMixin from '../isAdmin';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('isAdminMixin', () => {
+  let getters;
+  let store;
+
+  beforeEach(() => {
+    getters = {
+      getCurrentRole: () => 'administrator',
+    };
+
+    store = new Vuex.Store({ getters });
+  });
+  it('set accountId properly', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [isAdminMixin],
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(wrapper.vm.isAdmin).toBe(true);
+  });
+});

From 12c68e8a3cd73cdb2cec576a1943fe78c8ce4509 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 25 May 2021 14:10:09 +0530
Subject: [PATCH 15/67] chore: Upgrade @sentry/vue to 6.4.1 (#2332)

---
 app/javascript/packs/application.js |   7 +-
 package.json                        |   3 +-
 yarn.lock                           | 103 +++++++++++++++-------------
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 2976dd59f..e0443c15c 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -32,11 +32,16 @@ import {
 } from '../dashboard/helper/pushHelper';
 import * as Sentry from '@sentry/vue';
 import 'vue-easytable/libs/theme-default/index.css';
+import { Integrations } from '@sentry/tracing';
 
 Vue.config.env = process.env;
 
 if (window.errorLoggingConfig) {
-  Sentry.init({ Vue: Vue, dsn: window.errorLoggingConfig });
+  Sentry.init({
+    Vue,
+    dsn: window.errorLoggingConfig,
+    integrations: [new Integrations.BrowserTracing()],
+  });
 }
 
 Vue.use(VueRouter);
diff --git a/package.json b/package.json
index bf7f18e04..8bbad0b4d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
     "@chatwoot/utils": "^0.0.3",
     "@rails/actioncable": "6.1.3",
     "@rails/webpacker": "5.3.0",
-    "@sentry/vue": "^5.30.0",
+    "@sentry/tracing": "^6.4.1",
+    "@sentry/vue": "^6.4.1",
     "axios": "^0.21.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-vue-jsx": "^3.7.0",
diff --git a/yarn.lock b/yarn.lock
index 600a23f0c..83d1be5ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1653,68 +1653,79 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/browser@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3"
-  integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw==
+"@sentry/browser@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.4.1.tgz#b6c62736caaade7fdf6638513d9aad138abde2ac"
+  integrity sha512-3cDud6GWutnJqcnheIq0lPNTsUJbrRLevQ+g1YfawVXFUxfmmY2bOsGd/Mxq17LxYeBHgKTitXv3DU1bsQ+WBQ==
   dependencies:
-    "@sentry/core" "5.30.0"
-    "@sentry/types" "5.30.0"
-    "@sentry/utils" "5.30.0"
+    "@sentry/core" "6.4.1"
+    "@sentry/types" "6.4.1"
+    "@sentry/utils" "6.4.1"
     tslib "^1.9.3"
 
-"@sentry/core@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3"
-  integrity sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==
+"@sentry/core@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.4.1.tgz#789b0071996de5c1a20673f879408926aa3b4fa6"
+  integrity sha512-Lx13oTiP+Tjvm5VxulcCszNVd2S1wY4viSnr+ygq62ySVERR+t7uOZDSARZ0rZ259GwW6nkbMh9dDmD0d6VCGQ==
   dependencies:
-    "@sentry/hub" "5.30.0"
-    "@sentry/minimal" "5.30.0"
-    "@sentry/types" "5.30.0"
-    "@sentry/utils" "5.30.0"
+    "@sentry/hub" "6.4.1"
+    "@sentry/minimal" "6.4.1"
+    "@sentry/types" "6.4.1"
+    "@sentry/utils" "6.4.1"
     tslib "^1.9.3"
 
-"@sentry/hub@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz#2453be9b9cb903404366e198bd30c7ca74cdc100"
-  integrity sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==
+"@sentry/hub@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.4.1.tgz#fa9c05ca32674e2e8477120b71084a1c91a5e023"
+  integrity sha512-7IZRP5buDE6s/c3vWzzPR/ySE+8GUuHPgTEPiDCPOCWwUN11zXDafJDKkJqY3muJfebUKmC/JG67RyBx+XlnlQ==
   dependencies:
-    "@sentry/types" "5.30.0"
-    "@sentry/utils" "5.30.0"
+    "@sentry/types" "6.4.1"
+    "@sentry/utils" "6.4.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz#ce3d3a6a273428e0084adcb800bc12e72d34637b"
-  integrity sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==
+"@sentry/minimal@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.4.1.tgz#d3f968c060c3d3cc997071756659e24047b5dd97"
+  integrity sha512-4x/PRbDZACCKJqjta9EkhiIMyGMf7VgBX13EEWEDVWLP7ymFukBuTr4ap/Tz9429kB/yXZuDGGMIZp/G618H3g==
   dependencies:
-    "@sentry/hub" "5.30.0"
-    "@sentry/types" "5.30.0"
+    "@sentry/hub" "6.4.1"
+    "@sentry/types" "6.4.1"
     tslib "^1.9.3"
 
-"@sentry/types@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz#19709bbe12a1a0115bc790b8942917da5636f402"
-  integrity sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==
-
-"@sentry/utils@5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz#9a5bd7ccff85ccfe7856d493bffa64cabc41e980"
-  integrity sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==
+"@sentry/tracing@^6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.4.1.tgz#3a9119e1ef5206ea565854c325b19a317cc1cca7"
+  integrity sha512-EPRadE9n/wpUjx4jqP/8vXdOAZBk7vjlzRKniJgKgQUO3v03i0ui6xydaal2mvhplIyOCI2muXdGhjUO7ga4uw==
   dependencies:
-    "@sentry/types" "5.30.0"
+    "@sentry/hub" "6.4.1"
+    "@sentry/minimal" "6.4.1"
+    "@sentry/types" "6.4.1"
+    "@sentry/utils" "6.4.1"
     tslib "^1.9.3"
 
-"@sentry/vue@^5.30.0":
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-5.30.0.tgz#a7589a67f3c40cebe780aa1eedd1c4f2de17eb3c"
-  integrity sha512-13qfaitDkvjFkI7g458RnQJCcQd8V5JAsYeaPmnSTx3kPQ2hVkfaSxmEQIKfKPFm8ruW6Ojx0P0jvH5/1b7gjQ==
+"@sentry/types@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.4.1.tgz#7c0a4355a1d04321b901197723a8f55c263226e9"
+  integrity sha512-sTu/GaLsLYk1AkAqpkMT4+4q665LtZjhV0hkgiTD4N3zPl5uSf1pCIzxPRYjOpe7NEANmWv8U4PaGKGtc2eMfA==
+
+"@sentry/utils@6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.4.1.tgz#55fa7da58898773cbd538e4895fc2e4ec695ecab"
+  integrity sha512-xJ1uVa5fvg23pXQfulvCIBb9pQ3p1awyd1PapK2AYi+wKjTuYl4B9edmhjRREEQEExznl/d2OVm78fRXLq7M9Q==
   dependencies:
-    "@sentry/browser" "5.30.0"
-    "@sentry/core" "5.30.0"
-    "@sentry/minimal" "5.30.0"
-    "@sentry/types" "5.30.0"
-    "@sentry/utils" "5.30.0"
+    "@sentry/types" "6.4.1"
+    tslib "^1.9.3"
+
+"@sentry/vue@^6.4.1":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-6.4.1.tgz#776a05be1accf251ec7c74d01be0bba57ff995a9"
+  integrity sha512-Bq7HVbhXqcJlVd9cLs4gnCi+mwPksZ0K4E7w6ZZH1jpNYVziymL5EdhM28o83aD4YfgxEf3PHnOLBmfLfg7izA==
+  dependencies:
+    "@sentry/browser" "6.4.1"
+    "@sentry/core" "6.4.1"
+    "@sentry/minimal" "6.4.1"
+    "@sentry/types" "6.4.1"
+    "@sentry/utils" "6.4.1"
     tslib "^1.9.3"
 
 "@sinonjs/commons@^1.7.0":

From 9ffdb0ec70fc514256e68eccf21b3f11dba39f8f Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 25 May 2021 21:41:53 +0530
Subject: [PATCH 16/67] chore: Add select field example to WootMessageSeeder
 (#2338)

Fixes: #2076
---
 lib/woot_message_seeder.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/woot_message_seeder.rb b/lib/woot_message_seeder.rb
index 728b60019..e28eae3fc 100644
--- a/lib/woot_message_seeder.rb
+++ b/lib/woot_message_seeder.rb
@@ -77,8 +77,10 @@ module WootMessageSeeder
       content_attributes: {
         "items": [
           { "name": 'email', "placeholder": 'Please enter your email', "type": 'email', "label": 'Email' },
-          { "name": 'text_aread', "placeholder": 'Please enter text', "type": 'text_area', "label": 'Large Text' },
-          { "name": 'text', "placeholder": 'Please enter text', "type": 'text', "label": 'text', "default": 'defaut value' }
+          { "name": 'text_area', "placeholder": 'Please enter text', "type": 'text_area', "label": 'Large Text' },
+          { "name": 'text', "placeholder": 'Please enter text', "type": 'text', "label": 'text', "default": 'defaut value' },
+          { "name": 'select', "label": 'Select Option', "type": 'select', "options": [{ "label": '🌯 Burito', "value": 'Burito' },
+                                                                                      { "label": '🍝 Pasta', "value": 'Pasta' }] }
         ]
       }
     )

From 9c555e70c98b388a7be929e8fe683236be63629a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Thu, 27 May 2021 08:24:29 +0530
Subject: [PATCH 17/67] fix: Uses label component for add label button (#2337)

* fix: Uses label component for add label button

* Use button instead of span
---
 .../dashboard/components/ui/Label.vue         |  6 +++-
 .../components/ui/dropdown/AddLabel.vue       | 32 +++++++++----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index 14376d530..5415444d2 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -52,7 +52,11 @@ export default {
     },
     labelStyle() {
       if (this.bgColor) {
-        return { background: this.bgColor, color: this.textColor };
+        return {
+          background: this.bgColor,
+          color: this.textColor,
+          border: `1px solid ${this.bgColor}`,
+        };
       }
       return {};
     },
diff --git a/app/javascript/shared/components/ui/dropdown/AddLabel.vue b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
index 4702e6805..4254749c1 100644
--- a/app/javascript/shared/components/ui/dropdown/AddLabel.vue
+++ b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
@@ -1,20 +1,17 @@
 <template>
-  <woot-button
-    variant="hollow"
-    size="tiny"
-    icon="ion-plus-round"
-    color-scheme="secondary"
-    class-names="button-wrap"
-    @click="toggleLabels"
-  >
-    {{ $t('CONTACT_PANEL.LABELS.MODAL.ADD_BUTTON') }}
+  <woot-button variant="link" class="label--add" @click="addLabel">
+    <woot-label
+      color-scheme="secondary"
+      :title="$t('CONTACT_PANEL.LABELS.MODAL.ADD_BUTTON')"
+      icon="ion-plus-round"
+    />
   </woot-button>
 </template>
 
 <script>
 export default {
   methods: {
-    toggleLabels() {
+    addLabel() {
       this.$emit('add');
     },
   },
@@ -22,13 +19,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.button-wrap {
-  padding: var(--space-micro) var(--space-small);
-  display: inline;
-  line-height: 1.2;
+.label--add {
+  &::v-deep .label {
+    cursor: pointer;
+    background: transparent;
+    border-color: var(--s-700);
+    margin: 0;
 
-  &::v-deep .icon {
-    font-size: var(--font-size-mini);
+    &:hover {
+      background: var(--s-50);
+    }
   }
 }
 </style>

From 3b39eb3e33894b0ac0884b14745815864da673ad Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 27 May 2021 20:07:21 +0530
Subject: [PATCH 18/67] chore: ability to run Chatwoot as API only server
 (#2344)

- Ability to run chatwoot as an API only server
- Removes action cable testing gem since it is merged to rails 6
---
 .env.example                                  |  5 +++++
 Gemfile                                       |  2 --
 Gemfile.lock                                  |  3 ---
 config/environments/development.rb            |  9 +++++++++
 config/environments/production.rb             |  4 ++++
 config/routes.rb                              | 17 +++++++++++------
 spec/controllers/dashboard_controller_spec.rb | 14 ++++++++++++++
 spec/rails_helper.rb                          |  1 +
 8 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.env.example b/.env.example
index 624a44a7b..8d03180a8 100644
--- a/.env.example
+++ b/.env.example
@@ -143,6 +143,11 @@ USE_INBOX_AVATAR_FOR_BOT=true
 # maxmindb api key to use geoip2 service
 # IP_LOOKUP_API_KEY=
 
+
+## Running chatwoot as an API only server
+## setting this value to true will disable the frontend dashboard endpoints
+# CW_API_ONLY_SERVER=false
+
 ## Development Only Config
 # if you want to use letter_opener for local emails
 # LETTER_OPENER=true
diff --git a/Gemfile b/Gemfile
index 4e430a7c8..c4fa85bc5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -132,8 +132,6 @@ group :test do
 end
 
 group :development, :test do
-  # locking until https://github.com/codeclimate/test-reporter/issues/418 is resolved
-  gem 'action-cable-testing'
   gem 'bundle-audit', require: false
   gem 'byebug', platform: :mri
   gem 'factory_bot_rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index abb305465..e372d1545 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,8 +16,6 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    action-cable-testing (0.6.1)
-      actioncable (>= 5.0)
     actioncable (6.0.3.7)
       actionpack (= 6.0.3.7)
       nio4r (~> 2.0)
@@ -613,7 +611,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  action-cable-testing
   activerecord-import
   acts-as-taggable-on
   administrate
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 557000065..a03f8f2b4 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -76,4 +76,13 @@ Rails.application.configure do
     Bullet.bullet_logger = true
     Bullet.rails_logger = true
   end
+
+  # ref: https://github.com/cyu/rack-cors
+  config.middleware.insert_before 0, Rack::Cors do
+    allow do
+      origins '*'
+      resource '/packs/*', headers: :any, methods: [:get, :options]
+      resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
+    end
+  end
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f30ee2239..c812e7d10 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -110,10 +110,14 @@ Rails.application.configure do
 
   # font cors issue with CDN
   # Ref: https://stackoverflow.com/questions/56960709/rails-font-cors-policy
+  # ref: https://github.com/cyu/rack-cors
   config.middleware.insert_before 0, Rack::Cors do
     allow do
       origins '*'
       resource '/packs/*', headers: :any, methods: [:get, :options]
+      if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false))
+        resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
+      end
     end
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 140e19400..bbfe3599b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,14 +8,19 @@ Rails.application.routes.draw do
     token_validations: 'devise_overrides/token_validations'
   }, via: [:get, :post]
 
-  root to: 'dashboard#index'
+  ## renders the frontend paths only if its not an api only server
+  if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false))
+    root to: 'api#index'
+  else
+    root to: 'dashboard#index'
 
-  get '/app', to: 'dashboard#index'
-  get '/app/*params', to: 'dashboard#index'
-  get '/app/accounts/:account_id/settings/inboxes/new/twitter', to: 'dashboard#index', as: 'app_new_twitter_inbox'
-  get '/app/accounts/:account_id/settings/inboxes/new/:inbox_id/agents', to: 'dashboard#index', as: 'app_twitter_inbox_agents'
+    get '/app', to: 'dashboard#index'
+    get '/app/*params', to: 'dashboard#index'
+    get '/app/accounts/:account_id/settings/inboxes/new/twitter', to: 'dashboard#index', as: 'app_new_twitter_inbox'
+    get '/app/accounts/:account_id/settings/inboxes/new/:inbox_id/agents', to: 'dashboard#index', as: 'app_twitter_inbox_agents'
 
-  resource :widget, only: [:show]
+    resource :widget, only: [:show]
+  end
 
   get '/api', to: 'api#index'
   namespace :api, defaults: { format: 'json' } do
diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/dashboard_controller_spec.rb
index 7ada22702..e797c878a 100644
--- a/spec/controllers/dashboard_controller_spec.rb
+++ b/spec/controllers/dashboard_controller_spec.rb
@@ -17,4 +17,18 @@ describe '/app/login', type: :request do
       ENV['DEFAULT_LOCALE'] = 'en'
     end
   end
+
+  # Routes are loaded once on app start
+  # hence Rails.application.reload_routes! is used in this spec
+  # ref : https://stackoverflow.com/a/63584877/939299
+  context 'with CW_API_ONLY_SERVER true' do
+    it 'returns 404' do
+      ENV['CW_API_ONLY_SERVER'] = 'true'
+      Rails.application.reload_routes!
+      get '/app/login'
+      expect(response).to have_http_status(:not_found)
+      ENV['CW_API_ONLY_SERVER'] = nil
+      Rails.application.reload_routes!
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index b219a337c..4c8b38e25 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -66,6 +66,7 @@ RSpec.configure do |config|
   config.include SlackStubs
   config.include Devise::Test::IntegrationHelpers, type: :request
   config.include ActiveSupport::Testing::TimeHelpers
+  config.include ActionCable::TestHelper
 end
 
 Shoulda::Matchers.configure do |config|

From 25ba852b6852b99aca800d3a40bddce3e499dbef Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 28 May 2021 19:21:16 +0530
Subject: [PATCH 19/67] chore: Adjust Chatwoot Config to deploy frontend as a
 separate app (#2347)

---
 .../dashboard/assets/scss/_woot.scss          |  1 -
 .../components/widgets/InboxListItem.vue      | 16 ++++----
 .../components/widgets/WootWriter/Editor.vue  |  1 +
 app/javascript/dashboard/constants.js         |  5 +--
 app/javascript/dashboard/helper/APIHelper.js  |  9 ++---
 .../dashboard/helper/actionCable.js           |  3 +-
 .../dashboard/routes/auth/Confirmation.vue    | 38 ++++++++++---------
 .../dashboard/routes/auth/PasswordEdit.vue    |  7 ++--
 .../dashboard/routes/auth/ResetPassword.vue   |  2 -
 .../dashboard/routes/auth/Signup.vue          |  3 +-
 .../dashboard/settings/canned/EditCanned.vue  |  1 -
 .../dashboard/settings/integrations/New.vue   |  1 -
 app/javascript/dashboard/routes/index.js      | 14 +++----
 app/javascript/dashboard/routes/index.spec.js |  4 --
 .../dashboard/store/modules/auth.js           |  3 +-
 .../helpers/BaseActionCableConnector.js       |  5 ++-
 16 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 7ecec198b..1712e256e 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -46,5 +46,4 @@
 
 @import 'plugins/multiselect';
 @import 'plugins/dropdown';
-@import '@chatwoot/prosemirror-schema/src/woot-editor.css';
 @import '~shared/assets/stylesheets/ionicons';
diff --git a/app/javascript/dashboard/components/widgets/InboxListItem.vue b/app/javascript/dashboard/components/widgets/InboxListItem.vue
index 413fec00c..5bfdacdda 100644
--- a/app/javascript/dashboard/components/widgets/InboxListItem.vue
+++ b/app/javascript/dashboard/components/widgets/InboxListItem.vue
@@ -1,21 +1,23 @@
 <template>
-  <div class="inbox-item" >
-    <img src="~dashboard/assets/images/no_page_image.png" alt="No Page Image"/>
+  <div class="inbox-item">
+    <img src="~dashboard/assets/images/no_page_image.png" alt="No Page Image" />
     <div class="item--details columns">
-      <h4 class="item--name">{{ inbox.label }}</h4>
-      <p class="item--sub">Facebook</p>
+      <h4 class="item--name">
+        {{ inbox.label }}
+      </h4>
+      <p class="item--sub">
+        Facebook
+      </p>
     </div>
     <!-- <span class="ion-chevron-right arrow"></span> -->
   </div>
 </template>
 <script>
 /* eslint no-console: 0 */
-/* global bus */
 // import WootSwitch from '../ui/Switch';
 
 export default {
   props: ['inbox'],
-  created() {
-  },
+  created() {},
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index bbb1d4e82..ba26ef177 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -28,6 +28,7 @@ import TagAgents from '../conversation/TagAgents.vue';
 import { EditorState } from 'prosemirror-state';
 import { defaultMarkdownParser } from 'prosemirror-markdown';
 import { wootWriterSetup } from '@chatwoot/prosemirror-schema';
+import '@chatwoot/prosemirror-schema/src/woot-editor.css';
 
 const createState = (content, placeholder, plugins = []) => {
   return EditorState.create({
diff --git a/app/javascript/dashboard/constants.js b/app/javascript/dashboard/constants.js
index 9a00775bf..34f4b9845 100644
--- a/app/javascript/dashboard/constants.js
+++ b/app/javascript/dashboard/constants.js
@@ -1,8 +1,4 @@
 export default {
-  APP_BASE_URL: '/',
-  get apiURL() {
-    return `${this.APP_BASE_URL}/`;
-  },
   GRAVATAR_URL: 'https://www.gravatar.com/avatar/',
   ASSIGNEE_TYPE: {
     ME: 'me',
@@ -15,3 +11,4 @@ export default {
     BOT: 'bot',
   },
 };
+export const DEFAULT_REDIRECT_URL = '/app/';
diff --git a/app/javascript/dashboard/helper/APIHelper.js b/app/javascript/dashboard/helper/APIHelper.js
index 03e902259..5dcb34f97 100644
--- a/app/javascript/dashboard/helper/APIHelper.js
+++ b/app/javascript/dashboard/helper/APIHelper.js
@@ -1,14 +1,11 @@
 /* eslint no-console: 0 */
-import constants from '../constants';
 import Auth from '../api/auth';
 
-const parseErrorCode = error => {
-  return Promise.reject(error);
-};
+const parseErrorCode = error => Promise.reject(error);
 
 export default axios => {
-  const wootApi = axios.create();
-  wootApi.defaults.baseURL = constants.apiURL;
+  const { apiHost = '' } = window.chatwootConfig || {};
+  const wootApi = axios.create({ baseURL: `${apiHost}/` });
   // Add Auth Headers to requests if logged in
   if (Auth.isLoggedIn()) {
     const {
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 6103ee915..afddb1e88 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -4,7 +4,8 @@ import { newMessageNotification } from 'shared/helpers/AudioNotificationHelper';
 
 class ActionCableConnector extends BaseActionCableConnector {
   constructor(app, pubsubToken) {
-    super(app, pubsubToken);
+    const { websocketURL = '' } = window.chatwootConfig || {};
+    super(app, pubsubToken, websocketURL);
     this.CancelTyping = [];
     this.events = {
       'message.created': this.onMessageCreated,
diff --git a/app/javascript/dashboard/routes/auth/Confirmation.vue b/app/javascript/dashboard/routes/auth/Confirmation.vue
index ff41375a6..db439af03 100644
--- a/app/javascript/dashboard/routes/auth/Confirmation.vue
+++ b/app/javascript/dashboard/routes/auth/Confirmation.vue
@@ -2,31 +2,35 @@
   <loading-state :message="$t('CONFIRM_EMAIL')"></loading-state>
 </template>
 <script>
-/* eslint-disable */
 import LoadingState from '../../components/widgets/LoadingState';
 import Auth from '../../api/auth';
+import { DEFAULT_REDIRECT_URL } from '../../constants';
 export default {
-  props: {
-    confirmationToken: String,
-    redirectUrl: String,
-    config: String,
-  },
   components: {
     LoadingState,
   },
+  props: {
+    confirmationToken: {
+      type: String,
+      default: '',
+    },
+  },
   mounted() {
     this.confirmToken();
   },
   methods: {
-    confirmToken() {
-      Auth.verifyPasswordToken({
-        confirmationToken: this.confirmationToken
-      }).then(res => {
-        window.location = res.data.redirect_url;
-      }).catch(res => {
-        window.location = '/';
-      });
-    }
-  }
-}
+    async confirmToken() {
+      try {
+        const {
+          data: { redirect_url: redirectURL },
+        } = await Auth.verifyPasswordToken({
+          confirmationToken: this.confirmationToken,
+        });
+        window.location = redirectURL;
+      } catch (error) {
+        window.location = DEFAULT_REDIRECT_URL;
+      }
+    },
+  },
+};
 </script>
diff --git a/app/javascript/dashboard/routes/auth/PasswordEdit.vue b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
index 698c3f792..4549528a0 100644
--- a/app/javascript/dashboard/routes/auth/PasswordEdit.vue
+++ b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
@@ -46,12 +46,11 @@
 </template>
 
 <script>
-/* global bus */
-
 import { required, minLength } from 'vuelidate/lib/validators';
 import Auth from '../../api/auth';
 
 import WootSubmitButton from '../../components/buttons/FormSubmitButton';
+import { DEFAULT_REDIRECT_URL } from '../../constants';
 
 export default {
   components: {
@@ -81,7 +80,7 @@ export default {
     // If url opened without token
     // redirect to login
     if (!this.resetPasswordToken) {
-      window.location = '/';
+      window.location = DEFAULT_REDIRECT_URL;
     }
   },
   validations: {
@@ -118,7 +117,7 @@ export default {
       Auth.setNewPassword(credentials)
         .then(res => {
           if (res.status === 200) {
-            window.location = '/';
+            window.location = DEFAULT_REDIRECT_URL;
           }
         })
         .catch(() => {
diff --git a/app/javascript/dashboard/routes/auth/ResetPassword.vue b/app/javascript/dashboard/routes/auth/ResetPassword.vue
index 55a976106..e9eae00ab 100644
--- a/app/javascript/dashboard/routes/auth/ResetPassword.vue
+++ b/app/javascript/dashboard/routes/auth/ResetPassword.vue
@@ -30,7 +30,6 @@
 <script>
 import { required, minLength, email } from 'vuelidate/lib/validators';
 import Auth from '../../api/auth';
-import { frontendURL } from '../../helper/URLHelper';
 
 export default {
   data() {
@@ -71,7 +70,6 @@ export default {
             successMessage = res.data.message;
           }
           this.showAlert(successMessage);
-          window.location = frontendURL('login');
         })
         .catch(error => {
           let errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index ed6743c62..5b71e2887 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -79,6 +79,7 @@ import Auth from '../../api/auth';
 import { mapGetters } from 'vuex';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 import alertMixin from 'shared/mixins/alertMixin';
+import { DEFAULT_REDIRECT_URL } from '../../constants';
 
 export default {
   mixins: [globalConfigMixin, alertMixin],
@@ -132,7 +133,7 @@ export default {
       try {
         const response = await Auth.register(this.credentials);
         if (response.status === 200) {
-          window.location = '/';
+          window.location = DEFAULT_REDIRECT_URL;
         }
       } catch (error) {
         let errorMessage = this.$t('REGISTER.API.ERROR_MESSAGE');
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 5645d375c..5065454da 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -49,7 +49,6 @@
 </template>
 
 <script>
-/* global bus */
 /* eslint no-console: 0 */
 import { required, minLength } from 'vuelidate/lib/validators';
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue
index cf73436f6..55fbbc650 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue
@@ -44,7 +44,6 @@
 </template>
 
 <script>
-/* global bus */
 import { required, url, minLength } from 'vuelidate/lib/validators';
 
 import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index 6347e3894..83ae20533 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -1,4 +1,3 @@
-/* eslint no-console: 0 */
 import VueRouter from 'vue-router';
 
 import auth from '../api/auth';
@@ -7,14 +6,13 @@ import dashboard from './dashboard/dashboard.routes';
 import authRoute from './auth/auth.routes';
 import { frontendURL } from '../helper/URLHelper';
 
-const loggedInUser = auth.getCurrentUser() || {};
 const routes = [
   ...login.routes,
   ...dashboard.routes,
   ...authRoute.routes,
   {
     path: '/',
-    redirect: frontendURL(`accounts/${loggedInUser.account_id}/dashboard`),
+    redirect: '/app',
   },
 ];
 
@@ -41,10 +39,7 @@ const generateRoleWiseRoute = route => {
 // returns an object with roles as keys and routeArr as values
 generateRoleWiseRoute(routes);
 
-export const router = new VueRouter({
-  mode: 'history',
-  routes, // short for routes: routes
-});
+export const router = new VueRouter({ mode: 'history', routes });
 
 const unProtectedRoutes = ['login', 'auth_signup', 'auth_reset_password'];
 
@@ -117,7 +112,10 @@ const validateRouteAccess = (to, from, next) => {
 router.beforeEach((to, from, next) => {
   if (!to.name) {
     const user = auth.getCurrentUser();
-    return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+    if (user) {
+      return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+    }
+    return next('/app/login');
   }
 
   return validateRouteAccess(to, from, next);
diff --git a/app/javascript/dashboard/routes/index.spec.js b/app/javascript/dashboard/routes/index.spec.js
index 41d0cb226..b3af17480 100644
--- a/app/javascript/dashboard/routes/index.spec.js
+++ b/app/javascript/dashboard/routes/index.spec.js
@@ -13,10 +13,6 @@ jest.mock('./login/login.routes', () => ({
 }));
 jest.mock('../constants', () => {
   return {
-    APP_BASE_URL: '/',
-    get apiUrl() {
-      return `${this.APP_BASE_URL}/`;
-    },
     GRAVATAR_URL: 'https://www.gravatar.com/avatar',
     CHANNELS: {
       FACEBOOK: 'facebook',
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index b728e9ef8..3cdc045d1 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -6,6 +6,7 @@ import authAPI from '../../api/auth';
 import createAxios from '../../helper/APIHelper';
 import actionCable from '../../helper/actionCable';
 import { setUser, getHeaderExpiry, clearCookiesOnLogout } from '../utils/api';
+import { DEFAULT_REDIRECT_URL } from '../../constants';
 
 const state = {
   currentUser: {
@@ -69,7 +70,7 @@ export const actions = {
           commit(types.default.SET_CURRENT_USER);
           window.axios = createAxios(axios);
           actionCable.init(Vue);
-          window.location = '/';
+          window.location = DEFAULT_REDIRECT_URL;
           resolve();
         })
         .catch(error => {
diff --git a/app/javascript/shared/helpers/BaseActionCableConnector.js b/app/javascript/shared/helpers/BaseActionCableConnector.js
index ed0c1bb65..89b3ed6b0 100644
--- a/app/javascript/shared/helpers/BaseActionCableConnector.js
+++ b/app/javascript/shared/helpers/BaseActionCableConnector.js
@@ -3,8 +3,9 @@ import { createConsumer } from '@rails/actioncable';
 const PRESENCE_INTERVAL = 60000;
 
 class BaseActionCableConnector {
-  constructor(app, pubsubToken) {
-    this.consumer = createConsumer();
+  constructor(app, pubsubToken, websocketHost = '') {
+    const websocketURL = websocketHost ? `${websocketHost}/cable` : undefined;
+    this.consumer = createConsumer(websocketURL);
     this.subscription = this.consumer.subscriptions.create(
       {
         channel: 'RoomChannel',

From cc75a668cb28ada94e3d1fab5370137245dc95a9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 31 May 2021 10:07:07 +0530
Subject: [PATCH 20/67] feat: Create section header component (#2296)

---
 .../dashboard/i18n/locale/en/contact.json     | 10 +++
 .../components/SectionHeader.stories.js       | 22 ++++++
 .../contacts/components/SectionHeader.vue     | 71 +++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.stories.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 80a33f25a..544d54323 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -168,6 +168,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.stories.js b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.stories.js
new file mode 100644
index 000000000..0ceaa64b4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.stories.js
@@ -0,0 +1,22 @@
+import { action } from '@storybook/addon-actions';
+import SectionHeader from './SectionHeader';
+
+export default {
+  title: 'Components/Events/Section',
+  component: SectionHeader,
+  argTypes: {},
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { SectionHeader },
+  template:
+    '<section-header v-bind="$props" @notes="onClickNotes" @events="onClickEvents" @conversation="onClickConversation"></section-header>',
+});
+
+export const Section = Template.bind({});
+Section.args = {
+  onClickNotes: action('notes'),
+  onClickEvents: action('events'),
+  onClickConversation: action('conversation'),
+};
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue
new file mode 100644
index 000000000..be7778440
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="wrap">
+    <div class="header">
+      <h5 class="block-title">
+        {{ $t('EVENTS.HEADER.TITLE') }}
+      </h5>
+    </div>
+    <div class="button-wrap">
+      <woot-button
+        variant="hollow"
+        size="tiny"
+        color-scheme="secondary"
+        class-names="pill-button"
+        @click="onClickNotes"
+      >
+        {{ $t('EVENTS.BUTTON.PILL_BUTTON_NOTES') }}
+      </woot-button>
+      <woot-button
+        variant="hollow"
+        size="tiny"
+        color-scheme="secondary"
+        class-names="pill-button"
+        @click="onClickEvents"
+      >
+        {{ $t('EVENTS.BUTTON.PILL_BUTTON_EVENTS') }}
+      </woot-button>
+      <woot-button
+        variant="hollow"
+        size="tiny"
+        color-scheme="secondary"
+        class-names="pill-button"
+        @click="onClickConversation"
+      >
+        {{ $t('EVENTS.BUTTON.PILL_BUTTON_CONVO') }}
+      </woot-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    onClickNotes() {
+      this.$emit('notes');
+    },
+
+    onClickEvents() {
+      this.$emit('events');
+    },
+
+    onClickConversation() {
+      this.$emit('conversation');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  width: 100%;
+  padding: var(--space-normal);
+
+  .button-wrap {
+    display: flex;
+
+    .pill-button {
+      margin-right: var(--space-small);
+    }
+  }
+}
+</style>

From 9d16e52e333ec1aba5347e1691ca121d7712dd47 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 31 May 2021 10:58:43 +0530
Subject: [PATCH 21/67] chore: Add Swagger docs for Platform APIs (#2349)

---
 swagger/definitions/index.yml                 |   11 +
 .../request/account/create_update_payload.yml |    5 +
 .../agent_bot/create_update_payload.yml       |   11 +
 .../request/user/create_update_payload.yml    |   12 +
 swagger/definitions/resource/agent_bot.yml    |    9 +-
 .../definitions/resource/platform_account.yml |    9 +
 swagger/index.yml                             |   28 +-
 swagger/parameters/agent_bot_id.yml           |    6 +
 swagger/parameters/index.yml                  |    3 +
 swagger/paths/agent_bots/create.yml           |   19 +
 swagger/paths/agent_bots/delete.yml           |   12 +
 swagger/paths/agent_bots/index.yml            |   33 +-
 swagger/paths/agent_bots/show.yml             |   14 +
 swagger/paths/agent_bots/update.yml           |   18 +
 swagger/paths/inboxes/get_agent_bot.yml       |   21 +
 swagger/paths/inboxes/index.yml               |    3 +-
 swagger/paths/index.yml                       |  220 +-
 swagger/paths/integrations/apps/show.yml      |    5 +-
 .../paths/platform/account_users/create.yml   |   40 +
 .../paths/platform/account_users/delete.yml   |   26 +
 .../paths/platform/account_users/index.yml    |   28 +
 swagger/paths/platform/accounts/create.yml    |   20 +
 swagger/paths/platform/accounts/delete.yml    |   14 +
 swagger/paths/platform/accounts/show.yml      |   16 +
 swagger/paths/platform/accounts/update.yml    |   20 +
 swagger/paths/platform/agent_bots/create.yml  |   20 +
 swagger/paths/platform/agent_bots/delete.yml  |   14 +
 swagger/paths/platform/agent_bots/index.yml   |   17 +
 swagger/paths/platform/agent_bots/show.yml    |   16 +
 swagger/paths/platform/agent_bots/update.yml  |   20 +
 swagger/paths/platform/users/create.yml       |   20 +
 swagger/paths/platform/users/delete.yml       |   14 +
 swagger/paths/platform/users/login.yml        |   21 +
 swagger/paths/platform/users/show.yml         |   16 +
 swagger/paths/platform/users/update.yml       |   20 +
 swagger/paths/teams/index.yml                 |    3 +-
 swagger/swagger.json                          | 2368 +++++++++++------
 37 files changed, 2315 insertions(+), 837 deletions(-)
 create mode 100644 swagger/definitions/request/account/create_update_payload.yml
 create mode 100644 swagger/definitions/request/agent_bot/create_update_payload.yml
 create mode 100644 swagger/definitions/request/user/create_update_payload.yml
 create mode 100644 swagger/definitions/resource/platform_account.yml
 create mode 100644 swagger/parameters/agent_bot_id.yml
 create mode 100644 swagger/paths/agent_bots/create.yml
 create mode 100644 swagger/paths/agent_bots/delete.yml
 create mode 100644 swagger/paths/agent_bots/show.yml
 create mode 100644 swagger/paths/agent_bots/update.yml
 create mode 100644 swagger/paths/inboxes/get_agent_bot.yml
 create mode 100644 swagger/paths/platform/account_users/create.yml
 create mode 100644 swagger/paths/platform/account_users/delete.yml
 create mode 100644 swagger/paths/platform/account_users/index.yml
 create mode 100644 swagger/paths/platform/accounts/create.yml
 create mode 100644 swagger/paths/platform/accounts/delete.yml
 create mode 100644 swagger/paths/platform/accounts/show.yml
 create mode 100644 swagger/paths/platform/accounts/update.yml
 create mode 100644 swagger/paths/platform/agent_bots/create.yml
 create mode 100644 swagger/paths/platform/agent_bots/delete.yml
 create mode 100644 swagger/paths/platform/agent_bots/index.yml
 create mode 100644 swagger/paths/platform/agent_bots/show.yml
 create mode 100644 swagger/paths/platform/agent_bots/update.yml
 create mode 100644 swagger/paths/platform/users/create.yml
 create mode 100644 swagger/paths/platform/users/delete.yml
 create mode 100644 swagger/paths/platform/users/login.yml
 create mode 100644 swagger/paths/platform/users/show.yml
 create mode 100644 swagger/paths/platform/users/update.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index 7317ff2b0..14b71bb5b 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -25,6 +25,8 @@ contactable_inboxes:
   $ref: ./resource/contactable_inboxes.yml
 account:
   $ref: ./resource/account.yml
+platform_account:
+  $ref: ./resource/platform_account.yml
 team:
   $ref: ./resource/team.yml
 integrations_app:
@@ -78,6 +80,15 @@ extended_message:
 
 # REQUEST
 
+account_create_update_payload:
+  $ref: ./request/account/create_update_payload.yml
+
+agent_bot_create_update_payload:
+  $ref: ./request/agent_bot/create_update_payload.yml
+
+user_create_update_payload:
+  $ref: ./request/account/create_update_payload.yml
+
 ## contact
 contact_create:
   $ref: ./request/contact/create.yml
diff --git a/swagger/definitions/request/account/create_update_payload.yml b/swagger/definitions/request/account/create_update_payload.yml
new file mode 100644
index 000000000..63c0eed13
--- /dev/null
+++ b/swagger/definitions/request/account/create_update_payload.yml
@@ -0,0 +1,5 @@
+type: object
+properties:
+  name:
+    type: string
+    description: Name of the account
diff --git a/swagger/definitions/request/agent_bot/create_update_payload.yml b/swagger/definitions/request/agent_bot/create_update_payload.yml
new file mode 100644
index 000000000..4dc74bea3
--- /dev/null
+++ b/swagger/definitions/request/agent_bot/create_update_payload.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  name:
+    type: string
+    description: The name of the agent bot
+  description:
+    type: string
+    description: The description about the agent bot
+  outgoing_url:
+    type: string
+    description: The webhook URL for the bot
diff --git a/swagger/definitions/request/user/create_update_payload.yml b/swagger/definitions/request/user/create_update_payload.yml
new file mode 100644
index 000000000..a7745f18f
--- /dev/null
+++ b/swagger/definitions/request/user/create_update_payload.yml
@@ -0,0 +1,12 @@
+type: object
+properties:
+  name:
+    type: string
+    description: Name of the user
+  email:
+    type: string
+    description: Email of the user
+  password:
+    type: string
+    description: Password must contain uppercase, lowercase letters, number and a special character
+
diff --git a/swagger/definitions/resource/agent_bot.yml b/swagger/definitions/resource/agent_bot.yml
index d0f0efb3e..d94777d37 100644
--- a/swagger/definitions/resource/agent_bot.yml
+++ b/swagger/definitions/resource/agent_bot.yml
@@ -3,12 +3,15 @@ properties:
   id:
     type: number
     description: ID of the agent bot
-  description:
-    type: string
-    description: The description about the agent bot
   name:
     type: string
     description: The name of the agent bot
+  description:
+    type: string
+    description: The description about the agent bot
+  account_id:
+    type: number
+    description: Account ID if it's an account specific bot
   outgoing_url:
     type: string
     description: The webhook URL for the bot
diff --git a/swagger/definitions/resource/platform_account.yml b/swagger/definitions/resource/platform_account.yml
new file mode 100644
index 000000000..39399ebd2
--- /dev/null
+++ b/swagger/definitions/resource/platform_account.yml
@@ -0,0 +1,9 @@
+type: object
+properties:
+  id:
+    type: number
+    description: Account ID
+  name:
+    type: string
+    description: Name of the account
+
diff --git a/swagger/index.yml b/swagger/index.yml
index dc9cbedb9..0719c0739 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -5,12 +5,12 @@ info:
   title: Chatwoot
   termsOfService:	https://www.chatwoot.com/terms-of-service/
   contact:
-    email: support@chatwoot.com
+    email: hello@chatwoot.com
   license:
     name: MIT License
     url: https://opensource.org/licenses/MIT
 host: app.chatwoot.com
-basePath: /api/v1/
+basePath: 
 schemes:
   - https
 produces:
@@ -28,11 +28,11 @@ securityDefinitions:
     in: header
     name: api_access_token
     description: This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis.
-  superAdminApiKey:
+  platformAppApiKey:
     type: apiKey
     in: header
     name: api_access_token
-    description: This token is only for the system admin or obtained via rails console. This token is to be used rarely for cases like creating a pre verified user through api from external system.
+    description: This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles.
 security:
   - userApiKey: []
 
@@ -42,3 +42,23 @@ definitions:
   $ref: ./definitions/index.yml
 parameters:
   $ref: ./parameters/index.yml
+
+x-tagGroups:
+  - name: Platform
+    tags:
+      - Accounts
+      - Account Users
+      - AgentBots
+      - Users
+  - name: Application
+    tags:
+      - Account AgentBots
+      - Contact
+      - Conversation
+      - Conversation Assignment
+      - Conversation Labels
+      - Inbox
+      - Messages
+      - Integrations
+      - Profile
+      - Teams
\ No newline at end of file
diff --git a/swagger/parameters/agent_bot_id.yml b/swagger/parameters/agent_bot_id.yml
new file mode 100644
index 000000000..4d1479cb4
--- /dev/null
+++ b/swagger/parameters/agent_bot_id.yml
@@ -0,0 +1,6 @@
+in: path
+name: id
+schema:
+  type: integer
+required: true
+description: The ID of the agentbot to be updated
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index ac9c9a37b..daedad351 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -1,6 +1,9 @@
 account_id:
   $ref: ./account_id.yml
 
+agent_bot_id:
+  $ref: ./agent_bot_id.yml
+
 team_id:
   $ref: ./team_id.yml
 
diff --git a/swagger/paths/agent_bots/create.yml b/swagger/paths/agent_bots/create.yml
new file mode 100644
index 000000000..e0fde6184
--- /dev/null
+++ b/swagger/paths/agent_bots/create.yml
@@ -0,0 +1,19 @@
+tags:
+  - Account AgentBots
+operationId: create-an-account-agent-bot
+summary: Create an Agent Bot
+description: Create an agent bot in the account
+parameters:
+  - $ref: '#/parameters/account_id'
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/agent_bot_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/agent_bots/delete.yml b/swagger/paths/agent_bots/delete.yml
new file mode 100644
index 000000000..0e3daf6cb
--- /dev/null
+++ b/swagger/paths/agent_bots/delete.yml
@@ -0,0 +1,12 @@
+tags:
+  - Account AgentBots
+operationId: delete-an-account-agent-bot
+summary: Delete an AgentBot
+description: Delete an AgentBot from the account
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The agent bot does not exist in the account
diff --git a/swagger/paths/agent_bots/index.yml b/swagger/paths/agent_bots/index.yml
index 2fef38ff5..26766f5c8 100644
--- a/swagger/paths/agent_bots/index.yml
+++ b/swagger/paths/agent_bots/index.yml
@@ -1,17 +1,16 @@
-get:
-  tags:
-    - AgentBot
-  operationId: listAgentBots
-  summary: List all agentbots
-  description: List all available agentbots for the current installation
-  responses:
-    200:
-      description: Success
-      schema:
-        type: Array
-        description: 'List of agent bots'
-        $ref: '#/definitions/agent_bot'
-    404:
-      description: Inbox not found, Agent bot not found
-    403:
-      description: Access denied
+tags:
+  - Account AgentBots
+operationId: list-all-account-agent-bots
+summary: List all AgentBots
+description: List all agent bots available for the current account
+responses:
+  200:
+    description: Success
+    schema:
+      type: array
+      description: 'Array of agent bots'
+      items:
+        - $ref: '#/definitions/agent_bot'
+
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/agent_bots/show.yml b/swagger/paths/agent_bots/show.yml
new file mode 100644
index 000000000..b94637690
--- /dev/null
+++ b/swagger/paths/agent_bots/show.yml
@@ -0,0 +1,14 @@
+tags:
+  - Account AgentBots
+operationId: get-details-of-a-single-account-agent-bot
+summary: Get an agent bot details
+description: Get the details of an agent bot in the account
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
+  404:
+    description: The given agent bot ID does not exist in the account
diff --git a/swagger/paths/agent_bots/update.yml b/swagger/paths/agent_bots/update.yml
new file mode 100644
index 000000000..562d58841
--- /dev/null
+++ b/swagger/paths/agent_bots/update.yml
@@ -0,0 +1,18 @@
+tags:
+  - Account AgentBots
+operationId: update-an-account-agent-bot
+summary: Update an agent bot
+description: Update an agent bot's attributes
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/agent_bot_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/inboxes/get_agent_bot.yml b/swagger/paths/inboxes/get_agent_bot.yml
new file mode 100644
index 000000000..0f6c610cc
--- /dev/null
+++ b/swagger/paths/inboxes/get_agent_bot.yml
@@ -0,0 +1,21 @@
+get:
+  tags:
+    - Inbox
+  operationId: getInboxAgentBot
+  summary: Show Inbox Agent Bot
+  description: See if an agent bot is associated to the Inbox
+  parameters:
+    - name: id
+      in: path
+      type: number
+      description: ID of the inbox
+      required: true
+  responses:
+    204:
+      description: Success
+      schema:
+        $ref: '#/definitions/agent_bot'
+    404:
+      description: Inbox not found, Agent bot not found
+    403:
+      description: Access denied
diff --git a/swagger/paths/inboxes/index.yml b/swagger/paths/inboxes/index.yml
index dcb0e4b10..7b5b29445 100644
--- a/swagger/paths/inboxes/index.yml
+++ b/swagger/paths/inboxes/index.yml
@@ -10,7 +10,8 @@ get:
       schema:
         type: array
         description: 'Array of inboxes'
-        $ref: '#/definitions/inbox'
+        items:
+          $ref: '#/definitions/inbox'
     404:
       description: Inbox not found
     403:
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index c8fd3be03..3c6b16185 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -1,61 +1,138 @@
+# ------------  Platform API routes  ------------#
+
+# Accounts
+
+platform/api/v1/accounts:
+  post:
+    $ref: ./platform/accounts/create.yml
+platform/api/v1/accounts/{id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: './platform/accounts/show.yml'
+  patch:
+    $ref: ./platform/accounts/update.yml
+  delete:
+    $ref: ./platform/accounts/delete.yml
 
 
+# Account Users
 
-# Inboxes
-/accounts/{account_id}/inboxes:
-  $ref: ./inboxes/index.yml
-/accounts/{account_id}/inboxes/:
-  $ref: ./inboxes/create.yml
-/accounts/{account_id}/inboxes/{id}:
-  $ref: ./inboxes/update.yml
-/accounts/{account_id}/inboxes/{id}/set_agent_bot:
-  $ref: ./inboxes/set_agent_bot.yml
+platform/api/v1/accounts/{id}/account_users:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: './platform/account_users/index.yml'
+  post:
+    $ref: ./platform/account_users/create.yml
+  delete:
+    $ref: ./platform/account_users/delete.yml
+
+# AgentBots
+
+platform/api/v1/agent_bots:
+  get:
+    $ref: ./platform/agent_bots/index.yml
+  post:
+    $ref: ./platform/agent_bots/create.yml
+platform/api/v1/agent_bots/{id}:
+  parameters:
+    - $ref: '#/parameters/agent_bot_id'
+  get:
+    $ref: './platform/agent_bots/show.yml'
+  patch:
+    $ref: ./platform/agent_bots/update.yml
+  delete:
+    $ref: ./platform/agent_bots/delete.yml
+
+# Users
+
+platform/api/v1/users:
+  post:
+    $ref: ./platform/users/create.yml
+platform/api/v1/users/{id}:
+  parameters:
+    - $ref: '#/parameters/user_id'
+  get:
+    $ref: './platform/users/show.yml'
+  patch:
+    $ref: ./platform/users/update.yml
+  delete:
+    $ref: ./platform/users/delete.yml
+platform/api/v1/users/{id}/login:
+  parameters:
+    - $ref: '#/parameters/user_id'
+  $ref: './platform/users/login.yml'
+
+
+# ---------------- end of platform path -----------#
+
+# AgentBots
+
+/api/v1/accounts/{account_id}/agent_bots:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: ./agent_bots/index.yml
+  post:
+    $ref: ./agent_bots/create.yml
+/api/v1/accounts/{account_id}/agent_bots/{id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/agent_bot_id'
+  get:
+    $ref: './agent_bots/show.yml'
+  patch:
+    $ref: ./agent_bots/update.yml
+  delete:
+    $ref: ./agent_bots/delete.yml
+
+
+# Contacts
+/api/v1/accounts/{account_id}/contacts:
+  $ref: ./contact/list_create.yml
+/api/v1/accounts/{account_id}/contacts/{id}:
+  $ref: ./contact/crud.yml
+/api/v1/accounts/{account_id}/contacts/{id}/conversations:
+  $ref: ./contact/conversations.yml
+/api/v1/accounts/{account_id}/contacts/search:
+  $ref: ./contact/search.yml
+/api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes:
+  $ref: ./contact_inboxes/create.yml
+/api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes:
+  $ref: ./contactable_inboxes/get.yml
 
-/agent_bots:
-  $ref: ./agent_bots/index.yml
 
 # Conversations
-/accounts/{account_id}/conversations:
+/api/v1/accounts/{account_id}/conversations:
   parameters:
     - $ref: '#/parameters/account_id'
   $ref: ./conversation/index_or_create.yml
-
-/accounts/{account_id}/conversations/{converstion_id}:
+/api/v1/accounts/{account_id}/conversations/{converstion_id}:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/conversation_id'
   get:
     $ref: ./conversation/show.yml
-
-/accounts/{account_id}/conversations/{conversation_id}/toggle_status:
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/conversation_id'
   post:
     $ref: ./conversation/toggle_status.yml
 
-# Messages
-/accounts/{account_id}/conversations/{id}/messages:
-  $ref: ./conversation/messages/create_attachment.yml
-/accounts/{account_id}/conversations/{converstion_id}/messages:
+# Conversations Assignments
+
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/conversation_id'
-  get:
-    $ref: ./conversation/messages/index.yml
   post:
-    $ref: ./conversation/messages/create.yml
+    $ref: ./conversation/assignments.yml
 
-/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}:
-  parameters:
-    - $ref: '#/parameters/account_id'
-    - $ref: '#/parameters/conversation_id'
-    - $ref: '#/parameters/message_id'
-  delete:
-    $ref: ./conversation/messages/delete.yml
+# Conversation Labels
 
-
-/accounts/{account_id}/conversations/{conversation_id}/labels:
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/labels:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/conversation_id'
@@ -64,46 +141,71 @@
   post:
     $ref: ./conversation/labels/create.yml
 
-/accounts/{account_id}/conversations/{conversation_id}/assignments:
+
+# Inboxes
+/api/v1/accounts/{account_id}/inboxes:
+  $ref: ./inboxes/index.yml
+/api/v1/accounts/{account_id}/inboxes/:
+  $ref: ./inboxes/create.yml
+/api/v1/accounts/{account_id}/inboxes/{id}:
+  $ref: ./inboxes/update.yml
+/api/v1/accounts/{account_id}/inboxes/{id}/agent_bot:
+  $ref: ./inboxes/get_agent_bot.yml
+/api/v1/accounts/{account_id}/inboxes/{id}/set_agent_bot:
+  $ref: ./inboxes/set_agent_bot.yml
+
+
+# Messages
+/api/v1/accounts/{account_id}/conversations/{id}/messages:
+  $ref: ./conversation/messages/create_attachment.yml
+/api/v1/accounts/{account_id}/conversations/{converstion_id}/messages:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/conversation_id'
+  get:
+    $ref: ./conversation/messages/index.yml
   post:
-    $ref: ./conversation/assignments.yml
+    $ref: ./conversation/messages/create.yml
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/conversation_id'
+    - $ref: '#/parameters/message_id'
+  delete:
+    $ref: ./conversation/messages/delete.yml
 
-# Contacts
-/accounts/{account_id}/contacts:
-  $ref: ./contact/list_create.yml
 
-/accounts/{account_id}/contacts/{id}:
-  $ref: ./contact/crud.yml
 
-/accounts/{account_id}/contacts/{id}/conversations:
-  $ref: ./contact/conversations.yml
+# Integrations
+/api/v1/accounts/{account_id}/integrations/apps:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: './integrations/apps/show.yml'
+/api/v1/accounts/{account_id}/integrations/hooks:
+  post:
+    $ref: './integrations/hooks/create.yml'
+  patch:
+    $ref: ./integrations/hooks/update.yml
+  delete:
+    $ref: ./integrations/hooks/delete.yml
 
-/accounts/{account_id}/contacts/search:
-  $ref: ./contact/search.yml
-
-/accounts/{account_id}/contacts/{id}/contact_inboxes:
-  $ref: ./contact_inboxes/create.yml
-/accounts/{account_id}/contacts/{id}/contactable_inboxes:
-  $ref: ./contactable_inboxes/get.yml
 
 
 # Profile
 /profile:
   $ref: ./profile/index.yml
 
+
 # Teams
-/accounts/{account_id}/teams:
+/api/v1/accounts/{account_id}/teams:
   parameters:
     - $ref: '#/parameters/account_id'
   get:
     $ref: ./teams/index.yml
   post:
     $ref: ./teams/create.yml
-
-/accounts/{account_id}/teams/{id}:
+/api/v1/accounts/{account_id}/teams/{id}:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/team_id'
@@ -114,19 +216,3 @@
   delete:
     $ref: ./teams/delete.yml
 
-
-# Integrations
-/accounts/{account_id}/integrations/apps:
-  parameters:
-    - $ref: '#/parameters/account_id'
-  get:
-    $ref: './integrations/apps/show.yml'
-  
- 
-/accounts/{account_id}/integrations/hooks:
-  post:
-    $ref: './integrations/hooks/create.yml'
-  patch:
-    $ref: ./integrations/hooks/update.yml
-  delete:
-    $ref: ./integrations/hooks/delete.yml
\ No newline at end of file
diff --git a/swagger/paths/integrations/apps/show.yml b/swagger/paths/integrations/apps/show.yml
index 6d5f8332f..16ce299fe 100644
--- a/swagger/paths/integrations/apps/show.yml
+++ b/swagger/paths/integrations/apps/show.yml
@@ -7,7 +7,10 @@ responses:
   200:
     description: Success
     schema:
-      $ref: '#/definitions/integrations_app'
+      type: array
+      description: 'Array of Integration apps'
+      items:
+        $ref: '#/definitions/integrations_app'
   401:
     description: Unauthorized
   404:
diff --git a/swagger/paths/platform/account_users/create.yml b/swagger/paths/platform/account_users/create.yml
new file mode 100644
index 000000000..614efb7a8
--- /dev/null
+++ b/swagger/paths/platform/account_users/create.yml
@@ -0,0 +1,40 @@
+tags:
+  - Account Users
+operationId: create-an-account-user
+summary: Create an Account User
+description: Create an Account User
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      properties: 
+        user_id:
+          type: integer
+          description: The ID of the user
+          required: true
+        role:
+          type: string
+          description: whether user is an administrator or agent
+          required: true
+      
+responses:
+  200:
+    description: Success
+    schema:
+      properties: 
+        account_id:
+          type: integer
+          description: The ID of the user
+        user_id:
+          type: integer
+          description: The ID of the user
+        role:
+          type: string
+          description: whether user is an administrator or agent
+      
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/account_users/delete.yml b/swagger/paths/platform/account_users/delete.yml
new file mode 100644
index 000000000..1ff822a9e
--- /dev/null
+++ b/swagger/paths/platform/account_users/delete.yml
@@ -0,0 +1,26 @@
+tags:
+  - Account Users
+operationId: delete-an-account-user
+summary: Delete an Account User
+description: Delete an Account User
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      properties: 
+        user_id:
+          type: integer
+          description: The ID of the user
+          required: true
+
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The account does not exist
diff --git a/swagger/paths/platform/account_users/index.yml b/swagger/paths/platform/account_users/index.yml
new file mode 100644
index 000000000..bcaed1807
--- /dev/null
+++ b/swagger/paths/platform/account_users/index.yml
@@ -0,0 +1,28 @@
+tags:
+  - Account Users
+operationId: list-all-account-users
+summary: List all Account Users
+description: List all account users
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      type: array
+      description: 'Array of account users'
+      items:
+        type: object
+        properties: 
+          account_id:
+            type: integer
+            description: The ID of the user
+          user_id:
+            type: integer
+            description: The ID of the user
+          role:
+            type: string
+            description: whether user is an administrator or agent
+      
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/accounts/create.yml b/swagger/paths/platform/accounts/create.yml
new file mode 100644
index 000000000..a6e9841b9
--- /dev/null
+++ b/swagger/paths/platform/accounts/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Accounts
+operationId: create-an-account
+summary: Create an Account
+description: Create an Account
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/account_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/platform_account'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/accounts/delete.yml b/swagger/paths/platform/accounts/delete.yml
new file mode 100644
index 000000000..755b76d1e
--- /dev/null
+++ b/swagger/paths/platform/accounts/delete.yml
@@ -0,0 +1,14 @@
+tags:
+  - Accounts
+operationId: delete-an-account
+summary: Delete an Account
+description: Delete an Account
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The account does not exist
diff --git a/swagger/paths/platform/accounts/show.yml b/swagger/paths/platform/accounts/show.yml
new file mode 100644
index 000000000..d8ec94fe6
--- /dev/null
+++ b/swagger/paths/platform/accounts/show.yml
@@ -0,0 +1,16 @@
+tags:
+  - Accounts
+operationId: get-details-of-an-account
+summary: Get an account details
+description: Get the details of an account
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/platform_account'
+  401:
+    description: Unauthorized
+  404:
+    description: The given account does not exist
diff --git a/swagger/paths/platform/accounts/update.yml b/swagger/paths/platform/accounts/update.yml
new file mode 100644
index 000000000..a70ce9468
--- /dev/null
+++ b/swagger/paths/platform/accounts/update.yml
@@ -0,0 +1,20 @@
+tags:
+  - Accounts
+operationId: update-an-account
+summary: Update an account
+description: Update an account's attributes
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/account_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/platform_account'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/agent_bots/create.yml b/swagger/paths/platform/agent_bots/create.yml
new file mode 100644
index 000000000..a862ca131
--- /dev/null
+++ b/swagger/paths/platform/agent_bots/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - AgentBots
+operationId: create-an-agent-bot
+summary: Create an Agent Bot
+description: Create an agent bot
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/agent_bot_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/agent_bots/delete.yml b/swagger/paths/platform/agent_bots/delete.yml
new file mode 100644
index 000000000..676c8f525
--- /dev/null
+++ b/swagger/paths/platform/agent_bots/delete.yml
@@ -0,0 +1,14 @@
+tags:
+  - AgentBots
+operationId: delete-an-agent-bot
+summary: Delete an AgentBot
+description: Delete an AgentBot
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The agent bot does not exist
diff --git a/swagger/paths/platform/agent_bots/index.yml b/swagger/paths/platform/agent_bots/index.yml
new file mode 100644
index 000000000..7ef3ee9c9
--- /dev/null
+++ b/swagger/paths/platform/agent_bots/index.yml
@@ -0,0 +1,17 @@
+tags:
+  - AgentBots
+operationId: list-all-agent-bots
+summary: List all AgentBots
+description: List all agent bots available
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      type: array
+      description: 'Array of agent bots'
+      items:
+        $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/agent_bots/show.yml b/swagger/paths/platform/agent_bots/show.yml
new file mode 100644
index 000000000..dfbd43a27
--- /dev/null
+++ b/swagger/paths/platform/agent_bots/show.yml
@@ -0,0 +1,16 @@
+tags:
+  - AgentBots
+operationId: get-details-of-a-single-agent-bot
+summary: Get an agent bot details
+description: Get the details of an agent bot
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
+  404:
+    description: The given agent bot ID does not exist
diff --git a/swagger/paths/platform/agent_bots/update.yml b/swagger/paths/platform/agent_bots/update.yml
new file mode 100644
index 000000000..842b4854d
--- /dev/null
+++ b/swagger/paths/platform/agent_bots/update.yml
@@ -0,0 +1,20 @@
+tags:
+  - AgentBots
+operationId: update-an-agent-bot
+summary: Update an agent bot
+description: Update an agent bot's attributes
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/agent_bot_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/agent_bot'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/users/create.yml b/swagger/paths/platform/users/create.yml
new file mode 100644
index 000000000..7433b8dc6
--- /dev/null
+++ b/swagger/paths/platform/users/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Users
+operationId: create-a-user
+summary: Create a User
+description: Create a User
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/user_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/user'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/platform/users/delete.yml b/swagger/paths/platform/users/delete.yml
new file mode 100644
index 000000000..a7658c215
--- /dev/null
+++ b/swagger/paths/platform/users/delete.yml
@@ -0,0 +1,14 @@
+tags:
+  - Users
+operationId: delete-a-user
+summary: Delete a User
+description: Delete a User
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The user does not exist
diff --git a/swagger/paths/platform/users/login.yml b/swagger/paths/platform/users/login.yml
new file mode 100644
index 000000000..3f0b8b4c1
--- /dev/null
+++ b/swagger/paths/platform/users/login.yml
@@ -0,0 +1,21 @@
+get:
+  tags:
+    - Users
+  operationId: get-sso-url-of-a-user
+  summary: Get User SSO Link
+  description: Get the sso link of a user
+  security:
+    - platformAppApiKey: []
+  responses:
+    200:
+      description: Success
+      schema:
+        type: object
+        properties:
+          url:
+            type: string
+            description: SSO url to autenticate the user
+    401:
+      description: Unauthorized
+    404:
+      description: The given user does not exist
diff --git a/swagger/paths/platform/users/show.yml b/swagger/paths/platform/users/show.yml
new file mode 100644
index 000000000..bf937b49a
--- /dev/null
+++ b/swagger/paths/platform/users/show.yml
@@ -0,0 +1,16 @@
+tags:
+  - Users
+operationId: get-details-of-a-user
+summary: Get an user details
+description: Get the details of an user
+security:
+  - platformAppApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/user'
+  401:
+    description: Unauthorized
+  404:
+    description: The given user does not exist
diff --git a/swagger/paths/platform/users/update.yml b/swagger/paths/platform/users/update.yml
new file mode 100644
index 000000000..56ea0026d
--- /dev/null
+++ b/swagger/paths/platform/users/update.yml
@@ -0,0 +1,20 @@
+tags:
+  - Users
+operationId: update-a-user
+summary: Update a user
+description: Update a user's attributes
+security:
+  - platformAppApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/user_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/user'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/teams/index.yml b/swagger/paths/teams/index.yml
index 8e1384cf9..f93b6a553 100644
--- a/swagger/paths/teams/index.yml
+++ b/swagger/paths/teams/index.yml
@@ -9,6 +9,7 @@ responses:
     schema:
       type: array
       description: 'Array of teams'
-      $ref: '#/definitions/team'
+      items:
+        $ref: '#/definitions/team'
   401:
     description: Unauthorized
diff --git a/swagger/swagger.json b/swagger/swagger.json
index ff823ed84..a4e7a9377 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -6,7 +6,7 @@
     "title": "Chatwoot",
     "termsOfService": "https://www.chatwoot.com/terms-of-service/",
     "contact": {
-      "email": "support@chatwoot.com"
+      "email": "hello@chatwoot.com"
     },
     "license": {
       "name": "MIT License",
@@ -14,7 +14,7 @@
     }
   },
   "host": "app.chatwoot.com",
-  "basePath": "/api/v1/",
+  "basePath": null,
   "schemes": [
     "https"
   ],
@@ -37,11 +37,11 @@
       "name": "api_access_token",
       "description": "This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis."
     },
-    "superAdminApiKey": {
+    "platformAppApiKey": {
       "type": "apiKey",
       "in": "header",
       "name": "api_access_token",
-      "description": "This token is only for the system admin or obtained via rails console. This token is to be used rarely for cases like creating a pre verified user through api from external system."
+      "description": "This token can be obtained by the system admin after creating a platformApp. This token should be used to provision agent bots, accounts, users and their roles."
     }
   },
   "security": [
@@ -52,86 +52,28 @@
     }
   ],
   "paths": {
-    "/accounts/{account_id}/inboxes": {
-      "get": {
-        "tags": [
-          "Inbox"
-        ],
-        "operationId": "listAllInboxes",
-        "summary": "List all inboxes",
-        "description": "List all inboxes available in the current account",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/inbox"
-            }
-          },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/inboxes/": {
+    "platform/api/v1/accounts": {
       "post": {
         "tags": [
-          "Inbox"
+          "Accounts"
+        ],
+        "operationId": "create-an-account",
+        "summary": "Create an Account",
+        "description": "Create an Account",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
         ],
-        "operationId": "inboxCreation",
-        "summary": "Create an inbox",
-        "description": "You can create more than one website inbox in each account",
         "parameters": [
           {
             "name": "data",
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string",
-                  "description": "The name of the inbox"
-                },
-                "avatar": {
-                  "type": "file",
-                  "description": "File for avatar image"
-                },
-                "channel": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "string",
-                      "enum": [
-                        "web_widget"
-                      ]
-                    },
-                    "website_url": {
-                      "type": "string",
-                      "description": "URL at which the widget will be loaded"
-                    },
-                    "welcome_title": {
-                      "type": "string",
-                      "description": "Welcome title to be displayed on the widget"
-                    },
-                    "welcome_tagline": {
-                      "type": "string",
-                      "description": "Welcome tagline to be displayed on the widget"
-                    },
-                    "agent_away_message": {
-                      "type": "string",
-                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
-                    },
-                    "widget_color": {
-                      "type": "string",
-                      "description": "A Hex-color string used to customize the widget"
-                    }
-                  }
-                }
-              }
+              "$ref": "#/definitions/account_create_update_payload"
             }
           }
         ],
@@ -139,34 +81,178 @@
           "200": {
             "description": "Success",
             "schema": {
-              "$ref": "#/definitions/inbox"
+              "$ref": "#/definitions/platform_account"
             }
           },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
+          "401": {
+            "description": "Unauthorized"
           }
         }
       }
     },
-    "/accounts/{account_id}/inboxes/{id}": {
+    "platform/api/v1/accounts/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Accounts"
+        ],
+        "operationId": "get-details-of-an-account",
+        "summary": "Get an account details",
+        "description": "Get the details of an account",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/platform_account"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given account does not exist"
+          }
+        }
+      },
       "patch": {
         "tags": [
-          "Inbox"
+          "Accounts"
+        ],
+        "operationId": "update-an-account",
+        "summary": "Update an account",
+        "description": "Update an account's attributes",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
         ],
-        "operationId": "updateInbox",
-        "summary": "Update Inbox",
-        "description": "Add avatar and disable auto assignment for an inbox",
         "parameters": [
           {
-            "name": "id",
-            "in": "path",
-            "type": "number",
-            "description": "ID of the inbox",
-            "required": true
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/account_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/platform_account"
+            }
           },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Accounts"
+        ],
+        "operationId": "delete-an-account",
+        "summary": "Delete an Account",
+        "description": "Delete an Account",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The account does not exist"
+          }
+        }
+      }
+    },
+    "platform/api/v1/accounts/{id}/account_users": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Account Users"
+        ],
+        "operationId": "list-all-account-users",
+        "summary": "List all Account Users",
+        "description": "List all account users",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of account users",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "account_id": {
+                    "type": "integer",
+                    "description": "The ID of the user"
+                  },
+                  "user_id": {
+                    "type": "integer",
+                    "description": "The ID of the user"
+                  },
+                  "role": {
+                    "type": "string",
+                    "description": "whether user is an administrator or agent"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Account Users"
+        ],
+        "operationId": "create-an-account-user",
+        "summary": "Create an Account User",
+        "description": "Create an Account User",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
           {
             "name": "data",
             "in": "body",
@@ -174,44 +260,15 @@
             "schema": {
               "type": "object",
               "properties": {
-                "name": {
+                "user_id": {
+                  "type": "integer",
+                  "description": "The ID of the user",
+                  "required": true
+                },
+                "role": {
                   "type": "string",
-                  "description": "The name of the inbox"
-                },
-                "enable_auto_assignment": {
-                  "type": "boolean",
-                  "required": true,
-                  "description": "Enable Auto Assignment"
-                },
-                "avatar": {
-                  "type": "file",
-                  "required": false,
-                  "description": "Image file for avatar"
-                },
-                "channel": {
-                  "type": "object",
-                  "properties": {
-                    "website_url": {
-                      "type": "string",
-                      "description": "URL at which the widget will be loaded"
-                    },
-                    "welcome_title": {
-                      "type": "string",
-                      "description": "Welcome title to be displayed on the widget"
-                    },
-                    "welcome_tagline": {
-                      "type": "string",
-                      "description": "Welcome tagline to be displayed on the widget"
-                    },
-                    "agent_away_message": {
-                      "type": "string",
-                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
-                    },
-                    "widget_color": {
-                      "type": "string",
-                      "description": "A Hex-color string used to customize the widget"
-                    }
-                  }
+                  "description": "whether user is an administrator or agent",
+                  "required": true
                 }
               }
             }
@@ -221,34 +278,42 @@
           "200": {
             "description": "Success",
             "schema": {
-              "$ref": "#/definitions/inbox"
+              "properties": {
+                "account_id": {
+                  "type": "integer",
+                  "description": "The ID of the user"
+                },
+                "user_id": {
+                  "type": "integer",
+                  "description": "The ID of the user"
+                },
+                "role": {
+                  "type": "string",
+                  "description": "whether user is an administrator or agent"
+                }
+              }
             }
           },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
+          "401": {
+            "description": "Unauthorized"
           }
         }
-      }
-    },
-    "/accounts/{account_id}/inboxes/{id}/set_agent_bot": {
-      "post": {
+      },
+      "delete": {
         "tags": [
-          "Inbox"
+          "Account Users"
         ],
-        "operationId": "updateAgentBot",
-        "summary": "Add or remove agent bot",
-        "description": "To add an agent bot pass agent_bot id, to remove agent bot from an inbox pass null",
-        "parameters": [
+        "operationId": "delete-an-account-user",
+        "summary": "Delete an Account User",
+        "description": "Delete an Account User",
+        "security": [
           {
-            "name": "id",
-            "in": "path",
-            "type": "number",
-            "description": "ID of the inbox",
-            "required": true
-          },
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
           {
             "name": "data",
             "in": "body",
@@ -256,36 +321,83 @@
             "schema": {
               "type": "object",
               "properties": {
-                "agent_bot": {
-                  "type": "number",
-                  "required": true,
-                  "description": "Agent bot ID"
+                "user_id": {
+                  "type": "integer",
+                  "description": "The ID of the user",
+                  "required": true
                 }
               }
             }
           }
         ],
         "responses": {
-          "204": {
+          "200": {
             "description": "Success"
           },
-          "404": {
-            "description": "Inbox not found, Agent bot not found"
+          "401": {
+            "description": "Unauthorized"
           },
-          "403": {
-            "description": "Access denied"
+          "404": {
+            "description": "The account does not exist"
           }
         }
       }
     },
-    "/agent_bots": {
+    "platform/api/v1/agent_bots": {
       "get": {
         "tags": [
-          "AgentBot"
+          "AgentBots"
+        ],
+        "operationId": "list-all-agent-bots",
+        "summary": "List all AgentBots",
+        "description": "List all agent bots available",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of agent bots",
+              "items": {
+                "$ref": "#/definitions/agent_bot"
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "AgentBots"
+        ],
+        "operationId": "create-an-agent-bot",
+        "summary": "Create an Agent Bot",
+        "description": "Create an agent bot",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/agent_bot_create_update_payload"
+            }
+          }
         ],
-        "operationId": "listAgentBots",
-        "summary": "List all agentbots",
-        "description": "List all available agentbots for the current installation",
         "responses": {
           "200": {
             "description": "Success",
@@ -293,8 +405,554 @@
               "$ref": "#/definitions/agent_bot"
             }
           },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "platform/api/v1/agent_bots/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/agent_bot_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "AgentBots"
+        ],
+        "operationId": "get-details-of-a-single-agent-bot",
+        "summary": "Get an agent bot details",
+        "description": "Get the details of an agent bot",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
           "404": {
-            "description": "Inbox not found, Agent bot not found"
+            "description": "The given agent bot ID does not exist"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "AgentBots"
+        ],
+        "operationId": "update-an-agent-bot",
+        "summary": "Update an agent bot",
+        "description": "Update an agent bot's attributes",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/agent_bot_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "AgentBots"
+        ],
+        "operationId": "delete-an-agent-bot",
+        "summary": "Delete an AgentBot",
+        "description": "Delete an AgentBot",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The agent bot does not exist"
+          }
+        }
+      }
+    },
+    "platform/api/v1/users": {
+      "post": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "create-a-user",
+        "summary": "Create a User",
+        "description": "Create a User",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/user_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/user"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "platform/api/v1/users/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/user_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "get-details-of-a-user",
+        "summary": "Get an user details",
+        "description": "Get the details of an user",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/user"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given user does not exist"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "update-a-user",
+        "summary": "Update a user",
+        "description": "Update a user's attributes",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/user_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/user"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "delete-a-user",
+        "summary": "Delete a User",
+        "description": "Delete a User",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The user does not exist"
+          }
+        }
+      }
+    },
+    "platform/api/v1/users/{id}/login": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "get-sso-url-of-a-user",
+        "summary": "Get User SSO Link",
+        "description": "Get the sso link of a user",
+        "security": [
+          {
+            "platformAppApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "url": {
+                  "type": "string",
+                  "description": "SSO url to autenticate the user"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given user does not exist"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/agent_bots": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Account AgentBots"
+        ],
+        "operationId": "list-all-account-agent-bots",
+        "summary": "List all AgentBots",
+        "description": "List all agent bots available for the current account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of agent bots",
+              "items": [
+                {
+                  "$ref": "#/definitions/agent_bot"
+                }
+              ]
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Account AgentBots"
+        ],
+        "operationId": "create-an-account-agent-bot",
+        "summary": "Create an Agent Bot",
+        "description": "Create an agent bot in the account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/agent_bot_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/agent_bots/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/agent_bot_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Account AgentBots"
+        ],
+        "operationId": "get-details-of-a-single-account-agent-bot",
+        "summary": "Get an agent bot details",
+        "description": "Get the details of an agent bot in the account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given agent bot ID does not exist in the account"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Account AgentBots"
+        ],
+        "operationId": "update-an-account-agent-bot",
+        "summary": "Update an agent bot",
+        "description": "Update an agent bot's attributes",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/agent_bot_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Account AgentBots"
+        ],
+        "operationId": "delete-an-account-agent-bot",
+        "summary": "Delete an AgentBot",
+        "description": "Delete an AgentBot from the account",
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The agent bot does not exist in the account"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts": {
+      "get": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactList",
+        "description": "Listing all the contacts with pagination (Page size = 15)",
+        "summary": "List Contacts",
+        "parameters": [
+          {
+            "$ref": "#/parameters/contact_sort_param"
+          },
+          {
+            "$ref": "#/parameters/page"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_list"
+            }
+          },
+          "400": {
+            "description": "Bad Request Error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactCreate",
+        "description": "Create New Contact",
+        "summary": "Create Contact",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/contact_create"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/extended_contact"
+            }
+          },
+          "400": {
+            "description": "Bad Request Error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/{id}": {
+      "get": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactDetails",
+        "summary": "Show Contact",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the contact",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/extended_contact"
+            }
+          },
+          "404": {
+            "description": "Contact not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactUpdate",
+        "summary": "Update Contact",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the contact",
+            "required": true
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/contact_update"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_base"
+            }
+          },
+          "404": {
+            "description": "Contact not found"
           },
           "403": {
             "description": "Access denied"
@@ -302,7 +960,155 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations": {
+    "/api/v1/accounts/{account_id}/contacts/{id}/conversations": {
+      "get": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactConversations",
+        "summary": "Conversations",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the contact",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_conversations"
+            }
+          },
+          "404": {
+            "description": "Contact not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/search": {
+      "get": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactSearch",
+        "description": "Search the contacts using a search key, currently supports email search (Page size = 15)",
+        "summary": "Search Contacts",
+        "parameters": [
+          {
+            "name": "q",
+            "in": "query",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/contact_sort_param"
+          },
+          {
+            "$ref": "#/parameters/page"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "payload": {
+                  "$ref": "#/definitions/contact_list"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes": {
+      "post": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactInboxCreation",
+        "description": "Create a contact inbox record for an inbox",
+        "summary": "Create contact inbox",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "inbox_id": {
+                  "type": "number",
+                  "description": "The ID of the inbox",
+                  "required": true
+                },
+                "source_id": {
+                  "$ref": "#/parameters/source_id"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_inboxes"
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          },
+          "422": {
+            "description": "Incorrect payload"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes": {
+      "get": {
+        "tags": [
+          "Contact"
+        ],
+        "operationId": "contactableInboxesGet",
+        "description": "Get List of contactable Inboxes",
+        "summary": "Get Contactable Inboxes",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contactable_inboxes"
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          },
+          "422": {
+            "description": "Incorrect payload"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/conversations": {
       "get": {
         "tags": [
           "Conversation"
@@ -450,7 +1256,7 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{converstion_id}": {
+    "/api/v1/accounts/{account_id}/conversations/{converstion_id}": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -482,7 +1288,7 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{conversation_id}/toggle_status": {
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -548,7 +1354,395 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{id}/messages": {
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversation Assignment"
+        ],
+        "operationId": "assign-a-conversation",
+        "summary": "Assign Conversation",
+        "description": "Assign a conversation to an agent or a team",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "assignee_id": {
+                  "type": "number",
+                  "description": "Id of the assignee user"
+                },
+                "team_id": {
+                  "type": "number",
+                  "description": "Id of the team. If the assignee_id is present, this param would be ignored"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/user"
+            }
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/labels": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Conversation Labels"
+        ],
+        "operationId": "list-all-labels-of-a-conversation",
+        "summary": "List Labels",
+        "description": "Lists all the labels of a conversation",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/conversation_labels"
+            }
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Conversation Labels"
+        ],
+        "operationId": "conversation-add-labels",
+        "summary": "Add Labels",
+        "description": "Add labels to a conversation. Note that this API would overwrite the existing list of labels associated to the conversation.",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "labels": {
+                  "type": "array",
+                  "description": "Array of labels (comma-separated strings)",
+                  "properties": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/conversation_labels"
+            }
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/inboxes": {
+      "get": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "listAllInboxes",
+        "summary": "List all inboxes",
+        "description": "List all inboxes available in the current account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of inboxes",
+              "items": {
+                "$ref": "#/definitions/inbox"
+              }
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/inboxes/": {
+      "post": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "inboxCreation",
+        "summary": "Create an inbox",
+        "description": "You can create more than one website inbox in each account",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "description": "The name of the inbox"
+                },
+                "avatar": {
+                  "type": "file",
+                  "description": "File for avatar image"
+                },
+                "channel": {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "web_widget"
+                      ]
+                    },
+                    "website_url": {
+                      "type": "string",
+                      "description": "URL at which the widget will be loaded"
+                    },
+                    "welcome_title": {
+                      "type": "string",
+                      "description": "Welcome title to be displayed on the widget"
+                    },
+                    "welcome_tagline": {
+                      "type": "string",
+                      "description": "Welcome tagline to be displayed on the widget"
+                    },
+                    "agent_away_message": {
+                      "type": "string",
+                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
+                    },
+                    "widget_color": {
+                      "type": "string",
+                      "description": "A Hex-color string used to customize the widget"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/inbox"
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/inboxes/{id}": {
+      "patch": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "updateInbox",
+        "summary": "Update Inbox",
+        "description": "Add avatar and disable auto assignment for an inbox",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the inbox",
+            "required": true
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "description": "The name of the inbox"
+                },
+                "enable_auto_assignment": {
+                  "type": "boolean",
+                  "required": true,
+                  "description": "Enable Auto Assignment"
+                },
+                "avatar": {
+                  "type": "file",
+                  "required": false,
+                  "description": "Image file for avatar"
+                },
+                "channel": {
+                  "type": "object",
+                  "properties": {
+                    "website_url": {
+                      "type": "string",
+                      "description": "URL at which the widget will be loaded"
+                    },
+                    "welcome_title": {
+                      "type": "string",
+                      "description": "Welcome title to be displayed on the widget"
+                    },
+                    "welcome_tagline": {
+                      "type": "string",
+                      "description": "Welcome tagline to be displayed on the widget"
+                    },
+                    "agent_away_message": {
+                      "type": "string",
+                      "description": "A message which will be sent if there is not agent available. This is not available if agentbot is connected"
+                    },
+                    "widget_color": {
+                      "type": "string",
+                      "description": "A Hex-color string used to customize the widget"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/inbox"
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/inboxes/{id}/agent_bot": {
+      "get": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "getInboxAgentBot",
+        "summary": "Show Inbox Agent Bot",
+        "description": "See if an agent bot is associated to the Inbox",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the inbox",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/agent_bot"
+            }
+          },
+          "404": {
+            "description": "Inbox not found, Agent bot not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/inboxes/{id}/set_agent_bot": {
+      "post": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "updateAgentBot",
+        "summary": "Add or remove agent bot",
+        "description": "To add an agent bot pass agent_bot id, to remove agent bot from an inbox pass null",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "type": "number",
+            "description": "ID of the inbox",
+            "required": true
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "agent_bot": {
+                  "type": "number",
+                  "required": true,
+                  "description": "Agent bot ID"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Inbox not found, Agent bot not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/conversations/{id}/messages": {
       "post": {
         "tags": [
           "Messages"
@@ -633,7 +1827,7 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{converstion_id}/messages": {
+    "/api/v1/accounts/{account_id}/conversations/{converstion_id}/messages": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -724,7 +1918,7 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}": {
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages/{message_id}": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -756,573 +1950,7 @@
         }
       }
     },
-    "/accounts/{account_id}/conversations/{conversation_id}/labels": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        },
-        {
-          "$ref": "#/parameters/conversation_id"
-        }
-      ],
-      "get": {
-        "tags": [
-          "Conversation Labels"
-        ],
-        "operationId": "list-all-labels-of-a-conversation",
-        "summary": "List Labels",
-        "description": "Lists all the labels of a conversation",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_labels"
-            }
-          },
-          "404": {
-            "description": "Conversation not found"
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Conversation Labels"
-        ],
-        "operationId": "conversation-add-labels",
-        "summary": "Add Labels",
-        "description": "Add labels to a conversation. Note that this API would overwrite the existing list of labels associated to the conversation.",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "labels": {
-                  "type": "array",
-                  "description": "Array of labels (comma-separated strings)",
-                  "properties": {
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/conversation_labels"
-            }
-          },
-          "404": {
-            "description": "Conversation not found"
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/conversations/{conversation_id}/assignments": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        },
-        {
-          "$ref": "#/parameters/conversation_id"
-        }
-      ],
-      "post": {
-        "tags": [
-          "Conversation Assignment"
-        ],
-        "operationId": "assign-a-conversation",
-        "summary": "Assign Conversation",
-        "description": "Assign a conversation to an agent or a team",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "assignee_id": {
-                  "type": "number",
-                  "description": "Id of the assignee user"
-                },
-                "team_id": {
-                  "type": "number",
-                  "description": "Id of the team. If the assignee_id is present, this param would be ignored"
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
-            }
-          },
-          "404": {
-            "description": "Conversation not found"
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts": {
-      "get": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactList",
-        "description": "Listing all the contacts with pagination (Page size = 15)",
-        "summary": "List Contacts",
-        "parameters": [
-          {
-            "$ref": "#/parameters/contact_sort_param"
-          },
-          {
-            "$ref": "#/parameters/page"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_list"
-            }
-          },
-          "400": {
-            "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
-            }
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactCreate",
-        "description": "Create New Contact",
-        "summary": "Create Contact",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/contact_create"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/extended_contact"
-            }
-          },
-          "400": {
-            "description": "Bad Request Error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
-            }
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts/{id}": {
-      "get": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactDetails",
-        "summary": "Show Contact",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "type": "number",
-            "description": "ID of the contact",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/extended_contact"
-            }
-          },
-          "404": {
-            "description": "Contact not found"
-          },
-          "403": {
-            "description": "Access denied"
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactUpdate",
-        "summary": "Update Contact",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "type": "number",
-            "description": "ID of the contact",
-            "required": true
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/contact_update"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_base"
-            }
-          },
-          "404": {
-            "description": "Contact not found"
-          },
-          "403": {
-            "description": "Access denied"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts/{id}/conversations": {
-      "get": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactConversations",
-        "summary": "Conversations",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "type": "number",
-            "description": "ID of the contact",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_conversations"
-            }
-          },
-          "404": {
-            "description": "Contact not found"
-          },
-          "403": {
-            "description": "Access denied"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts/search": {
-      "get": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactSearch",
-        "description": "Search the contacts using a search key, currently supports email search (Page size = 15)",
-        "summary": "Search Contacts",
-        "parameters": [
-          {
-            "name": "q",
-            "in": "query",
-            "type": "string"
-          },
-          {
-            "$ref": "#/parameters/contact_sort_param"
-          },
-          {
-            "$ref": "#/parameters/page"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "payload": {
-                  "$ref": "#/definitions/contact_list"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
-            }
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts/{id}/contact_inboxes": {
-      "post": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactInboxCreation",
-        "description": "Create a contact inbox record for an inbox",
-        "summary": "Create contact inbox",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "inbox_id": {
-                  "type": "number",
-                  "description": "The ID of the inbox",
-                  "required": true
-                },
-                "source_id": {
-                  "$ref": "#/parameters/source_id"
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contact_inboxes"
-            }
-          },
-          "401": {
-            "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
-            }
-          },
-          "422": {
-            "description": "Incorrect payload"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/contacts/{id}/contactable_inboxes": {
-      "get": {
-        "tags": [
-          "Contact"
-        ],
-        "operationId": "contactableInboxesGet",
-        "description": "Get List of contactable Inboxes",
-        "summary": "Get Contactable Inboxes",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/contactable_inboxes"
-            }
-          },
-          "401": {
-            "description": "Authentication error",
-            "schema": {
-              "$ref": "#/definitions/bad_request_error"
-            }
-          },
-          "422": {
-            "description": "Incorrect payload"
-          }
-        }
-      }
-    },
-    "/profile": {
-      "get": {
-        "tags": [
-          "Profile"
-        ],
-        "operationId": "fetchProfile",
-        "summary": "Fetch user profile",
-        "description": "Get the user profile details",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/user"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/teams": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        }
-      ],
-      "get": {
-        "tags": [
-          "Teams"
-        ],
-        "operationId": "list-all-teams",
-        "summary": "List all teams",
-        "description": "List all teams available in the current account",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Teams"
-        ],
-        "operationId": "create-a-team",
-        "summary": "Create a team",
-        "description": "Create a team in the account",
-        "parameters": [
-          {
-            "$ref": "#/parameters/account_id"
-          },
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/team_create_update_payload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/teams/{id}": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/account_id"
-        },
-        {
-          "$ref": "#/parameters/team_id"
-        }
-      ],
-      "get": {
-        "tags": [
-          "Teams"
-        ],
-        "operationId": "get-details-of-a-single-team",
-        "summary": "Get a team details",
-        "description": "Get the details of a team in the account",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          },
-          "404": {
-            "description": "The given team ID does not exist in the account"
-          }
-        }
-      },
-      "patch": {
-        "tags": [
-          "Teams"
-        ],
-        "operationId": "update-a-team",
-        "summary": "Update a team",
-        "description": "Update a team's attributes",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/team_create_update_payload"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/team"
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "Teams"
-        ],
-        "operationId": "delete-a-team",
-        "summary": "Delete a team",
-        "description": "Delete a team from the account",
-        "responses": {
-          "200": {
-            "description": "Success"
-          },
-          "401": {
-            "description": "Unauthorized"
-          },
-          "404": {
-            "description": "The team does not exist in the account"
-          }
-        }
-      }
-    },
-    "/accounts/{account_id}/integrations/apps": {
+    "/api/v1/accounts/{account_id}/integrations/apps": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -1339,7 +1967,11 @@
           "200": {
             "description": "Success",
             "schema": {
-              "$ref": "#/definitions/integrations_app"
+              "type": "array",
+              "description": "Array of Integration apps",
+              "items": {
+                "$ref": "#/definitions/integrations_app"
+              }
             }
           },
           "401": {
@@ -1351,7 +1983,7 @@
         }
       }
     },
-    "/accounts/{account_id}/integrations/hooks": {
+    "/api/v1/accounts/{account_id}/integrations/hooks": {
       "post": {
         "tags": [
           "Integrations"
@@ -1446,6 +2078,169 @@
           }
         }
       }
+    },
+    "/profile": {
+      "get": {
+        "tags": [
+          "Profile"
+        ],
+        "operationId": "fetchProfile",
+        "summary": "Fetch user profile",
+        "description": "Get the user profile details",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/user"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/teams": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "list-all-teams",
+        "summary": "List all teams",
+        "description": "List all teams available in the current account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of teams",
+              "items": {
+                "$ref": "#/definitions/team"
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "create-a-team",
+        "summary": "Create a team",
+        "description": "Create a team in the account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/team_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/team"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/teams/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/team_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "get-details-of-a-single-team",
+        "summary": "Get a team details",
+        "description": "Get the details of a team in the account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/team"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given team ID does not exist in the account"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "update-a-team",
+        "summary": "Update a team",
+        "description": "Update a team's attributes",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/team_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/team"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "delete-a-team",
+        "summary": "Delete a team",
+        "description": "Delete a team from the account",
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The team does not exist in the account"
+          }
+        }
+      }
     }
   },
   "definitions": {
@@ -1723,13 +2518,17 @@
           "type": "number",
           "description": "ID of the agent bot"
         },
+        "name": {
+          "type": "string",
+          "description": "The name of the agent bot"
+        },
         "description": {
           "type": "string",
           "description": "The description about the agent bot"
         },
-        "name": {
-          "type": "string",
-          "description": "The name of the agent bot"
+        "account_id": {
+          "type": "number",
+          "description": "Account ID if it's an account specific bot"
         },
         "outgoing_url": {
           "type": "string",
@@ -1782,6 +2581,19 @@
         }
       }
     },
+    "platform_account": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "number",
+          "description": "Account ID"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the account"
+        }
+      }
+    },
     "team": {
       "type": "object",
       "properties": {
@@ -2154,6 +2966,41 @@
         }
       ]
     },
+    "account_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the account"
+        }
+      }
+    },
+    "agent_bot_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the agent bot"
+        },
+        "description": {
+          "type": "string",
+          "description": "The description about the agent bot"
+        },
+        "outgoing_url": {
+          "type": "string",
+          "description": "The webhook URL for the bot"
+        }
+      }
+    },
+    "user_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the account"
+        }
+      }
+    },
     "contact_create": {
       "type": "object",
       "properties": {
@@ -2277,6 +3124,15 @@
       "required": true,
       "description": "The numeric ID of the account"
     },
+    "agent_bot_id": {
+      "in": "path",
+      "name": "id",
+      "schema": {
+        "type": "integer"
+      },
+      "required": true,
+      "description": "The ID of the agentbot to be updated"
+    },
     "team_id": {
       "in": "path",
       "name": "id",
@@ -2346,5 +3202,31 @@
       "required": false,
       "description": "The page parameter"
     }
-  }
+  },
+  "x-tagGroups": [
+    {
+      "name": "Platform",
+      "tags": [
+        "Accounts",
+        "Account Users",
+        "AgentBots",
+        "Users"
+      ]
+    },
+    {
+      "name": "Application",
+      "tags": [
+        "Account AgentBots",
+        "Contact",
+        "Conversation",
+        "Conversation Assignment",
+        "Conversation Labels",
+        "Inbox",
+        "Messages",
+        "Integrations",
+        "Profile",
+        "Teams"
+      ]
+    }
+  ]
 }
\ No newline at end of file

From 22965be6dc9cbbf9143f3c37552182c163988638 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 1 Jun 2021 22:34:25 +0530
Subject: [PATCH 22/67] feat: Add AgentBot APIs (#2323)

---
 .../api/v1/accounts/agent_bots_controller.rb  |  35 ++++
 .../api/v1/accounts/inboxes_controller.rb     |   4 +
 .../api/v1/agent_bots_controller.rb           |   7 -
 .../platform/api/v1/agent_bots_controller.rb  |  35 ++++
 app/dashboards/agent_bot_dashboard.rb         |   5 +-
 app/javascript/widget/mixins/configMixin.js   |   3 -
 .../widget/mixins/specs/configMixin.spec.js   |   3 -
 app/javascript/widget/views/Home.vue          |  14 +-
 app/models/account.rb                         |   1 +
 app/models/agent_bot.rb                       |  23 ++-
 app/policies/agent_bot_policy.rb              |  21 ++
 app/policies/inbox_policy.rb                  |   4 +
 .../accounts/agent_bots/create.json.jbuilder  |   1 +
 .../accounts/agent_bots/index.json.jbuilder   |   3 +
 .../v1/accounts/agent_bots/show.json.jbuilder |   1 +
 .../accounts/agent_bots/update.json.jbuilder  |   1 +
 .../accounts/inboxes/agent_bot.json.jbuilder  |   3 +
 .../api/v1/models/_agent_bot.json.jbuilder    |   5 +
 .../api/v1/agent_bots/create.json.jbuilder    |   1 +
 .../api/v1/agent_bots/index.json.jbuilder     |   3 +
 .../api/v1/agent_bots/show.json.jbuilder      |   1 +
 .../api/v1/agent_bots/update.json.jbuilder    |   1 +
 .../api/v1/models/_agent_bot.json.jbuilder    |   5 +
 app/views/widgets/show.html.erb               |   3 -
 config/routes.rb                              |   6 +-
 ...0520200729_add_account_id_to_agent_bots.rb |   6 +
 db/schema.rb                                  |   6 +-
 .../v1/accounts/agent_bots_controller_spec.rb | 180 ++++++++++++++++++
 .../v1/accounts/inboxes_controller_spec.rb    |  49 ++++-
 .../api/v1/agent_bots_controller_spec.rb      |  17 --
 .../api/v1/agent_bots_controller_spec.rb      | 172 +++++++++++++++++
 31 files changed, 552 insertions(+), 67 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/agent_bots_controller.rb
 delete mode 100644 app/controllers/api/v1/agent_bots_controller.rb
 create mode 100644 app/controllers/platform/api/v1/agent_bots_controller.rb
 create mode 100644 app/policies/agent_bot_policy.rb
 create mode 100644 app/views/api/v1/accounts/agent_bots/create.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/agent_bots/index.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/agent_bots/show.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/agent_bots/update.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/inboxes/agent_bot.json.jbuilder
 create mode 100644 app/views/api/v1/models/_agent_bot.json.jbuilder
 create mode 100644 app/views/platform/api/v1/agent_bots/create.json.jbuilder
 create mode 100644 app/views/platform/api/v1/agent_bots/index.json.jbuilder
 create mode 100644 app/views/platform/api/v1/agent_bots/show.json.jbuilder
 create mode 100644 app/views/platform/api/v1/agent_bots/update.json.jbuilder
 create mode 100644 app/views/platform/api/v1/models/_agent_bot.json.jbuilder
 create mode 100644 db/migrate/20210520200729_add_account_id_to_agent_bots.rb
 create mode 100644 spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
 delete mode 100644 spec/controllers/api/v1/agent_bots_controller_spec.rb
 create mode 100644 spec/controllers/platform/api/v1/agent_bots_controller_spec.rb

diff --git a/app/controllers/api/v1/accounts/agent_bots_controller.rb b/app/controllers/api/v1/accounts/agent_bots_controller.rb
new file mode 100644
index 000000000..7348ef255
--- /dev/null
+++ b/app/controllers/api/v1/accounts/agent_bots_controller.rb
@@ -0,0 +1,35 @@
+class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
+  before_action :current_account
+  before_action :check_authorization
+  before_action :agent_bot, except: [:index, :create]
+
+  def index
+    @agent_bots = AgentBot.where(account_id: [nil, Current.account.id])
+  end
+
+  def show; end
+
+  def create
+    @agent_bot = Current.account.agent_bots.create!(permitted_params)
+  end
+
+  def update
+    @agent_bot.update!(permitted_params)
+  end
+
+  def destroy
+    @agent_bot.destroy
+    head :ok
+  end
+
+  private
+
+  def agent_bot
+    @agent_bot = AgentBot.where(account_id: [nil, Current.account.id]).find(params[:id]) if params[:action] == 'show'
+    @agent_bot ||= Current.account.agent_bots.find(params[:id])
+  end
+
+  def permitted_params
+    params.permit(:name, :description, :outgoing_url)
+  end
+end
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 014e213d4..8a5f5b9b9 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -38,6 +38,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     update_channel_feature_flags
   end
 
+  def agent_bot
+    @agent_bot = @inbox.agent_bot
+  end
+
   def set_agent_bot
     if @agent_bot
       agent_bot_inbox = @inbox.agent_bot_inbox || AgentBotInbox.new(inbox: @inbox)
diff --git a/app/controllers/api/v1/agent_bots_controller.rb b/app/controllers/api/v1/agent_bots_controller.rb
deleted file mode 100644
index a82f71bb9..000000000
--- a/app/controllers/api/v1/agent_bots_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Api::V1::AgentBotsController < Api::BaseController
-  skip_before_action :authenticate_user!
-
-  def index
-    render json: AgentBot.all
-  end
-end
diff --git a/app/controllers/platform/api/v1/agent_bots_controller.rb b/app/controllers/platform/api/v1/agent_bots_controller.rb
new file mode 100644
index 000000000..0c79e118d
--- /dev/null
+++ b/app/controllers/platform/api/v1/agent_bots_controller.rb
@@ -0,0 +1,35 @@
+class Platform::Api::V1::AgentBotsController < PlatformController
+  before_action :set_resource, except: [:index, :create]
+  before_action :validate_platform_app_permissible, except: [:index, :create]
+
+  def index
+    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
+  end
+
+  def create
+    @resource = AgentBot.new(agent_bot_params)
+    @resource.save!
+    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
+  end
+
+  def show; end
+
+  def update
+    @resource.update!(agent_bot_params)
+  end
+
+  def destroy
+    @resource.destroy!
+    head :ok
+  end
+
+  private
+
+  def set_resource
+    @resource = AgentBot.find(params[:id])
+  end
+
+  def agent_bot_params
+    params.permit(:name, :description, :account_id, :outgoing_url)
+  end
+end
diff --git a/app/dashboards/agent_bot_dashboard.rb b/app/dashboards/agent_bot_dashboard.rb
index ca6ca7ad1..87605135d 100644
--- a/app/dashboards/agent_bot_dashboard.rb
+++ b/app/dashboards/agent_bot_dashboard.rb
@@ -15,8 +15,7 @@ class AgentBotDashboard < Administrate::BaseDashboard
     description: Field::String,
     outgoing_url: Field::String,
     created_at: Field::DateTime,
-    updated_at: Field::DateTime,
-    hide_input_for_bot_conversations: Field::Boolean
+    updated_at: Field::DateTime
   }.freeze
 
   # COLLECTION_ATTRIBUTES
@@ -39,7 +38,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
     name
     description
     outgoing_url
-    hide_input_for_bot_conversations
   ].freeze
 
   # FORM_ATTRIBUTES
@@ -49,7 +47,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
     name
     description
     outgoing_url
-    hide_input_for_bot_conversations
   ].freeze
 
   # COLLECTION_FILTERS
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index df26add3b..c70d9ca57 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -1,8 +1,5 @@
 export default {
   computed: {
-    hideInputForBotConversations() {
-      return window.chatwootWebChannel.hideInputForBotConversations;
-    },
     useInboxAvatarForBot() {
       return window.chatwootWidgetDefaults.useInboxAvatarForBot;
     },
diff --git a/app/javascript/widget/mixins/specs/configMixin.spec.js b/app/javascript/widget/mixins/specs/configMixin.spec.js
index 014a7930a..663cf695d 100644
--- a/app/javascript/widget/mixins/specs/configMixin.spec.js
+++ b/app/javascript/widget/mixins/specs/configMixin.spec.js
@@ -3,7 +3,6 @@ import configMixin from '../configMixin';
 import Vue from 'vue';
 
 global.chatwootWebChannel = {
-  hideInputForBotConversations: true,
   avatarUrl: 'https://test.url',
   hasAConnectedAgentBot: 'AgentBot',
   enabledFeatures: ['emoji_picker', 'attachments'],
@@ -25,12 +24,10 @@ describe('configMixin', () => {
     const wrapper = createWrapper(vm);
     expect(wrapper.vm.hasEmojiPickerEnabled).toBe(true);
     expect(wrapper.vm.hasAttachmentsEnabled).toBe(true);
-    expect(wrapper.vm.hideInputForBotConversations).toBe(true);
     expect(wrapper.vm.hasAConnectedAgentBot).toBe(true);
     expect(wrapper.vm.useInboxAvatarForBot).toBe(true);
     expect(wrapper.vm.inboxAvatarUrl).toBe('https://test.url');
     expect(wrapper.vm.channelConfig).toEqual({
-      hideInputForBotConversations: true,
       avatarUrl: 'https://test.url',
       hasAConnectedAgentBot: 'AgentBot',
       enabledFeatures: ['emoji_picker', 'attachments'],
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index 3d77f33b5..a86c29a28 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -62,10 +62,7 @@
         leave-class="opacity-100 transform translate-y-0"
         leave-to-class="opacity-0 transform "
       >
-        <div
-          v-if="showInputTextArea && currentView === 'messageView'"
-          class="input-wrap"
-        >
+        <div v-if="currentView === 'messageView'" class="input-wrap">
           <chat-footer />
         </div>
         <team-availability
@@ -146,15 +143,6 @@ export default {
     fileUploadSizeLimit() {
       return MAXIMUM_FILE_UPLOAD_SIZE;
     },
-    showInputTextArea() {
-      if (this.hideInputForBotConversations) {
-        if (this.isOpen) {
-          return true;
-        }
-        return false;
-      }
-      return true;
-    },
     isHeaderCollapsed() {
       if (!this.hasIntroText || this.conversationSize) {
         return true;
diff --git a/app/models/account.rb b/app/models/account.rb
index b7a023bda..b0c4e2b72 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -33,6 +33,7 @@ class Account < ApplicationRecord
 
   has_many :account_users, dependent: :destroy
   has_many :agent_bot_inboxes, dependent: :destroy
+  has_many :agent_bots, dependent: :destroy
   has_many :data_imports, dependent: :destroy
   has_many :users, through: :account_users
   has_many :inboxes, dependent: :destroy
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 6f849b0f8..75f051f8e 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -2,13 +2,21 @@
 #
 # Table name: agent_bots
 #
-#  id                               :bigint           not null, primary key
-#  description                      :string
-#  hide_input_for_bot_conversations :boolean          default(FALSE)
-#  name                             :string
-#  outgoing_url                     :string
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
+#  id           :bigint           not null, primary key
+#  description  :string
+#  name         :string
+#  outgoing_url :string
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  account_id   :bigint
+#
+# Indexes
+#
+#  index_agent_bots_on_account_id  (account_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
 #
 
 class AgentBot < ApplicationRecord
@@ -18,6 +26,7 @@ class AgentBot < ApplicationRecord
   has_many :agent_bot_inboxes, dependent: :destroy
   has_many :inboxes, through: :agent_bot_inboxes
   has_many :messages, as: :sender, dependent: :restrict_with_exception
+  belongs_to :account, dependent: :destroy, optional: true
 
   def available_name
     name
diff --git a/app/policies/agent_bot_policy.rb b/app/policies/agent_bot_policy.rb
new file mode 100644
index 000000000..4d5e363ea
--- /dev/null
+++ b/app/policies/agent_bot_policy.rb
@@ -0,0 +1,21 @@
+class AgentBotPolicy < ApplicationPolicy
+  def index?
+    @account_user.administrator? || @account_user.agent?
+  end
+
+  def update?
+    @account_user.administrator?
+  end
+
+  def show?
+    @account_user.administrator? || @account_user.agent?
+  end
+
+  def create?
+    @account_user.administrator?
+  end
+
+  def destroy?
+    @account_user.administrator?
+  end
+end
diff --git a/app/policies/inbox_policy.rb b/app/policies/inbox_policy.rb
index 927ff9435..0bfe6fe40 100644
--- a/app/policies/inbox_policy.rb
+++ b/app/policies/inbox_policy.rb
@@ -27,6 +27,10 @@ class InboxPolicy < ApplicationPolicy
     true
   end
 
+  def agent_bot?
+    true
+  end
+
   def campaigns?
     @account_user.administrator?
   end
diff --git a/app/views/api/v1/accounts/agent_bots/create.json.jbuilder b/app/views/api/v1/accounts/agent_bots/create.json.jbuilder
new file mode 100644
index 000000000..453ef5cb4
--- /dev/null
+++ b/app/views/api/v1/accounts/agent_bots/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: @agent_bot
diff --git a/app/views/api/v1/accounts/agent_bots/index.json.jbuilder b/app/views/api/v1/accounts/agent_bots/index.json.jbuilder
new file mode 100644
index 000000000..d65188ff2
--- /dev/null
+++ b/app/views/api/v1/accounts/agent_bots/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @agent_bots do |agent_bot|
+  json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: agent_bot
+end
diff --git a/app/views/api/v1/accounts/agent_bots/show.json.jbuilder b/app/views/api/v1/accounts/agent_bots/show.json.jbuilder
new file mode 100644
index 000000000..453ef5cb4
--- /dev/null
+++ b/app/views/api/v1/accounts/agent_bots/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: @agent_bot
diff --git a/app/views/api/v1/accounts/agent_bots/update.json.jbuilder b/app/views/api/v1/accounts/agent_bots/update.json.jbuilder
new file mode 100644
index 000000000..453ef5cb4
--- /dev/null
+++ b/app/views/api/v1/accounts/agent_bots/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: @agent_bot
diff --git a/app/views/api/v1/accounts/inboxes/agent_bot.json.jbuilder b/app/views/api/v1/accounts/inboxes/agent_bot.json.jbuilder
new file mode 100644
index 000000000..73b364f04
--- /dev/null
+++ b/app/views/api/v1/accounts/inboxes/agent_bot.json.jbuilder
@@ -0,0 +1,3 @@
+json.agent_bot do
+  json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: @agent_bot if @agent_bot.present?
+end
diff --git a/app/views/api/v1/models/_agent_bot.json.jbuilder b/app/views/api/v1/models/_agent_bot.json.jbuilder
new file mode 100644
index 000000000..1aa152186
--- /dev/null
+++ b/app/views/api/v1/models/_agent_bot.json.jbuilder
@@ -0,0 +1,5 @@
+json.id resource.id
+json.name resource.name
+json.description resource.description
+json.outgoing_url resource.name
+json.account_id resource.account_id
diff --git a/app/views/platform/api/v1/agent_bots/create.json.jbuilder b/app/views/platform/api/v1/agent_bots/create.json.jbuilder
new file mode 100644
index 000000000..32123ab29
--- /dev/null
+++ b/app/views/platform/api/v1/agent_bots/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/agent_bot.json.jbuilder', resource: @resource
diff --git a/app/views/platform/api/v1/agent_bots/index.json.jbuilder b/app/views/platform/api/v1/agent_bots/index.json.jbuilder
new file mode 100644
index 000000000..9dd6dcce6
--- /dev/null
+++ b/app/views/platform/api/v1/agent_bots/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @resources do |resource|
+  json.partial! 'platform/api/v1/models/agent_bot.json.jbuilder', resource: resource.permissible
+end
diff --git a/app/views/platform/api/v1/agent_bots/show.json.jbuilder b/app/views/platform/api/v1/agent_bots/show.json.jbuilder
new file mode 100644
index 000000000..32123ab29
--- /dev/null
+++ b/app/views/platform/api/v1/agent_bots/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/agent_bot.json.jbuilder', resource: @resource
diff --git a/app/views/platform/api/v1/agent_bots/update.json.jbuilder b/app/views/platform/api/v1/agent_bots/update.json.jbuilder
new file mode 100644
index 000000000..32123ab29
--- /dev/null
+++ b/app/views/platform/api/v1/agent_bots/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/agent_bot.json.jbuilder', resource: @resource
diff --git a/app/views/platform/api/v1/models/_agent_bot.json.jbuilder b/app/views/platform/api/v1/models/_agent_bot.json.jbuilder
new file mode 100644
index 000000000..1aa152186
--- /dev/null
+++ b/app/views/platform/api/v1/models/_agent_bot.json.jbuilder
@@ -0,0 +1,5 @@
+json.id resource.id
+json.name resource.name
+json.description resource.description
+json.outgoing_url resource.name
+json.account_id resource.account_id
diff --git a/app/views/widgets/show.html.erb b/app/views/widgets/show.html.erb
index 85297111a..c63dd08eb 100644
--- a/app/views/widgets/show.html.erb
+++ b/app/views/widgets/show.html.erb
@@ -8,9 +8,6 @@
       window.chatwootWebChannel = {
         avatarUrl: '<%= @web_widget.inbox.avatar_url %>',
         hasAConnectedAgentBot: '<%= @web_widget.inbox.agent_bot&.name %>',
-        <% if @web_widget.inbox.agent_bot %>
-          hideInputForBotConversations: <%= @web_widget.inbox.agent_bot.hide_input_for_bot_conversations %>,
-        <% end %>
         locale: '<%= @web_widget.account.locale %>',
         websiteName: '<%= @web_widget.inbox.name %>',
         websiteToken: '<%= @web_widget.website_token %>',
diff --git a/config/routes.rb b/config/routes.rb
index bbfe3599b..499588e42 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -38,6 +38,8 @@ Rails.application.routes.draw do
           end
 
           resources :agents, except: [:show, :edit, :new]
+          resources :agent_bots, only: [:index, :create, :show, :update, :destroy]
+
           resources :callbacks, only: [] do
             collection do
               post :register_facebook_page
@@ -97,6 +99,7 @@ Rails.application.routes.draw do
           resources :inboxes, only: [:index, :create, :update, :destroy] do
             get :assignable_agents, on: :member
             get :campaigns, on: :member
+            get :agent_bot, on: :member
             post :set_agent_bot, on: :member
           end
           resources :inbox_members, only: [:create, :show], param: :inbox_id
@@ -151,8 +154,6 @@ Rails.application.routes.draw do
       resource :profile, only: [:show, :update]
       resource :notification_subscriptions, only: [:create]
 
-      resources :agent_bots, only: [:index]
-
       namespace :widget do
         resources :campaigns, only: [:index]
         resources :events, only: [:create]
@@ -194,6 +195,7 @@ Rails.application.routes.draw do
             get :login
           end
         end
+        resources :agent_bots, only: [:index, :create, :show, :update, :destroy]
         resources :accounts, only: [:create, :show, :update, :destroy] do
           resources :account_users, only: [:index, :create] do
             collection do
diff --git a/db/migrate/20210520200729_add_account_id_to_agent_bots.rb b/db/migrate/20210520200729_add_account_id_to_agent_bots.rb
new file mode 100644
index 000000000..cd4a26073
--- /dev/null
+++ b/db/migrate/20210520200729_add_account_id_to_agent_bots.rb
@@ -0,0 +1,6 @@
+class AddAccountIdToAgentBots < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :agent_bots, :hide_input_for_bot_conversations, :boolean
+    add_reference :agent_bots, :account, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 60f080d5c..5a1fd235b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_05_13_083044) do
+ActiveRecord::Schema.define(version: 2021_05_20_200729) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -97,7 +97,8 @@ ActiveRecord::Schema.define(version: 2021_05_13_083044) do
     t.string "outgoing_url"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.boolean "hide_input_for_bot_conversations", default: false
+    t.bigint "account_id"
+    t.index ["account_id"], name: "index_agent_bots_on_account_id"
   end
 
   create_table "attachments", id: :serial, force: :cascade do |t|
@@ -611,6 +612,7 @@ ActiveRecord::Schema.define(version: 2021_05_13_083044) do
   add_foreign_key "account_users", "accounts"
   add_foreign_key "account_users", "users"
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "agent_bots", "accounts"
   add_foreign_key "campaigns", "accounts"
   add_foreign_key "campaigns", "inboxes"
   add_foreign_key "contact_inboxes", "contacts"
diff --git a/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb b/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
new file mode 100644
index 000000000..60442e6d6
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
@@ -0,0 +1,180 @@
+require 'rails_helper'
+
+RSpec.describe 'Agent Bot API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:agent_bot) { create(:agent_bot, account: account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  describe 'GET /api/v1/accounts/{account.id}/agent_bots' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/agent_bots"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns all the agent_bots in account along with global agent bots' do
+        global_bot = create(:agent_bot)
+        get "/api/v1/accounts/#{account.id}/agent_bots",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(agent_bot.name)
+        expect(response.body).to include(global_bot.name)
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/agent_bots/:id' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'shows the agent bot' do
+        get "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(agent_bot.name)
+      end
+
+      it 'will show a global agent bot' do
+        global_bot = create(:agent_bot)
+        get "/api/v1/accounts/#{account.id}/agent_bots/#{global_bot.id}",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(global_bot.name)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/agent_bots' do
+    let(:valid_params) { { name: 'test' } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        expect { post "/api/v1/accounts/#{account.id}/agent_bots", params: valid_params }.to change(Label, :count).by(0)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'creates the agent bot when administrator' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/agent_bots", headers: admin.create_new_auth_token,
+                                                            params: valid_params
+        end.to change(AgentBot, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'would not create the agent bot when agent' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/agent_bots", headers: agent.create_new_auth_token,
+                                                            params: valid_params
+        end.to change(AgentBot, :count).by(0)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/agent_bots/:id' do
+    let(:valid_params) { { name: 'test_updated' } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        patch "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+              params: valid_params
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'updates the agent bot' do
+        patch "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+              headers: admin.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(agent_bot.reload.name).to eq('test_updated')
+      end
+
+      it 'would not update the agent bot when agent' do
+        patch "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+              headers: agent.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+        expect(agent_bot.reload.name).not_to eq('test_updated')
+      end
+
+      it 'would not update a global agent bot' do
+        global_bot = create(:agent_bot)
+        patch "/api/v1/accounts/#{account.id}/agent_bots/#{global_bot.id}",
+              headers: admin.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:not_found)
+        expect(agent_bot.reload.name).not_to eq('test_updated')
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/agent_bots/:id' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'deletes an agent bot when administrator' do
+        delete "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+               headers: admin.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(account.agent_bots.size).to eq(0)
+      end
+
+      it 'would not delete the agent bot when agent' do
+        delete "/api/v1/accounts/#{account.id}/agent_bots/#{agent_bot.id}",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+        expect(account.agent_bots.size).not_to eq(0)
+      end
+
+      it 'would not delete a global agent bot' do
+        global_bot = create(:agent_bot)
+        delete "/api/v1/accounts/#{account.id}/agent_bots/#{global_bot.id}",
+               headers: admin.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:not_found)
+        expect(account.agent_bots.size).not_to eq(0)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 5efa8049c..a4143df25 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -2,6 +2,8 @@ require 'rails_helper'
 
 RSpec.describe 'Inboxes API', type: :request do
   let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
 
   describe 'GET /api/v1/accounts/{account.id}/inboxes' do
     context 'when it is an unauthenticated user' do
@@ -15,11 +17,11 @@ RSpec.describe 'Inboxes API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:admin) { create(:user, account: account, role: :administrator) }
+      let(:inbox) { create(:inbox, account: account) }
 
       before do
         create(:inbox, account: account)
-        second_inbox = create(:inbox, account: account)
-        create(:inbox_member, user: agent, inbox: second_inbox)
+        create(:inbox_member, user: agent, inbox: inbox)
       end
 
       it 'returns all inboxes of current_account as administrator' do
@@ -54,9 +56,6 @@ RSpec.describe 'Inboxes API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-      let(:admin) { create(:user, account: account, role: :administrator) }
-
       before do
         create(:inbox_member, user: agent, inbox: inbox)
       end
@@ -92,7 +91,9 @@ RSpec.describe 'Inboxes API', type: :request do
       let!(:campaign) { create(:campaign, account: account, inbox: inbox) }
 
       it 'returns unauthorized for agents' do
-        get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/campaigns"
+        get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/campaigns",
+            headers: agent.create_new_auth_token,
+            as: :json
 
         expect(response).to have_http_status(:unauthorized)
       end
@@ -263,6 +264,42 @@ RSpec.describe 'Inboxes API', type: :request do
     end
   end
 
+  describe 'GET /api/v1/accounts/{account.id}/inboxes/{inbox.id}/agent_bot' do
+    let(:inbox) { create(:inbox, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/agent_bot"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns empty when no agent bot is present' do
+        get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/agent_bot",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        inbox_data = JSON.parse(response.body, symbolize_names: true)
+        expect(inbox_data[:agent_bot].blank?).to eq(true)
+      end
+
+      it 'returns the agent bot attached to the inbox' do
+        agent_bot = create(:agent_bot)
+        create(:agent_bot_inbox, agent_bot: agent_bot, inbox: inbox)
+        get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/agent_bot",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        inbox_data = JSON.parse(response.body, symbolize_names: true)
+        expect(inbox_data[:agent_bot][:name]).to eq agent_bot.name
+      end
+    end
+  end
+
   describe 'POST /api/v1/accounts/{account.id}/inboxes/:id/set_agent_bot' do
     let(:inbox) { create(:inbox, account: account) }
     let(:agent_bot) { create(:agent_bot) }
diff --git a/spec/controllers/api/v1/agent_bots_controller_spec.rb b/spec/controllers/api/v1/agent_bots_controller_spec.rb
deleted file mode 100644
index 258fad5c3..000000000
--- a/spec/controllers/api/v1/agent_bots_controller_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Profile API', type: :request do
-  let!(:agent_bot1) { create(:agent_bot) }
-  let!(:agent_bot2) { create(:agent_bot) }
-
-  describe 'GET /api/v1/agent_bots' do
-    it 'returns all the agent bots in the system' do
-      get '/api/v1/agent_bots',
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.body).to include(agent_bot1.name)
-      expect(response.body).to include(agent_bot2.name)
-    end
-  end
-end
diff --git a/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
new file mode 100644
index 000000000..d56e1dfb9
--- /dev/null
+++ b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
@@ -0,0 +1,172 @@
+require 'rails_helper'
+
+RSpec.describe 'Platform Agent Bot API', type: :request do
+  let!(:agent_bot) { create(:agent_bot) }
+
+  describe 'GET /platform/api/v1/agent_bots' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        get '/platform/api/v1/agent_bots'
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an invalid platform app token' do
+      it 'returns unauthorized' do
+        get '/platform/api/v1/agent_bots', headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'returns unauthorized when its not a permissible object' do
+        get '/platform/api/v1/agent_bots', headers: { api_access_token: platform_app.access_token.token }, as: :json
+        expect(response).to have_http_status(:success)
+        data = JSON.parse(response.body)
+        expect(data.length).to eq(0)
+      end
+
+      it 'shows a agent_bot when its permissible object' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+
+        get '/platform/api/v1/agent_bots',
+            headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        data = JSON.parse(response.body)
+        expect(data.length).to eq(1)
+      end
+    end
+  end
+
+  describe 'GET /platform/api/v1/agent_bots/{agent_bot_id}' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        get "/platform/api/v1/agent_bots/#{agent_bot.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an invalid platform app token' do
+      it 'returns unauthorized' do
+        get "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'returns unauthorized when its not a permissible object' do
+        get "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: platform_app.access_token.token }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'shows a agent_bot when its permissible object' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+
+        get "/platform/api/v1/agent_bots/#{agent_bot.id}",
+            headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        data = JSON.parse(response.body)
+        expect(data['name']).to eq(agent_bot.name)
+      end
+    end
+  end
+
+  describe 'POST /platform/api/v1/agent_bots/' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        post '/platform/api/v1/agent_bots'
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an invalid platform app token' do
+      it 'returns unauthorized' do
+        post '/platform/api/v1/agent_bots/', headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'creates a new agent bot' do
+        post '/platform/api/v1/agent_bots/', params: { name: 'test' },
+                                             headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        data = JSON.parse(response.body)
+        expect(data['name']).to eq('test')
+        expect(platform_app.platform_app_permissibles.first.permissible_id).to eq data['id']
+      end
+    end
+  end
+
+  describe 'PATCH /platform/api/v1/agent_bots/{agent_bot_id}' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        patch "/platform/api/v1/agent_bots/#{agent_bot.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an invalid platform app token' do
+      it 'returns unauthorized' do
+        patch "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'returns unauthorized when its not a permissible object' do
+        patch "/platform/api/v1/agent_bots/#{agent_bot.id}", params: { name: 'test' },
+                                                             headers: { api_access_token: platform_app.access_token.token }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'updates the agent_bot' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+        patch "/platform/api/v1/agent_bots/#{agent_bot.id}", params: { name: 'test123' },
+                                                             headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        data = JSON.parse(response.body)
+        expect(data['name']).to eq('test123')
+      end
+    end
+  end
+
+  describe 'DELETE /platform/api/v1/agent_bots/{agent_bot_id}' do
+    context 'when it is an unauthenticated platform app' do
+      it 'returns unauthorized' do
+        delete "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated platform app' do
+      let(:platform_app) { create(:platform_app) }
+
+      it 'returns unauthorized when its not a permissible object' do
+        delete "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: 'invalid' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns deletes the account user' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+
+        delete "/platform/api/v1/agent_bots/#{agent_bot.id}", headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(AgentBot.count).to eq 0
+      end
+    end
+  end
+end

From 2c42e706377517fe2cfaa2cc441952418ce20877 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Wed, 2 Jun 2021 10:20:40 +0530
Subject: [PATCH 23/67] feat: Add support for canned response command anywhere
 on rich text editor (#2356)

---
 .../components/widgets/WootWriter/Editor.vue  | 75 ++++++++++++++++---
 .../widgets/conversation/ReplyBox.vue         | 10 ++-
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index ba26ef177..ff9ddfd67 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -5,29 +5,38 @@
       :search-key="mentionSearchKey"
       @click="insertMentionNode"
     />
+    <canned-response
+      v-if="showCannedMenu"
+      :search-key="cannedSearchTerm"
+      @click="insertCannedResponse"
+    />
     <div ref="editor"></div>
   </div>
 </template>
 
 <script>
 import { EditorView } from 'prosemirror-view';
+
 import { defaultMarkdownSerializer } from 'prosemirror-markdown';
-
-const TYPING_INDICATOR_IDLE_TIME = 4000;
-
 import {
   addMentionsToMarkdownSerializer,
   addMentionsToMarkdownParser,
   schemaWithMentions,
 } from '@chatwoot/prosemirror-schema/src/mentions/schema';
+
 import {
   suggestionsPlugin,
   triggerCharacters,
 } from '@chatwoot/prosemirror-schema/src/mentions/plugin';
-import TagAgents from '../conversation/TagAgents.vue';
 import { EditorState } from 'prosemirror-state';
 import { defaultMarkdownParser } from 'prosemirror-markdown';
 import { wootWriterSetup } from '@chatwoot/prosemirror-schema';
+
+import TagAgents from '../conversation/TagAgents';
+import CannedResponse from '../conversation/CannedResponse';
+
+const TYPING_INDICATOR_IDLE_TIME = 4000;
+
 import '@chatwoot/prosemirror-schema/src/woot-editor.css';
 
 const createState = (content, placeholder, plugins = []) => {
@@ -43,7 +52,7 @@ const createState = (content, placeholder, plugins = []) => {
 
 export default {
   name: 'WootMessageEditor',
-  components: { TagAgents },
+  components: { TagAgents, CannedResponse },
   props: {
     value: { type: String, default: '' },
     placeholder: { type: String, default: '' },
@@ -53,7 +62,9 @@ export default {
     return {
       lastValue: null,
       showUserMentions: false,
+      showCannedMenu: false,
       mentionSearchKey: '',
+      cannedSearchTerm: '',
       editorView: null,
       range: null,
     };
@@ -86,6 +97,35 @@ export default {
             return event.keyCode === 13 && this.showUserMentions;
           },
         }),
+        suggestionsPlugin({
+          matcher: triggerCharacters('/'),
+          suggestionClass: '',
+          onEnter: args => {
+            if (this.isPrivate) {
+              return false;
+            }
+            this.showCannedMenu = true;
+            this.range = args.range;
+            this.editorView = args.view;
+            return false;
+          },
+          onChange: args => {
+            this.editorView = args.view;
+            this.range = args.range;
+
+            this.cannedSearchTerm = args.text.replace('/', '');
+            return false;
+          },
+          onExit: () => {
+            this.cannedSearchTerm = '';
+            this.showCannedMenu = false;
+            this.editorView = null;
+            return false;
+          },
+          onKeyDown: ({ event }) => {
+            return event.keyCode === 13 && this.showCannedMenu;
+          },
+        }),
       ];
     },
   },
@@ -93,6 +133,9 @@ export default {
     showUserMentions(updatedValue) {
       this.$emit('toggle-user-mention', this.isPrivate && updatedValue);
     },
+    showCannedMenu(updatedValue) {
+      this.$emit('toggle-canned-menu', !this.isPrivate && updatedValue);
+    },
     value(newValue) {
       if (newValue !== this.lastValue) {
         this.state = createState(newValue, this.placeholder, this.plugins);
@@ -141,6 +184,21 @@ export default {
       this.state = this.view.state.apply(tr);
       return this.emitOnChange();
     },
+
+    insertCannedResponse(cannedItem) {
+      if (!this.view) {
+        return null;
+      }
+
+      const tr = this.view.state.tr.insertText(
+        cannedItem,
+        this.range.from,
+        this.range.to
+      );
+      this.state = this.view.state.apply(tr);
+      return this.emitOnChange();
+    },
+
     emitOnChange() {
       this.view.updateState(this.state);
       this.lastValue = addMentionsToMarkdownSerializer(
@@ -206,10 +264,9 @@ export default {
 .is-private {
   .prosemirror-mention-node {
     font-weight: var(--font-weight-medium);
-    background: var(--s-300);
-    border-radius: var(--border-radius-small);
-    padding: 1px 4px;
-    color: var(--white);
+    background: var(--s-50);
+    color: var(--s-900);
+    padding: 0 var(--space-smaller);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 81c94640f..5d97076bb 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -42,6 +42,7 @@
         @focus="onFocus"
         @blur="onBlur"
         @toggle-user-mention="toggleUserMention"
+        @toggle-canned-menu="toggleCannedMenu"
       />
     </div>
     <div v-if="hasAttachments" class="attachment-preview-box">
@@ -249,7 +250,8 @@ export default {
       }
     },
     message(updatedMessage) {
-      this.hasSlashCommand = updatedMessage[0] === '/';
+      this.hasSlashCommand =
+        updatedMessage[0] === '/' && !this.showRichContentEditor;
       const hasNextWord = updatedMessage.includes(' ');
       const isShortCodeActive = this.hasSlashCommand && !hasNextWord;
       if (isShortCodeActive) {
@@ -271,6 +273,9 @@ export default {
     toggleUserMention(currentMentionState) {
       this.hasUserMention = currentMentionState;
     },
+    toggleCannedMenu(value) {
+      this.showCannedMenu = value;
+    },
     handleKeyEvents(e) {
       if (isEscape(e)) {
         this.hideEmojiPicker();
@@ -279,7 +284,8 @@ export default {
         const hasSendOnEnterEnabled =
           (this.showRichContentEditor &&
             this.enterToSendEnabled &&
-            !this.hasUserMention) ||
+            !this.hasUserMention &&
+            !this.showCannedMenu) ||
           !this.showRichContentEditor;
         const shouldSendMessage =
           hasSendOnEnterEnabled && !hasPressedShift(e) && this.isFocused;

From b0b4d9d6f5227c3e0325ad117973d83295d1eddf Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 2 Jun 2021 17:52:24 +0530
Subject: [PATCH 24/67] enhancement: Current password confirmation in change
 password (#2108)

* add current password field in change password form

* locale changes

* chore: update password API

* chore: rubocop fixes

* replace currentPassword with current_password

* code cleanup

* replace input with woot-input

* code cleanup

Co-authored-by: Sojan <sojan@pepalo.com>
---
 app/controllers/api/v1/profiles_controller.rb |  16 +-
 .../dashboard/i18n/locale/en/settings.json    |   5 +
 .../settings/profile/ChangePassword.vue       | 152 ++++++++++++++++++
 .../dashboard/settings/profile/Index.vue      |  93 ++---------
 .../dashboard/store/modules/auth.js           |   3 +-
 .../api/v1/profiles_controller_spec.rb        |  16 +-
 6 files changed, 201 insertions(+), 84 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue

diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index c59edfce0..5805f49ed 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -6,6 +6,12 @@ class Api::V1::ProfilesController < Api::BaseController
   end
 
   def update
+    if password_params[:password].present?
+      render_could_not_create_error('Invalid current password') and return unless @user.valid_password?(password_params[:current_password])
+
+      @user.update!(password_params.except(:current_password))
+    end
+
     @user.update!(profile_params)
   end
 
@@ -20,11 +26,17 @@ class Api::V1::ProfilesController < Api::BaseController
       :email,
       :name,
       :display_name,
-      :password,
-      :password_confirmation,
       :avatar,
       :availability,
       ui_settings: {}
     )
   end
+
+  def password_params
+    params.require(:profile).permit(
+      :current_password,
+      :password,
+      :password_confirmation
+    )
+  end
 end
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 314bbbbda..aa51c35be 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -74,6 +74,11 @@
         "ERROR": "Please enter a valid email address",
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Password",
         "ERROR": "Please enter a password of length 6 or more",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
new file mode 100644
index 000000000..2b226add9
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -0,0 +1,152 @@
+<template>
+  <form @submit.prevent="changePassword()">
+    <div class="profile--settings--row row">
+      <div class="columns small-3">
+        <h4 class="block-title">
+          {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.TITLE') }}
+        </h4>
+        <p>{{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.NOTE') }}</p>
+      </div>
+      <div class="columns small-9 medium-5">
+        <woot-input
+          v-model="currentPassword"
+          type="password"
+          :class="{ error: $v.currentPassword.$error }"
+          :label="$t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.LABEL')"
+          :placeholder="
+            $t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.PLACEHOLDER')
+          "
+          :error="
+            $v.currentPassword.$error
+              ? $t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.ERROR')
+              : ''
+          "
+          @blur="$v.currentPassword.$touch"
+        />
+
+        <woot-input
+          v-model="password"
+          type="password"
+          :class="{ error: $v.password.$error }"
+          :label="$t('PROFILE_SETTINGS.FORM.PASSWORD.LABEL')"
+          :placeholder="$t('PROFILE_SETTINGS.FORM.PASSWORD.PLACEHOLDER')"
+          :error="
+            $v.password.$error ? $t('PROFILE_SETTINGS.FORM.PASSWORD.ERROR') : ''
+          "
+          @blur="$v.password.$touch"
+        />
+
+        <woot-input
+          v-model="passwordConfirmation"
+          type="password"
+          :class="{ error: $v.passwordConfirmation.$error }"
+          :label="$t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.LABEL')"
+          :placeholder="
+            $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.PLACEHOLDER')
+          "
+          :error="
+            $v.passwordConfirmation.$error
+              ? $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.ERROR')
+              : ''
+          "
+          @blur="$v.passwordConfirmation.$touch"
+        />
+
+        <woot-button
+          :is-loading="isPasswordChanging"
+          type="submit"
+          :disabled="
+            !currentPassword ||
+              !passwordConfirmation ||
+              !$v.passwordConfirmation.isEqPassword
+          "
+        >
+          {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.BTN_TEXT') }}
+        </woot-button>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script>
+import { required, minLength } from 'vuelidate/lib/validators';
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  mixins: [alertMixin],
+  data() {
+    return {
+      currentPassword: '',
+      password: '',
+      passwordConfirmation: '',
+      isPasswordChanging: false,
+      errorMessage: '',
+    };
+  },
+  validations: {
+    currentPassword: {
+      required,
+    },
+    password: {
+      minLength: minLength(6),
+    },
+    passwordConfirmation: {
+      minLength: minLength(6),
+      isEqPassword(value) {
+        if (value !== this.password) {
+          return false;
+        }
+        return true;
+      },
+    },
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+      currentUserId: 'getCurrentUserID',
+    }),
+  },
+  methods: {
+    async changePassword() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
+        return;
+      }
+
+      try {
+        await this.$store.dispatch('updateProfile', {
+          password: this.password,
+          password_confirmation: this.passwordConfirmation,
+          current_password: this.currentPassword,
+        });
+        this.errorMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
+      } catch (error) {
+        this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
+        if (error?.response?.data?.error) {
+          this.errorMessage = error.response.data.error;
+        }
+      } finally {
+        this.isPasswordChanging = false;
+        this.showAlert(this.errorMessage);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@import '~dashboard/assets/scss/mixins.scss';
+
+.profile--settings--row {
+  @include border-normal-bottom;
+  padding: var(--space-normal);
+  .small-3 {
+    padding: var(--space-normal) var(--space-medium) var(--space-normal) 0;
+  }
+  .small-9 {
+    padding: var(--space-normal);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 90d6f7012..93d965421 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -55,53 +55,7 @@
         </div>
       </div>
     </form>
-    <form @submit.prevent="updateUser('password')">
-      <div class="profile--settings--row row">
-        <div class="columns small-3">
-          <h4 class="block-title">
-            {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.TITLE') }}
-          </h4>
-          <p>{{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.NOTE') }}</p>
-        </div>
-        <div class="columns small-9 medium-5">
-          <label :class="{ error: $v.password.$error }">
-            {{ $t('PROFILE_SETTINGS.FORM.PASSWORD.LABEL') }}
-            <input
-              v-model.trim="password"
-              type="password"
-              :placeholder="$t('PROFILE_SETTINGS.FORM.PASSWORD.PLACEHOLDER')"
-              @input="$v.password.$touch"
-            />
-            <span v-if="$v.password.$error" class="message">
-              {{ $t('PROFILE_SETTINGS.FORM.PASSWORD.ERROR') }}
-            </span>
-          </label>
-          <label :class="{ error: $v.passwordConfirmation.$error }">
-            {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.LABEL') }}
-            <input
-              v-model.trim="passwordConfirmation"
-              type="password"
-              :placeholder="
-                $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.PLACEHOLDER')
-              "
-              @input="$v.passwordConfirmation.$touch"
-            />
-            <span v-if="$v.passwordConfirmation.$error" class="message">
-              {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.ERROR') }}
-            </span>
-          </label>
-          <woot-button
-            :is-loading="isPasswordChanging"
-            type="submit"
-            :disabled="
-              !passwordConfirmation || !$v.passwordConfirmation.isEqPassword
-            "
-          >
-            {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.BTN_TEXT') }}
-          </woot-button>
-        </div>
-      </div>
-    </form>
+    <change-password />
     <notification-settings />
     <div class="profile--settings--row row">
       <div class="columns small-3">
@@ -123,10 +77,12 @@ import { mapGetters } from 'vuex';
 import { clearCookiesOnLogout } from '../../../../store/utils/api';
 import NotificationSettings from './NotificationSettings';
 import alertMixin from 'shared/mixins/alertMixin';
+import ChangePassword from './ChangePassword.vue';
 
 export default {
   components: {
     NotificationSettings,
+    ChangePassword,
   },
   mixins: [alertMixin],
   data() {
@@ -136,10 +92,8 @@ export default {
       name: '',
       displayName: '',
       email: '',
-      password: '',
-      passwordConfirmation: '',
       isProfileUpdating: false,
-      isPasswordChanging: false,
+      errorMessage: '',
     };
   },
   validations: {
@@ -152,18 +106,6 @@ export default {
       required,
       email,
     },
-    password: {
-      minLength: minLength(6),
-    },
-    passwordConfirmation: {
-      minLength: minLength(6),
-      isEqPassword(value) {
-        if (value !== this.password) {
-          return false;
-        }
-        return true;
-      },
-    },
   },
   computed: {
     ...mapGetters({
@@ -190,41 +132,36 @@ export default {
       this.avatarUrl = this.currentUser.avatar_url;
       this.displayName = this.currentUser.display_name;
     },
-    async updateUser(type) {
+    async updateUser() {
       this.$v.$touch();
       if (this.$v.$invalid) {
         this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
         return;
       }
-      if (type === 'profile') {
-        this.isProfileUpdating = true;
-      } else if (type === 'password') {
-        this.isPasswordChanging = true;
-      }
+
+      this.isProfileUpdating = true;
       const hasEmailChanged = this.currentUser.email !== this.email;
       try {
         await this.$store.dispatch('updateProfile', {
           name: this.name,
           email: this.email,
           avatar: this.avatarFile,
-          password: this.password,
           displayName: this.displayName,
-          password_confirmation: this.passwordConfirmation,
         });
         this.isProfileUpdating = false;
-        this.isPasswordChanging = false;
         if (hasEmailChanged) {
           clearCookiesOnLogout();
-          this.showAlert(this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED'));
-        }
-        if (type === 'profile') {
-          this.showAlert(this.$t('PROFILE_SETTINGS.UPDATE_SUCCESS'));
-        } else if (type === 'password') {
-          this.showAlert(this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS'));
+          this.errorMessage = this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED');
         }
+        this.errorMessage = this.$t('PROFILE_SETTINGS.UPDATE_SUCCESS');
       } catch (error) {
+        this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
+        if (error?.response?.data?.error) {
+          this.errorMessage = error.response.data.error;
+        }
+      } finally {
         this.isProfileUpdating = false;
-        this.isPasswordChanging = false;
+        this.showAlert(this.errorMessage);
       }
     },
     handleImageUpload({ file, url }) {
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index 3cdc045d1..1ed23a41a 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -102,12 +102,13 @@ export const actions = {
   },
 
   updateProfile: async ({ commit }, params) => {
+    // eslint-disable-next-line no-useless-catch
     try {
       const response = await authAPI.profileUpdate(params);
       setUser(response.data, getHeaderExpiry(response));
       commit(types.default.SET_CURRENT_USER);
     } catch (error) {
-      // Ignore error
+      throw error;
     }
   },
 
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 4282b02a7..0a936c6d4 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe 'Profile API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent) { create(:user, password: 'Test123!', account: account, role: :agent) }
 
       it 'updates the name & email' do
         new_email = Faker::Internet.email
@@ -56,13 +56,23 @@ RSpec.describe 'Profile API', type: :request do
         expect(agent.email).to eq(new_email)
       end
 
-      it 'updates the password' do
+      it 'updates the password when current password is provided' do
         put '/api/v1/profile',
-            params: { profile: { password: 'test123', password_confirmation: 'test123' } },
+            params: { profile: { current_password: 'Test123!', password: 'test123', password_confirmation: 'test123' } },
             headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
+        expect(agent.reload.valid_password?('test123')).to eq true
+      end
+
+      it 'throws error when current password provided is invalid' do
+        put '/api/v1/profile',
+            params: { profile: { current_password: 'Test', password: 'test123', password_confirmation: 'test123' } },
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it 'updates avatar' do

From 49be9e21c3c4f6e24c83dcbb41136127b03e8d83 Mon Sep 17 00:00:00 2001
From: Ani Ravi <5902976+aniravi24@users.noreply.github.com>
Date: Wed, 2 Jun 2021 08:46:45 -0700
Subject: [PATCH 25/67] chore: Universal Linking for Android (#2324)

* android assetlinks.json config

* try renaming html to json

* update env example

* chore: fix styling

* chore: styling part 2

* test: add spec for android assetlinks

* minor fixes

* minor fixes

* remove android sha256 value from env example

* add default sh256 value

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .env.example                                |  4 ++++
 app/controllers/android_app_controller.rb   |  5 +++++
 app/views/android_app/assetlinks.json.erb   | 12 ++++++++++++
 config/routes.rb                            |  1 +
 spec/controllers/android_assetlinks_spec.rb | 10 ++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 app/controllers/android_app_controller.rb
 create mode 100644 app/views/android_app/assetlinks.json.erb
 create mode 100644 spec/controllers/android_assetlinks_spec.rb

diff --git a/.env.example b/.env.example
index 8d03180a8..08e72816e 100644
--- a/.env.example
+++ b/.env.example
@@ -116,6 +116,10 @@ SLACK_CLIENT_SECRET=
 ### Change this env variable only if you are using a custom build mobile app
 ## Mobile app env variables
 IOS_APP_ID=6C953F3RX2.com.chatwoot.app
+ANDROID_BUNDLE_ID=com.chatwoot.app
+
+# https://developers.google.com/android/guides/client-auth (use keytool to print the fingerprint in the first section)
+ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:D4:5D:D4:53:F8:3B:FB:D3:C6:28:64:1D:AA:08:1E:D8
 
 
 ### Smart App Banner
diff --git a/app/controllers/android_app_controller.rb b/app/controllers/android_app_controller.rb
new file mode 100644
index 000000000..c403d7756
--- /dev/null
+++ b/app/controllers/android_app_controller.rb
@@ -0,0 +1,5 @@
+class AndroidAppController < ApplicationController
+  def assetlinks
+    render layout: false
+  end
+end
diff --git a/app/views/android_app/assetlinks.json.erb b/app/views/android_app/assetlinks.json.erb
new file mode 100644
index 000000000..575ca3b56
--- /dev/null
+++ b/app/views/android_app/assetlinks.json.erb
@@ -0,0 +1,12 @@
+[
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "<%= ENV['ANDROID_BUNDLE_ID'] %>",
+      "sha256_cert_fingerprints": [
+        "<%= ENV['ANDROID_SHA256_CERT_FINGERPRINT'] %>"
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 499588e42..667346c02 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -232,6 +232,7 @@ Rails.application.routes.draw do
   # ----------------------------------------------------------------------
   # Routes for external service verifications
   get 'apple-app-site-association' => 'apple_app#site_association'
+  get '.well-known/assetlinks.json' => 'android_app#assetlinks'
 
   # ----------------------------------------------------------------------
   # Internal Monitoring Routes
diff --git a/spec/controllers/android_assetlinks_spec.rb b/spec/controllers/android_assetlinks_spec.rb
new file mode 100644
index 000000000..a44ef111a
--- /dev/null
+++ b/spec/controllers/android_assetlinks_spec.rb
@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+describe '.well-known/assetlinks.json', type: :request do
+  describe 'GET /.well-known/assetlinks.json' do
+    it 'successfully retrieves assetlinks.json file' do
+      get '/.well-known/assetlinks.json'
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

From b8aaf6c90d145314aa2f65021e81bde96bf60c71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 21:21:20 +0530
Subject: [PATCH 26/67] chore: Bump dns-packet from 1.3.1 to 1.3.4 (#2346)

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 83d1be5ab..3b6fcada0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5667,9 +5667,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"

From 75fe851345bf84061a60b48c0988f23a93370ae3 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 2 Jun 2021 21:29:53 +0530
Subject: [PATCH 27/67] fix: Update the translation key for Custom Attributes
 (#2364)

---
 .../routes/dashboard/conversation/ContactCustomAttributes.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
index 2a5e391c2..ee14a9761 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="custom-attributes--panel">
     <contact-details-item
-      :title="$t('CONTACT_PANEL.CUSTOM_ATTRIBUTES.TITLE')"
+      :title="$t('CUSTOM_ATTRIBUTES.TITLE')"
       icon="ion-code"
       emoji="📕"
     />

From 2fca87e3e7f2ebe9f9c5aec23be9cf392a0f0ff0 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 2 Jun 2021 22:48:09 +0530
Subject: [PATCH 28/67] Feat: Creates reminder list component for CRM (#2258)

* Feat: Creates reminder list component for CRM


Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 .../components/ReminderItem.stories.js        |  52 +++++++
 .../contacts/components/ReminderItem.vue      | 127 ++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.stories.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.stories.js b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.stories.js
new file mode 100644
index 000000000..853542357
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.stories.js
@@ -0,0 +1,52 @@
+import { action } from '@storybook/addon-actions';
+import ReminderItem from './ReminderItem';
+
+export default {
+  title: 'Components/Reminder/Item',
+  component: ReminderItem,
+  argTypes: {
+    id: {
+      control: {
+        type: 'number',
+      },
+    },
+    text: {
+      defaultValue:
+        'A copy and paste musical notes symbols & music symbols collection for easy access.',
+      control: {
+        type: 'text',
+      },
+    },
+    isCompleted: {
+      control: {
+        type: 'boolean',
+      },
+    },
+    date: {
+      defaultValue: '03/06/2020',
+      control: {
+        type: 'text',
+      },
+    },
+    label: {
+      defaultValue: 'Call',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { ReminderItem },
+  template:
+    '<reminder-item v-bind="$props" @completed="onClick" @edit="onEdit" @delete="onDelete"></reminder-item>',
+});
+
+export const Item = Template.bind({});
+Item.args = {
+  onClick: action('Marked'),
+  onEdit: action('Edit'),
+  onDelete: action('Delete'),
+};
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue
new file mode 100644
index 000000000..2fe47a66e
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="reminder-wrap">
+    <div class="status-wrap">
+      <input :checked="isCompleted" type="radio" @click="onClick" />
+    </div>
+    <div class="wrap">
+      <p class="content">
+        {{ text }}
+      </p>
+      <div class="footer">
+        <div class="meta">
+          <woot-label
+            :title="date"
+            description="date"
+            icon="ion-android-calendar"
+            color-scheme="secondary"
+          />
+          <woot-label
+            :title="label"
+            description="label"
+            color-scheme="secondary"
+          />
+        </div>
+        <div class="actions">
+          <woot-button
+            variant="clear"
+            size="small"
+            icon="ion-compose"
+            color-scheme="secondary"
+            class-names="button--emoji"
+            class="action-button"
+            @click="onEdit"
+          />
+          <woot-button
+            variant="clear"
+            size="small"
+            icon="ion-trash-b"
+            color-scheme="secondary"
+            class-names="button--emoji"
+            class="action-button"
+            @click="onDelete"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    id: {
+      type: Number,
+      default: 0,
+    },
+    text: {
+      type: String,
+      default: '',
+    },
+    isCompleted: {
+      type: Boolean,
+      default: false,
+    },
+    date: {
+      type: String,
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+  },
+
+  methods: {
+    onClick() {
+      this.$emit('completed', this.isCompleted);
+    },
+    onEdit() {
+      this.$emit('edit', this.id);
+    },
+    onDelete() {
+      this.$emit('delete', this.id);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.reminder-wrap {
+  display: flex;
+  margin-bottom: var(--space-smaller);
+
+  .status-wrap {
+    padding: var(--space-small) var(--space-smaller);
+    margin-top: var(--space-smaller);
+  }
+
+  .wrap {
+    padding: var(--space-small);
+
+    .footer {
+      display: flex;
+      justify-content: space-between;
+
+      .meta {
+        display: flex;
+      }
+    }
+  }
+}
+
+.actions {
+  display: none;
+
+  .action-button {
+    margin-right: var(--space-small);
+    height: var(--space-medium);
+    width: var(--space-medium);
+  }
+}
+
+.reminder-wrap:hover {
+  .actions {
+    display: flex;
+  }
+}
+</style>

From 9a9bcf81531d744e7ac45fff6fc54cfef4ced8d7 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 2 Jun 2021 22:53:13 +0530
Subject: [PATCH 29/67] feat: Create add reminder component for CRM (#2264)

* feat: Creates add reminder component for CRM

Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 .../dashboard/i18n/locale/en/contact.json     |  10 ++
 .../components/AddReminder.stories.js         |  41 +++++
 .../contacts/components/AddReminder.vue       | 140 ++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.stories.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 544d54323..949637088 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -155,6 +155,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.stories.js b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.stories.js
new file mode 100644
index 000000000..a9bdbb5e8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.stories.js
@@ -0,0 +1,41 @@
+import { action } from '@storybook/addon-actions';
+import AddReminder from './AddReminder';
+
+export default {
+  title: 'Components/Reminder/Add',
+  component: AddReminder,
+  argTypes: {
+    options: {
+      control: {
+        type: 'object',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { AddReminder },
+  template:
+    '<add-reminder v-bind="$props" @add="onAdd" @click="onClick"></add-reminder>',
+});
+
+export const Add = Template.bind({});
+Add.args = {
+  onAdd: action('Added'),
+  onClick: action('Label'),
+  options: [
+    {
+      id: '12345',
+      name: 'calls',
+    },
+    {
+      id: '12346',
+      name: 'meeting',
+    },
+    {
+      id: '12347',
+      name: 'review',
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue
new file mode 100644
index 000000000..0408d2c70
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="wrap">
+    <div class="input-select-wrap">
+      <textarea
+        v-model="content"
+        class="input--reminder"
+        @keydown.enter.shift.exact="onAdd"
+      >
+      </textarea>
+      <div class="select-wrap">
+        <div class="select">
+          <div class="input-group">
+            <i class="ion-android-calendar input-group-label" />
+            <input
+              v-model="date"
+              type="text"
+              :placeholder="$t('REMINDER.FOOTER.DUE_DATE')"
+              class="input-group-field"
+            />
+          </div>
+          <div class="task-wrap">
+            <select class="task__type" @change="optionSelected($event)">
+              <option value="" disabled selected>
+                {{ $t('REMINDER.FOOTER.LABEL_TITLE') }}
+              </option>
+              <option
+                v-for="option in options"
+                :key="option.id"
+                :value="option.id"
+              >
+                {{ option.name }}
+              </option>
+            </select>
+          </div>
+        </div>
+        <woot-button
+          size="tiny"
+          color-scheme="primary"
+          class-names="add-button"
+          :title="$t('REMINDER.ADD_BUTTON.TITLE')"
+          :is-disabled="buttonDisabled"
+          @click="onAdd"
+        >
+          {{ $t('REMINDER.ADD_BUTTON.BUTTON') }}
+        </woot-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    options: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      content: '',
+      date: '',
+      label: '',
+    };
+  },
+  computed: {
+    buttonDisabled() {
+      return this.content && this.date === '';
+    },
+  },
+  methods: {
+    resetValue() {
+      this.content = '';
+      this.date = '';
+    },
+
+    optionSelected(event) {
+      this.label = event.target.value;
+    },
+
+    onAdd() {
+      const task = {
+        content: this.content,
+        date: this.date,
+        label: this.label,
+      };
+      this.$emit('add', task);
+      this.resetValue();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  display: flex;
+  margin-bottom: var(--space-smaller);
+  width: 100%;
+
+  .input-select-wrap {
+    padding: var(--space-small) var(--space-small);
+    width: 100%;
+
+    .input--reminder {
+      font-size: var(--font-size-mini);
+      margin-bottom: var(--space-small);
+      resize: none;
+    }
+
+    .select-wrap {
+      display: flex;
+      justify-content: space-between;
+
+      .select {
+        display: flex;
+      }
+    }
+
+    .input-group {
+      margin-bottom: 0;
+      font-size: var(--font-size-mini);
+
+      .input-group-field {
+        height: var(--space-medium);
+        font-size: var(--font-size-micro);
+      }
+    }
+
+    .task-wrap {
+      .task__type {
+        margin: 0 0 0 var(--space-smaller);
+        height: var(--space-medium);
+        width: fit-content;
+        padding: 0 var(--space-two) 0 var(--space-smaller);
+        font-size: var(--font-size-micro);
+      }
+    }
+  }
+}
+</style>

From b1228f805e7cb39a95b6541be44e0977cfe48f39 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 2 Jun 2021 23:09:43 +0530
Subject: [PATCH 30/67] feat: Creates event timeline card component for CRM
 (#2291)

* feat: Creates event timeline card component for CRM


Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 .../components/TimelineCard.stories.js        |  45 ++++++
 .../contacts/components/TimelineCard.vue      | 133 ++++++++++++++++++
 2 files changed, 178 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.stories.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.stories.js b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.stories.js
new file mode 100644
index 000000000..2aedbcd15
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.stories.js
@@ -0,0 +1,45 @@
+import { action } from '@storybook/addon-actions';
+import TimelineCard from './TimelineCard';
+
+export default {
+  title: 'Components/Events/Timeline',
+  component: TimelineCard,
+  argTypes: {
+    eventType: {
+      defaultValue: 'Commented',
+      control: {
+        type: 'text',
+      },
+    },
+    eventPath: {
+      defaultValue: 'chatwoot/chatwoot',
+      control: {
+        type: 'text',
+      },
+    },
+    eventBody: {
+      defaultValue:
+        'Commentedmany variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour',
+      control: {
+        type: 'text',
+      },
+    },
+    timeStamp: {
+      defaultValue: '1618046084',
+      control: {
+        type: 'number',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { TimelineCard },
+  template: '<timeline-card v-bind="$props" @more="onClick"></timeline-card>',
+});
+
+export const Timeline = Template.bind({});
+Timeline.args = {
+  onClick: action('more'),
+};
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue
new file mode 100644
index 000000000..a7f74fe58
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="timeline-card-wrap">
+    <div class="icon-chatbox">
+      <i class="ion-chatboxes" />
+    </div>
+    <div class="card-wrap">
+      <div class="header">
+        <div class="text-wrap">
+          <h6 class="text-block-title">
+            {{ eventType }}
+          </h6>
+          <span class="event-path">on {{ eventPath }}</span>
+        </div>
+        <div class="date-wrap">
+          <span>{{ readableTime }}</span>
+        </div>
+      </div>
+      <div class="comment-wrap">
+        <p class="comment">
+          {{ eventBody }}
+        </p>
+      </div>
+    </div>
+    <div class="icon-more" @click="onClick">
+      <i class="ion-android-more-vertical" />
+    </div>
+  </div>
+</template>
+
+<script>
+import timeMixin from 'dashboard/mixins/time';
+export default {
+  mixins: [timeMixin],
+
+  props: {
+    eventType: {
+      type: String,
+      default: '',
+    },
+    eventPath: {
+      type: String,
+      default: '',
+    },
+    eventBody: {
+      type: String,
+      default: '',
+    },
+    timeStamp: {
+      type: Number,
+      default: 0,
+    },
+  },
+
+  computed: {
+    readableTime() {
+      return this.dynamicTime(this.timeStamp);
+    },
+  },
+
+  methods: {
+    onClick() {
+      this.$emit('more');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.timeline-card-wrap {
+  display: flex;
+  width: 100%;
+  color: var(--color-body);
+  padding: var(--space-small);
+
+  .icon-chatbox {
+    width: var(--space-large);
+    height: var(--space-large);
+    border-radius: 50%;
+    display: flex;
+    flex-shrink: 0;
+    justify-content: center;
+    border: 1px solid var(--color-border);
+    background-color: var(--color-background);
+
+    .ion-chatboxes {
+      font-size: var(--font-size-default);
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .card-wrap {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding: var(--space-smaller) var(--space-normal) 0;
+
+    .header {
+      display: flex;
+      justify-content: space-between;
+
+      .text-wrap {
+        display: flex;
+      }
+
+      .event-path {
+        font-size: var(--font-size-mini);
+        margin-left: var(--space-smaller);
+      }
+
+      .date-wrap {
+        font-size: var(--font-size-micro);
+      }
+    }
+
+    .comment-wrap {
+      border: 1px solid var(--color-border-light);
+
+      .comment {
+        padding: var(--space-small);
+        font-size: var(--font-size-mini);
+        margin: 0;
+      }
+    }
+  }
+
+  .icon-more {
+    .ion-android-more-vertical {
+      font-size: var(--font-size-medium);
+    }
+  }
+}
+</style>

From f731002b7073059b237ef81f830d37df2633067d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 3 Jun 2021 23:20:30 +0530
Subject: [PATCH 31/67] fix: Retain focus after sending message in rich content
 editor (#2372)

Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 .../dashboard/components/widgets/WootWriter/Editor.vue      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index ff9ddfd67..ab4f5b5f1 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -136,9 +136,11 @@ export default {
     showCannedMenu(updatedValue) {
       this.$emit('toggle-canned-menu', !this.isPrivate && updatedValue);
     },
-    value(newValue) {
+    value(newValue = '') {
       if (newValue !== this.lastValue) {
-        this.state = createState(newValue, this.placeholder, this.plugins);
+        const { tr } = this.state;
+        tr.insertText(newValue, 0, tr.doc.content.size);
+        this.state = this.view.state.apply(tr);
         this.view.updateState(this.state);
       }
     },

From 58846e7ad84cca31b01bb30d5ec2b2d2b1dc335e Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Thu, 3 Jun 2021 23:21:39 +0530
Subject: [PATCH 32/67] chore: Add new color shade + tint for violet (#2373)

---
 .../shared/assets/stylesheets/colors.scss     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 037333888..eca7b4514 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -67,6 +67,17 @@
   --r-800: #D11320;
   --r-900: #C30011;
 
+  --v-50: #FFFFFF;
+  --v-100: #F5EBFF;
+  --v-200: #DDB8FF;
+  --v-300: #C585FF;
+  --v-400: #AC52FF;
+  --v-500: #941FFF;
+  --v-600: #7B00EB;
+  --v-700: #6000B8;
+  --v-800: #450085;
+  --v-900: #2B0052;
+
   // Common color aliases
   --color-woot: var(--w-500);
 
@@ -80,10 +91,10 @@
   --color-background: #f4f6fb;
   --color-background-light: #f9fafc;
 
-	// Social and inboxes brand colors
-	--color-facebook-brand: #3b5998;
-	--color-twitter-brand: #1da1f2;
-	--color-whatsapp-brand: #25d366;
-	--color-sms-twilio: #f42f46;
-	--color-cloud-generic: #18b7b0;
+  // Social and inboxes brand colors
+  --color-facebook-brand: #3b5998;
+  --color-twitter-brand: #1da1f2;
+  --color-whatsapp-brand: #25d366;
+  --color-sms-twilio: #f42f46;
+  --color-cloud-generic: #18b7b0;
 }

From 562a65a70dd5af19641c2f99ba985b2be896e7c8 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 4 Jun 2021 12:54:16 +0530
Subject: [PATCH 33/67] chore: Cleanup unused components (#2379)

---
 .../dashboard/components/widgets/Button.vue   |  49 -------
 .../labels/AddLabelToConversation.vue         | 136 ------------------
 2 files changed, 185 deletions(-)
 delete mode 100644 app/javascript/dashboard/components/widgets/Button.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue

diff --git a/app/javascript/dashboard/components/widgets/Button.vue b/app/javascript/dashboard/components/widgets/Button.vue
deleted file mode 100644
index b3d582cfe..000000000
--- a/app/javascript/dashboard/components/widgets/Button.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <button :type="type" class="button nice" :class="variant" @click="onClick">
-    <i
-      v-if="!isLoading && icon"
-      class="icon"
-      :class="buttonIconClass + ' ' + icon"
-    />
-    <spinner v-if="isLoading" />
-    <slot></slot>
-  </button>
-</template>
-
-<script>
-export default {
-  props: {
-    isLoading: {
-      type: Boolean,
-      default: false,
-    },
-    icon: {
-      type: String,
-      default: '',
-    },
-    buttonIconClass: {
-      type: String,
-      default: '',
-    },
-    type: {
-      type: String,
-      default: 'button',
-    },
-    variant: {
-      type: String,
-      default: 'primary',
-    },
-  },
-  methods: {
-    onClick(e) {
-      this.$emit('click', e);
-    },
-  },
-};
-</script>
-
-<style scoped>
-.icon {
-  font-size: var(--font-size-large) !important;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue
deleted file mode 100644
index bdae422a9..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <woot-modal :show.sync="show" :on-close="onClose">
-    <div class="column content-box">
-      <woot-modal-header
-        :header-title="
-          $t('CONTACT_PANEL.LABELS.MODAL.TITLE') + ' #' + conversationId
-        "
-      />
-      <div class="content">
-        <div class="label-content--block">
-          <div class="label-content--title">
-            {{ $t('CONTACT_PANEL.LABELS.MODAL.ACTIVE_LABELS') }}
-            <span v-tooltip.bottom="$t('CONTACT_PANEL.LABELS.MODAL.REMOVE')">
-              <i class="ion-ios-help-outline" />
-            </span>
-          </div>
-          <div v-if="activeList.length">
-            <woot-label
-              v-for="label in activeList"
-              :key="label.id"
-              :title="label.title"
-              :description="label.description"
-              :bg-color="label.color"
-              :show-close="true"
-              @click="onRemove"
-            />
-          </div>
-          <p v-else>
-            {{ $t('CONTACT_PANEL.LABELS.NO_AVAILABLE_LABELS') }}
-          </p>
-        </div>
-
-        <div class="label-content--block">
-          <div class="label-content--title">
-            {{ $t('CONTACT_PANEL.LABELS.MODAL.INACTIVE_LABELS') }}
-            <span v-tooltip.bottom="$t('CONTACT_PANEL.LABELS.MODAL.ADD')">
-              <i class="ion-ios-help-outline" />
-            </span>
-          </div>
-          <div v-if="inactiveList.length">
-            <woot-label
-              v-for="label in inactiveList"
-              :key="label.id"
-              :title="label.title"
-              :description="label.description"
-              :bg-color="label.color"
-              icon="ion-plus"
-              @click="onAdd"
-            />
-          </div>
-          <p v-else>
-            {{ $t('CONTACT_PANEL.LABELS.NO_LABELS_TO_ADD') }}
-          </p>
-        </div>
-      </div>
-    </div>
-  </woot-modal>
-</template>
-<script>
-export default {
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    conversationId: {
-      type: [String, Number],
-      default: '',
-    },
-    accountLabels: {
-      type: Array,
-      default: () => [],
-    },
-    savedLabels: {
-      type: Array,
-      default: () => [],
-    },
-    onClose: {
-      type: Function,
-      default: () => [],
-    },
-    updateLabels: {
-      type: Function,
-      default: () => {},
-    },
-  },
-  computed: {
-    activeList() {
-      return this.accountLabels
-        .filter(accountLabel => this.savedLabels.includes(accountLabel.title))
-        .sort((a, b) => {
-          return a.title.localeCompare(b.title);
-        });
-    },
-    inactiveList() {
-      return this.accountLabels
-        .filter(accountLabel => !this.savedLabels.includes(accountLabel.title))
-        .sort((a, b) => {
-          return a.title.localeCompare(b.title);
-        });
-    },
-  },
-  methods: {
-    onAdd(label) {
-      const activeLabels = this.activeList.map(
-        activeLabel => activeLabel.title
-      );
-      this.updateLabels([...activeLabels, label]);
-    },
-
-    onRemove(label) {
-      const activeLabels = this.activeList
-        .filter(activeLabel => activeLabel.title !== label)
-        .map(activeLabel => activeLabel.title);
-      this.updateLabels(activeLabels);
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-@import '~dashboard/assets/scss/variables';
-
-.label-content--block {
-  margin-bottom: $space-normal;
-}
-
-.label-content--title {
-  font-weight: $font-weight-bold;
-  margin-bottom: $space-small;
-}
-
-.content {
-  padding-top: $space-normal;
-}
-</style>

From 8a283a778350d53b06a7a73d13a3a71e8df088ee Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 4 Jun 2021 13:17:44 +0530
Subject: [PATCH 34/67] feat: Ask to confirm with name before inbox/team
 deletion (#2370)

---
 app/javascript/dashboard/components/index.js  |  2 +
 .../widgets/modal/ConfirmDeleteModal.vue      | 86 +++++++++++++++++++
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  1 +
 .../i18n/locale/en/teamsSettings.json         |  7 +-
 .../routes/dashboard/settings/inbox/Index.vue | 17 ++--
 .../routes/dashboard/settings/teams/Index.vue | 18 ++--
 6 files changed, 118 insertions(+), 13 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue

diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js
index cc2a70a2c..e5ec89da0 100644
--- a/app/javascript/dashboard/components/index.js
+++ b/app/javascript/dashboard/components/index.js
@@ -6,6 +6,7 @@ import Button from './ui/WootButton';
 import Code from './Code';
 import ColorPicker from './widgets/ColorPicker';
 import DeleteModal from './widgets/modal/DeleteModal.vue';
+import ConfirmDeleteModal from './widgets/modal/ConfirmDeleteModal.vue';
 import DropdownItem from 'shared/components/ui/dropdown/DropdownItem';
 import DropdownMenu from 'shared/components/ui/dropdown/DropdownMenu';
 import Input from './widgets/forms/Input.vue';
@@ -42,6 +43,7 @@ const WootUIKit = {
   Tabs,
   TabsItem,
   Thumbnail,
+  ConfirmDeleteModal,
   install(Vue) {
     const keys = Object.keys(this);
     keys.pop(); // remove 'install' from keys
diff --git a/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue b/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue
new file mode 100644
index 000000000..ef86059ff
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue
@@ -0,0 +1,86 @@
+<template>
+  <modal :show.sync="show" :on-close="closeModal">
+    <woot-modal-header :header-title="title" :header-content="message" />
+    <form @submit.prevent="onConfirm">
+      <woot-input
+        v-model="value"
+        type="text"
+        :class="{ error: $v.value.$error }"
+        :placeholder="confirmPlaceHolderText"
+        @blur="$v.value.$touch"
+      />
+      <div class="button-wrapper">
+        <woot-button color-scheme="alert" :is-disabled="$v.value.$invalid">
+          {{ confirmText }}
+        </woot-button>
+        <woot-button class="clear" @click.prevent="closeModal">
+          {{ rejectText }}
+        </woot-button>
+      </div>
+    </form>
+  </modal>
+</template>
+
+<script>
+import { required } from 'vuelidate/lib/validators';
+import Modal from '../../Modal';
+
+export default {
+  components: {
+    Modal,
+  },
+
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    message: {
+      type: String,
+      default: '',
+    },
+    confirmText: {
+      type: String,
+      default: '',
+    },
+    rejectText: {
+      type: String,
+      default: '',
+    },
+    confirmValue: {
+      type: String,
+      default: '',
+    },
+    confirmPlaceHolderText: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      value: '',
+    };
+  },
+  validations: {
+    value: {
+      required,
+      isEqual(value) {
+        return value === this.confirmValue;
+      },
+    },
+  },
+  methods: {
+    closeModal() {
+      this.value = '';
+      this.$emit('on-close');
+    },
+    onConfirm() {
+      this.$emit('on-confirm');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 4d0fcdffc..f5d164324 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -215,6 +215,7 @@
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
         "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Yes, Delete ",
         "NO": "No, Keep "
       },
diff --git a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
index a836134df..98a8ad755 100644
--- a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
@@ -17,7 +17,8 @@
         "TITLE": "Add agents to team - %{teamName}",
         "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
       },
-      "WIZARD": [{
+      "WIZARD": [
+        {
           "title": "Create",
           "route": "settings_teams_new",
           "body": "Create a new team of agents."
@@ -45,7 +46,8 @@
         "TITLE": "Add agents to team - %{teamName}",
         "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
       },
-      "WIZARD": [{
+      "WIZARD": [
+        {
           "title": "Team details",
           "route": "settings_teams_edit",
           "body": "Change name, description and other details."
@@ -97,6 +99,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Delete ",
         "NO": "Cancel"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 9eccee913..478d04dbf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -106,14 +106,16 @@
       :inbox="selectedInbox"
     />
 
-    <woot-delete-modal
+    <woot-confirm-delete-modal
       :show.sync="showDeletePopup"
-      :on-close="closeDelete"
-      :on-confirm="confirmDeletion"
       :title="$t('INBOX_MGMT.DELETE.CONFIRM.TITLE')"
-      :message="deleteMessage"
+      :message="confirmDeleteMessage"
       :confirm-text="deleteConfirmText"
       :reject-text="deleteRejectText"
+      :confirm-value="selectedInbox.name"
+      :confirm-place-holder-text="confirmPlaceHolderText"
+      @on-confirm="confirmDeletion"
+      @on-close="closeDelete"
     />
   </div>
 </template>
@@ -153,11 +155,16 @@ export default {
         this.selectedInbox.name
       }`;
     },
-    deleteMessage() {
+    confirmDeleteMessage() {
       return `${this.$t('INBOX_MGMT.DELETE.CONFIRM.MESSAGE')} ${
         this.selectedInbox.name
       } ?`;
     },
+    confirmPlaceHolderText() {
+      return `${this.$t('INBOX_MGMT.DELETE.CONFIRM.PLACE_HOLDER', {
+        inboxName: this.selectedInbox.name,
+      })}`;
+    },
   },
   methods: {
     openSettings(inbox) {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
index 655898ee3..91d8d4fa5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -63,15 +63,16 @@
         />
       </div>
     </div>
-
-    <woot-delete-modal
+    <woot-confirm-delete-modal
       :show.sync="showDeletePopup"
-      :on-close="closeDelete"
-      :on-confirm="confirmDeletion"
-      :title="deleteTitle"
+      :title="confirmDeleteTitle"
       :message="$t('TEAMS_SETTINGS.DELETE.CONFIRM.MESSAGE')"
       :confirm-text="deleteConfirmText"
       :reject-text="deleteRejectText"
+      :confirm-value="selectedTeam.name"
+      :confirm-place-holder-text="confirmPlaceHolderText"
+      @on-confirm="confirmDeletion"
+      @on-close="closeDelete"
     />
   </div>
 </template>
@@ -105,11 +106,16 @@ export default {
     deleteRejectText() {
       return this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.NO');
     },
-    deleteTitle() {
+    confirmDeleteTitle() {
       return this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.TITLE', {
         teamName: this.selectedTeam.name,
       });
     },
+    confirmPlaceHolderText() {
+      return `${this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.PLACE_HOLDER', {
+        teamName: this.selectedTeam.name,
+      })}`;
+    },
   },
   methods: {
     async deleteTeam({ id }) {

From c028f30f82a3d29ebdb97617478cf82f7aa520eb Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 4 Jun 2021 21:54:06 +0530
Subject: [PATCH 35/67]  chore: Add a different color for messages from bot
 (#2374)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../components/widgets/conversation/Message.vue      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index bf39087cf..78b1c148f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -197,11 +197,16 @@ export default {
         'is-private': this.data.private,
         'is-image': this.hasImageAttachment,
         'is-text': this.hasText,
+        'is-from-bot': this.isSentByBot,
       };
     },
     isPending() {
       return this.data.status === MESSAGE_STATUS.PROGRESS;
     },
+    isSentByBot() {
+      if (this.isPending) return false;
+      return !this.sender.type || this.sender.type === 'bot';
+    },
   },
 };
 </script>
@@ -250,6 +255,13 @@ export default {
       color: var(--color-body);
       text-decoration: underline;
     }
+
+    &.is-from-bot {
+      background: var(--v-400);
+      .message-text--metadata .time {
+        color: var(--v-50);
+      }
+    }
   }
 
   &.is-pending {

From c6487877bf58e4c58d7993bd64e63f679ce0fa2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 5 Jun 2021 18:58:59 +0530
Subject: [PATCH 36/67] chore: Bump ws from 6.2.1 to 6.2.2 (#2382)

Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3b6fcada0..f2b766a26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15461,9 +15461,9 @@ write@1.0.3:
     mkdirp "^0.5.1"
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 

From 14b51e108ac57fd7106621fd5473fb56b81bc058 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sun, 6 Jun 2021 16:59:05 +0530
Subject: [PATCH 37/67] feat: Add Integration hooks UI (#2301)

---
 app/javascript/dashboard/api/integrations.js  |   8 +
 .../dashboard/api/specs/apiSpecHelper.js      |   1 +
 .../dashboard/api/specs/integrations.spec.js  |  55 +++++++
 .../dashboard/assets/scss/_formulate.scss     |  18 ++
 .../dashboard/assets/scss/_woot.scss          |   2 +-
 app/javascript/dashboard/helper/commons.js    |  12 ++
 .../dashboard/i18n/default-sidebar.js         |  10 ++
 .../dashboard/i18n/locale/en/index.js         |   2 +
 .../i18n/locale/en/integrationApps.json       |  62 +++++++
 .../dashboard/i18n/locale/en/settings.json    |   1 +
 .../settings/integrationapps/Index.vue        |  56 +++++++
 .../integrationapps/IntegrationHooks.vue      | 155 ++++++++++++++++++
 .../integrationapps/IntegrationItem.vue       |  78 +++++++++
 .../MultipleIntegrationHooks.vue              | 106 ++++++++++++
 .../settings/integrationapps/NewHook.vue      | 136 +++++++++++++++
 .../SingleIntegrationHooks.vue                |  47 ++++++
 .../settings/integrationapps/hookMixin.js     |  10 ++
 .../integrationapps/integrations.routes.js    |  43 +++++
 .../integrationapps/specs/hookMixin.spec.js   |  26 +++
 .../dashboard/settings/settings.routes.js     |   2 +
 .../dashboard/store/modules/inboxes.js        |   5 +
 .../dashboard/store/modules/integrations.js   |  52 +++++-
 .../modules/specs/inboxes/getters.spec.js     |   5 +
 .../specs/integrations/actions.spec.js        |  81 ++++++---
 .../specs/integrations/getters.spec.js        |  27 +++
 .../specs/integrations/mutations.spec.js      |  59 ++++++-
 .../dashboard/store/mutation-types.js         |   2 +
 app/javascript/packs/application.js           |   8 +-
 app/models/integrations/app.rb                |   4 +-
 app/views/api/v1/models/_hook.json.jbuilder   |   2 +-
 config/integration/apps.yml                   |  31 +++-
 config/locales/en.yml                         |   5 +-
 package.json                                  |   1 +
 .../images/integrations/fullcontact.png       | Bin 0 -> 7204 bytes
 yarn.lock                                     |  27 ++-
 35 files changed, 1108 insertions(+), 31 deletions(-)
 create mode 100644 app/javascript/dashboard/api/specs/integrations.spec.js
 create mode 100644 app/javascript/dashboard/assets/scss/_formulate.scss
 create mode 100644 app/javascript/dashboard/i18n/locale/en/integrationApps.json
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/hookMixin.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/integrations.routes.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrationapps/specs/hookMixin.spec.js
 create mode 100644 public/dashboard/images/integrations/fullcontact.png

diff --git a/app/javascript/dashboard/api/integrations.js b/app/javascript/dashboard/api/integrations.js
index 587c94d43..72e433c25 100644
--- a/app/javascript/dashboard/api/integrations.js
+++ b/app/javascript/dashboard/api/integrations.js
@@ -16,6 +16,14 @@ class IntegrationsAPI extends ApiClient {
   delete(integrationId) {
     return axios.delete(`${this.baseUrl()}/integrations/${integrationId}`);
   }
+
+  createHook(hookData) {
+    return axios.post(`${this.baseUrl()}/integrations/hooks`, hookData);
+  }
+
+  deleteHook(hookId) {
+    return axios.delete(`${this.baseUrl()}/integrations/hooks/${hookId}`);
+  }
 }
 
 export default new IntegrationsAPI();
diff --git a/app/javascript/dashboard/api/specs/apiSpecHelper.js b/app/javascript/dashboard/api/specs/apiSpecHelper.js
index aedea13f8..aab90b045 100644
--- a/app/javascript/dashboard/api/specs/apiSpecHelper.js
+++ b/app/javascript/dashboard/api/specs/apiSpecHelper.js
@@ -5,6 +5,7 @@ function apiSpecHelper() {
       post: jest.fn(() => Promise.resolve()),
       get: jest.fn(() => Promise.resolve()),
       patch: jest.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
     };
     window.axios = this.axiosMock;
   });
diff --git a/app/javascript/dashboard/api/specs/integrations.spec.js b/app/javascript/dashboard/api/specs/integrations.spec.js
new file mode 100644
index 000000000..05391ceb6
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/integrations.spec.js
@@ -0,0 +1,55 @@
+import integrationAPI from '../integrations';
+import ApiClient from '../ApiClient';
+import describeWithAPIMock from './apiSpecHelper';
+
+describe('#integrationAPI', () => {
+  it('creates correct instance', () => {
+    expect(integrationAPI).toBeInstanceOf(ApiClient);
+    expect(integrationAPI).toHaveProperty('get');
+    expect(integrationAPI).toHaveProperty('show');
+    expect(integrationAPI).toHaveProperty('create');
+    expect(integrationAPI).toHaveProperty('update');
+    expect(integrationAPI).toHaveProperty('delete');
+    expect(integrationAPI).toHaveProperty('connectSlack');
+    expect(integrationAPI).toHaveProperty('createHook');
+    expect(integrationAPI).toHaveProperty('deleteHook');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#connectSlack', () => {
+      const code = 'SDNFJNSDFNDSJN';
+      integrationAPI.connectSlack(code);
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/integrations/slack',
+        {
+          code,
+        }
+      );
+    });
+
+    it('#delete', () => {
+      integrationAPI.delete(2);
+      expect(context.axiosMock.delete).toHaveBeenCalledWith(
+        '/api/v1/integrations/2'
+      );
+    });
+
+    it('#createHook', () => {
+      const hookData = {
+        app_id: 'fullcontact',
+        settings: { api_key: 'SDFSDGSVE' },
+      };
+      integrationAPI.createHook(hookData);
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/integrations/hooks',
+        hookData
+      );
+    });
+
+    it('#deleteHook', () => {
+      integrationAPI.deleteHook(2);
+      expect(context.axiosMock.delete).toHaveBeenCalledWith(
+        '/api/v1/integrations/hooks/2'
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/assets/scss/_formulate.scss b/app/javascript/dashboard/assets/scss/_formulate.scss
new file mode 100644
index 000000000..57c43a3d6
--- /dev/null
+++ b/app/javascript/dashboard/assets/scss/_formulate.scss
@@ -0,0 +1,18 @@
+@import '~dashboard/assets/scss/variables';
+
+.formulate-input {
+  .formulate-input-errors {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .formulate-input-error {
+    color: var(--r-400);
+    display: block;
+    font-size: var(--font-size-small);
+    font-weight: $font-weight-normal;
+    margin-bottom: $space-one;
+    width: 100%;
+  }
+}
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 1712e256e..d156f77b9 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -11,13 +11,13 @@
 @import 'mixins';
 @import 'foundation-settings';
 @import 'helper-classes';
+@import 'formulate';
 
 @import 'foundation-sites/scss/foundation';
 @import '~bourbon/core/bourbon';
 
 @include foundation-everything($flex: true);
 
-
 @import 'typography';
 @import 'layout';
 @import 'animations';
diff --git a/app/javascript/dashboard/helper/commons.js b/app/javascript/dashboard/helper/commons.js
index d7d34283a..40ff06c83 100644
--- a/app/javascript/dashboard/helper/commons.js
+++ b/app/javascript/dashboard/helper/commons.js
@@ -13,6 +13,18 @@ export default () => {
   }
 };
 
+export const isEmptyObject = obj =>
+  Object.keys(obj).length === 0 && obj.constructor === Object;
+
+export const isJSONValid = value => {
+  try {
+    JSON.parse(value);
+  } catch (e) {
+    return false;
+  }
+  return true;
+};
+
 export const getTypingUsersText = (users = []) => {
   const count = users.length;
   if (count === 1) {
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index 6488c022e..8bb78f61b 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -74,6 +74,9 @@ export const getSidebarItems = accountId => ({
       'settings_integrations',
       'settings_integrations_webhook',
       'settings_integrations_integration',
+      'settings_applications',
+      'settings_applications_webhook',
+      'settings_applications_integration',
       'general_settings',
       'general_settings_index',
       'settings_teams_list',
@@ -136,6 +139,13 @@ export const getSidebarItems = accountId => ({
         toState: frontendURL(`accounts/${accountId}/settings/integrations`),
         toStateName: 'settings_integrations',
       },
+      settings_applications: {
+        icon: 'ion-asterisk',
+        label: 'APPLICATIONS',
+        hasSubMenu: false,
+        toState: frontendURL(`accounts/${accountId}/settings/applications`),
+        toStateName: 'settings_applications',
+      },
       general_settings_index: {
         icon: 'ion-gear-a',
         label: 'ACCOUNT_SETTINGS',
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index cf1dda7fe..4afba79aa 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -15,6 +15,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _integrationApps } from './integrationApps.json';
 
 export default {
   ..._agentMgmt,
@@ -34,4 +35,5 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._integrationApps,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/integrationApps.json b/app/javascript/dashboard/i18n/locale/en/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index aa51c35be..c7bb0cb6d 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -133,6 +133,7 @@
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/Index.vue
new file mode 100644
index 000000000..5441742bd
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/Index.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="column content-box">
+    <div class="row">
+      <div class="empty-wrapper">
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('INTEGRATION_APPS.FETCHING')"
+        />
+      </div>
+
+      <div class="small-12 columns integrations-wrap">
+        <div class="row integrations">
+          <div
+            v-for="item in integrationsList"
+            :key="item.id"
+            class="small-12 columns integration"
+          >
+            <integration-item
+              :integration-id="item.id"
+              :integration-logo="item.logo"
+              :integration-name="item.name"
+              :integration-description="item.description"
+              :integration-enabled="item.hooks.length"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import IntegrationItem from './IntegrationItem';
+
+export default {
+  components: {
+    IntegrationItem,
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'labels/getUIFlags',
+      integrationsList: 'integrations/getAppIntegrations',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('integrations/get');
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '~dashboard/assets/scss/variables';
+.empty-wrapper {
+  margin: var(--space-zero) auto;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
new file mode 100644
index 000000000..6d9c4395c
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="row content-box full-height">
+    <woot-button
+      v-if="showAddButton"
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="ion-android-add-circle"
+      @click="openAddHookModal"
+    >
+      {{ $t('INTEGRATION_APPS.ADD_BUTTON') }}
+    </woot-button>
+    <div v-if="showIntegrationHooks" class="integration-hooks">
+      <div v-if="isIntegrationMultiple">
+        <multiple-integration-hooks
+          :integration="integration"
+          @delete="openDeletePopup"
+        />
+      </div>
+
+      <div v-if="isIntegrationSingle">
+        <single-integration-hooks
+          :integration="integration"
+          @add="openAddHookModal"
+          @delete="openDeletePopup"
+        />
+      </div>
+    </div>
+
+    <woot-modal :show.sync="showAddHookModal" :on-close="hideAddHookModal">
+      <new-hook :integration="integration" @close="hideAddHookModal" />
+    </woot-modal>
+
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="deleteTitle"
+      :message="deleteMessage"
+      :confirm-text="confirmText"
+      :reject-text="cancelText"
+    />
+  </div>
+</template>
+<script>
+import { isEmptyObject } from '../../../../helper/commons';
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import hookMixin from './hookMixin';
+import NewHook from './NewHook';
+import SingleIntegrationHooks from './SingleIntegrationHooks';
+import MultipleIntegrationHooks from './MultipleIntegrationHooks';
+
+export default {
+  components: {
+    NewHook,
+    SingleIntegrationHooks,
+    MultipleIntegrationHooks,
+  },
+  mixins: [alertMixin, hookMixin],
+  props: {
+    integrationId: {
+      type: [String, Number],
+      required: true,
+    },
+  },
+  data() {
+    return {
+      loading: {},
+      showAddHookModal: false,
+      showDeleteConfirmationPopup: false,
+      selectedHook: {},
+      alertMessage: '',
+    };
+  },
+  computed: {
+    ...mapGetters({ uiFlags: 'integrations/getUIFlags' }),
+    integration() {
+      return this.$store.getters['integrations/getIntegration'](
+        this.integrationId
+      );
+    },
+    showIntegrationHooks() {
+      return !this.uiFlags.isFetching && !isEmptyObject(this.integration);
+    },
+    integrationType() {
+      return this.integration.allow_multiple_hooks ? 'multiple' : 'single';
+    },
+    isIntegrationMultiple() {
+      return this.integrationType === 'multiple';
+    },
+    isIntegrationSingle() {
+      return this.integrationType === 'single';
+    },
+    showAddButton() {
+      return this.showIntegrationHooks && this.isIntegrationMultiple;
+    },
+    deleteTitle() {
+      return this.isHookTypeInbox
+        ? this.$t('INTEGRATION_APPS.DELETE.TITLE.INBOX')
+        : this.$t('INTEGRATION_APPS.DELETE.TITLE.ACCOUNT');
+    },
+    deleteMessage() {
+      return this.isHookTypeInbox
+        ? this.$t('INTEGRATION_APPS.DELETE.MESSAGE.INBOX')
+        : this.$t('INTEGRATION_APPS.DELETE.MESSAGE.ACCOUNT');
+    },
+    confirmText() {
+      return this.isHookTypeInbox
+        ? this.$t('INTEGRATION_APPS.DELETE.CONFIRM_BUTTON_TEXT.INBOX')
+        : this.$t('INTEGRATION_APPS.DELETE.CONFIRM_BUTTON_TEXT.ACCOUNT');
+    },
+    cancelText() {
+      return this.$t('INTEGRATION_APPS.DELETE.CANCEL_BUTTON_TEXT');
+    },
+  },
+  methods: {
+    openAddHookModal() {
+      this.showAddHookModal = true;
+    },
+    hideAddHookModal() {
+      this.showAddHookModal = false;
+    },
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
+      this.selectedHook = response;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    async confirmDeletion() {
+      try {
+        await this.$store.dispatch('integrations/deleteHook', {
+          hookId: this.selectedHook.id,
+          appId: this.selectedHook.app_id,
+        });
+        this.alertMessage = this.$t(
+          'INTEGRATION_APPS.DELETE.API.SUCCESS_MESSAGE'
+        );
+        this.closeDeletePopup();
+      } catch (error) {
+        const errorMessage = error?.response?.data?.message;
+        this.alertMessage =
+          errorMessage || this.$t('INTEGRATION_APPS.DELETE.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.integration-hooks {
+  width: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
new file mode 100644
index 000000000..7d0e64550
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="row">
+    <div class="integration--image">
+      <img :src="'/dashboard/images/integrations/' + integrationLogo" />
+    </div>
+    <div class="column">
+      <h3 class="integration--title">
+        {{ integrationName }}
+      </h3>
+      <p class="integration--description">
+        {{ integrationDescription }}
+      </p>
+    </div>
+    <div class="small-2 column button-wrap">
+      <woot-label :title="labelText" :color-scheme="labelColor" />
+    </div>
+    <div class="small-2 column button-wrap">
+      <router-link
+        :to="
+          frontendURL(
+            `accounts/${accountId}/settings/applications/` + integrationId
+          )
+        "
+      >
+        <woot-button icon="ion-gear-b">
+          {{ $t('INTEGRATION_APPS.CONFIGURE') }}
+        </woot-button>
+      </router-link>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { frontendURL } from '../../../../helper/URLHelper';
+import WootLabel from 'dashboard/components/ui/Label';
+
+export default {
+  components: {
+    WootLabel,
+  },
+  props: {
+    integrationId: {
+      type: String,
+      default: '',
+    },
+    integrationLogo: {
+      type: String,
+      default: '',
+    },
+    integrationName: {
+      type: String,
+      default: '',
+    },
+    integrationDescription: {
+      type: String,
+      default: '',
+    },
+    integrationEnabled: {
+      type: Number,
+      default: 0,
+    },
+  },
+  computed: {
+    ...mapGetters({ accountId: 'getCurrentAccountId' }),
+    labelText() {
+      return this.integrationEnabled
+        ? this.$t('INTEGRATION_APPS.STATUS.ENABLED')
+        : this.$t('INTEGRATION_APPS.STATUS.DISABLED');
+    },
+    labelColor() {
+      return this.integrationEnabled ? 'success' : 'secondary';
+    },
+  },
+  methods: {
+    frontendURL,
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
new file mode 100644
index 000000000..fdce8cadc
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="row ">
+    <div class="small-8 columns">
+      <table v-if="hasConnectedHooks" class="woot-table">
+        <thead>
+          <th v-for="hookHeader in hookHeaders" :key="hookHeader">
+            {{ hookHeader }}
+          </th>
+          <th v-if="isHookTypeInbox">
+            {{ $t('INTEGRATION_APPS.LIST.INBOX') }}
+          </th>
+        </thead>
+        <tbody>
+          <tr v-for="hook in hooks" :key="hook.id">
+            <td
+              v-for="property in hook.properties"
+              :key="property"
+              class="hook-item"
+            >
+              {{ property }}
+            </td>
+            <td v-if="isHookTypeInbox" class="hook-item">
+              {{ inboxName(hook) }}
+            </td>
+            <td class="button-wrapper">
+              <woot-button
+                variant="link"
+                color-scheme="secondary"
+                icon="ion-close-circled"
+                class-names="grey-btn"
+                @click="$emit('delete', hook)"
+              >
+                {{ $t('INTEGRATION_APPS.LIST.DELETE.BUTTON_TEXT') }}
+              </woot-button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <p v-else class="no-items-error-message">
+        {{
+          $t('INTEGRATION_APPS.NO_HOOK_CONFIGURED', {
+            integrationId: integration.id,
+          })
+        }}
+      </p>
+    </div>
+    <div class="small-4 columns">
+      <p>
+        <b>{{ integration.name }}</b>
+      </p>
+      <p
+        v-html="
+          $t(
+            `INTEGRATION_APPS.SIDEBAR_DESCRIPTION.${integration.name.toUpperCase()}`,
+            { installationName: globalConfig.installationName }
+          )
+        "
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import hookMixin from './hookMixin';
+export default {
+  mixins: [hookMixin],
+  props: {
+    integration: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    ...mapGetters({
+      globalConfig: 'globalConfig/get',
+    }),
+    hookHeaders() {
+      return this.integration.visible_properties;
+    },
+    hooks() {
+      if (!this.hasConnectedHooks) {
+        return [];
+      }
+      const { hooks } = this.integration;
+      return hooks.map(hook => ({
+        ...hook,
+        id: hook.id,
+        properties: this.hookHeaders.map(property =>
+          hook.settings[property] ? hook.settings[property] : '--'
+        ),
+      }));
+    },
+  },
+  mounted() {},
+  methods: {
+    inboxName(hook) {
+      return hook.inbox ? hook.inbox.name : '';
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.hook-item {
+  word-break: break-word;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
new file mode 100644
index 000000000..3d343ab14
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="integration.name"
+      :header-content="integration.description"
+    />
+    <formulate-form
+      #default="{ hasErrors }"
+      v-model="values"
+      @submit="submitForm"
+    >
+      <formulate-input
+        v-for="item in formItems"
+        :key="item.name"
+        v-bind="item"
+      />
+      <formulate-input
+        v-if="isHookTypeInbox"
+        :options="inboxes"
+        type="select"
+        name="inbox"
+        :placeholder="$t('INTEGRATION_APPS.ADD.FORM.INBOX.LABEL')"
+        :label="$t('INTEGRATION_APPS.ADD.FORM.INBOX.PLACEHOLDER')"
+        validation="required"
+        validation-name="Inbox"
+      />
+      <div class="modal-footer">
+        <woot-button :disabled="hasErrors" :loading="uiFlags.isCreatingHook">
+          {{ $t('INTEGRATION_APPS.ADD.FORM.SUBMIT') }}
+        </woot-button>
+        <woot-button class="button clear" @click.prevent="onClose">
+          {{ $t('INTEGRATION_APPS.ADD.FORM.CANCEL') }}
+        </woot-button>
+      </div>
+    </formulate-form>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import hookMixin from './hookMixin';
+
+export default {
+  mixins: [alertMixin, hookMixin],
+  props: {
+    integration: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      endPoint: '',
+      alertMessage: '',
+      values: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'integrations/getUIFlags',
+      websiteInboxes: 'inboxes/getWebsiteInboxes',
+    }),
+    inboxes() {
+      return this.websiteInboxes
+        .filter(inbox => {
+          if (!this.isIntegrationDialogflow) {
+            return true;
+          }
+          return !this.connectedDialogflowInboxIds.includes(inbox.id);
+        })
+        .map(inbox => ({ label: inbox.name, value: inbox.id }));
+    },
+
+    connectedDialogflowInboxIds() {
+      if (!this.isIntegrationDialogflow) {
+        return [];
+      }
+      return this.integration.hooks.map(hook => hook.inbox?.id);
+    },
+    formItems() {
+      return this.integration.settings_form_schema;
+    },
+    isIntegrationDialogflow() {
+      return this.integration.id === 'dialogflow';
+    },
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    buildHookPayload() {
+      const hookPayload = {
+        app_id: this.integration.id,
+        settings: {},
+      };
+
+      hookPayload.settings = Object.keys(this.values).reduce((acc, key) => {
+        if (key !== 'inbox') {
+          acc[key] = this.values[key];
+        }
+        return acc;
+      }, {});
+
+      this.formItems.forEach(item => {
+        if (item.validation.includes('JSON')) {
+          hookPayload.settings[item.name] = JSON.parse(
+            hookPayload.settings[item.name]
+          );
+        }
+      });
+
+      if (this.isHookTypeInbox && this.values.inbox) {
+        hookPayload.inbox_id = this.values.inbox;
+      }
+
+      return hookPayload;
+    },
+    async submitForm() {
+      try {
+        await this.$store.dispatch(
+          'integrations/createHook',
+          this.buildHookPayload()
+        );
+        this.alertMessage = this.$t('INTEGRATION_APPS.ADD.API.SUCCESS_MESSAGE');
+        this.onClose();
+      } catch (error) {
+        const errorMessage = error?.response?.data?.message;
+        this.alertMessage =
+          errorMessage || this.$t('INTEGRATION_APPS.ADD.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
new file mode 100644
index 000000000..24d9f2610
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="column content-box">
+    <div class="small-12 columns integrations-wrap">
+      <div class="small-12 columns integration">
+        <div class="row">
+          <div class="integration--image">
+            <img :src="'/dashboard/images/integrations/' + integration.logo" />
+          </div>
+          <div class="column">
+            <h3 class="integration--title">
+              {{ integration.name }}
+            </h3>
+            <p class="integration--description">
+              {{ integration.description }}
+            </p>
+          </div>
+          <div class="small-2 column button-wrap">
+            <div v-if="hasConnectedHooks">
+              <div @click="$emit('delete', integration.hooks[0])">
+                <woot-button class="nice alert">
+                  {{ $t('INTEGRATION_APPS.DISCONNECT.BUTTON_TEXT') }}
+                </woot-button>
+              </div>
+            </div>
+            <div v-else>
+              <woot-button class="button nice" @click="$emit('add')">
+                {{ $t('INTEGRATION_APPS.CONNECT.BUTTON_TEXT') }}
+              </woot-button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import hookMixin from './hookMixin';
+export default {
+  mixins: [hookMixin],
+  props: {
+    integration: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/hookMixin.js b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/hookMixin.js
new file mode 100644
index 000000000..fd545f480
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/hookMixin.js
@@ -0,0 +1,10 @@
+export default {
+  computed: {
+    isHookTypeInbox() {
+      return this.integration.hook_type === 'inbox';
+    },
+    hasConnectedHooks() {
+      return !!this.integration.hooks.length;
+    },
+  },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/integrations.routes.js b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/integrations.routes.js
new file mode 100644
index 000000000..c05982551
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/integrations.routes.js
@@ -0,0 +1,43 @@
+import Index from './Index';
+import SettingsContent from '../Wrapper';
+import IntegrationHooks from './IntegrationHooks';
+import { frontendURL } from '../../../../helper/URLHelper';
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/applications'),
+      component: SettingsContent,
+      props: params => {
+        const showBackButton = params.name !== 'settings_applications';
+        const backUrl =
+          params.name === 'settings_applications_integration'
+            ? { name: 'settings_applications' }
+            : '';
+        return {
+          headerTitle: 'INTEGRATION_APPS.HEADER',
+          icon: 'ion-asterisk',
+          showBackButton,
+          backUrl,
+        };
+      },
+      children: [
+        {
+          path: '',
+          name: 'settings_applications',
+          component: Index,
+          roles: ['administrator'],
+        },
+        {
+          path: ':integration_id',
+          name: 'settings_applications_integration',
+          component: IntegrationHooks,
+          roles: ['administrator'],
+          props: route => ({
+            integrationId: route.params.integration_id,
+          }),
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/specs/hookMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/specs/hookMixin.spec.js
new file mode 100644
index 000000000..eb895ccf3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/specs/hookMixin.spec.js
@@ -0,0 +1,26 @@
+import { shallowMount } from '@vue/test-utils';
+import hookMixin from '../hookMixin';
+
+describe('hookMixin', () => {
+  const Component = {
+    render() {},
+    mixins: [hookMixin],
+    data() {
+      return {
+        integration: {
+          hook_type: 'inbox',
+          hooks: [{ id: 1, properties: {} }],
+        },
+      };
+    },
+  };
+  const wrapper = shallowMount(Component);
+
+  it('#isHookTypeInbox returns correct value', () => {
+    expect(wrapper.vm.isHookTypeInbox).toBe(true);
+  });
+
+  it('#hasConnectedHooks returns correct value', () => {
+    expect(wrapper.vm.hasConnectedHooks).toBe(true);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 46617349c..6293f08c1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -4,6 +4,7 @@ import agent from './agents/agent.routes';
 import canned from './canned/canned.routes';
 import inbox from './inbox/inbox.routes';
 import integrations from './integrations/integrations.routes';
+import integrationapps from './integrationapps/integrations.routes';
 import labels from './labels/labels.routes';
 import profile from './profile/profile.routes';
 import reports from './reports/reports.routes';
@@ -32,5 +33,6 @@ export default {
     ...profile.routes,
     ...reports.routes,
     ...teams.routes,
+    ...integrationapps.routes,
   ],
 };
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 753622ccd..c4f38c96e 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -65,6 +65,11 @@ export const getters = {
   getUIFlags($state) {
     return $state.uiFlags;
   },
+  getWebsiteInboxes($state) {
+    return $state.records.filter(
+      item => item.channel_type === 'Channel::WebWidget'
+    );
+  },
 };
 
 export const actions = {
diff --git a/app/javascript/dashboard/store/modules/integrations.js b/app/javascript/dashboard/store/modules/integrations.js
index 7c8d62ef8..6b3ebe8a4 100644
--- a/app/javascript/dashboard/store/modules/integrations.js
+++ b/app/javascript/dashboard/store/modules/integrations.js
@@ -1,4 +1,5 @@
 /* eslint no-param-reassign: 0 */
+import Vue from 'vue';
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import IntegrationsAPI from '../../api/integrations';
@@ -6,15 +7,23 @@ import IntegrationsAPI from '../../api/integrations';
 const state = {
   records: [],
   uiFlags: {
+    isCreating: false,
     isFetching: false,
     isFetchingItem: false,
     isUpdating: false,
+    isCreatingHook: false,
+    isDeletingHook: false,
   },
 };
 
 export const getters = {
   getIntegrations($state) {
-    return $state.records;
+    return $state.records.filter(
+      item => item.id !== 'fullcontact' && item.id !== 'dialogflow'
+    );
+  },
+  getAppIntegrations($state) {
+    return $state.records.filter(item => item.id === 'dialogflow');
   },
   getIntegration: $state => integrationId => {
     const [integration] = $state.records.filter(
@@ -63,6 +72,28 @@ export const actions = {
       commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false });
     }
   },
+  createHook: async ({ commit }, hookData) => {
+    commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: true });
+    try {
+      const response = await IntegrationsAPI.createHook(hookData);
+      commit(types.default.ADD_INTEGRATION_HOOKS, response.data);
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false });
+    } catch (error) {
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false });
+      throw new Error(error);
+    }
+  },
+  deleteHook: async ({ commit }, { appId, hookId }) => {
+    commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: true });
+    try {
+      await IntegrationsAPI.deleteHook(hookId);
+      commit(types.default.DELETE_INTEGRATION_HOOKS, { appId, hookId });
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: false });
+    } catch (error) {
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: false });
+      throw new Error(error);
+    }
+  },
 };
 
 export const mutations = {
@@ -72,6 +103,25 @@ export const mutations = {
   [types.default.SET_INTEGRATIONS]: MutationHelpers.set,
   [types.default.ADD_INTEGRATION]: MutationHelpers.updateAttributes,
   [types.default.DELETE_INTEGRATION]: MutationHelpers.updateAttributes,
+  [types.default.ADD_INTEGRATION_HOOKS]: ($state, data) => {
+    $state.records.forEach((element, index) => {
+      if (element.id === data.app_id) {
+        const record = $state.records[index];
+        Vue.set(record, 'hooks', [...record.hooks, data]);
+      }
+    });
+  },
+  [types.default.DELETE_INTEGRATION_HOOKS]: ($state, { appId, hookId }) => {
+    $state.records.forEach((element, index) => {
+      if (element.id === appId) {
+        const record = $state.records[index];
+        const hooksWithoutDeletedHook = record.hooks.filter(
+          hook => hook.id !== hookId
+        );
+        Vue.set(record, 'hooks', hooksWithoutDeletedHook);
+      }
+    });
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
index 5bd531a80..f3e85773c 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
@@ -9,6 +9,11 @@ describe('#getters', () => {
     expect(getters.getInboxes(state)).toEqual(inboxList);
   });
 
+  it('getWebsiteInboxes', () => {
+    const state = { records: inboxList };
+    expect(getters.getWebsiteInboxes(state).length).toEqual(3);
+  });
+
   it('getInbox', () => {
     const state = {
       records: inboxList,
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
index cc0dd9d22..1f625b0c4 100644
--- a/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
@@ -1,29 +1,30 @@
 import axios from 'axios';
 import { actions } from '../../integrations';
-import * as types from '../../../mutation-types';
+import types from '../../../mutation-types';
 import integrationsList from './fixtures';
 
 const commit = jest.fn();
 global.axios = axios;
 jest.mock('axios');
 
+const errorMessage = { message: 'Incorrect header' };
 describe('#actions', () => {
   describe('#get', () => {
     it('sends correct actions if API is success', async () => {
       axios.get.mockResolvedValue({ data: integrationsList });
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
-        [types.default.SET_INTEGRATIONS, integrationsList.payload],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
+        [types.SET_INTEGRATIONS, integrationsList.payload],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
-      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      axios.get.mockRejectedValue(errorMessage);
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
       ]);
     });
   });
@@ -34,17 +35,17 @@ describe('#actions', () => {
       axios.post.mockResolvedValue({ data: data });
       await actions.connectSlack({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
-        [types.default.ADD_INTEGRATION, data],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
+        [types.ADD_INTEGRATION, data],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
-      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      axios.post.mockRejectedValue(errorMessage);
       await actions.connectSlack({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
       ]);
     });
   });
@@ -55,17 +56,59 @@ describe('#actions', () => {
       axios.delete.mockResolvedValue({ data: data });
       await actions.deleteIntegration({ commit }, data.id);
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
-        [types.default.DELETE_INTEGRATION, data],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
+        [types.DELETE_INTEGRATION, data],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
-      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      axios.delete.mockRejectedValue(errorMessage);
       await actions.deleteIntegration({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
-        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+
+  describe('#createHooks', () => {
+    it('sends correct actions if API is success', async () => {
+      let data = { id: 'slack', enabled: false };
+      axios.post.mockResolvedValue({ data: data });
+      await actions.createHook({ commit }, data);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: true }],
+        [types.ADD_INTEGRATION_HOOKS, data],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue(errorMessage);
+      await expect(actions.createHook({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: true }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false }],
+      ]);
+    });
+  });
+
+  describe('#deleteHook', () => {
+    it('sends correct actions if API is success', async () => {
+      let data = { appId: 'dialogflow', hookId: 2 };
+      axios.delete.mockResolvedValue({ data });
+      await actions.deleteHook({ commit }, data);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: true }],
+        [types.DELETE_INTEGRATION_HOOKS, { appId: 'dialogflow', hookId: 2 }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue(errorMessage);
+      await expect(actions.deleteHook({ commit }, {})).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: true }],
+        [types.SET_INTEGRATIONS_UI_FLAG, { isDeletingHook: false }],
       ]);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
index 7ec4657a6..2c4ef9e63 100644
--- a/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
@@ -34,6 +34,33 @@ describe('#getters', () => {
     ]);
   });
 
+  it('getAppIntegrations', () => {
+    const state = {
+      records: [
+        {
+          id: 1,
+          name: 'test1',
+          logo: 'test',
+          enabled: true,
+        },
+        {
+          id: 'dialogflow',
+          name: 'test2',
+          logo: 'test',
+          enabled: true,
+        },
+      ],
+    };
+    expect(getters.getAppIntegrations(state)).toEqual([
+      {
+        id: 'dialogflow',
+        name: 'test2',
+        logo: 'test',
+        enabled: true,
+      },
+    ]);
+  });
+
   it('getUIFlags', () => {
     const state = {
       uiFlags: {
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
index c485b5018..212ef44ce 100644
--- a/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
@@ -1,11 +1,11 @@
-import * as types from '../../../mutation-types';
+import types from '../../../mutation-types';
 import { mutations } from '../../integrations';
 
 describe('#mutations', () => {
   describe('#GET_INTEGRATIONS', () => {
     it('set integrations records', () => {
       const state = { records: [] };
-      mutations[types.default.SET_INTEGRATIONS](state, [
+      mutations[types.SET_INTEGRATIONS](state, [
         {
           id: 1,
           name: 'test1',
@@ -23,4 +23,59 @@ describe('#mutations', () => {
       ]);
     });
   });
+
+  describe('#ADD_INTEGRATION_HOOKS', () => {
+    it('set integrations hook records', () => {
+      const state = { records: [{ id: 'dialogflow', hooks: [] }] };
+      const hookRecord = {
+        id: 1,
+        app_id: 'dialogflow',
+        status: false,
+        inbox: { id: 1, name: 'Chatwoot' },
+        account_id: 1,
+        hook_type: 'inbox',
+        settings: { project_id: 'test', credentials: {} },
+      };
+      mutations[types.ADD_INTEGRATION_HOOKS](state, hookRecord);
+      expect(state.records).toEqual([
+        {
+          id: 'dialogflow',
+          hooks: [hookRecord],
+        },
+      ]);
+    });
+  });
+
+  describe('#DELETE_INTEGRATION_HOOKS', () => {
+    it('delete integrations hook record', () => {
+      const state = {
+        records: [
+          {
+            id: 'dialogflow',
+            hooks: [
+              {
+                id: 1,
+                app_id: 'dialogflow',
+                status: false,
+                inbox: { id: 1, name: 'Chatwoot' },
+                account_id: 1,
+                hook_type: 'inbox',
+                settings: { project_id: 'test', credentials: {} },
+              },
+            ],
+          },
+        ],
+      };
+      mutations[types.DELETE_INTEGRATION_HOOKS](state, {
+        appId: 'dialogflow',
+        hookId: 1,
+      });
+      expect(state.records).toEqual([
+        {
+          id: 'dialogflow',
+          hooks: [],
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 29b1e45b5..ec9f527c4 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -83,6 +83,8 @@ export default {
   SET_INTEGRATIONS: 'SET_INTEGRATIONS',
   ADD_INTEGRATION: 'ADD_INTEGRATION',
   DELETE_INTEGRATION: 'DELETE_INTEGRATION',
+  ADD_INTEGRATION_HOOKS: 'ADD_INTEGRATION_HOOKS',
+  DELETE_INTEGRATION_HOOKS: 'DELETE_INTEGRATION_HOOKS',
 
   // WebHook
   SET_WEBHOOK_UI_FLAG: 'SET_WEBHOOK_UI_FLAG',
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index e0443c15c..2b7b3cc30 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -10,6 +10,7 @@ import axios from 'axios';
 // Global Components
 import hljs from 'highlight.js';
 import Multiselect from 'vue-multiselect';
+import VueFormulate from '@braid/vue-formulate';
 import WootSwitch from 'components/ui/Switch';
 import WootWizard from 'components/ui/Wizard';
 import { sync } from 'vuex-router-sync';
@@ -19,7 +20,7 @@ import WootUiKit from '../dashboard/components';
 import App from '../dashboard/App';
 import i18n from '../dashboard/i18n';
 import createAxios from '../dashboard/helper/APIHelper';
-import commonHelpers from '../dashboard/helper/commons';
+import commonHelpers, { isJSONValid } from '../dashboard/helper/commons';
 import { getAlertAudio } from '../shared/helpers/AudioNotificationHelper';
 import { initFaviconSwitcher } from '../shared/helpers/faviconHelper';
 import router from '../dashboard/routes';
@@ -48,6 +49,11 @@ Vue.use(VueRouter);
 Vue.use(VueI18n);
 Vue.use(WootUiKit);
 Vue.use(Vuelidate);
+Vue.use(VueFormulate, {
+  rules: {
+    JSON: ({ value }) => isJSONValid(value),
+  },
+});
 Vue.use(VTooltip, {
   defaultHtml: false,
 });
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
index bae1ca02f..149a305b3 100644
--- a/app/models/integrations/app.rb
+++ b/app/models/integrations/app.rb
@@ -38,8 +38,8 @@ class Integrations::App
     case params[:id]
     when 'slack'
       ENV['SLACK_CLIENT_SECRET'].present?
-    when 'dialogflow'
-      false
+    when 'dialogflow', 'fullcontact'
+      true
     else
       true
     end
diff --git a/app/views/api/v1/models/_hook.json.jbuilder b/app/views/api/v1/models/_hook.json.jbuilder
index e9c921516..3c692c13d 100644
--- a/app/views/api/v1/models/_hook.json.jbuilder
+++ b/app/views/api/v1/models/_hook.json.jbuilder
@@ -1,7 +1,7 @@
 json.id resource.id
 json.app_id resource.app_id
 json.status resource.enabled?
-json.inbox_id resource.inbox_id
+json.inbox resource.inbox&.slice(:id, :name)
 json.account_id resource.account_id
 json.hook_type resource.hook_type
 json.settings resource.settings
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index 1c6276894..a9ae7b4a2 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -3,7 +3,7 @@
 # logo: place the image in /public/dashboard/images/integrations and reference here
 # i18n_key: the key under which translations for the integration is placed in en.yml
 # action: if integration requires external redirect url
-# hook_type: ( account / inbox ) 
+# hook_type: ( account / inbox )
 # allow_multiple_hooks: whether multiple hooks can be created for the integration
 # settings_json_schema: the json schema used to validate the settings hash (https://json-schema.org/)
 # settings_form_schema: the formulate schema used in frontend to render settings form (https://vueformulate.com/)
@@ -43,11 +43,38 @@ dialogflow:
     {
       "label": "Dialogflow Project ID",
       "type": "text",
-      "name": "project_id"
+      "name": "project_id",
+      "validation": "required",
+      "validationName": 'Project Id',
     },
     {
       "label": "Dialogflow Project Key File",
       "type": "textarea",
       "name": "credentials",
+      "validation": "required|JSON",
+      "validationName": 'Credentials',
+      "validation-messages": {
+          "JSON": "Invalid JSON",
+          "required": "Credentials is required"
+      }
     }
   ]
+  visible_properties: ['project_id']
+fullcontact:
+  id: fullcontact
+  logo: fullcontact.png
+  i18n_key: fullcontact
+  action: /fullcontact
+  hook_type: account
+  allow_multiple_hooks: false
+  settings_json_schema:
+    {
+      'type': 'object',
+      'properties': { 'api_key': { 'type': 'string' } },
+      'required': ['api_key'],
+      'additionalProperties': false,
+    }
+  settings_form_schema:
+    [{ 'label': 'API Key', 'type': 'text', 'name': 'api_key',"validation": "required", }]
+  visible_properties: ['api_key']
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ecea2c545..b4bd4357c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -95,4 +95,7 @@ en:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/package.json b/package.json
index 8bbad0b4d..cb6b4fa42 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "build-storybook": "build-storybook"
   },
   "dependencies": {
+    "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git#7e8acadd10d7b932c0dc0bd0a18f804434f83517",
     "@chatwoot/utils": "^0.0.3",
     "@rails/actioncable": "6.1.3",
diff --git a/public/dashboard/images/integrations/fullcontact.png b/public/dashboard/images/integrations/fullcontact.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5d9b7f9e5c2b5bece94a6a9cae344f4d2f912b
GIT binary patch
literal 7204
zcmZXZWmFVS*!JmWcS&hjO1hC{34x_cq+^lpmPTp;Sz1aOq?VKvq;m-orKP(=N=gZN
z{6FvW?LBAiGr#MaYv#j!=F6Ok)zMZVC88t3z`!6?Q&rT(z`zFlS2)=J93@xH(0>z-
zgS?hJ21dg>;(IIHe;U(US49D%c8uZRpP<pv)K^mR)HLp1`~SzA;)lt98GIjIZ9R-!
zH^vQxo(UA83kC*#rkbL>e!${Sb1m4CG=&%;;T(pWH|ZtYT)J*+G<A*(Q4?HmF%v$L
zd3Cdv@vc0*OfhvQKc)E&+ts8bKi_1;FJqAQ^o76wGYJd0`2$3@fSK9C+}zFG{p2Jx
zFw-e!phK`DS1{>&&(?HH&76ZweuYSy<;`I4{NVl4k!ZdUAKpz$*c+LdSYnzhJqMD|
zPctt0Jwjf${giQkP$K$X&>&HvLAEtruDI}e(Pu@Q(;2fwJ@aqu`-dd7h~8BRJ=@sY
zM`?ddle>lE5lLK@{u*I=n~&fY{I%!&xke|zMm?#GwE-#%)cljeD^)Y0YQsjMQk7qD
zMm(MXhgW@&ql#9sv(^~JsS=Xrp>Tf6q*CGrI+xeO$|v#PF6BOFp)H_=JF54l$yeiO
zh%BoaYZ3a0II1rPMH@x46;zw<#H5d2t@fTN7Px-c`cxFBSc9YG^qcWfqd_cz)Pmuv
zNz9WnHYo!yi8X~1WI^iTT8@q8MKe?yw?idJD!-HkE!7X>yV*IWu~{vh`D^k36x}R0
zW1RhSixC@7K~!Tg%F;sm**V1#MeTBmy2aH1MIRx3iWmZ`3Rcj|ew{ATSXHZvoKH!G
z<>`ub+^=X7Bqty6l782Ac(lWw2(2muU`p2?T{v&Ej0*qIndntkeV=noM6=n{49UAG
zhVSQ8Db64v-8qMfysv0xd2nC@#g*i`+<!R(?3{hJn{Su(`HO#wF=ibqMUf_%;#$Q_
z7|jhE41i@VR>XfKP}EF1?=?XNoc4H38Qg8E?j{der`&k?V^y;%t=&+LgD!LWGR2@e
z{IXjz`LL1<3=*<S37)y1N&1}yxnkC4CTecJi^@<|d#J>LqJ~LqWOjhKo)ibeHwDJL
z_O|pp^_14OS~Y%Ik^ZyU(kD^h^qJXXu&wa#`%7tj-gvvH_4m%L(v-(yo4wiUEu~}R
zpE9j#R@KWmH0>7>y1HBB-s<%ZviV-h$i66Eqy=$4Zuigy#?`cKFRp0Ntyh^CbX3`+
zrfS`k`anMo>bUVJ7Y(Kntl*qD45c;Sj~GH(ZP@u?(NPsHP#yLtKQXR$dcxCw{`lB3
z*c4$Asce$pTHDxt361=e{9ZmQxM@u*1(X9|AS|+uWd+Yjc?J+@;S&Li4toF3K9HOA
z`{C9ahTN7NFfPvpgT)vj<O<Upl_071B8Q9uK;<V*w|wX5s0oT1UWNT87bAxtrI_GH
zMfz1<Sm{Fzf8r1D#NSx}vr5Yg83tsg9#92r{sZk5AW2n2Ic1>4i_GkpptVn~<uR2k
ztqy_!4yuZO$d>V#RtuOLH0i1uQPpUtxV+zu$uK<Nk;wLWJ|iA<h~h4`h|8P}L{-cj
zLF*_B+P^O@NOwcED|9am4*s;P%vp@NyI4IuWUk~t@iG5G-o9pQa63J_kSbqrk}OZw
zsjKJPnHlLxf9f9!N)!vY$=%Nynp}u$I3c4Q(>AESoYaV)ESO>;Yt@yoRzMKO22z;?
z|It8#!*(kit#U&stB)dciClF&51O2Jt^O_t&U;kZg9*ODPCk8aRq53N11Hv*_oh5d
zeta;9&062X-WBW`{!0rOs26Dx6Wokmf3yM2F3H`95%q=Rvl@Gp(2A1;uqcq}Jt0O5
zUEfmgvrzcK#DEPs&N}v_O)~9FG9->H{bJ@zUTNf*;<!%j&o(X8da(YCCI|j(qWtw3
z@MS!uWwQ)bA4ch}qNOQkO4Qj#d>^mPB+9>21kA@!(tEn<THxO}fe@Yj6ri>2N9aI4
zUc$j?>`|GQiNDxDuGhjdh}qe9C#-AgY_~HInl~`>k&+jj?L@=I|9(JS)t*ODvm(FM
z(C}4wR%J3bt}pkCMv)RmW?^&v#P{L(IjqCDc<*gE7(}(KOHfnK+X<_J{to!i{8<HN
z(%n3_By^(GxPQT3i|?YC(Y+mY)Fnl<5Cj=vFQ%v1V8!FTJjIErzFv+Bzx>_pAcF8z
zP76>KJ0;w}s0=|nW_;sHi@R_v0I;0kJeDL1c~2XQ7zr@49Gsxwm{q>36a$zIW5G}d
zj32kcX(YYaL0oe|gVUIsVCi&Txn=>81q@dLQX4KCm=yzt#`h3W)mP2hq6abSw3yoq
zWW(~I%>5>9wZl4S*2~w7K`-Z0hcWB*j!jwcE@|n@Gjkg=k+fL&a*H=#M$w=MSX!rC
zOkElw4xSvUz$+6ei-#ZB0o@P)%76gNFL+)tQPc7a$oR&$NjF(Seo{OkI6o9e_OW<?
zIR{E5(Hkru?yhk+>u>pG3*S0U3ZxK%@B+y{YloimPrg%S2rybPRd2#!;atLM087_0
z5Jh%cJEw3SV#P=P4#Zr-5@s=HHfVUAfvd16L%?jt8eloLJ0%7~`n(&_&QxuQP*Ey7
zTgjYWsrh&NiFVSPJdX8h0gv3lzsI}F{~ix>&XgyJj4f$CUb!@~o%Z+=@TTQ?d0k=`
z>EIAL@i396qUJCWx7A_rV-X?^H$C#DD9Kw$!SBfZ0emATfzMvA$+8ZfK6Z(%?Hbim
zi#H5eFm>0qZa)h{7}t=Y%;8TVB(id12L-0BBYWMVZWo&u&)y(f?QPWe%7)}6O@^-L
zNq_yaJaEr@bnuo}#@0IdHBs-|O)=~q>th0M)&^9LMxyJ)%9e4h2Mo%}H(V}5AffWA
zt%G7)bYsoaaLGXWVe-Ca4Ak@|J#yZ*y+tS$SVO|>ja@_Pr}*R(Hj?bGK5c?_t!}}@
zTNBpSBT8)~CqCLbt>e-*JktUKW04~H>dp0OxkIL9OB{RjdPST9)888r_B=EFc8hj`
zV|8SE$)Kt7WwV#<2hHS$jGuR)@l#rNRoQ7GSH>ps_44UCh%ZZhu(KuzYV=aavL=)-
z|F-}61D?xthg|V4xdh=iynYg=wIB0Oz|V6IRZD65NnKyIQxlk1ps0K-hOAADoHxdl
z$2PglL?~<@Lf>98`M%pu2(N+j{4SF`zWd6UnzpKYAxc@);~Bfiu`xW+>1Kv3J=)@H
zED4S@cBiz5PmNlEm7mCHZ{&DSl(=Qq1uQgD+4m3Jzq<nSFDYAB`+%bZ2>J$u<3tu^
zy>+pLi@&IANG_yD!WZSf(ac1U{d{&gs9V=+nVO;T`5GLR^U9MhCJ)SA9^v9M=ERag
zROU<cn$Ibagqw6=s-1&BvzDWITeX&&iqSCFk_1KS(ie+P2&XqoO?O+kTkV}wJ%9Jv
zj~&H+P(J@U*nfl^sq;n;HrYXSrc-K>Mv7umPLB>6`8D4w_*NvB-|tW}kJ8k$QYh1V
z`nvYz{q#^stLt|=DN;#08=F|q_Zc-5R>g(ECg-POHE0!`*BcCRQ-%IHaYhwy>kCf_
z+HbI&+M^wYUf&R?6#x1rr8Q`G)O^+n_uibq8Z{ifTA<$TgB>{Sm&8uiet)7ps3qx@
zg?Jmm0hkI^$}1?hTyRFhN`67M|3Nt$3=rRV{t#g7@?*GYI2H}cedh-e(|BW<K^miS
zA8Z`L0L_CW)c+lH4|GreeCFucI<$x{#Q;EgCD)}9JI>LEqhlzL+_SRtBbhj!UyAM!
z8IY)-L071^jppAPMtjE$Il|G*#Eq4ZUeA3ww>(Awc;~X&6E><cY;Nf!?8I=ZL$8tp
z#CVkh_GiYpLQo-b&*qb657vYci;ydzMglyM3W;-n3A2}5Howyd8y{%j#26^TUdEkz
zK-v*+W3>}SeU6v<2)RUb$h8Z$fBTYX;zgh~SGp(8MAwGN3n0w12x?`+Z*BV>*e%Hq
zps-AvBu9oTf4GG2ps93A2En{mKPERUlXnMyJs>@aA}*I7V7zZZE*T%3k1`4Y*|Lxe
zq%DGd>tBOaw@&0IlWpMy7tQ7}3XsJ|uG@$wNYC_<KYuToD~Z&U4^9c^Lss!N93Oej
zZC)`%n9z@oSJAMG%TXhC21queRy1^B?(Tm!QvBAJ9R{o-I@>s`kW(PPMygH6Q!@c^
z5&&#+$P7t?kKGlhqAzr%`0|DhPT}n>Wn%!$xlMQLzT+S?#qmq*mMdQT^=1gE${-it
zTl*T1XQo)<q7-j}wf=tfA*h#Xcwx7r{6AS5$MSaZ`VnZuE*?&eIQDpsA92(FZD557
zg8+X?e3A6Ju+;Cipm?dU<7S&kk(WZ8H<Xf;RcUF_BrTF*yYz%E1bbq|%o?}<TBVL&
zhe1xF<uBv8lA=Ek3)>+V10Sg(#%CJSRYC)9?^4xz`}m;bVfN3!mMJn0@{dX(Ry)u%
ztYxWiH;*^iFOAzwi9{Jhm-pMm_g8Rthv__)HAxV~3!(Yc>}A>dt5ms!%PT6`G1iR+
z8Wlqqi~#!j4l}`-ATnMDetez8&r%xkX1IDsv^>`Jx3nFuU3SsL^D8yJAz-(a(S5t4
z@1}irB@dKT##QkN76L1mI|xWq<1gOkW-e?ZYB9j|jQNcg!5tkA`#$~P)X>UmfoS8y
zlpa8m%#z_J2dd7;w-shzPyCvsvj@$WpXow{c+kdTfO0&I(twH~E`)I1<DmjZbwnFF
zjNzfz)cEVi$5Qm6sUz}y^1fSIt8`~jt`rDVAd}hBtAfodt3xyWQ=?fcyc3a!WJrh%
zd9eta-0tE_6?q`W--mkg%+#XVcYKbCg#<0VJc|Jm_RtY^j;;yiD*IkS6Y|)O2J)<e
z4M;0h4Bs2GB*TbjU13T<8H^SztF_g6zs?h@O$daVz^ub}Gic#i4t35v=5{TGy<K(r
zn2~twmSs?_-mEd{0RCQlgvo}3IBaX;Yu?-m58%&wu$oWc?^rZ60Ou2*7>G%za1<L8
zK=IC`x+icmVq8WbD|_3^QxGH}yJ@j9*}3K2mb1D3ljWr9>J#co$E5<*D<&FGW82V%
z8wv7E*tkpLWZJ~nXA`h2hwg@(O|VqR;x8r4<s<gKK3Ln|q#LPRqvuJ_|Ggsfsan6b
zZ?2cau~p2x&Yaw$lG<M~NSn^|m5hX=!J#1LK8Vk`o{)8~6;>GvvFW*Xr8JcDk|ECc
zP{*qRvOGu`ht9%65=XrJeRYea^qmVpGN34o8IokBIc2CJ2Em}xoBrp?l+|wbPS`l>
zNXy2$^UvQ4kl)3jnHyB+rG+*y8bRVE5Fz6j;z2~8f@c<zp5d9QGFAgfD+B3qz8+pN
z<2JZamvxg`Go=r~_^i?qhYeE@BOwDENk`Ih@R%-meo529kM<s_=bY}|>|Nh+lxAQC
z6hFNKv@&&$h%t;r(%TFoirV_FmR%v5)0)T+M;?jJ($=X5y<7mC)L3=Cm35shy5!_a
z*{5#~nHT{{YjtsJ>T8P1$jCnhh7Jcz`0Xh0gdfW6jkf~Ba*q|&c{loTNh<eqs~0~3
zG2NG0Tan9I+kU&FHujd5{IiW3HIX#_C=%C(j-|hMH)`R8>_rVLvQxYVGlKQ-*~%(5
zliSq|hK&Fa(A$MH86UkR5BYZ0ZKgC^a}fZ_IDAK%ip;w)zF_4{abI40TrU*Cte*NF
z5Ig?k&u@de>M2s7&1Ph*0jIS=`vMHPEng)9t|rgM2ajK-NY2v=!-)(z?G2oBTm*nx
zlEELGMDZ`q2yb1x#?a;h0GmUda$6?6%owBjlu+~g9Lo>x>w||q^kP8z<zagL>POdk
zW`-;z_=(z__ZdXbR^l&G+4c+O2{mp$vPhF+jwb|$H}(uhj#*wLe*&g0Ab^stB|(_Q
zizwvFH?CE<pg^tW92aM=28#Z~?EqFoXYq5V)*ZxSUNvX~le8tCpGn$L?{P9MdU`o>
zlHVAq$v61Ci}LpU6PsLNf7-uv9vu?7vvv10i{joF7d8SNE^g2(Tg$Z!=842p=7|Ht
z#z|t2A>WJB@1h<BEtO^#8IZ;A545x2p`*&vQA1Hie9I5rJwF282A!%=YkT)Zrz?cv
z2c*W@LC@_aZrtQ>gY?El@}ysTtmUo<G9}^NUf7!P{DlVe_VwN6FOQ}yul|&Dz8{<%
z`Ez}dX(8D1Q?V~N*Vg%zI_!c|WCr)p5=j)ejpXkcbJ|<Zhf5_TM3dXUu%GEUdMo_)
zK`Dfh8_4}r;;^H{yg+FPhFLxAzZ4+Bx&@A8B+axQm#inVkW_96f2?62L%Yo0FDJam
zA3E^72xER~$V5Z2dDpNT_)(gLM;=#ZbcPievwxY7Y^9_3o=3!ro=7^)2C$Gk+^!+B
z2S%}3q(YuIJgb#6N00r{E_CS8*xKlMcj6+Cc>Wi*_(3Qgy2bR#H3fgq{=6HmG>A^{
z1*^n%rT6E&P!!ANnOOGOrXb4>QkH!*C+9xOI^h1=DS7@hrYblrXozy#d44dC`xYm_
z<@1j=H$iF0@JlS>`4AAW(@arX)5QN)hA%BpTAKZ%**EpG<A~Wq;X)z)d5K-)CJlGu
z>4cD!Oq5s0+%WR>6`y^erzw#9jK9}#x@n8WEWiuYSucaB*!E44mIc84=O~DzfwTc9
z=8}vFewD?8Hf3yzl01%1!hOIql|uU!*oOUV)Z8SU*0zwd){Giz9x!K24|*M$k_g(H
zs<h3s1?o6C5ShSa@s$HSTR2UuB1m8;bAu>c8`H(X^Iu!r@ZeazIFC=2fERht!%b55
z3USjL`;qr@rK|8RZmw7i#23rl0C;>88=^v3GMaVD9j6$_cm25VI|u9<*IIrgZC1AP
z+0&+_Co$a4vD6BYk*Uc#ue&%TT>~u;zKAb68aq>tA!%`Lr?U9sp*v4ucP{#_#ENeh
z8(HGD{VRTUv}j<`mHip{^Qt9&kMDFbi}kwcJu?YuMwhyJK+JoAYRU*Z#211$#KhPG
z@85LTE(r0*h|N<S#(|zvumcUnUn|cyB!dI%t5WoOhjmz;>Un3l*KM+d1M7KaX#asi
zU_IB2xRr|)(N3SWTP*=I3~$FOQ77kVxFqd6oewg%AhZ9a=c_vPa|^9QzbtE>jT1g%
zup2XdB=l7?<`S%zHl{eFwJZuwLiH8seBcj^;qT2$P^uvAjebj;g$z+p`?4~wHkSob
zkKicM?vr-?2dH;o?2CG3E<(SkcD!jz-fsee{~_yz<pDWfKa6ie8s3)aq@f_AbWwl$
zs*In|H)7Xn^M4_3*DCUi=p%t|^lsk}Z$Nur1_cvqz?LbwewFQo<(6I^nZ7gTUSEVm
z@M5KL%+;JH(={QHlNIAO$rxHx(MBcIu*{R`GwA&vz3tCGqP=9;f=NA>oYAdiQRRh8
zhJmrJHyr9qdvRmf+oY;XpJ@y5561kZwz?4kamm<<5%t7+(!i+<Vb~Y_h&}n%mg(6F
zf~Rei<B^_ruY_cgSpOi(d1=msO<yI`*d{op5exBddg|rphm#uNEnzIund3|gPMj8y
zYoV;o%<xxirdk?VC7)Mg((6_vm7}TSUdNcg51?NxydVdrGdbFxQaN^}GnO`m6%JW7
zBE>^YU_@eKDy#lmd}-I0u3y>RnP$1{0`p%oV{aENo#Ep4W7FY0N7t_4G@$wdm!*BQ
z8tO`RtteQ55f+Na*g&=<=x#C=Ej4gOrH5G*Xx$_DLilCbuL%4~=Va^BuRx|+$R^j!
zqH#bUw&R&XO`^#+>B|H0y5Vn;$r>XNQ(s15;6u|(doRyJTwrO#C}d7lFd&(1I8?(j
z_bYY@N_4h8s{SX%52pbDA=w_CSLl8hIrj#9>sZj>BTsgq92%-Y+hQ%Q$@<l}J_9Dr
zrO6iScf>=S!uojwYaFc-YsFl9CMS{-1eB%MmbWtX5w2L}gq8KQE&e5FaMPT$YF=(C
z5(MdFxUO<Nff%mHO3WI?7-xjl)J-_OdqGT5#kbH^2p>(Q=JYdZ^l!G9w{r^T{6x*E
z?BQKp=VeDSc{JA_#ie1IMPsMNNYTgdln#r6919C8<UQ*_%0WRu(=5Y&&oG|Tqfs~}
z`q*-LDwB{)V<_QuNN$(#HgL-{>vqdij%oJN_gYz)1*l9+QN*{<sxP2V(otiYTN@&L
z=7DE)tNg}lf8}`5=NM^g$<)-c(OO<a7D3J=rXbfJsZ0>3Uac#tZ~DIdiS1aG0qTS(
z`xAu^6;|O?)l98fa63A6a&y|=!s0!(l$z~F!4~Xo?f+5{`U&_ef*3kZ2F}syE@dY;
z3wO$5dM$%RTtH{@C02?Z`I>6)>8jcHR;EAN{lf3TQSA&fc(IUwtNFQxE7l`IHO}T{
z)&(Z({}*g#B;u9cFR<AwGpOMOqn$EbaNkHQ97cKOZulq^mPKk44EYGz>phJc&4_*`
zQ81Kkz|^#a%mP5cOp(VL{yqwjpJxYSiRGS-xp;12qW^Eh1R-YjzXZ*+{8JoTsAIHe
zKBE}y9;z;t^UsC*Wi%ZV9q_FTtAsp+9~2UM-{{a~PP}cCV%H9wAVmCk_DM2yS6<>K
z1h$idw{rY73()>>$D6b=U3e_(Pbz!tE<_i+xYFw*Hq)WYnipi0;LrtIcF=x8!&LmL
zN_KYw^vT~Yz|cIVm1Pp-vDPfccmIN3gJfXA9$GdD+T+ZDqR&BgRoWz=bJSs+Dl8am
z{fZ?pMnDlR<Rnzm%A@C05mUWpWEmJ!wdVf?1ujFiO(m1Pc*CZ20n)OA+E0Tt?085S
zy#mUx#$l9BClN1TBu=#=vMj%4r#sIgkn2+GvFA88%^#g#q2%F_@xq4XLu^s>)xeNq
zF#N)lwx_<J8p3kskURnwUj+~R9eR5X+CatFFgp<lDy3&<N=MB){zBDI2IXlaw9FeN
z&O)B}hZE~phy2*@eeG*bGft*hdo8Sjbj-mj1V`ZwdvFr`K6&*>7>OtPt7H0dEGk0l
zgN>q7KVn$8|7IPensD|Uf+Mf!C`NO!26wUq74ZT{K5~;TI>$9tQeu#8Os!Lqfv4BW
z$gHN<Ny&<)*VPJ%g(dD4ae5A(7`_-;IyqY6a_p^B=@f0Syu{K(J5Z3lI$-6(4m--g
zP)%mJor8)`Vmjtp3#&h`xZ*W%q>BAuM%$C^h-u1~SoFR@k)12$#N57kX#Y6@U8uw)
zwodL>eJ70HW#eBlE!AhjxG=+q*7h_ldhVVfwWB{U{3OmN0llwZ@eDHC*LdX6_U2bh
zLAAGWN<?T@2!U)B-WD-ZG<t8|M|N*!1bkvEBmUqk;4?)?Hdyf7$bA22z8})B;p+6O
zf*|K=7_Bb#^=0C<;EN8lj#p#3o|VD(S8cNS(nfAfLtjp|d6NsD`F=4uZ^VD{bk8&i
z?k)U$O=`l3b9nG>C0}rKA<M$OXL;J%78^gTYk9S;QySWSbNwz!KyduSX~=~7Hm5BE
jLoj55sFVip5nmcZx&Hd9X6@gv9fq2cwqmV<WyJpgRqArK

literal 0
HcmV?d00001

diff --git a/yarn.lock b/yarn.lock
index f2b766a26..8eafe2e3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1081,6 +1081,21 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@braid/vue-formulate-i18n@^1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@braid/vue-formulate-i18n/-/vue-formulate-i18n-1.16.0.tgz#71c9121c909c7bbdfd4dfcf6a57d554f5bb1ec75"
+  integrity sha512-CuX1kN7bWg4ukynnTS3LGsmPKrUvS2Wh75zKatIe+nHQQy0gSvfmggQsCz4QZey7Ois+pGYmOIgrE1SvX+zQTw==
+
+"@braid/vue-formulate@^2.5.2":
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/@braid/vue-formulate/-/vue-formulate-2.5.2.tgz#32076d6a513760763a3a89dd69e8911c1bad1fcb"
+  integrity sha512-0LWKp3Rjq2a+WwA4y49VaXqQOVClJGy6mmdivxJJyRvNB0aUcTOKOINLumeU/XHf7/c0HNhtbZih2vs6hMDyvQ==
+  dependencies:
+    "@braid/vue-formulate-i18n" "^1.16.0"
+    is-plain-object "^3.0.1"
+    is-url "^1.2.4"
+    nanoid "^2.1.11"
+
 "@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git#7e8acadd10d7b932c0dc0bd0a18f804434f83517":
   version "1.0.0"
   resolved "https://github.com/chatwoot/prosemirror-schema.git#7e8acadd10d7b932c0dc0bd0a18f804434f83517"
@@ -8366,7 +8381,7 @@ is-plain-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
-is-plain-object@3.0.1:
+is-plain-object@3.0.1, is-plain-object@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
   integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
@@ -8448,6 +8463,11 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-url@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -10116,6 +10136,11 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
+nanoid@^2.1.11:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
+  integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
+
 nanoid@^3.1.22:
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"

From 94a83ea995b70c9d800c8a71465260ee6b7ce699 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sun, 6 Jun 2021 16:59:47 +0530
Subject: [PATCH 38/67] feat: Add an option to edit webhook URL (#2316)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../i18n/locale/en/integrations.json          |  23 +++-
 .../settings/integrations/EditWebHook.vue     | 108 ++++++++++++++++++
 .../integrations/{New.vue => NewWebHook.vue}  |  30 +++--
 .../settings/integrations/Webhook.vue         |  50 ++++++--
 .../modules/specs/webhooks/actions.spec.js    |  24 ++++
 .../modules/specs/webhooks/mutations.spec.js  |  10 ++
 .../dashboard/store/modules/webhooks.js       |  20 +++-
 .../dashboard/store/mutation-types.js         |   1 +
 8 files changed, 233 insertions(+), 33 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
 rename app/javascript/dashboard/routes/dashboard/settings/integrations/{New.vue => NewWebHook.vue} (81%)

diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 8e158982a..cbbe0ebbf 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -12,10 +12,25 @@
       "LIST": {
         "404": "There are no webhooks configured for this account.",
         "TITLE": "Manage webhooks",
-        "TABLE_HEADER": [
-          "Webhook endpoint",
-          "Actions"
-        ]
+        "TABLE_HEADER": ["Webhook endpoint", "Actions"]
+      },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
       },
       "ADD": {
         "CANCEL": "Cancel",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
new file mode 100644
index 000000000..cdfa2998a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.TITLE')"
+    />
+    <form class="row" @submit.prevent="editWebhook">
+      <div class="medium-12 columns">
+        <label :class="{ error: $v.endPoint.$error }">
+          {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.LABEL') }}
+          <input
+            v-model.trim="endPoint"
+            type="text"
+            name="endPoint"
+            :placeholder="
+              $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.PLACEHOLDER')
+            "
+            @input="$v.endPoint.$touch"
+          />
+          <span v-if="$v.endPoint.$error" class="message">
+            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="modal-footer">
+        <div class="medium-12 columns">
+          <woot-button
+            :is-disabled="
+              $v.endPoint.$invalid || uiFlags.updatingItem || endPoint === url
+            "
+            :is-loading="uiFlags.updatingItem"
+          >
+            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.SUBMIT') }}
+          </woot-button>
+          <woot-button class="button clear" @click.prevent="onClose">
+            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.CANCEL') }}
+          </woot-button>
+        </div>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+import { required, url, minLength } from 'vuelidate/lib/validators';
+import alertMixin from 'shared/mixins/alertMixin';
+import { mapGetters } from 'vuex';
+
+export default {
+  mixins: [alertMixin],
+  props: {
+    id: {
+      type: Number,
+      required: true,
+    },
+    url: {
+      type: String,
+      required: true,
+    },
+    onClose: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      alertMessage: '',
+      endPoint: this.url,
+      webhookId: this.id,
+    };
+  },
+  validations: {
+    endPoint: {
+      required,
+      minLength: minLength(7),
+      url,
+    },
+  },
+  computed: {
+    ...mapGetters({ uiFlags: 'webhooks/getUIFlags' }),
+  },
+  methods: {
+    resetForm() {
+      this.endPoint = '';
+      this.$v.endPoint.$reset();
+    },
+    async editWebhook() {
+      try {
+        await this.$store.dispatch('webhooks/update', {
+          webhook: { url: this.endPoint },
+          id: this.webhookId,
+        });
+        this.alertMessage = this.$t(
+          'INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.SUCCESS_MESSAGE'
+        );
+        this.resetForm();
+        this.onClose();
+      } catch (error) {
+        this.alertMessage =
+          error.response.data.message ||
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
similarity index 81%
rename from app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue
rename to app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
index 55fbbc650..8c445771f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/New.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
@@ -28,14 +28,15 @@
 
         <div class="modal-footer">
           <div class="medium-12 columns">
-            <woot-submit-button
+            <woot-button
               :disabled="$v.endPoint.$invalid || addWebHook.showLoading"
-              :button-text="$t('INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.SUBMIT')"
-              :loading="addWebHook.showLoading"
-            />
-            <button class="button clear" @click.prevent="onClose">
+              :is-loading="addWebHook.showLoading"
+            >
+              {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.SUBMIT') }}
+            </woot-button>
+            <woot-button class="button clear" @click.prevent="onClose">
               {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.CANCEL') }}
-            </button>
+            </woot-button>
           </div>
         </div>
       </form>
@@ -45,15 +46,14 @@
 
 <script>
 import { required, url, minLength } from 'vuelidate/lib/validators';
-
-import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import alertMixin from 'shared/mixins/alertMixin';
 import Modal from '../../../../components/Modal';
 
 export default {
   components: {
-    WootSubmitButton,
     Modal,
   },
+  mixins: [alertMixin],
   props: {
     onClose: {
       type: Function,
@@ -66,7 +66,6 @@ export default {
       addWebHook: {
         showAlert: false,
         showLoading: false,
-        message: '',
       },
       show: true,
     };
@@ -79,9 +78,6 @@ export default {
     },
   },
   methods: {
-    showAlert() {
-      bus.$emit('newToastMessage', this.addWebHook.message);
-    },
     resetForm() {
       this.endPoint = '';
       this.$v.endPoint.$reset();
@@ -94,18 +90,20 @@ export default {
           webhook: { url: this.endPoint },
         });
         this.addWebHook.showLoading = false;
+
         this.addWebHook.message = this.$t(
           'INTEGRATION_SETTINGS.WEBHOOK.ADD.API.SUCCESS_MESSAGE'
         );
-        this.showAlert();
         this.resetForm();
         this.onClose();
       } catch (error) {
         this.addWebHook.showLoading = false;
         this.addWebHook.message =
           error.response.data.message ||
-          this.$t('INTEGRATION_SETTINGS.WEBHOOK.ADD.API.ERROR_MESSAGE');
-        this.showAlert();
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
+      } finally {
+        this.addWebHook.showLoading = false;
+        this.showAlert(this.addWebHook.message);
       }
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
index b64f5140e..6607909f4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
@@ -42,16 +42,22 @@
                 {{ webHookItem.url }}
               </td>
               <td class="button-wrapper">
-                <div @click="openDeletePopup(webHookItem, index)">
-                  <woot-button
-                    :is-loading="loading[webHookItem.id]"
-                    icon="ion-close-circled"
-                    variant="link"
-                    color-scheme="secondary"
-                  >
-                    {{ $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT') }}
-                  </woot-button>
-                </div>
+                <woot-button
+                  variant="link"
+                  color-scheme="secondary"
+                  icon="ion-edit"
+                  @click="openEditPopup(webHookItem)"
+                >
+                  {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.BUTTON_TEXT') }}
+                </woot-button>
+                <woot-button
+                  variant="link"
+                  icon="ion-close-circled"
+                  color-scheme="secondary"
+                  @click="openDeletePopup(webHookItem, index)"
+                >
+                  {{ $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT') }}
+                </woot-button>
               </td>
             </tr>
           </tbody>
@@ -74,6 +80,15 @@
       <new-webhook :on-close="hideAddPopup" />
     </woot-modal>
 
+    <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
+      <edit-webhook
+        v-if="showEditPopup"
+        :id="selectedWebHook.id"
+        :url="selectedWebHook.url"
+        :on-close="hideEditPopup"
+      />
+    </woot-modal>
+
     <woot-delete-modal
       :show.sync="showDeleteConfirmationPopup"
       :on-close="closeDeletePopup"
@@ -87,19 +102,22 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import NewWebhook from './New';
+import NewWebhook from './NewWebHook';
+import EditWebhook from './EditWebHook';
 import alertMixin from 'shared/mixins/alertMixin';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 
 export default {
   components: {
     NewWebhook,
+    EditWebhook,
   },
   mixins: [alertMixin, globalConfigMixin],
   data() {
     return {
       loading: {},
       showAddPopup: false,
+      showEditPopup: false,
       showDeleteConfirmationPopup: false,
       selectedWebHook: {},
     };
@@ -128,6 +146,13 @@ export default {
     closeDeletePopup() {
       this.showDeleteConfirmationPopup = false;
     },
+    openEditPopup(webhook) {
+      this.showEditPopup = true;
+      this.selectedWebHook = webhook;
+    },
+    hideEditPopup() {
+      this.showEditPopup = false;
+    },
     confirmDeletion() {
       this.loading[this.selectedWebHook.id] = true;
       this.closeDeletePopup();
@@ -152,4 +177,7 @@ export default {
 .webhook-link {
   word-break: break-word;
 }
+.button-wrapper button:nth-child(2) {
+  margin-left: var(--space-normal);
+}
 </style>
diff --git a/app/javascript/dashboard/store/modules/specs/webhooks/actions.spec.js b/app/javascript/dashboard/store/modules/specs/webhooks/actions.spec.js
index 47c1debea..0cb8b8787 100644
--- a/app/javascript/dashboard/store/modules/specs/webhooks/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/webhooks/actions.spec.js
@@ -52,6 +52,30 @@ describe('#actions', () => {
     });
   });
 
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({
+        data: { payload: { webhook: webhooks[1] } },
+      });
+      await actions.update({ commit }, webhooks[1]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: true }],
+        [types.default.UPDATE_WEBHOOK, webhooks[1]],
+        [types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.put.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.update({ commit }, webhooks[0])).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: true }],
+        [types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: false }],
+      ]);
+    });
+  });
+
   describe('#delete', () => {
     it('sends correct actions if API is success', async () => {
       axios.delete.mockResolvedValue({ data: webhooks[0] });
diff --git a/app/javascript/dashboard/store/modules/specs/webhooks/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/webhooks/mutations.spec.js
index 4a728f7ac..2ab51ce70 100644
--- a/app/javascript/dashboard/store/modules/specs/webhooks/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/webhooks/mutations.spec.js
@@ -30,4 +30,14 @@ describe('#mutations', () => {
       expect(state.records).toEqual([]);
     });
   });
+
+  describe('#UPDATE_WEBHOOK', () => {
+    it('update webhook ', () => {
+      const state = {
+        records: [webhooks[0]],
+      };
+      mutations[types.default.UPDATE_WEBHOOK](state, webhooks[0]);
+      expect(state.records[0].url).toEqual('https://1.chatwoot.com');
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/webhooks.js b/app/javascript/dashboard/store/modules/webhooks.js
index 3d3a72107..11c0dec34 100644
--- a/app/javascript/dashboard/store/modules/webhooks.js
+++ b/app/javascript/dashboard/store/modules/webhooks.js
@@ -8,6 +8,7 @@ const state = {
     fetchingList: false,
     creatingItem: false,
     deletingItem: false,
+    updatingItem: false,
   },
 };
 
@@ -36,7 +37,10 @@ export const actions = {
     commit(types.default.SET_WEBHOOK_UI_FLAG, { creatingItem: true });
     try {
       const response = await webHookAPI.create(params);
-      commit(types.default.ADD_WEBHOOK, response.data.payload.webhook);
+      const {
+        payload: { webhook },
+      } = response.data;
+      commit(types.default.ADD_WEBHOOK, webhook);
       commit(types.default.SET_WEBHOOK_UI_FLAG, { creatingItem: false });
     } catch (error) {
       commit(types.default.SET_WEBHOOK_UI_FLAG, { creatingItem: false });
@@ -44,6 +48,18 @@ export const actions = {
     }
   },
 
+  update: async ({ commit }, { id, ...updateObj }) => {
+    commit(types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: true });
+    try {
+      const response = await webHookAPI.update(id, updateObj);
+      commit(types.default.UPDATE_WEBHOOK, response.data.payload.webhook);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.default.SET_WEBHOOK_UI_FLAG, { updatingItem: false });
+    }
+  },
+
   async delete({ commit }, id) {
     commit(types.default.SET_WEBHOOK_UI_FLAG, { deletingItem: true });
     try {
@@ -64,10 +80,10 @@ export const mutations = {
       ...data,
     };
   },
-
   [types.default.SET_WEBHOOK]: MutationHelpers.set,
   [types.default.ADD_WEBHOOK]: MutationHelpers.create,
   [types.default.DELETE_WEBHOOK]: MutationHelpers.destroy,
+  [types.default.UPDATE_WEBHOOK]: MutationHelpers.update,
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index ec9f527c4..152959cb2 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -91,6 +91,7 @@ export default {
   SET_WEBHOOK: 'SET_WEBHOOK',
   ADD_WEBHOOK: 'ADD_WEBHOOK',
   DELETE_WEBHOOK: 'DELETE_WEBHOOK',
+  UPDATE_WEBHOOK: 'UPDATE_WEBHOOK',
 
   // Contacts
   SET_CONTACT_META: 'SET_CONTACT_META',

From 1155b49e420580cc3433147f8990b0b8c987375f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Sun, 6 Jun 2021 21:18:47 +0530
Subject: [PATCH 39/67] fix: Add swagger definition for platform_user_id
 (#2385)

---
 swagger/parameters/index.yml            |  3 +++
 swagger/parameters/platform_user_id.yml |  6 ++++++
 swagger/paths/index.yml                 |  5 ++---
 swagger/swagger.json                    | 11 ++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 swagger/parameters/platform_user_id.yml

diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index daedad351..3e8f0cb68 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -24,3 +24,6 @@ contact_sort_param:
 
 page:
   $ref: ./page.yml
+
+platform_user_id:
+  $ref: ./platform_user_id.yml
diff --git a/swagger/parameters/platform_user_id.yml b/swagger/parameters/platform_user_id.yml
new file mode 100644
index 000000000..708a0aad9
--- /dev/null
+++ b/swagger/parameters/platform_user_id.yml
@@ -0,0 +1,6 @@
+in: path
+name: id
+schema:
+  type: integer
+required: true
+description: The numeric ID of the user on the platform
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 3c6b16185..f4ece98a3 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -52,7 +52,7 @@ platform/api/v1/users:
     $ref: ./platform/users/create.yml
 platform/api/v1/users/{id}:
   parameters:
-    - $ref: '#/parameters/user_id'
+    - $ref: '#/parameters/platform_user_id'
   get:
     $ref: './platform/users/show.yml'
   patch:
@@ -61,7 +61,7 @@ platform/api/v1/users/{id}:
     $ref: ./platform/users/delete.yml
 platform/api/v1/users/{id}/login:
   parameters:
-    - $ref: '#/parameters/user_id'
+    - $ref: '#/parameters/platform_user_id'
   $ref: './platform/users/login.yml'
 
 
@@ -215,4 +215,3 @@ platform/api/v1/users/{id}/login:
     $ref: ./teams/update.yml
   delete:
     $ref: ./teams/delete.yml
-
diff --git a/swagger/swagger.json b/swagger/swagger.json
index a4e7a9377..b9db2b77e 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -550,7 +550,7 @@
     "platform/api/v1/users/{id}": {
       "parameters": [
         {
-          "$ref": "#/parameters/user_id"
+          "$ref": "#/parameters/platform_user_id"
         }
       ],
       "get": {
@@ -3201,6 +3201,15 @@
       },
       "required": false,
       "description": "The page parameter"
+    },
+    "platform_user_id": {
+      "in": "path",
+      "name": "id",
+      "schema": {
+        "type": "integer"
+      },
+      "required": true,
+      "description": "The numeric ID of the user on the platform"
     }
   },
   "x-tagGroups": [

From ae3cbf4f79d65205b836465ea1197f0df040936e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 7 Jun 2021 11:46:47 +0530
Subject: [PATCH 40/67] chore: Expose contact identifier in API (#2391)

---
 app/views/api/v1/models/_contact.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 95d761e10..a3088f965 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -4,6 +4,7 @@ json.email resource.email
 json.id resource.id
 json.name resource.name
 json.phone_number resource.phone_number
+json.identifier resource.identifier
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
 json.conversations_count resource.conversations_count if resource[:conversations_count].present?

From d1b3c7b0c2f78987cda3c8ebd7b3db61553371e6 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 7 Jun 2021 13:58:01 +0530
Subject: [PATCH 41/67] chore: Update Facebook Messenger gem (#2342)

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  |   6 +-
 app/bot/facebook_bot.rb                       |   8 +-
 .../messages/facebook/message_builder.rb      |  15 +-
 .../facebook_indicators_controller.rb         |  55 -------
 .../facebook/send_on_facebook_service.rb      |   2 +-
 config/initializers/bot.rb                    |  24 +--
 config/routes.rb                              |   8 -
 .../facebook_indicators_controller_spec.rb    | 143 ------------------
 .../facebook/send_on_facebook_service_spec.rb |   6 +-
 10 files changed, 29 insertions(+), 240 deletions(-)
 delete mode 100644 app/controllers/api/v1/accounts/facebook_indicators_controller.rb
 delete mode 100644 spec/controllers/api/v1/accounts/facebook_indicators_controller_spec.rb

diff --git a/Gemfile b/Gemfile
index c4fa85bc5..45d54dfe0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ gem 'wisper', '2.0.0'
 
 ##--- gems for channels ---##
 # TODO: bump up gem to 2.0
-gem 'facebook-messenger', '1.5.0'
+gem 'facebook-messenger'
 gem 'telegram-bot-ruby'
 gem 'twilio-ruby', '~> 5.32.0'
 # twitty will handle subscription of twitter account events
diff --git a/Gemfile.lock b/Gemfile.lock
index e372d1545..2923468cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     execjs (2.7.0)
-    facebook-messenger (1.5.0)
+    facebook-messenger (2.0.1)
       httparty (~> 0.13, >= 0.13.7)
       rack (>= 1.4.5)
     factory_bot (6.1.0)
@@ -333,7 +333,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2021.0225)
     mini_magick (4.10.1)
     mini_mime (1.1.0)
     mini_portile2 (2.5.1)
@@ -631,7 +631,7 @@ DEPENDENCIES
   devise
   devise_token_auth
   dotenv-rails
-  facebook-messenger (= 1.5.0)
+  facebook-messenger
   factory_bot_rails
   faker
   fcm
diff --git a/app/bot/facebook_bot.rb b/app/bot/facebook_bot.rb
index f3f87220d..c13cf12ed 100644
--- a/app/bot/facebook_bot.rb
+++ b/app/bot/facebook_bot.rb
@@ -1,15 +1,13 @@
 require 'facebook/messenger'
 
 class FacebookBot
-  include Facebook::Messenger
-
-  Bot.on :message do |message|
+  Facebook::Messenger::Bot.on :message do |message|
     Rails.logger.info "MESSAGE_RECIEVED #{message}"
     response = ::Integrations::Facebook::MessageParser.new(message)
     ::Integrations::Facebook::MessageCreator.new(response).perform
   end
 
-  Bot.on :delivery do |delivery|
+  Facebook::Messenger::Bot.on :delivery do |delivery|
     # delivery.ids       # => 'mid.1457764197618:41d102a3e1ae206a38'
     # delivery.sender    # => { 'id' => '1008372609250235' }
     # delivery.recipient # => { 'id' => '2015573629214912' }
@@ -20,7 +18,7 @@ class FacebookBot
     Rails.logger.info "Human was online at #{delivery.at}"
   end
 
-  Bot.on :message_echo do |message|
+  Facebook::Messenger::Bot.on :message_echo do |message|
     Rails.logger.info "MESSAGE_ECHO #{message}"
     response = ::Integrations::Facebook::MessageParser.new(message)
     ::Integrations::Facebook::MessageCreator.new(response).perform
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 447fe3cec..f0fc21f7d 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -13,6 +13,7 @@ class Messages::Facebook::MessageBuilder
     @outgoing_echo = outgoing_echo
     @sender_id = (@outgoing_echo ? @response.recipient_id : @response.sender_id)
     @message_type = (@outgoing_echo ? :outgoing : :incoming)
+    @attachments = (@response.attachments || [])
   end
 
   def perform
@@ -41,13 +42,19 @@ class Messages::Facebook::MessageBuilder
 
   def build_message
     @message = conversation.messages.create!(message_params)
-    (response.attachments || []).each do |attachment|
-      attachment_obj = @message.attachments.new(attachment_params(attachment).except(:remote_file_url))
-      attachment_obj.save!
-      attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
+    @attachments.each do |attachment|
+      process_attachment(attachment)
     end
   end
 
+  def process_attachment(attachment)
+    return if attachment['type'].to_sym == :template
+
+    attachment_obj = @message.attachments.new(attachment_params(attachment).except(:remote_file_url))
+    attachment_obj.save!
+    attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
+  end
+
   def attach_file(attachment, file_url)
     file_resource = LocalResource.new(file_url)
     attachment.file.attach(io: file_resource.file, filename: file_resource.filename, content_type: file_resource.encoding)
diff --git a/app/controllers/api/v1/accounts/facebook_indicators_controller.rb b/app/controllers/api/v1/accounts/facebook_indicators_controller.rb
deleted file mode 100644
index a0e42c040..000000000
--- a/app/controllers/api/v1/accounts/facebook_indicators_controller.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-class Api::V1::Accounts::FacebookIndicatorsController < Api::V1::Accounts::BaseController
-  before_action :set_access_token
-  around_action :handle_with_exception
-
-  def mark_seen
-    fb_bot.deliver(payload('mark_seen'), access_token: @access_token)
-    head :ok
-  end
-
-  def typing_on
-    fb_bot.deliver(payload('typing_on'), access_token: @access_token)
-    head :ok
-  end
-
-  def typing_off
-    fb_bot.deliver(payload('typing_off'), access_token: @access_token)
-    head :ok
-  end
-
-  private
-
-  def fb_bot
-    ::Facebook::Messenger::Bot
-  end
-
-  def handle_with_exception
-    yield
-  rescue Facebook::Messenger::Error => e
-    Rails.logger.debug "Rescued: #{e.inspect}"
-    true
-  end
-
-  def payload(action)
-    {
-      recipient: { id: contact.source_id },
-      sender_action: action
-    }
-  end
-
-  def inbox
-    @inbox ||= Current.account.inboxes.find(permitted_params[:inbox_id])
-  end
-
-  def set_access_token
-    @access_token = inbox.channel.page_access_token
-  end
-
-  def contact
-    @contact ||= inbox.contact_inboxes.find_by!(contact_id: permitted_params[:contact_id])
-  end
-
-  def permitted_params
-    params.permit(:inbox_id, :contact_id)
-  end
-end
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index b8102c6fa..a0c75db92 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -14,7 +14,7 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   end
 
   def send_message_to_facebook(delivery_params)
-    result = FacebookBot::Bot.deliver(delivery_params, access_token: message.channel_token)
+    result = Facebook::Messenger::Bot.deliver(delivery_params, page_id: channel.page_id)
     message.update!(source_id: JSON.parse(result)['message_id'])
   end
 
diff --git a/config/initializers/bot.rb b/config/initializers/bot.rb
index c730c8b1b..00ef3a0ac 100644
--- a/config/initializers/bot.rb
+++ b/config/initializers/bot.rb
@@ -1,3 +1,7 @@
+# Remember that Rails only eager loads everything in its production environment.
+# In the development and test environments, it only requires files as you reference constants. 
+# You'll need to explicitly load app/bot
+
 unless Rails.env.production?
   bot_files = Dir[Rails.root.join('app', 'bot', '**', '*.rb')]
   bot_reloader = ActiveSupport::FileUpdateChecker.new(bot_files) do
@@ -11,21 +15,7 @@ unless Rails.env.production?
   bot_files.each { |file| require_dependency file }
 end
 
-module Facebook
-  module Messenger
-    module Incoming
-      # The Message class represents an incoming Facebook Messenger message.
-      class Message
-        include Facebook::Messenger::Incoming::Common
-
-        def app_id
-          @messaging['message']['app_id']
-        end
-      end
-    end
-  end
-end
-
+# ref: https://github.com/jgorset/facebook-messenger#make-a-configuration-provider
 class ChatwootFbProvider < Facebook::Messenger::Configuration::Providers::Base
   def valid_verify_token?(_verify_token)
     ENV['FB_VERIFY_TOKEN']
@@ -36,13 +26,13 @@ class ChatwootFbProvider < Facebook::Messenger::Configuration::Providers::Base
   end
 
   def access_token_for(page_id)
-    Channel::FacebookPage.where(page_id: page_id).last.access_token
+    Channel::FacebookPage.where(page_id: page_id).last.page_access_token
   end
 
   private
 
   def bot
-    MyApp::Bot
+    Chatwoot::Bot
   end
 end
 
diff --git a/config/routes.rb b/config/routes.rb
index 667346c02..fba20286f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,14 +88,6 @@ Rails.application.routes.draw do
             end
           end
 
-          resources :facebook_indicators, only: [] do
-            collection do
-              post :mark_seen
-              post :typing_on
-              post :typing_off
-            end
-          end
-
           resources :inboxes, only: [:index, :create, :update, :destroy] do
             get :assignable_agents, on: :member
             get :campaigns, on: :member
diff --git a/spec/controllers/api/v1/accounts/facebook_indicators_controller_spec.rb b/spec/controllers/api/v1/accounts/facebook_indicators_controller_spec.rb
deleted file mode 100644
index 0b32705f1..000000000
--- a/spec/controllers/api/v1/accounts/facebook_indicators_controller_spec.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Facebook Indicators API', type: :request do
-  let(:account) { create(:account) }
-  let(:facebook_channel) { create(:channel_facebook_page, account: account) }
-  let(:inbox) { create(:inbox, account: account, channel: facebook_channel) }
-  let(:contact) { create(:contact, account: account) }
-  let(:valid_params) { { contact_id: contact.id, inbox_id: inbox.id } }
-
-  before do
-    allow(Facebook::Messenger::Bot).to receive(:deliver).and_return(true)
-    allow(Facebook::Messenger::Subscriptions).to receive(:subscribe).and_return(true)
-  end
-
-  describe 'POST /api/v1/accounts/{account.id}/facebook_indicators/mark_seen' do
-    context 'when it is an unauthenticated user' do
-      it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/mark_seen"
-
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'marks a payload as seen' do
-        contact_inbox = create(:contact_inbox, contact: contact, inbox: inbox)
-
-        expect(Facebook::Messenger::Bot).to receive(:deliver).with(
-          { recipient: { id: contact_inbox.source_id }, sender_action: 'mark_seen' },
-          access_token: inbox.channel.page_access_token
-        )
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/mark_seen",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'rescues an error' do
-        create(:contact_inbox, contact: contact, inbox: inbox)
-
-        allow(Facebook::Messenger::Bot).to receive(:deliver).and_raise(Facebook::Messenger::Error)
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/mark_seen",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-    end
-  end
-
-  describe 'POST /api/v1/accounts/{account.id}/facebook_indicators/typing_on' do
-    context 'when it is an unauthenticated user' do
-      it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_on"
-
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'marks a payload as typing_on' do
-        contact_inbox = create(:contact_inbox, contact: contact, inbox: inbox)
-
-        expect(Facebook::Messenger::Bot).to receive(:deliver).with(
-          { recipient: { id: contact_inbox.source_id }, sender_action: 'typing_on' },
-          access_token: inbox.channel.page_access_token
-        )
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_on",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'rescues an error' do
-        create(:contact_inbox, contact: contact, inbox: inbox)
-
-        allow(Facebook::Messenger::Bot).to receive(:deliver).and_raise(Facebook::Messenger::Error)
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_on",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-    end
-  end
-
-  describe 'POST /api/v1/accounts/{account.id}/facebook_indicators/typing_off' do
-    context 'when it is an unauthenticated user' do
-      it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_off"
-
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'marks a payload as typing_off' do
-        contact_inbox = create(:contact_inbox, contact: contact, inbox: inbox)
-
-        expect(Facebook::Messenger::Bot).to receive(:deliver).with(
-          { recipient: { id: contact_inbox.source_id }, sender_action: 'typing_off' },
-          access_token: inbox.channel.page_access_token
-        )
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_off",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'rescues an error' do
-        create(:contact_inbox, contact: contact, inbox: inbox)
-
-        allow(Facebook::Messenger::Bot).to receive(:deliver).and_raise(Facebook::Messenger::Error)
-
-        post "/api/v1/accounts/#{account.id}/facebook_indicators/typing_off",
-             headers: agent.create_new_auth_token,
-             params: valid_params,
-             as: :json
-
-        expect(response).to have_http_status(:success)
-      end
-    end
-  end
-end
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index e84319a26..8ff842591 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -10,7 +10,7 @@ describe Facebook::SendOnFacebookService do
   end
 
   let!(:account) { create(:account) }
-  let(:bot) { class_double('FacebookBot::Bot').as_stubbed_const }
+  let(:bot) { class_double('Facebook::Messenger::Bot').as_stubbed_const }
   let!(:widget_inbox) { create(:inbox, account: account) }
   let!(:facebook_channel) { create(:channel_facebook_page, account: account) }
   let!(:facebook_inbox) { create(:inbox, channel: facebook_channel, account: account) }
@@ -61,7 +61,7 @@ describe Facebook::SendOnFacebookService do
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
                                                       message: { text: message.content }
-                                                    }, { access_token: facebook_channel.page_access_token })
+                                                    }, { page_id: facebook_channel.page_id })
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
                                                       message: {
@@ -72,7 +72,7 @@ describe Facebook::SendOnFacebookService do
                                                           }
                                                         }
                                                       }
-                                                    }, { access_token: facebook_channel.page_access_token })
+                                                    }, { page_id: facebook_channel.page_id })
       end
     end
   end

From 467b45b4278dd191507c92ec9d15c086b18c36e7 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 7 Jun 2021 17:26:08 +0530
Subject: [PATCH 42/67] feat: Improved password security policy (#2345)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 Gemfile                                       |  1 +
 Gemfile.lock                                  | 16 ++--
 app/builders/account_builder.rb               |  8 +-
 .../api/v1/accounts/agents_controller.rb      |  5 +-
 app/controllers/api/v1/accounts_controller.rb |  8 +-
 .../api/v1/widget/messages_controller.rb      |  2 +-
 .../concerns/access_token_auth_helper.rb      |  5 --
 .../confirmations_controller.rb               | 23 +++---
 .../devise_overrides/passwords_controller.rb  |  6 +-
 app/dashboards/super_admin_dashboard.rb       |  2 -
 app/javascript/dashboard/api/auth.js          | 15 +++-
 .../dashboard/routes/auth/Confirmation.vue    |  6 +-
 .../dashboard/routes/auth/PasswordEdit.vue    |  8 +-
 .../dashboard/routes/auth/Signup.vue          | 56 ++++++++++++--
 .../settings/profile/ChangePassword.vue       |  4 +-
 app/models/super_admin.rb                     |  4 +-
 app/models/user.rb                            |  3 +-
 .../email_templates/db_resolver_service.rb    |  2 +-
 .../notification/push_notification_service.rb | 10 +--
 config/initializers/liquid_handler.rb         |  2 +
 config/initializers/secure_password.rb        | 44 +++++++++++
 config/initializers/sidekiq.rb                |  2 +
 config/locales/secure_password.en.yml         | 74 +++++++++++++++++++
 ...7173755_remove_super_admin_access_tokes.rb |  5 ++
 db/schema.rb                                  |  2 +-
 db/seeds.rb                                   |  4 +-
 lib/woot_message_seeder.rb                    | 48 ++++++------
 .../api/v1/accounts_controller_spec.rb        | 39 +---------
 .../api/v1/profiles_controller_spec.rb        |  2 +-
 .../devise/confirmations_controller_spec.rb   |  8 +-
 .../devise/session_controller_spec.rb         |  8 +-
 .../platform/api/v1/users_controller_spec.rb  |  4 +-
 .../access_tokens_controller_spec.rb          |  3 +-
 spec/factories/super_admins.rb                |  2 +-
 spec/factories/users.rb                       |  2 +-
 spec/lib/chatwoot_hub_spec.rb                 |  2 +-
 36 files changed, 284 insertions(+), 151 deletions(-)
 create mode 100644 config/initializers/secure_password.rb
 create mode 100644 config/locales/secure_password.en.yml
 create mode 100644 db/migrate/20210527173755_remove_super_admin_access_tokes.rb

diff --git a/Gemfile b/Gemfile
index 45d54dfe0..ae0938676 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ gem 'barnes'
 
 ##--- gems for authentication & authorization ---##
 gem 'devise'
+gem 'devise-secure_password', '~> 2.0'
 gem 'devise_token_auth'
 # authorization
 gem 'jwt'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2923468cd..55d3dbd29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
     barnes (0.0.8)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
-    bcrypt (3.1.15)
+    bcrypt (3.1.16)
     bindex (0.8.1)
     bootsnap (1.4.8)
       msgpack (~> 1.0)
@@ -158,12 +158,15 @@ GEM
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.7.2)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-secure_password (2.0.1)
+      devise (>= 4.0.0, < 5.0.0)
+      railties (>= 5.0.0, < 7.0.0)
     devise_token_auth (1.1.4)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
@@ -259,7 +262,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    groupdate (5.1.0)
+    groupdate (5.2.2)
       activesupport (>= 5)
     grpc (1.37.1)
       google-protobuf (~> 3.15)
@@ -348,7 +351,7 @@ GEM
       connection_pool (~> 2.2)
     netrc (0.11.0)
     nio4r (2.5.7)
-    nokogiri (1.11.4)
+    nokogiri (1.11.6)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth (0.5.6)
@@ -582,8 +585,8 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (4.0.4)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -629,6 +632,7 @@ DEPENDENCIES
   cypress-on-rails (~> 1.0)
   database_cleaner
   devise
+  devise-secure_password (~> 2.0)
   devise_token_auth
   dotenv-rails
   facebook-messenger
diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index f7f94fada..0464c8013 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed!, :user, :user_full_name, :user_password]
+  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password]
 
   def perform
     if @user.nil?
@@ -61,11 +61,9 @@ class AccountBuilder
   end
 
   def create_user
-    password = user_password || SecureRandom.alphanumeric(12)
-
     @user = User.new(email: @email,
-                     password: password,
-                     password_confirmation: password,
+                     password: user_password,
+                     password_confirmation: user_password,
                      name: @user_full_name)
     @user.confirm if @confirmed
     @user.save!
diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 83f1ad186..46d35d09d 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -58,9 +58,10 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   end
 
   def new_agent_params
-    time = Time.now.to_i
+    # intial string ensures the password requirements are met
+    temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
     params.require(:agent).permit(:email, :name, :role)
-          .merge!(password: time, password_confirmation: time, inviter: current_user)
+          .merge!(password: temp_password, password_confirmation: temp_password, inviter: current_user)
   end
 
   def agents
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 8fbb56c19..f67972486 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -18,7 +18,7 @@ class Api::V1::AccountsController < Api::BaseController
       account_name: account_params[:account_name],
       user_full_name: account_params[:user_full_name],
       email: account_params[:email],
-      confirmed: confirmed?,
+      user_password: account_params[:password],
       user: current_user
     ).perform
     if @user
@@ -46,17 +46,13 @@ class Api::V1::AccountsController < Api::BaseController
 
   private
 
-  def confirmed?
-    super_admin? && params[:confirmed]
-  end
-
   def fetch_account
     @account = current_user.accounts.find(params[:id])
     @current_account_user = @account.account_users.find_by(user_id: current_user.id)
   end
 
   def account_params
-    params.permit(:account_name, :email, :name, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
   end
 
   def check_signup_enabled
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 6def00a3a..fc55b0c1b 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -20,7 +20,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
       @message.update!(message_update_params[:message])
     end
   rescue StandardError => e
-    render json: { error: @contact.errors, message: e.message }.to_json, status: 500
+    render json: { error: @contact.errors, message: e.message }.to_json, status: :internal_server_error
   end
 
   private
diff --git a/app/controllers/concerns/access_token_auth_helper.rb b/app/controllers/concerns/access_token_auth_helper.rb
index 91bd461aa..2f4dc4337 100644
--- a/app/controllers/concerns/access_token_auth_helper.rb
+++ b/app/controllers/concerns/access_token_auth_helper.rb
@@ -17,13 +17,8 @@ module AccessTokenAuthHelper
     Current.user = @resource if current_user.is_a?(User)
   end
 
-  def super_admin?
-    @resource.present? && @resource.is_a?(SuperAdmin)
-  end
-
   def validate_bot_access_token!
     return if Current.user.is_a?(User)
-    return if super_admin?
     return if agent_bot_accessible?
 
     render_unauthorized('Access to this endpoint is not authorized for bots')
diff --git a/app/controllers/devise_overrides/confirmations_controller.rb b/app/controllers/devise_overrides/confirmations_controller.rb
index 0cb71f0d9..02d412cb1 100644
--- a/app/controllers/devise_overrides/confirmations_controller.rb
+++ b/app/controllers/devise_overrides/confirmations_controller.rb
@@ -1,34 +1,29 @@
 class DeviseOverrides::ConfirmationsController < Devise::ConfirmationsController
+  include AuthHelper
   skip_before_action :require_no_authentication, raise: false
   skip_before_action :authenticate_user!, raise: false
 
   def create
     @confirmable = User.find_by(confirmation_token: params[:confirmation_token])
+    render_confirmation_success and return if @confirmable&.confirm
 
-    if confirm
-      render_confirmation_success
-    else
-      render_confirmation_error
-    end
+    render_confirmation_error
   end
 
-  protected
-
-  def confirm
-    @confirmable&.confirm || (@confirmable&.confirmed_at && @confirmable&.reset_password_token)
-  end
+  private
 
   def render_confirmation_success
-    render json: { "message": 'Success', "redirect_url": create_reset_token_link(@confirmable) }, status: :ok
+    send_auth_headers(@confirmable)
+    render partial: 'devise/auth.json', locals: { resource: @confirmable }
   end
 
   def render_confirmation_error
     if @confirmable.blank?
-      render json: { "message": 'Invalid token', "redirect_url": '/' }, status: 422
+      render json: { message: 'Invalid token', redirect_url: '/' }, status: :unprocessable_entity
     elsif @confirmable.confirmed_at
-      render json: { "message": 'Already confirmed', "redirect_url": '/' }, status: 422
+      render json: { message: 'Already confirmed', redirect_url: '/' }, status: :unprocessable_entity
     else
-      render json: { "message": 'Failure', "redirect_url": '/' }, status: 422
+      render json: { message: 'Failure', redirect_url: '/' }, status: :unprocessable_entity
     end
   end
 
diff --git a/app/controllers/devise_overrides/passwords_controller.rb b/app/controllers/devise_overrides/passwords_controller.rb
index ed9d012eb..501b9f90c 100644
--- a/app/controllers/devise_overrides/passwords_controller.rb
+++ b/app/controllers/devise_overrides/passwords_controller.rb
@@ -13,7 +13,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
       send_auth_headers(@recoverable)
       render partial: 'devise/auth.json', locals: { resource: @recoverable }
     else
-      render json: { "message": 'Invalid token', "redirect_url": '/' }, status: 422
+      render json: { message: 'Invalid token', redirect_url: '/' }, status: :unprocessable_entity
     end
   end
 
@@ -27,7 +27,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
     end
   end
 
-  protected
+  private
 
   def reset_password_and_confirmation(recoverable)
     recoverable.confirm unless recoverable.confirmed? # confirm if user resets password without confirming anytime before
@@ -40,7 +40,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
 
   def build_response(message, status)
     render json: {
-      "message": message
+      message: message
     }, status: status
   end
 end
diff --git a/app/dashboards/super_admin_dashboard.rb b/app/dashboards/super_admin_dashboard.rb
index ab467a255..1d9afd1ba 100644
--- a/app/dashboards/super_admin_dashboard.rb
+++ b/app/dashboards/super_admin_dashboard.rb
@@ -11,7 +11,6 @@ class SuperAdminDashboard < Administrate::BaseDashboard
     id: Field::Number,
     email: Field::String,
     password: Field::Password,
-    access_token: Field::HasOne,
     remember_created_at: Field::DateTime,
     sign_in_count: Field::Number,
     current_sign_in_at: Field::DateTime,
@@ -30,7 +29,6 @@ class SuperAdminDashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = %i[
     id
     email
-    access_token
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index 4a1ca37f1..558eb4933 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -29,6 +29,7 @@ export default {
           account_name: creds.accountName.trim(),
           user_full_name: creds.fullName.trim(),
           email: creds.email,
+          password: creds.password,
         })
         .then(response => {
           setAuthCredentials(response);
@@ -95,8 +96,18 @@ export default {
   },
 
   verifyPasswordToken({ confirmationToken }) {
-    return axios.post('auth/confirmation', {
-      confirmation_token: confirmationToken,
+    return new Promise((resolve, reject) => {
+      axios
+        .post('auth/confirmation', {
+          confirmation_token: confirmationToken,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
     });
   },
 
diff --git a/app/javascript/dashboard/routes/auth/Confirmation.vue b/app/javascript/dashboard/routes/auth/Confirmation.vue
index db439af03..1abf16f1e 100644
--- a/app/javascript/dashboard/routes/auth/Confirmation.vue
+++ b/app/javascript/dashboard/routes/auth/Confirmation.vue
@@ -21,12 +21,10 @@ export default {
   methods: {
     async confirmToken() {
       try {
-        const {
-          data: { redirect_url: redirectURL },
-        } = await Auth.verifyPasswordToken({
+        await Auth.verifyPasswordToken({
           confirmationToken: this.confirmationToken,
         });
-        window.location = redirectURL;
+        window.location = DEFAULT_REDIRECT_URL;
       } catch (error) {
         window.location = DEFAULT_REDIRECT_URL;
       }
diff --git a/app/javascript/dashboard/routes/auth/PasswordEdit.vue b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
index 4549528a0..751f16e83 100644
--- a/app/javascript/dashboard/routes/auth/PasswordEdit.vue
+++ b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
@@ -120,8 +120,12 @@ export default {
             window.location = DEFAULT_REDIRECT_URL;
           }
         })
-        .catch(() => {
-          this.showAlert(this.$t('SET_NEW_PASSWORD.API.ERROR_MESSAGE'));
+        .catch(error => {
+          let errorMessage = this.$t('SET_NEW_PASSWORD.API.ERROR_MESSAGE');
+          if (error?.data?.message) {
+            errorMessage = error.data.message;
+          }
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index 5b71e2887..c175e7b9e 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -25,6 +25,17 @@
             "
             @blur="$v.credentials.fullName.$touch"
           />
+          <woot-input
+            v-model.trim="credentials.email"
+            type="email"
+            :class="{ error: $v.credentials.email.$error }"
+            :label="$t('REGISTER.EMAIL.LABEL')"
+            :placeholder="$t('REGISTER.EMAIL.PLACEHOLDER')"
+            :error="
+              $v.credentials.email.$error ? $t('REGISTER.EMAIL.ERROR') : ''
+            "
+            @blur="$v.credentials.email.$touch"
+          />
           <woot-input
             v-model="credentials.accountName"
             :class="{ error: $v.credentials.accountName.$error }"
@@ -38,15 +49,31 @@
             @blur="$v.credentials.accountName.$touch"
           />
           <woot-input
-            v-model.trim="credentials.email"
-            type="email"
-            :class="{ error: $v.credentials.email.$error }"
-            :label="$t('REGISTER.EMAIL.LABEL')"
-            :placeholder="$t('REGISTER.EMAIL.PLACEHOLDER')"
+            v-model.trim="credentials.password"
+            type="password"
+            :class="{ error: $v.credentials.password.$error }"
+            :label="$t('LOGIN.PASSWORD.LABEL')"
+            :placeholder="$t('SET_NEW_PASSWORD.PASSWORD.PLACEHOLDER')"
             :error="
-              $v.credentials.email.$error ? $t('REGISTER.EMAIL.ERROR') : ''
+              $v.credentials.password.$error
+                ? $t('SET_NEW_PASSWORD.PASSWORD.ERROR')
+                : ''
             "
-            @blur="$v.credentials.email.$touch"
+            @blur="$v.credentials.password.$touch"
+          />
+
+          <woot-input
+            v-model.trim="credentials.confirmPassword"
+            type="password"
+            :class="{ error: $v.credentials.confirmPassword.$error }"
+            :label="$t('SET_NEW_PASSWORD.CONFIRM_PASSWORD.LABEL')"
+            :placeholder="$t('SET_NEW_PASSWORD.CONFIRM_PASSWORD.PLACEHOLDER')"
+            :error="
+              $v.credentials.confirmPassword.$error
+                ? $t('SET_NEW_PASSWORD.CONFIRM_PASSWORD.ERROR')
+                : ''
+            "
+            @blur="$v.credentials.confirmPassword.$touch"
           />
           <woot-submit-button
             :disabled="isSignupInProgress"
@@ -89,6 +116,8 @@ export default {
         accountName: '',
         fullName: '',
         email: '',
+        password: '',
+        confirmPassword: '',
       },
       isSignupInProgress: false,
       error: '',
@@ -108,6 +137,19 @@ export default {
         required,
         email,
       },
+      password: {
+        required,
+        minLength: minLength(6),
+      },
+      confirmPassword: {
+        required,
+        isEqPassword(value) {
+          if (value !== this.credentials.password) {
+            return false;
+          }
+          return true;
+        },
+      },
     },
   },
   computed: {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
index 2b226add9..a946530c5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -124,8 +124,8 @@ export default {
         this.errorMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
       } catch (error) {
         this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
-        if (error?.response?.data?.error) {
-          this.errorMessage = error.response.data.error;
+        if (error?.response?.data?.message) {
+          this.errorMessage = error.response.data.message;
         }
       } finally {
         this.isPasswordChanging = false;
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index 72b1ceb8a..5bad00c05 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -21,7 +21,5 @@
 class SuperAdmin < ApplicationRecord
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-  devise :database_authenticatable, :trackable, :rememberable, :validatable
-
-  include AccessTokenable
+  devise :database_authenticatable, :trackable, :rememberable, :validatable, :password_has_required_content
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index b449d89ef..e1b1b4e71 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,7 +53,8 @@ class User < ApplicationRecord
          :rememberable,
          :trackable,
          :validatable,
-         :confirmable
+         :confirmable,
+         :password_has_required_content
 
   enum availability: { online: 0, offline: 1, busy: 2 }
 
diff --git a/app/services/email_templates/db_resolver_service.rb b/app/services/email_templates/db_resolver_service.rb
index 341e95ee3..139684526 100644
--- a/app/services/email_templates/db_resolver_service.rb
+++ b/app/services/email_templates/db_resolver_service.rb
@@ -4,7 +4,7 @@
 # layout will be rendered with erb and other content in html format
 # Further processing in liquid is implemented in mailers
 
-# Note: rails resolver looks for templates in cache first
+# NOTE: rails resolver looks for templates in cache first
 # which we don't want to happen here
 # so we are overriding find_all method in action view resolver
 # If anything breaks - look into rails : actionview/lib/action_view/template/resolver.rb
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index 83cdfa08e..c3132f260 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -79,12 +79,12 @@ class Notification::PushNotificationService
 
   def fcm_options
     {
-      "notification": {
-        "title": notification.notification_type.titleize,
-        "body": notification.push_message_title
+      notification: {
+        title: notification.notification_type.titleize,
+        body: notification.push_message_title
       },
-      "data": { notification: notification.push_event_data.to_json },
-      "collapse_key": "chatwoot_#{notification.primary_actor_type.downcase}_#{notification.primary_actor_id}"
+      data: { notification: notification.push_event_data.to_json },
+      collapse_key: "chatwoot_#{notification.primary_actor_type.downcase}_#{notification.primary_actor_id}"
     }
   end
 end
diff --git a/config/initializers/liquid_handler.rb b/config/initializers/liquid_handler.rb
index 7ce86da51..f50093437 100644
--- a/config/initializers/liquid_handler.rb
+++ b/config/initializers/liquid_handler.rb
@@ -1 +1,3 @@
+require Rails.root.join('lib/action_view/template/handlers/liquid')
+
 ActionView::Template.register_template_handler :liquid, ActionView::Template::Handlers::Liquid
diff --git a/config/initializers/secure_password.rb b/config/initializers/secure_password.rb
new file mode 100644
index 000000000..139bcfe15
--- /dev/null
+++ b/config/initializers/secure_password.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+Devise.setup do |config|
+  # ==> Configuration for the Devise Secure Password extension
+  #     Module: password_has_required_content
+  #
+  # Configure password content requirements including the number of uppercase,
+  # lowercase, number, and special characters that are required. To configure the
+  # minimum and maximum length refer to the Devise config.password_length
+  # standard configuration parameter.
+
+  # The number of uppercase letters (latin A-Z) required in a password:
+  config.password_required_uppercase_count = 1
+
+  # The number of lowercase letters (latin A-Z) required in a password:
+  config.password_required_lowercase_count = 1
+
+  # The number of numbers (0-9) required in a password:
+  config.password_required_number_count = 1
+
+  # The number of special characters (!@#$%^&*()_+-=[]{}|') required in a password:
+  config.password_required_special_character_count = 1
+
+  # we are not using the configurations below
+  # ==> Configuration for the Devise Secure Password extension
+  #     Module: password_disallows_frequent_reuse
+  #
+  # The number of previously used passwords that can not be reused:
+  # config.password_previously_used_count = 8
+
+  # ==> Configuration for the Devise Secure Password extension
+  #     Module: password_disallows_frequent_changes
+  #     *Requires* password_disallows_frequent_reuse
+  #
+  # The minimum time that must pass between password changes:
+  # config.password_minimum_age = 1.days
+
+  # ==> Configuration for the Devise Secure Password extension
+  #     Module: password_requires_regular_updates
+  #     *Requires* password_disallows_frequent_reuse
+  #
+  # The maximum allowed age of a password:
+  # config.password_maximum_age = 180.days
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index f3ba72aef..f76e4a409 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,3 +1,5 @@
+require Rails.root.join('lib/redis/config')
+
 schedule_file = 'config/schedule.yml'
 
 Sidekiq.configure_client do |config|
diff --git a/config/locales/secure_password.en.yml b/config/locales/secure_password.en.yml
new file mode 100644
index 000000000..ad8bbd074
--- /dev/null
+++ b/config/locales/secure_password.en.yml
@@ -0,0 +1,74 @@
+en:
+  secure_password:
+    character:
+      one: "character"
+      other: "characters"
+
+    types:
+      uppercase: "uppercase"
+      downcase: "downcase"
+      lowercase: "lowercase"
+      number: "number"
+      special: "special"
+
+    password_has_required_content:
+      errors:
+        messages:
+          unknown_characters: "contains %{count} invalid %{subject}"
+          minimum_characters: "must contain at least %{count} %{type} %{subject}"
+          maximum_characters: "must contain less than %{count} %{type} %{subject}"
+          minimum_length: "must contain at least %{count} %{subject}"
+          maximum_length: "must contain less than %{count} %{subject}"
+    password_disallows_frequent_reuse:
+      errors:
+        messages:
+          password_is_recent: "Last %{count} passwords may not be reused"
+    password_disallows_frequent_changes:
+      errors:
+        messages:
+          password_is_recent: "Password cannot be changed more than once per %{timeframe}"
+    password_requires_regular_updates:
+      alerts:
+        messages:
+          password_updated: "Your password has been updated."
+      errors:
+        messages:
+          password_expired: "Your password has expired. Passwords must be changed every %{timeframe}"
+    datetime:
+      # update distance_in_words translations to remove the determiner words:
+      #   about, almost, over, less than, etc.
+      precise_distance_in_words:
+        half_a_minute: "half a minute"
+        less_than_x_seconds:
+          one:   "1 second" # default was: "less than 1 second"
+          other: "%{count} seconds" # default was: "less than %{count} seconds"
+        x_seconds:
+          one:   "1 second"
+          other: "%{count} seconds"
+        less_than_x_minutes:
+          one:   "a minute" # default was: "less than a minute"
+          other: "%{count} minutes" # default was: "less than %{count} minutes"
+        x_minutes:
+          one:   "1 minute"
+          other: "%{count} minutes"
+        about_x_hours:
+          one:   "1 hour" # default was: "about 1 hour"
+          other: "%{count} hours" # default was: "about %{count} hours"
+        x_days:
+          one:   "1 day"
+          other: "%{count} days"
+        about_x_months:
+          one:   "1 month" # default was: "about 1 month"
+          other: "%{count} months" # default was: "about %{count} months"
+        x_months:
+          one:   "1 month"
+          other: "%{count} months"
+        about_x_years:
+          one:   "1 year" # default was: "about 1 year"
+          other: "%{count} years" # default was: "about %{count} years"
+        over_x_years:
+          one:   "1 year" # default was: "over 1 year"
+          other: "%{count} years" # default was: "over %{count} years"
+        almost_x_years:
+          one:   "1 year" # default was: "almost 1 year"
+          other: "%{count} years" # default was: "almost %{count} years"
\ No newline at end of file
diff --git a/db/migrate/20210527173755_remove_super_admin_access_tokes.rb b/db/migrate/20210527173755_remove_super_admin_access_tokes.rb
new file mode 100644
index 000000000..18ad7d4f8
--- /dev/null
+++ b/db/migrate/20210527173755_remove_super_admin_access_tokes.rb
@@ -0,0 +1,5 @@
+class RemoveSuperAdminAccessTokes < ActiveRecord::Migration[6.0]
+  def change
+    AccessToken.where(owner_type: 'SuperAdmin').destroy_all
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a1fd235b..884c208d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_05_20_200729) do
+ActiveRecord::Schema.define(version: 2021_05_27_173755) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
diff --git a/db/seeds.rb b/db/seeds.rb
index 115a27108..8d47bded9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -10,13 +10,13 @@ end
 
 ## Seeds for Local Development
 unless Rails.env.production?
-  SuperAdmin.create!(email: 'john@acme.inc', password: '123456')
+  SuperAdmin.create!(email: 'john@acme.inc', password: 'Password1!')
 
   account = Account.create!(
     name: 'Acme Inc'
   )
 
-  user = User.new(name: 'John', email: 'john@acme.inc', password: '123456')
+  user = User.new(name: 'John', email: 'john@acme.inc', password: 'Password1!')
   user.skip_confirmation!
   user.save!
 
diff --git a/lib/woot_message_seeder.rb b/lib/woot_message_seeder.rb
index e28eae3fc..7f7c81e95 100644
--- a/lib/woot_message_seeder.rb
+++ b/lib/woot_message_seeder.rb
@@ -29,19 +29,19 @@ module WootMessageSeeder
 
   def self.sample_card_item
     {
-      "media_url": 'https://i.imgur.com/d8Djr4k.jpg',
-      "title": 'Acme Shoes 2.0',
-      "description": 'Move with Acme Shoe 2.0',
-      "actions": [
+      media_url: 'https://i.imgur.com/d8Djr4k.jpg',
+      title: 'Acme Shoes 2.0',
+      description: 'Move with Acme Shoe 2.0',
+      actions: [
         {
-          "type": 'link',
-          "text": 'View More',
-          "uri": 'http://acme-shoes.inc'
+          type: 'link',
+          text: 'View More',
+          uri: 'http://acme-shoes.inc'
         },
         {
-          "type": 'postback',
-          "text": 'Add to cart',
-          "payload": 'ITEM_SELECTED'
+          type: 'postback',
+          text: 'Add to cart',
+          payload: 'ITEM_SELECTED'
         }
       ]
     }
@@ -56,11 +56,11 @@ module WootMessageSeeder
       content: 'Your favorite food',
       content_type: 'input_select',
       content_attributes: {
-        "items": [
-          { "title": '🌯 Burito', "value": 'Burito' },
-          { "title": '🍝 Pasta', "value": 'Pasta' },
-          { "title": ' 🍱 Sushi', "value": 'Sushi' },
-          { "title": ' 🥗 Salad', "value": 'Salad' }
+        items: [
+          { title: '🌯 Burito', value: 'Burito' },
+          { title: '🍝 Pasta', value: 'Pasta' },
+          { title: ' 🍱 Sushi', value: 'Sushi' },
+          { title: ' 🥗 Salad', value: 'Salad' }
         ]
       }
     )
@@ -75,12 +75,12 @@ module WootMessageSeeder
       content_type: 'form',
       content: 'form',
       content_attributes: {
-        "items": [
-          { "name": 'email', "placeholder": 'Please enter your email', "type": 'email', "label": 'Email' },
-          { "name": 'text_area', "placeholder": 'Please enter text', "type": 'text_area', "label": 'Large Text' },
-          { "name": 'text', "placeholder": 'Please enter text', "type": 'text', "label": 'text', "default": 'defaut value' },
-          { "name": 'select', "label": 'Select Option', "type": 'select', "options": [{ "label": '🌯 Burito', "value": 'Burito' },
-                                                                                      { "label": '🍝 Pasta', "value": 'Pasta' }] }
+        items: [
+          { name: 'email', placeholder: 'Please enter your email', type: 'email', label: 'Email' },
+          { name: 'text_area', placeholder: 'Please enter text', type: 'text_area', label: 'Large Text' },
+          { name: 'text', placeholder: 'Please enter text', type: 'text', label: 'text', default: 'defaut value' },
+          { name: 'select', label: 'Select Option', type: 'select', options: [{ label: '🌯 Burito', value: 'Burito' },
+                                                                              { label: '🍝 Pasta', value: 'Pasta' }] }
         ]
       }
     )
@@ -95,9 +95,9 @@ module WootMessageSeeder
       content: 'Tech Companies',
       content_type: 'article',
       content_attributes: {
-        "items": [
-          { "title": 'Acme Hardware', "description": 'Hardware reimagined', "link": 'http://acme-hardware.inc' },
-          { "title": 'Acme Search', "description": 'The best Search Engine', "link": 'http://acme-search.inc' }
+        items: [
+          { title: 'Acme Hardware', description: 'Hardware reimagined', link: 'http://acme-hardware.inc' },
+          { title: 'Acme Search', description: 'The best Search Engine', link: 'http://acme-search.inc' }
         ]
       }
     )
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 16f36720d..24607f250 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -18,13 +18,13 @@ RSpec.describe 'Accounts API', type: :request do
       it 'calls account builder' do
         allow(account_builder).to receive(:perform).and_return([user, account])
 
-        params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name }
+        params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
 
         post api_v1_accounts_url,
              params: params,
              as: :json
 
-        expect(AccountBuilder).to have_received(:new).with(params.merge(confirmed: false))
+        expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
         expect(account_builder).to have_received(:perform)
         expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
       end
@@ -38,44 +38,11 @@ RSpec.describe 'Accounts API', type: :request do
              params: params,
              as: :json
 
-        expect(AccountBuilder).to have_received(:new).with(params.merge(confirmed: false))
+        expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
         expect(account_builder).to have_received(:perform)
         expect(response).to have_http_status(:forbidden)
         expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
       end
-
-      it 'ignores confirmed param when called with out super admin token' do
-        allow(account_builder).to receive(:perform).and_return(nil)
-
-        params = { account_name: 'test', email: email, confirmed: true, user: nil, user_full_name: user_full_name }
-
-        post api_v1_accounts_url,
-             params: params,
-             as: :json
-
-        expect(AccountBuilder).to have_received(:new).with(params.merge(confirmed: false))
-        expect(account_builder).to have_received(:perform)
-        expect(response).to have_http_status(:forbidden)
-        expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
-      end
-    end
-
-    context 'when called with super admin token' do
-      let(:super_admin) { create(:super_admin) }
-
-      it 'calls account builder with confirmed true when confirmed param is passed' do
-        params = { account_name: 'test', email: email, confirmed: true, user_full_name: user_full_name }
-
-        post api_v1_accounts_url,
-             params: params,
-             headers: { api_access_token: super_admin.access_token.token },
-             as: :json
-
-        created_user = User.find_by(email: email)
-        expect(created_user.confirmed?).to eq(true)
-        expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
-        expect(response.body).to include(created_user.access_token.token)
-      end
     end
 
     context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to false' do
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 0a936c6d4..13c2511ad 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe 'Profile API', type: :request do
       it 'updates the name & email' do
         new_email = Faker::Internet.email
         put '/api/v1/profile',
-            params: { profile: { name: 'test', 'email': new_email } },
+            params: { profile: { name: 'test', email: new_email } },
             headers: agent.create_new_auth_token,
             as: :json
 
diff --git a/spec/controllers/devise/confirmations_controller_spec.rb b/spec/controllers/devise/confirmations_controller_spec.rb
index 6970b5777..d01ecb196 100644
--- a/spec/controllers/devise/confirmations_controller_spec.rb
+++ b/spec/controllers/devise/confirmations_controller_spec.rb
@@ -18,12 +18,8 @@ RSpec.describe 'Token Confirmation', type: :request do
         expect(response.status).to eq 200
       end
 
-      it 'returns message "Success"' do
-        expect(response_json[:message]).to eq 'Success'
-      end
-
-      it 'returns "redirect_url"' do
-        expect(response_json[:redirect_url]).to include '/app/auth/password/edit?config=default&redirect_url=&reset_password_token'
+      it 'returns "auth data"' do
+        expect(response.body).to include('john.doe@gmail.com')
       end
     end
 
diff --git a/spec/controllers/devise/session_controller_spec.rb b/spec/controllers/devise/session_controller_spec.rb
index ef51f5e4b..957604be3 100644
--- a/spec/controllers/devise/session_controller_spec.rb
+++ b/spec/controllers/devise/session_controller_spec.rb
@@ -17,10 +17,10 @@ RSpec.describe 'Session', type: :request do
     end
 
     context 'when it is valid credentials' do
-      let!(:user) { create(:user, password: 'test1234', account: account) }
+      let!(:user) { create(:user, password: 'Password1!', account: account) }
 
       it 'returns successful auth response' do
-        params = { email: user.email, password: 'test1234' }
+        params = { email: user.email, password: 'Password1!' }
 
         post new_user_session_url,
              params: params,
@@ -32,7 +32,7 @@ RSpec.describe 'Session', type: :request do
     end
 
     context 'when it is invalid sso auth token' do
-      let!(:user) { create(:user, password: 'test1234', account: account) }
+      let!(:user) { create(:user, password: 'Password1!', account: account) }
 
       it 'returns unauthorized' do
         params = { email: user.email, sso_auth_token: SecureRandom.hex(32) }
@@ -46,7 +46,7 @@ RSpec.describe 'Session', type: :request do
     end
 
     context 'when with valid sso auth token' do
-      let!(:user) { create(:user, password: 'test1234', account: account) }
+      let!(:user) { create(:user, password: 'Password1!', account: account) }
 
       it 'returns successful auth response' do
         params = { email: user.email, sso_auth_token: user.generate_sso_auth_token }
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index 7f9167b14..e25f3cb42 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -94,7 +94,7 @@ RSpec.describe 'Platform Users API', type: :request do
       let(:platform_app) { create(:platform_app) }
 
       it 'creates a new user and permissible for the user' do
-        post '/platform/api/v1/users/', params: { name: 'test', email: 'test@test.com', password: 'password123' },
+        post '/platform/api/v1/users/', params: { name: 'test', email: 'test@test.com', password: 'Password1!' },
                                         headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
@@ -105,7 +105,7 @@ RSpec.describe 'Platform Users API', type: :request do
 
       it 'fetch existing user and creates permissible for the user' do
         create(:user, name: 'old test', email: 'test@test.com')
-        post '/platform/api/v1/users/', params: { name: 'test', email: 'test@test.com', password: 'password123' },
+        post '/platform/api/v1/users/', params: { name: 'test', email: 'test@test.com', password: 'Password1!' },
                                         headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
diff --git a/spec/controllers/super_admin/access_tokens_controller_spec.rb b/spec/controllers/super_admin/access_tokens_controller_spec.rb
index bb516bc04..ace011663 100644
--- a/spec/controllers/super_admin/access_tokens_controller_spec.rb
+++ b/spec/controllers/super_admin/access_tokens_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Super Admin access tokens API', type: :request do
   let(:super_admin) { create(:super_admin) }
+  let!(:platform_app) { create(:platform_app) }
 
   describe 'GET /super_admin/access_tokens' do
     context 'when it is an unauthenticated super admin' do
@@ -16,7 +17,7 @@ RSpec.describe 'Super Admin access tokens API', type: :request do
         sign_in super_admin
         get '/super_admin/access_tokens'
         expect(response).to have_http_status(:success)
-        expect(response.body).to include(super_admin.access_token.token)
+        expect(response.body).to include(platform_app.access_token.token)
       end
     end
   end
diff --git a/spec/factories/super_admins.rb b/spec/factories/super_admins.rb
index 88e488f68..fc0b485c5 100644
--- a/spec/factories/super_admins.rb
+++ b/spec/factories/super_admins.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :super_admin do
     email { "admin@#{SecureRandom.uuid}.com" }
-    password { 'password' }
+    password { 'Password1!' }
   end
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index bbe1e6acd..cbebfa838 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -14,7 +14,7 @@ FactoryBot.define do
     name { Faker::Name.name }
     display_name { Faker::Name.first_name }
     email { display_name + "@#{SecureRandom.uuid}.com" }
-    password { 'password' }
+    password { 'Password1!' }
 
     after(:build) do |user, evaluator|
       user.skip_confirmation! if evaluator.skip_confirmation
diff --git a/spec/lib/chatwoot_hub_spec.rb b/spec/lib/chatwoot_hub_spec.rb
index 26d75365f..2cd5c6be1 100644
--- a/spec/lib/chatwoot_hub_spec.rb
+++ b/spec/lib/chatwoot_hub_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe ChatwootHub do
   it 'get latest version from chatwoot hub' do
     version = '1.1.1'
-    allow(RestClient).to receive(:get).and_return({ 'version': version }.to_json)
+    allow(RestClient).to receive(:get).and_return({ version: version }.to_json)
     expect(described_class.latest_version).to eq version
     expect(RestClient).to have_received(:get).with(described_class::BASE_URL, { params: described_class.instance_config })
   end

From 9e56565a30d25f3a8bca560f7eab4b362d7b079e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 7 Jun 2021 20:04:31 +0530
Subject: [PATCH 43/67] chore: Add status param in conversation APIs (#2394)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/accounts/conversations_controller.rb      |  3 ++-
 .../api/v1/accounts/conversations_controller_spec.rb | 12 ++++++++++++
 spec/controllers/api/v1/profiles_controller_spec.rb  |  4 ++--
 swagger/paths/conversation/index_or_create.yml       |  6 +++++-
 swagger/swagger.json                                 |  9 +++++++++
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index dccb56a95..897731d19 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -98,13 +98,14 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def conversation_params
     additional_attributes = params[:additional_attributes]&.permit! || {}
+    status = params[:status].present? ? { status: params[:status] } : {}
     {
       account_id: Current.account.id,
       inbox_id: @contact_inbox.inbox_id,
       contact_id: @contact_inbox.contact_id,
       contact_inbox_id: @contact_inbox.id,
       additional_attributes: additional_attributes
-    }
+    }.merge(status)
   end
 
   def conversation_finder
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 8d4b3de20..e890ef295 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -162,6 +162,18 @@ RSpec.describe 'Conversations API', type: :request do
         expect(response_data[:additional_attributes]).to eq(additional_attributes)
       end
 
+      it 'creates a conversation in specificed status' do
+        allow(Rails.configuration.dispatcher).to receive(:dispatch)
+        post "/api/v1/accounts/#{account.id}/conversations",
+             headers: agent.create_new_auth_token,
+             params: { source_id: contact_inbox.source_id, status: 'bot' },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+        expect(response_data[:status]).to eq('bot')
+      end
+
       it 'creates a new conversation with message when message is passed' do
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
         post "/api/v1/accounts/#{account.id}/conversations",
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 13c2511ad..c73194fec 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -58,12 +58,12 @@ RSpec.describe 'Profile API', type: :request do
 
       it 'updates the password when current password is provided' do
         put '/api/v1/profile',
-            params: { profile: { current_password: 'Test123!', password: 'test123', password_confirmation: 'test123' } },
+            params: { profile: { current_password: 'Test123!', password: 'Test1234!', password_confirmation: 'Test1234!' } },
             headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(agent.reload.valid_password?('test123')).to eq true
+        expect(agent.reload.valid_password?('Test1234!')).to eq true
       end
 
       it 'throws error when current password provided is invalid' do
diff --git a/swagger/paths/conversation/index_or_create.yml b/swagger/paths/conversation/index_or_create.yml
index 0fc253fff..b553b02f5 100644
--- a/swagger/paths/conversation/index_or_create.yml
+++ b/swagger/paths/conversation/index_or_create.yml
@@ -100,7 +100,7 @@ post:
       schema:
         type: object
         properties:
-          source_id: 
+          source_id:
             $ref: '#/parameters/source_id'
           inbox_id:
             type: string
@@ -111,6 +111,10 @@ post:
           additional_attributes:
             type: object
             description: Lets you specify attributes like browser information
+          status:
+            type: string
+            enum: ['open', 'resolved', 'bot']
+            description: Specify the conversation whether it's bot, open, closed
 
   responses:
     200:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index b9db2b77e..bcb76ccf8 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1224,6 +1224,15 @@
                 "additional_attributes": {
                   "type": "object",
                   "description": "Lets you specify attributes like browser information"
+                },
+                "status": {
+                  "type": "string",
+                  "enum": [
+                    "open",
+                    "resolved",
+                    "bot"
+                  ],
+                  "description": "Specify the conversation whether it's bot, open, closed"
                 }
               }
             }

From 1ebab21cfa606aea61a71c90d96228dc8215ca3a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 8 Jun 2021 00:22:36 +0530
Subject: [PATCH 44/67] chore: Configure API channel name and thumbnail (#2398)

---
 app/controllers/dashboard_controller.rb       |  4 ++-
 .../assets/scss/views/settings/channel.scss   |  3 +-
 .../components/widgets/ChannelItem.vue        |  6 +++-
 .../dashboard/settings/inbox/ChannelList.vue  | 28 ++++++++++++-------
 .../routes/dashboard/settings/inbox/Index.vue |  2 +-
 app/javascript/shared/store/globalConfig.js   |  4 +++
 config/installation_config.yml                |  4 +++
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 14030b565..53c0abb02 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -21,7 +21,9 @@ class DashboardController < ActionController::Base
       'PRIVACY_URL',
       'DISPLAY_MANIFEST',
       'CREATE_NEW_ACCOUNT_FROM_DASHBOARD',
-      'CHATWOOT_INBOX_TOKEN'
+      'CHATWOOT_INBOX_TOKEN',
+      'API_CHANNEL_NAME',
+      'API_CHANNEL_THUMBNAIL'
     ).merge(
       APP_VERSION: Chatwoot.config[:version]
     )
diff --git a/app/javascript/dashboard/assets/scss/views/settings/channel.scss b/app/javascript/dashboard/assets/scss/views/settings/channel.scss
index 01828eb4d..80400bb71 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/channel.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/channel.scss
@@ -31,8 +31,9 @@
     }
 
     img {
-      width: 50%;
       @include margin($space-normal auto);
+      flex: 1;
+      width: 50%;
     }
 
     .channel__title{
diff --git a/app/javascript/dashboard/components/widgets/ChannelItem.vue b/app/javascript/dashboard/components/widgets/ChannelItem.vue
index 32989cc76..37b82436e 100644
--- a/app/javascript/dashboard/components/widgets/ChannelItem.vue
+++ b/app/javascript/dashboard/components/widgets/ChannelItem.vue
@@ -17,9 +17,13 @@
       src="~dashboard/assets/images/channels/telegram.png"
     />
     <img
-      v-if="channel.key === 'api'"
+      v-if="channel.key === 'api' && !channel.thumbnail"
       src="~dashboard/assets/images/channels/api.png"
     />
+    <img
+      v-if="channel.key === 'api' && channel.thumbnail"
+      :src="channel.thumbnail"
+    />
     <img
       v-if="channel.key === 'email'"
       src="~dashboard/assets/images/channels/email.png"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
index 920eb132a..ce19b918e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
@@ -29,16 +29,6 @@ export default {
   },
   data() {
     return {
-      channelList: [
-        { key: 'website', name: 'Website' },
-        { key: 'facebook', name: 'Facebook' },
-        { key: 'twitter', name: 'Twitter' },
-        { key: 'twilio', name: 'Twilio' },
-        { key: 'email', name: 'Email' },
-        { key: 'api', name: 'API' },
-        { key: 'telegram', name: 'Telegram' },
-        { key: 'line', name: 'Line' },
-      ],
       enabledFeatures: {},
     };
   },
@@ -46,8 +36,26 @@ export default {
     account() {
       return this.$store.getters['accounts/getAccount'](this.accountId);
     },
+    channelList() {
+      const { apiChannelName, apiChannelThumbnail } = this.globalConfig;
+      return [
+        { key: 'website', name: 'Website' },
+        { key: 'facebook', name: 'Facebook' },
+        { key: 'twitter', name: 'Twitter' },
+        { key: 'twilio', name: 'Twilio' },
+        { key: 'email', name: 'Email' },
+        {
+          key: 'api',
+          name: apiChannelName || 'API',
+          thumbnail: apiChannelThumbnail,
+        },
+        { key: 'telegram', name: 'Telegram' },
+        { key: 'line', name: 'Line' },
+      ];
+    },
     ...mapGetters({
       accountId: 'getCurrentAccountId',
+      globalConfig: 'globalConfig/get',
     }),
   },
   mounted() {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 478d04dbf..7eda147fc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -49,7 +49,7 @@
                   Email
                 </span>
                 <span v-if="item.channel_type === 'Channel::Api'">
-                  Api
+                  {{ globalConfig.apiChannelName || 'API' }}
                 </span>
               </td>
 
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 73feb88b5..69117179a 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -1,4 +1,6 @@
 const {
+  API_CHANNEL_NAME: apiChannelName,
+  API_CHANNEL_THUMBNAIL: apiChannelThumbnail,
   APP_VERSION: appVersion,
   BRAND_NAME: brandName,
   CHATWOOT_INBOX_TOKEN: chatwootInboxToken,
@@ -13,6 +15,8 @@ const {
 } = window.globalConfig || {};
 
 const state = {
+  apiChannelName,
+  apiChannelThumbnail,
   appVersion,
   brandName,
   chatwootInboxToken,
diff --git a/config/installation_config.yml b/config/installation_config.yml
index e0ca16637..3f14a9a26 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -36,3 +36,7 @@
 - name: CHATWOOT_INBOX_HMAC_KEY
   value:
   locked: false
+- name: API_CHANNEL_NAME
+  value:
+- name: API_CHANNEL_THUMBNAIL
+  value:

From 0a087c95fddba70b9c071ab2f7cad280d4c298f0 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 8 Jun 2021 01:11:06 +0530
Subject: [PATCH 45/67] chore: Message API improvements (#2396)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/builders/messages/message_builder.rb        | 14 ++++++++++++--
 .../components/widgets/conversation/Message.vue |  7 +++++--
 app/models/message.rb                           |  5 ++++-
 .../api/v1/models/_agent_bot.json.jbuilder      |  2 +-
 .../conversations/messages_controller_spec.rb   | 17 +++++++++++++++++
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 6fc3bab5d..ba78d76d7 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -39,7 +39,17 @@ class Messages::MessageBuilder
   end
 
   def sender
-    message_type == 'outgoing' ? @user : @conversation.contact
+    message_type == 'outgoing' ? (message_sender || @user) : @conversation.contact
+  end
+
+  def external_created_at
+    @params[:external_created_at].present? ? { external_created_at: @params[:external_created_at] } : {}
+  end
+
+  def message_sender
+    return if @params[:sender_type] != 'AgentBot'
+
+    AgentBot.where(account_id: [nil, @conversation.account.id]).find_by(id: @params[:sender_id])
   end
 
   def message_params
@@ -54,6 +64,6 @@ class Messages::MessageBuilder
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id]
-    }
+    }.merge(external_created_at)
   end
 end
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 78b1c148f..eb6644c91 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -152,7 +152,10 @@ export default {
       return !messageType ? 'left' : 'right';
     },
     readableTime() {
-      return this.messageStamp(this.data.created_at, 'LLL d, h:mm a');
+      return this.messageStamp(
+        this.contentAttributes.external_created_at || this.data.created_at,
+        'LLL d, h:mm a'
+      );
     },
     isBubble() {
       return [0, 1, 3].includes(this.data.message_type);
@@ -205,7 +208,7 @@ export default {
     },
     isSentByBot() {
       if (this.isPending) return false;
-      return !this.sender.type || this.sender.type === 'bot';
+      return !this.sender.type || this.sender.type === 'agent_bot';
     },
   },
 };
diff --git a/app/models/message.rb b/app/models/message.rb
index ea41b15fa..aaaa34db5 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -55,7 +55,10 @@ class Message < ApplicationRecord
   # [:submitted_email, :items, :submitted_values] : Used for bot message types
   # [:email] : Used by conversation_continuity incoming email messages
   # [:in_reply_to] : Used to reply to a particular tweet in threads
-  store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted], coder: JSON
+  # [:deleted] : Used to denote whether the message was deleted by the agent
+  # [:external_created_at] : Can specify if the message was created at a different timestamp externally
+  store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
+                                         :external_created_at], coder: JSON
 
   store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
 
diff --git a/app/views/api/v1/models/_agent_bot.json.jbuilder b/app/views/api/v1/models/_agent_bot.json.jbuilder
index 1aa152186..d9d1eaa17 100644
--- a/app/views/api/v1/models/_agent_bot.json.jbuilder
+++ b/app/views/api/v1/models/_agent_bot.json.jbuilder
@@ -1,5 +1,5 @@
 json.id resource.id
 json.name resource.name
 json.description resource.description
-json.outgoing_url resource.name
+json.outgoing_url resource.outgoing_url
 json.account_id resource.account_id
diff --git a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
index a8521a439..93283dbb5 100644
--- a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
@@ -31,6 +31,23 @@ RSpec.describe 'Conversation Messages API', type: :request do
         expect(conversation.messages.first.content).to eq(params[:content])
       end
 
+      it 'creates an outgoing message with a specific bot sender' do
+        agent_bot = create(:agent_bot)
+        time_stamp = Time.now.utc.to_s
+        params = { content: 'test-message', external_created_at: time_stamp, sender_type: 'AgentBot', sender_id: agent_bot.id }
+
+        post api_v1_account_conversation_messages_url(account_id: account.id, conversation_id: conversation.display_id),
+             params: params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body)
+        expect(response_data['content_attributes']['external_created_at']).to eq time_stamp
+        expect(conversation.messages.count).to eq(1)
+        expect(conversation.messages.last.sender_id).to eq(agent_bot.id)
+      end
+
       it 'creates a new outgoing message with attachment' do
         file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
         params = { content: 'test-message', attachments: [file] }

From 67ce6f57047f4e756ae8f25c90eeeb2bf7195b48 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 8 Jun 2021 16:32:01 +0530
Subject: [PATCH 46/67] feat: Add regex validation on form message inputs
 (#2317)

Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
Co-authored-by: Sojan <sojan@pepalo.com>
---
 .rubocop.yml                                  |  3 +
 app/javascript/shared/components/ChatForm.vue | 61 ++++++++++++++++++-
 app/javascript/widget/i18n/locale/en.json     |  7 ++-
 .../concerns/content_attribute_validator.rb   |  2 +-
 lib/woot_message_seeder.rb                    | 25 +++++---
 5 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 668951de2..77bd4ad18 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -44,6 +44,9 @@ Metrics/BlockLength:
     - '**/routes.rb'
     - 'config/environments/*'
     - db/schema.rb
+Metrics/ModuleLength:
+  Exclude:
+    - lib/woot_message_seeder.rb
 Rails/ApplicationController:
   Exclude:
     - 'app/controllers/api/v1/widget/messages_controller.rb'
diff --git a/app/javascript/shared/components/ChatForm.vue b/app/javascript/shared/components/ChatForm.vue
index 56391fdb8..f943f23c1 100644
--- a/app/javascript/shared/components/ChatForm.vue
+++ b/app/javascript/shared/components/ChatForm.vue
@@ -1,12 +1,33 @@
 <template>
   <div class="form chat-bubble agent">
     <form @submit.prevent="onSubmit">
-      <div v-for="item in items" :key="item.key" class="form-block">
+      <div
+        v-for="item in items"
+        :key="item.key"
+        class="form-block"
+        :class="{
+          'has-submitted': hasSubmitted,
+        }"
+      >
         <label>{{ item.label }}</label>
         <input
-          v-if="item.type === 'email' || item.type === 'text'"
+          v-if="item.type === 'email'"
           v-model="formValues[item.name]"
           :type="item.type"
+          :pattern="item.regex"
+          :title="item.title"
+          :required="item.required && 'required'"
+          :name="item.name"
+          :placeholder="item.placeholder"
+          :disabled="!!submittedValues.length"
+        />
+        <input
+          v-else-if="item.type === 'text'"
+          v-model="formValues[item.name]"
+          :required="item.required && 'required'"
+          :pattern="item.pattern"
+          :title="item.title"
+          :type="item.type"
           :name="item.name"
           :placeholder="item.placeholder"
           :disabled="!!submittedValues.length"
@@ -14,6 +35,8 @@
         <textarea
           v-else-if="item.type === 'text_area'"
           v-model="formValues[item.name]"
+          :required="item.required && 'required'"
+          :title="item.title"
           :name="item.name"
           :placeholder="item.placeholder"
           :disabled="!!submittedValues.length"
@@ -21,6 +44,7 @@
         <select
           v-else-if="item.type === 'select'"
           v-model="formValues[item.name]"
+          :required="item.required && 'required'"
         >
           <option
             v-for="option in item.options"
@@ -30,13 +54,16 @@
             {{ option.label }}
           </option>
         </select>
+        <span class="error-message">
+          {{ item.pattern_error || $t('CHAT_FORM.INVALID.FIELD') }}
+        </span>
       </div>
       <button
         v-if="!submittedValues.length"
         class="button block"
         type="submit"
-        :disabled="!isFormValid"
         :style="{ background: widgetColor, borderColor: widgetColor }"
+        @click="onSubmitClick"
       >
         {{ buttonLabel || $t('COMPONENTS.FORM_BUBBLE.SUBMIT') }}
       </button>
@@ -64,6 +91,7 @@ export default {
   data() {
     return {
       formValues: {},
+      hasSubmitted: false,
     };
   },
   computed: {
@@ -84,6 +112,9 @@ export default {
     }
   },
   methods: {
+    onSubmitClick() {
+      this.hasSubmitted = true;
+    },
     onSubmit() {
       if (!this.isFormValid) {
         return;
@@ -171,5 +202,29 @@ export default {
   .button {
     font-size: $font-size-default;
   }
+
+  .error-message {
+    display: none;
+    margin-top: $space-smaller;
+    color: $color-error;
+  }
+
+  .has-submitted {
+    input:invalid {
+      border: 1px solid $color-error;
+    }
+
+    input:invalid + .error-message {
+      display: block;
+    }
+
+    textarea:invalid {
+      border: 1px solid $color-error;
+    }
+
+    textarea:invalid + .error-message {
+      display: block;
+    }
+  }
 }
 </style>
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 4e22e35e6..44a2b5dcf 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/models/concerns/content_attribute_validator.rb b/app/models/concerns/content_attribute_validator.rb
index a846a1a82..868dffa4c 100644
--- a/app/models/concerns/content_attribute_validator.rb
+++ b/app/models/concerns/content_attribute_validator.rb
@@ -2,7 +2,7 @@ class ContentAttributeValidator < ActiveModel::Validator
   ALLOWED_SELECT_ITEM_KEYS = [:title, :value].freeze
   ALLOWED_CARD_ITEM_KEYS = [:title, :description, :media_url, :actions].freeze
   ALLOWED_CARD_ITEM_ACTION_KEYS = [:text, :type, :payload, :uri].freeze
-  ALLOWED_FORM_ITEM_KEYS = [:type, :placeholder, :label, :name, :options, :default].freeze
+  ALLOWED_FORM_ITEM_KEYS = [:type, :placeholder, :label, :name, :options, :default, :required, :pattern, :title, :pattern_error].freeze
   ALLOWED_ARTICLE_KEYS = [:title, :description, :link].freeze
 
   def validate(record)
diff --git a/lib/woot_message_seeder.rb b/lib/woot_message_seeder.rb
index 7f7c81e95..7e9aaebe1 100644
--- a/lib/woot_message_seeder.rb
+++ b/lib/woot_message_seeder.rb
@@ -74,18 +74,25 @@ module WootMessageSeeder
       message_type: :template,
       content_type: 'form',
       content: 'form',
-      content_attributes: {
-        items: [
-          { name: 'email', placeholder: 'Please enter your email', type: 'email', label: 'Email' },
-          { name: 'text_area', placeholder: 'Please enter text', type: 'text_area', label: 'Large Text' },
-          { name: 'text', placeholder: 'Please enter text', type: 'text', label: 'text', default: 'defaut value' },
-          { name: 'select', label: 'Select Option', type: 'select', options: [{ label: '🌯 Burito', value: 'Burito' },
-                                                                              { label: '🍝 Pasta', value: 'Pasta' }] }
-        ]
-      }
+      content_attributes: sample_form
     )
   end
 
+  def self.sample_form
+    {
+      "items": [
+        { "name": 'email', "placeholder": 'Please enter your email', "type": 'email', "label": 'Email', "required": 'required',
+          "pattern_error": 'Please fill this field', "pattern": '^[^\s@]+@[^\s@]+\.[^\s@]+$' },
+        { "name": 'text_area', "placeholder": 'Please enter text', "type": 'text_area', "label": 'Large Text', "required": 'required',
+          "pattern_error": 'Please fill this field' },
+        { "name": 'text', "placeholder": 'Please enter text', "type": 'text', "label": 'text', "default": 'defaut value', "required": 'required',
+          "pattern": '^[a-zA-Z ]*$', "pattern_error": 'Only alphabets are allowed' },
+        { "name": 'select', "label": 'Select Option', "type": 'select', "options": [{ "label": '🌯 Burito', "value": 'Burito' },
+                                                                                    { "label": '🍝 Pasta', "value": 'Pasta' }] }
+      ]
+    }
+  end
+
   def self.create_sample_articles_message(conversation)
     Message.create!(
       account: conversation.account,

From 1bf722784396082c1f07e876c98d78217f9356c5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 8 Jun 2021 22:45:01 +0530
Subject: [PATCH 47/67] chore: Fix emails being sent with the wrong
 translations (#2236)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/accounts/agents_controller.rb      |  2 ++
 .../v1/accounts/conversations_controller.rb   |  4 ++-
 .../api/v1/widget/conversations_controller.rb |  2 +-
 app/mailers/application_mailer.rb             |  1 +
 app/models/concerns/reauthorizable.rb         |  4 ++-
 app/models/user.rb                            |  2 +-
 .../email_templates/db_resolver_service.rb    |  4 +--
 .../mailer/confirmation_instructions.html.erb |  5 ++--
 .../conversation_reply_email_worker.rb        |  4 +--
 db/seeds.rb                                   | 16 +++++++++++
 .../accounts/conversations_controller_spec.rb | 14 ++++++++--
 .../widget/conversations_controller_spec.rb   |  6 ++--
 .../db_resolver_service_spec.rb               | 28 +++++++++----------
 .../mailers/confirmation_instructions_spec.rb |  6 ++--
 .../conversation_reply_email_worker_spec.rb   | 15 ++++++----
 15 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 46d35d09d..334844de9 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -38,6 +38,8 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
     @user =  User.find_by(email: new_agent_params[:email])
   end
 
+  # TODO: move this to a builder and combine the save account user method into a builder
+  # ensure the account user association is also created in a single transaction
   def create_user
     return if @user
 
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 897731d19..91381095d 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -41,7 +41,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def transcript
-    ConversationReplyMailer.conversation_transcript(@conversation, params[:email])&.deliver_later if params[:email].present?
+    render json: { error: 'email param missing' }, status: :unprocessable_entity and return if params[:email].blank?
+
+    ConversationReplyMailer.with(account: @conversation.account).conversation_transcript(@conversation, params[:email])&.deliver_later
     head :ok
   end
 
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index cc68cb888..8d28345d4 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -23,7 +23,7 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
 
   def transcript
     if permitted_params[:email].present? && conversation.present?
-      ConversationReplyMailer.conversation_transcript(
+      ConversationReplyMailer.with(account: conversation.account).conversation_transcript(
         conversation,
         permitted_params[:email]
       )&.deliver_later
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 9b5c876d6..9d5fd0214 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -65,6 +65,7 @@ class ApplicationMailer < ActionMailer::Base
   end
 
   def ensure_current_account(account)
+    Current.reset
     Current.account = account if account.present?
   end
 
diff --git a/app/models/concerns/reauthorizable.rb b/app/models/concerns/reauthorizable.rb
index 6e2433482..a0c43310b 100644
--- a/app/models/concerns/reauthorizable.rb
+++ b/app/models/concerns/reauthorizable.rb
@@ -36,7 +36,9 @@ module Reauthorizable
   # could used to manually prompt reauthorization if auth scope changes
   def prompt_reauthorization!
     ::Redis::Alfred.set(reauthorization_required_key, true)
-    AdministratorNotifications::ChannelNotificationsMailer.slack_disconnect(account)&.deliver_later if (is_a? Integrations::Hook) && slack?
+    return unless (is_a? Integrations::Hook) && slack?
+
+    AdministratorNotifications::ChannelNotificationsMailer.with(account: account).slack_disconnect(account)&.deliver_later
   end
 
   # call this after you successfully Reauthorized the object in UI
diff --git a/app/models/user.rb b/app/models/user.rb
index e1b1b4e71..fefe8669d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -91,7 +91,7 @@ class User < ApplicationRecord
   scope :order_by_full_name, -> { order('lower(name) ASC') }
 
   def send_devise_notification(notification, *args)
-    devise_mailer.send(notification, self, *args).deliver_later
+    devise_mailer.with(account: Current.account).send(notification, self, *args).deliver_later
   end
 
   def set_password_and_uid
diff --git a/app/services/email_templates/db_resolver_service.rb b/app/services/email_templates/db_resolver_service.rb
index 139684526..42222fe75 100644
--- a/app/services/email_templates/db_resolver_service.rb
+++ b/app/services/email_templates/db_resolver_service.rb
@@ -43,12 +43,12 @@ class ::EmailTemplates::DbResolverService < ActionView::Resolver
     handler = ActionView::Template.registered_template_handler(:liquid)
 
     template_details = {
+      locals: [],
       format: Mime['html'].to_sym,
-      updated_at: @db_template.updated_at,
       virtual_path: virtual_path(path, partial)
     }
 
-    [ActionView::Template.new(@db_template.body, "DB Template - #{@db_template.id}", handler, template_details)]
+    [ActionView::Template.new(@db_template.body, "DB Template - #{@db_template.id}", handler, **template_details)]
   end
 
   private
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index c03e5dc3c..79f838dbb 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,7 +1,8 @@
 <p>Welcome, <%= @resource.name %>!</p>
 
-<% if @resource&.inviter.present? %>
-  <p><%= @resource.inviter.name %>, with <%= @resource.inviter.account.name %>, has invited you to try out Chatwoot! </p>
+<% account_user = @resource&.account_users&.first %>
+<% if account_user&.inviter.present? %>
+  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out Chatwoot! </p>
 <% end %>
 
 <p>You can confirm your account email through the link below:</p>
diff --git a/app/workers/conversation_reply_email_worker.rb b/app/workers/conversation_reply_email_worker.rb
index c352711b0..1f97b43ee 100644
--- a/app/workers/conversation_reply_email_worker.rb
+++ b/app/workers/conversation_reply_email_worker.rb
@@ -8,9 +8,9 @@ class ConversationReplyEmailWorker
 
     # send the email
     if @conversation.messages.incoming&.last&.content_type == 'incoming_email' || email_inbox?
-      ConversationReplyMailer.reply_without_summary(@conversation, queued_time).deliver_later
+      ConversationReplyMailer.with(account: @conversation.account).reply_without_summary(@conversation, queued_time).deliver_later
     else
-      ConversationReplyMailer.reply_with_summary(@conversation, queued_time).deliver_later
+      ConversationReplyMailer.with(account: @conversation.account).reply_with_summary(@conversation, queued_time).deliver_later
     end
 
     # delete the redis set from the first new message on the conversation
diff --git a/db/seeds.rb b/db/seeds.rb
index 8d47bded9..6fb8b7970 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -16,6 +16,10 @@ unless Rails.env.production?
     name: 'Acme Inc'
   )
 
+  secondary_account = Account.create!(
+    name: 'Acme Org'
+  )
+
   user = User.new(name: 'John', email: 'john@acme.inc', password: 'Password1!')
   user.skip_confirmation!
   user.save!
@@ -26,6 +30,18 @@ unless Rails.env.production?
     role: :administrator
   )
 
+  AccountUser.create!(
+    account_id: secondary_account.id,
+    user_id: user.id,
+    role: :administrator
+  )
+
+  # Enables creating additional accounts from dashboard
+  installation_config = InstallationConfig.find_by(name: 'CREATE_NEW_ACCOUNT_FROM_DASHBOARD')
+  installation_config.value = true
+  installation_config.save!
+  GlobalConfig.clear_cache
+
   web_widget = Channel::WebWidget.create!(account: account, website_url: 'https://acme.inc')
 
   inbox = Inbox.create!(channel: web_widget, account: account, name: 'Acme Support')
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index e890ef295..2ddd3f31a 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -374,14 +374,24 @@ RSpec.describe 'Conversations API', type: :request do
       let(:params) { { email: 'test@test.com' } }
 
       it 'mutes conversation' do
-        allow(ConversationReplyMailer).to receive(:conversation_transcript)
+        mailer = double
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript)
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/transcript",
              headers: agent.create_new_auth_token,
              params: params,
              as: :json
 
         expect(response).to have_http_status(:success)
-        expect(ConversationReplyMailer).to have_received(:conversation_transcript).with(conversation, 'test@test.com')
+        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'test@test.com')
+      end
+
+      it 'renders error when parameter missing' do
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/transcript",
+             headers: agent.create_new_auth_token,
+             params: {},
+             as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
       end
     end
   end
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 9ba2d066a..2603d1e15 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -104,7 +104,9 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
   describe 'POST /api/v1/widget/conversations/transcript' do
     context 'with a conversation' do
       it 'sends transcript email' do
-        allow(ConversationReplyMailer).to receive(:conversation_transcript)
+        mailer = double
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript)
 
         post '/api/v1/widget/conversations/transcript',
              headers: { 'X-Auth-Token' => token },
@@ -112,7 +114,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        expect(ConversationReplyMailer).to have_received(:conversation_transcript).with(conversation, 'test@test.com')
+        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'test@test.com')
       end
     end
   end
diff --git a/spec/lib/email_templates/db_resolver_service_spec.rb b/spec/lib/email_templates/db_resolver_service_spec.rb
index 7bbb5c508..8648d8514 100644
--- a/spec/lib/email_templates/db_resolver_service_spec.rb
+++ b/spec/lib/email_templates/db_resolver_service_spec.rb
@@ -15,43 +15,43 @@ describe ::EmailTemplates::DbResolverService do
         email_template = create(:email_template, name: 'test', body: 'test')
         handler = ActionView::Template.registered_template_handler(:liquid)
         template_details = {
+          locals: [],
           format: Mime['html'].to_sym,
-          updated_at: email_template.updated_at,
           virtual_path: 'test'
         }
 
         expect(
-          resolver.find_templates('test', '', false, []).first.to_json
+          resolver.find_templates('test', '', false, []).first.inspect
         ).to eq(
           ActionView::Template.new(
             email_template.body,
-            "DB Template - #{email_template.id}", handler, template_details
-          ).to_json
+            "DB Template - #{email_template.id}", handler, **template_details
+          ).inspect
         )
       end
     end
 
     context 'when account template exists in db' do
       let(:account) { create(:account) }
-      let(:installation_template) { create(:email_template, name: 'test', body: 'test') }
-      let(:account_template) { create(:email_template, name: 'test', body: 'test2', account: account) }
+      let!(:installation_template) { create(:email_template, name: 'test', body: 'test') }
+      let!(:account_template) { create(:email_template, name: 'test', body: 'test2', account: account) }
 
       it 'return account template for current account' do
         Current.account = account
         handler = ActionView::Template.registered_template_handler(:liquid)
         template_details = {
+          locals: [],
           format: Mime['html'].to_sym,
-          updated_at: account_template.updated_at,
           virtual_path: 'test'
         }
 
         expect(
-          resolver.find_templates('test', '', false, []).first.to_json
+          resolver.find_templates('test', '', false, []).first.inspect
         ).to eq(
           ActionView::Template.new(
             account_template.body,
-            "DB Template - #{account_template.id}", handler, template_details
-          ).to_json
+            "DB Template - #{account_template.id}", handler, **template_details
+          ).inspect
         )
         Current.account = nil
       end
@@ -60,18 +60,18 @@ describe ::EmailTemplates::DbResolverService do
         Current.account = create(:account)
         handler = ActionView::Template.registered_template_handler(:liquid)
         template_details = {
+          locals: [],
           format: Mime['html'].to_sym,
-          updated_at: installation_template.updated_at,
           virtual_path: 'test'
         }
 
         expect(
-          resolver.find_templates('test', '', false, []).first.to_json
+          resolver.find_templates('test', '', false, []).first.inspect
         ).to eq(
           ActionView::Template.new(
             installation_template.body,
-            "DB Template - #{installation_template.id}", handler, template_details
-          ).to_json
+            "DB Template - #{installation_template.id}", handler, **template_details
+          ).inspect
         )
         Current.account = nil
       end
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 9914c1585..8310ab714 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe 'Confirmation Instructions', type: :mailer do
   describe :notify do
     let(:account) { create(:account) }
-    let(:confirmable_user) { build(:user, inviter: inviter_val, account: account) }
+    let(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
     let(:inviter_val) { nil }
     let(:mail) { Devise::Mailer.confirmation_instructions(confirmable_user, nil, {}) }
 
@@ -27,11 +27,9 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
       let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
 
       it 'refers to the inviter and their account' do
-        Current.account = account
         expect(mail.body).to match(
-          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(inviter_val.account.name)}, has invited you to try out Chatwoot!"
+          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot!"
         )
-        Current.account = nil
       end
     end
   end
diff --git a/spec/workers/conversation_reply_email_worker_spec.rb b/spec/workers/conversation_reply_email_worker_spec.rb
index 11be19b3f..469431c61 100644
--- a/spec/workers/conversation_reply_email_worker_spec.rb
+++ b/spec/workers/conversation_reply_email_worker_spec.rb
@@ -6,15 +6,18 @@ RSpec.describe ConversationReplyEmailWorker, type: :worker do
   let(:scheduled_job) { described_class.perform_at(perform_at, 1, Time.zone.now) }
   let(:conversation) { build(:conversation, display_id: nil) }
   let(:message) { build(:message, conversation: conversation, content_type: 'incoming_email', inbox: conversation.inbox) }
+  let(:mailer) { double }
+  let(:mailer_action) { double }
 
   describe 'testing ConversationSummaryEmailWorker' do
     before do
       conversation.save!
       allow(Conversation).to receive(:find).and_return(conversation)
-      mailer = double
-      allow(ConversationReplyMailer).to receive(:reply_with_summary).and_return(mailer)
-      allow(ConversationReplyMailer).to receive(:reply_without_summary).and_return(mailer)
-      allow(mailer).to receive(:deliver_later).and_return(true)
+      allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+      allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+      allow(mailer).to receive(:reply_with_summary).and_return(mailer_action)
+      allow(mailer).to receive(:reply_without_summary).and_return(mailer_action)
+      allow(mailer_action).to receive(:deliver_later).and_return(true)
     end
 
     it 'worker jobs are enqueued in the mailers queue' do
@@ -32,13 +35,13 @@ RSpec.describe ConversationReplyEmailWorker, type: :worker do
     context 'with actions performed by the worker' do
       it 'calls ConversationSummaryMailer#reply_with_summary when last incoming message was not email' do
         described_class.new.perform(1, Time.zone.now)
-        expect(ConversationReplyMailer).to have_received(:reply_with_summary)
+        expect(mailer).to have_received(:reply_with_summary)
       end
 
       it 'calls ConversationSummaryMailer#reply_without_summary when last incoming message was from email' do
         message.save
         described_class.new.perform(1, Time.zone.now)
-        expect(ConversationReplyMailer).to have_received(:reply_without_summary)
+        expect(mailer).to have_received(:reply_without_summary)
       end
     end
   end

From 8a0afb912c59e3c262fa9b538d4977f4f10e867f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 9 Jun 2021 13:57:42 +0530
Subject: [PATCH 48/67] chore: Add validation error for label create/edit modal
 (#2381)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/labelsMgmt.json  |  10 +-
 .../dashboard/settings/labels/AddLabel.vue    | 114 ++++++++----------
 .../dashboard/settings/labels/EditLabel.vue   | 114 ++++++++----------
 .../dashboard/settings/labels/Index.vue       |  21 ++--
 .../labels/specs/validationMixin.spec.js      |  76 ++++++++++++
 .../settings/labels/validationMixin.js        |  16 +++
 6 files changed, 208 insertions(+), 143 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js

diff --git a/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
index b0dbe439f..2b6848a32 100644
--- a/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
@@ -9,17 +9,15 @@
       "404": "There are no labels available in this account.",
       "TITLE": "Manage labels",
       "DESC": "Labels let you group the conversations together.",
-      "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "Color"
-      ]
+      "TABLE_HEADER": ["Name", "Description", "Color"]
     },
     "FORM": {
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
index 8056362b4..29c2ddd6d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
@@ -1,79 +1,66 @@
 <template>
-  <modal :show.sync="show" :on-close="onClose">
-    <div class="column content-box">
-      <woot-modal-header
-        :header-title="$t('LABEL_MGMT.ADD.TITLE')"
-        :header-content="$t('LABEL_MGMT.ADD.DESC')"
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="$t('LABEL_MGMT.ADD.TITLE')"
+      :header-content="$t('LABEL_MGMT.ADD.DESC')"
+    />
+    <form class="row" @submit.prevent="addLabel">
+      <woot-input
+        v-model.trim="title"
+        :class="{ error: $v.title.$error }"
+        class="medium-12 columns"
+        :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
+        :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
+        :error="getLabelTitleErrorMessage"
+        @input="$v.title.$touch"
       />
-      <form class="row" @submit.prevent="addLabel">
-        <woot-input
-          v-model.trim="title"
-          :class="{ error: $v.title.$error }"
-          class="medium-12 columns"
-          :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
-          :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
-          @input="$v.title.$touch"
-        />
 
-        <woot-input
-          v-model.trim="description"
-          :class="{ error: $v.description.$error }"
-          class="medium-12 columns"
-          :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
-          :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
-          @input="$v.description.$touch"
-        />
+      <woot-input
+        v-model.trim="description"
+        :class="{ error: $v.description.$error }"
+        class="medium-12 columns"
+        :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
+        :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
+        @input="$v.description.$touch"
+      />
 
-        <div class="medium-12">
-          <label>
-            {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
-            <woot-color-picker v-model="color" />
-          </label>
-        </div>
-        <div class="medium-12">
-          <input v-model="showOnSidebar" type="checkbox" :value="true" />
-          <label for="conversation_creation">
-            {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
-          </label>
-        </div>
-        <div class="modal-footer">
-          <woot-submit-button
-            :disabled="$v.title.$invalid || uiFlags.isCreating"
-            :button-text="$t('LABEL_MGMT.FORM.CREATE')"
-            :loading="uiFlags.isCreating"
-          />
-          <button class="button clear" @click.prevent="onClose">
+      <div class="medium-12">
+        <label>
+          {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
+          <woot-color-picker v-model="color" />
+        </label>
+      </div>
+      <div class="medium-12">
+        <input v-model="showOnSidebar" type="checkbox" :value="true" />
+        <label for="conversation_creation">
+          {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
+        </label>
+      </div>
+      <div class="modal-footer">
+        <div class="medium-12 columns">
+          <woot-button
+            :is-disabled="$v.title.$invalid || uiFlags.isCreating"
+            :is-loading="uiFlags.isCreating"
+          >
+            {{ $t('LABEL_MGMT.FORM.CREATE') }}
+          </woot-button>
+          <woot-button class="button clear" @click.prevent="onClose">
             {{ $t('LABEL_MGMT.FORM.CANCEL') }}
-          </button>
+          </woot-button>
         </div>
-      </form>
-    </div>
-  </modal>
+      </div>
+    </form>
+  </div>
 </template>
 
 <script>
-import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
-import Modal from '../../../../components/Modal';
 import alertMixin from 'shared/mixins/alertMixin';
+import validationMixin from './validationMixin';
 import { mapGetters } from 'vuex';
 import validations from './validations';
 
 export default {
-  components: {
-    WootSubmitButton,
-    Modal,
-  },
-  mixins: [alertMixin],
-  props: {
-    onClose: {
-      type: Function,
-      default: () => {},
-    },
-    show: {
-      type: Boolean,
-      default: true,
-    },
-  },
+  mixins: [alertMixin, validationMixin],
   data() {
     return {
       color: '#000',
@@ -92,6 +79,9 @@ export default {
     this.color = this.getRandomColor();
   },
   methods: {
+    onClose() {
+      this.$emit('close');
+    },
     getRandomColor() {
       const letters = '0123456789ABCDEF';
       let color = '#';
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
index 43e75de64..fbb15ac8a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
@@ -1,82 +1,67 @@
 <template>
-  <modal :show.sync="show" :on-close="onClose">
-    <div class="column content-box">
-      <woot-modal-header :header-title="pageTitle" />
-      <form class="row" @submit.prevent="editLabel">
-        <woot-input
-          v-model.trim="title"
-          :class="{ error: $v.title.$error }"
-          class="medium-12 columns"
-          :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
-          :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
-          @input="$v.title.$touch"
-        />
+  <div class="column content-box">
+    <woot-modal-header :header-title="pageTitle" />
+    <form class="row" @submit.prevent="editLabel">
+      <woot-input
+        v-model.trim="title"
+        :class="{ error: $v.title.$error }"
+        class="medium-12 columns"
+        :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
+        :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
+        :error="getLabelTitleErrorMessage"
+        @input="$v.title.$touch"
+      />
+      <woot-input
+        v-model.trim="description"
+        :class="{ error: $v.description.$error }"
+        class="medium-12 columns"
+        :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
+        :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
+        @input="$v.description.$touch"
+      />
 
-        <woot-input
-          v-model.trim="description"
-          :class="{ error: $v.description.$error }"
-          class="medium-12 columns"
-          :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
-          :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
-          @input="$v.description.$touch"
-        />
-
-        <div class="medium-12">
-          <label>
-            {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
-            <woot-color-picker v-model="color" />
-          </label>
+      <div class="medium-12">
+        <label>
+          {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
+          <woot-color-picker v-model="color" />
+        </label>
+      </div>
+      <div class="medium-12">
+        <input v-model="showOnSidebar" type="checkbox" :value="true" />
+        <label for="conversation_creation">
+          {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
+        </label>
+      </div>
+      <div class="modal-footer">
+        <div class="medium-12 columns">
+          <woot-button
+            :is-disabled="$v.title.$invalid || uiFlags.isUpdating"
+            :is-loading="uiFlags.isUpdating"
+          >
+            {{ $t('LABEL_MGMT.FORM.EDIT') }}
+          </woot-button>
+          <woot-button class="button clear" @click.prevent="onClose">
+            {{ $t('LABEL_MGMT.FORM.CANCEL') }}
+          </woot-button>
         </div>
-        <div class="medium-12">
-          <input v-model="showOnSidebar" type="checkbox" :value="true" />
-          <label for="conversation_creation">
-            {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
-          </label>
-        </div>
-        <div class="modal-footer">
-          <div class="medium-12 columns">
-            <woot-submit-button
-              :disabled="$v.title.$invalid || uiFlags.isUpdating"
-              :button-text="$t('LABEL_MGMT.FORM.EDIT')"
-              :loading="uiFlags.isUpdating"
-            />
-            <button class="button clear" @click.prevent="onClose">
-              {{ $t('LABEL_MGMT.FORM.CANCEL') }}
-            </button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </modal>
+      </div>
+    </form>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
-
-import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
-import Modal from '../../../../components/Modal';
+import validationMixin from './validationMixin';
 import validations from './validations';
 
 export default {
-  components: {
-    WootSubmitButton,
-    Modal,
-  },
-  mixins: [alertMixin],
+  mixins: [alertMixin, validationMixin],
   props: {
-    show: {
-      type: Boolean,
-      default: () => {},
-    },
     selectedResponse: {
       type: Object,
       default: () => {},
     },
-    onClose: {
-      type: Function,
-      default: () => {},
-    },
   },
   data() {
     return {
@@ -101,6 +86,9 @@ export default {
     this.setFormValues();
   },
   methods: {
+    onClose() {
+      this.$emit('close');
+    },
     setFormValues() {
       this.title = this.selectedResponse.title;
       this.description = this.selectedResponse.description;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index f254152a7..aece1ea82 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -73,19 +73,16 @@
         <span v-html="$t('LABEL_MGMT.SIDEBAR_TXT')"></span>
       </div>
     </div>
+    <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
+      <add-label @close="hideAddPopup" />
+    </woot-modal>
 
-    <add-label
-      v-if="showAddPopup"
-      :show.sync="showAddPopup"
-      :on-close="hideAddPopup"
-    />
-
-    <edit-label
-      v-if="showEditPopup"
-      :show.sync="showEditPopup"
-      :selected-response="selectedResponse"
-      :on-close="hideEditPopup"
-    />
+    <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
+      <edit-label
+        :selected-response="selectedResponse"
+        @close="hideEditPopup"
+      />
+    </woot-modal>
 
     <woot-delete-modal
       :show.sync="showDeleteConfirmationPopup"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
new file mode 100644
index 000000000..ee02f674e
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validationMixin.spec.js
@@ -0,0 +1,76 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import VueI18n from 'vue-i18n';
+import Vuelidate from 'vuelidate';
+
+import validationMixin from '../validationMixin';
+import validations from '../validations';
+import i18n from 'dashboard/i18n';
+const localVue = createLocalVue();
+
+localVue.use(VueI18n);
+localVue.use(Vuelidate);
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+const Component = {
+  render() {},
+  title: 'TestComponent',
+  mixins: [validationMixin],
+  validations,
+};
+
+describe('validationMixin', () => {
+  it('it should return empty error message if valid label name passed', async () => {
+    const wrapper = shallowMount(Component, {
+      i18n: i18nConfig,
+      localVue,
+      data() {
+        return {
+          title: 'sales',
+        };
+      },
+    });
+    expect(wrapper.vm.getLabelTitleErrorMessage).toBe('');
+  });
+  it('it should return label required error message if empty name is passed', async () => {
+    const wrapper = shallowMount(Component, {
+      i18n: i18nConfig,
+      localVue,
+      data() {
+        return {
+          title: '',
+        };
+      },
+    });
+    expect(wrapper.vm.getLabelTitleErrorMessage).toBe('Label name is required');
+  });
+  it('it should return label minimum length error message if one charceter label name is passed', async () => {
+    const wrapper = shallowMount(Component, {
+      i18n: i18nConfig,
+      localVue,
+      data() {
+        return {
+          title: 's',
+        };
+      },
+    });
+    expect(wrapper.vm.getLabelTitleErrorMessage).toBe(
+      'Minimum length 2 is required'
+    );
+  });
+  it('it should return invalid character error message if invalid lable name passed', async () => {
+    const wrapper = shallowMount(Component, {
+      i18n: i18nConfig,
+      localVue,
+      data() {
+        return {
+          title: 'sales enquiry',
+        };
+      },
+    });
+    expect(wrapper.vm.getLabelTitleErrorMessage).toBe(
+      'Only Alphabets, Numbers, Hyphen and Underscore are allowed'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js b/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
new file mode 100644
index 000000000..ca2a0b777
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
@@ -0,0 +1,16 @@
+export default {
+  computed: {
+    getLabelTitleErrorMessage() {
+      if (!this.title) {
+        return this.$t('LABEL_MGMT.FORM.NAME.REQUIRED_ERROR');
+      }
+      if (!this.$v.title.minLength) {
+        return this.$t('LABEL_MGMT.FORM.NAME.MINIMUM_LENGTH_ERROR');
+      }
+      if (!this.$v.title.validLabelCharacters) {
+        return this.$t('LABEL_MGMT.FORM.NAME.VALID_ERROR');
+      }
+      return '';
+    },
+  },
+};

From f79e489a0ada8c6781dd9f9b2d65ee04581ed83c Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Wed, 9 Jun 2021 14:01:43 +0530
Subject: [PATCH 49/67] chore: Use button component in ReplyBox

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../assets/scss/widgets/_buttons.scss         |  60 +++++----
 .../assets/scss/widgets/_reply-box.scss       |  21 ---
 .../components/buttons/ResolveAction.vue      |   6 +-
 .../dashboard/components/ui/WootButton.vue    |  24 +++-
 .../widgets/WootWriter/ReplyBottomPanel.vue   | 123 +++++++-----------
 .../contacts/components/ContactNote.vue       |  16 +--
 .../contacts/components/ReminderItem.vue      |   6 +-
 7 files changed, 117 insertions(+), 139 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 1d6b12631..edbef16bb 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -1,31 +1,24 @@
+$default-button-height: 4.0rem;
+
 .button {
   align-items: center;
   display: inline-flex;
-  height: 4.0rem;
+  height: $default-button-height;
   margin-bottom: 0;
 
-  &.button--emoji {
-    align-items: center;
-    background: var(--b-50);
-    border: 1px solid var(--color-border-light);
-    border-radius: var(--border-radius-large);
-    display: flex;
-    font-size: var(--font-size-small);
-    height: var(--space-large);
-    justify-content: center;
-    padding: var(--space-micro);
-    text-align: center;
-    width: var(--space-large);
-
-    &:hover {
-      background: var(--b-200);
-    }
-  }
-
   .spinner {
     padding: 0 var(--space-small);
   }
 
+  .icon--emoji+.button__content {
+    padding-left: var(--space-small);
+  }
+
+  .icon--font+.button__content {
+    padding-left: var(--space-small);
+  }
+
+  // @TODDO - Remove after moving all buttons to woot-button
   .icon+.button__content {
     padding-left: var(--space-small);
   }
@@ -48,23 +41,23 @@
 
   // Smooth style
   &.smooth {
-    @include button-style(var(--w-100), var(--w-50), var(--w-700));
+    @include button-style(var(--w-50), var(--w-100), var(--w-700));
 
 
     &.secondary {
-      @include button-style(var(--s-100), var(--s-50), var(--s-700));
+      @include button-style(var(--s-50), var(--s-100), var(--s-700));
     }
 
     &.success {
-      @include button-style(var(--g-100), var(--g-50), var(--g-700));
+      @include button-style(var(--g-50), var(--g-100), var(--g-700));
     }
 
     &.alert {
-      @include button-style(var(--r-100), var(--r-50), var(--r-700));
+      @include button-style(var(--r-50), var(--r-100), var(--r-700));
     }
 
     &.warning {
-      @include button-style(var(--y-200), var(--y-100), var(--y-900));
+      @include button-style(var(--y-100), var(--y-200), var(--y-900));
     }
   }
 
@@ -81,6 +74,25 @@
     height: var(--space-larger);
   }
 
+  &.button--only-icon {
+    justify-content: center;
+    padding-left: 0;
+    padding-right: 0;
+    width: $default-button-height;
+
+    &.tiny {
+      width: var(--space-medium);
+    }
+
+    &.small {
+      width: var(--space-large);
+    }
+
+    &.large {
+      width: var(--space-larger);
+    }
+  }
+
   &.link {
     height: auto;
     margin: 0;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index c09812527..8a53545fe 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -52,25 +52,4 @@
     }
   }
 
-  .file-uploads>label {
-    cursor: pointer;
-
-    &:hover .button--emoji {
-      background: var(--b-200);
-    }
-  }
-
-  .bottom-box .button--emoji.button--upload {
-    padding: 0;
-
-    .file-uploads {
-      height: 100%;
-      line-height: var(--space-large);
-      width: 100%;
-    }
-
-    label {
-      padding: var(--space-small);
-    }
-  }
 }
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 0343a20ff..5c429d237 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -6,6 +6,7 @@
         class-names="resolve"
         color-scheme="success"
         icon="ion-checkmark"
+        emoji="✅"
         :is-loading="isLoading"
         @click="() => toggleStatus(STATUS_TYPE.RESOLVED)"
       >
@@ -16,6 +17,7 @@
         class-names="resolve"
         color-scheme="warning"
         icon="ion-refresh"
+        emoji="👀"
         :is-loading="isLoading"
         @click="() => toggleStatus(STATUS_TYPE.OPEN)"
       >
@@ -36,9 +38,9 @@
         :color-scheme="buttonClass"
         :disabled="isLoading"
         icon="ion-arrow-down-b"
+        emoji="🔽"
         @click="openDropdown"
-      >
-      </woot-button>
+      />
     </div>
     <div
       v-if="showDropdown"
diff --git a/app/javascript/dashboard/components/ui/WootButton.vue b/app/javascript/dashboard/components/ui/WootButton.vue
index a71e5388e..fab786238 100644
--- a/app/javascript/dashboard/components/ui/WootButton.vue
+++ b/app/javascript/dashboard/components/ui/WootButton.vue
@@ -6,16 +6,22 @@
     @click="handleClick"
   >
     <spinner v-if="isLoading" size="small" />
-    <i v-else-if="icon" class="icon" :class="icon"></i>
+    <emoji-or-icon
+      v-else-if="icon || emoji"
+      class="icon"
+      :emoji="emoji"
+      :icon="icon"
+    />
     <span v-if="$slots.default" class="button__content"><slot></slot></span>
   </button>
 </template>
 <script>
-import Spinner from 'shared/components/Spinner.vue';
+import Spinner from 'shared/components/Spinner';
+import EmojiOrIcon from 'shared/components/EmojiOrIcon';
 
 export default {
   name: 'WootButton',
-  components: { Spinner },
+  components: { EmojiOrIcon, Spinner },
   props: {
     variant: {
       type: String,
@@ -29,12 +35,16 @@ export default {
       type: String,
       default: '',
     },
+    emoji: {
+      type: String,
+      default: '',
+    },
     colorScheme: {
       type: String,
       default: 'primary',
     },
     classNames: {
-      type: String,
+      type: [String, Object],
       default: '',
     },
     isDisabled: {
@@ -57,9 +67,15 @@ export default {
       }
       return this.variant;
     },
+    hasOnlyIconClasses() {
+      const hasEmojiOrIcon = this.emoji || this.icon;
+      if (!this.$slots.default && hasEmojiOrIcon) return 'button--only-icon';
+      return '';
+    },
     buttonClasses() {
       return [
         this.variantClasses,
+        this.hasOnlyIconClasses,
         this.size,
         this.colorScheme,
         this.classNames,
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 28289472f..60e7625e5 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -1,34 +1,42 @@
 <template>
   <div class="bottom-box" :class="wrapClass">
     <div class="left-wrap">
-      <button
-        class="button clear button--emoji"
+      <woot-button
         :title="$t('CONVERSATION.REPLYBOX.TIP_EMOJI_ICON')"
+        icon="ion-happy-outline"
+        emoji="😊"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
         @click="toggleEmojiPicker"
+      />
+
+      <file-upload
+        :size="4096 * 4096"
+        accept="image/*, application/pdf, audio/mpeg, video/mp4, audio/ogg, text/csv"
+        @input-file="onFileUpload"
       >
-        <emoji-or-icon icon="ion-happy-outline" emoji="😊" />
-      </button>
-      <button
-        v-if="showAttachButton"
-        class="button clear button--emoji button--upload"
-        :title="$t('CONVERSATION.REPLYBOX.TIP_ATTACH_ICON')"
-      >
-        <file-upload
-          :size="4096 * 4096"
-          accept="image/*, application/pdf, audio/mpeg, video/mp4, audio/ogg, text/csv"
-          @input-file="onFileUpload"
-        >
-          <emoji-or-icon icon="ion-android-attach" emoji="📎" />
-        </file-upload>
-      </button>
-      <button
+        <woot-button
+          v-if="showAttachButton"
+          class-names="button--upload"
+          :title="$t('CONVERSATION.REPLYBOX.TIP_ATTACH_ICON')"
+          icon="ion-android-attach"
+          emoji="📎"
+          color-scheme="secondary"
+          variant="smooth"
+          size="small"
+        />
+      </file-upload>
+      <woot-button
         v-if="enableRichEditor && !isOnPrivateNote"
-        class="button clear button--emoji"
+        icon="ion-quote"
+        emoji="🖊️"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
         :title="$t('CONVERSATION.REPLYBOX.TIP_FORMAT_ICON')"
         @click="toggleFormatMode"
-      >
-        <emoji-or-icon icon="ion-quote" emoji="🖊️" />
-      </button>
+      />
     </div>
     <div class="right-wrap">
       <div v-if="isFormatMode" class="enter-to-send--checkbox">
@@ -42,25 +50,25 @@
           {{ $t('CONVERSATION.REPLYBOX.ENTER_TO_SEND') }}
         </label>
       </div>
-      <button
-        class="button nice primary button--send"
-        :class="buttonClass"
+      <woot-button
+        size="small"
+        :class-names="buttonClass"
+        :is-disabled="isSendDisabled"
         @click="onSend"
       >
         {{ sendButtonText }}
-      </button>
+      </woot-button>
     </div>
   </div>
 </template>
 
 <script>
 import FileUpload from 'vue-upload-component';
-import EmojiOrIcon from 'shared/components/EmojiOrIcon';
 
 import { REPLY_EDITOR_MODES } from './constants';
 export default {
   name: 'ReplyTopPanel',
-  components: { EmojiOrIcon, FileUpload },
+  components: { FileUpload },
   props: {
     mode: {
       type: String,
@@ -126,8 +134,7 @@ export default {
     },
     buttonClass() {
       return {
-        'button--note': this.isNote,
-        'button--disabled': this.isSendDisabled,
+        warning: this.isNote,
       };
     },
     showAttachButton() {
@@ -146,9 +153,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~widget/assets/scss/variables.scss';
-@import '~widget/assets/scss/mixins.scss';
-
 .bottom-box {
   display: flex;
   justify-content: space-between;
@@ -159,39 +163,8 @@ export default {
   }
 }
 
-.button {
-  &.button--emoji {
-    margin-right: var(--space-small);
-  }
-
-  &.is-active {
-    background: white;
-  }
-
-  &.button--note {
-    background: var(--y-800);
-    color: white;
-
-    &:hover {
-      background: var(--y-700);
-    }
-  }
-
-  &.button--disabled {
-    background: var(--b-100);
-    color: var(--b-400);
-    cursor: default;
-
-    &:hover {
-      background: var(--b-100);
-    }
-  }
-}
-
-.bottom-box.is-note-mode {
-  .button--emoji {
-    background: white;
-  }
+.left-wrap .button {
+  margin-right: var(--space-small);
 }
 
 .left-wrap {
@@ -199,15 +172,6 @@ export default {
   display: flex;
 }
 
-.button--reply {
-  border-right: 1px solid var(--color-border-light);
-}
-
-.icon--font {
-  color: var(--s-600);
-  font-size: var(--font-size-default);
-}
-
 .right-wrap {
   display: flex;
 
@@ -225,4 +189,13 @@ export default {
     }
   }
 }
+
+::v-deep .file-uploads {
+  label {
+    cursor: pointer;
+  }
+  &:hover .button {
+    background: var(--s-100);
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
index f3e718464..fe0e30861 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
@@ -14,19 +14,17 @@
       </div>
       <div class="actions">
         <woot-button
-          variant="clear"
+          variant="smooth"
           size="small"
           icon="ion-compose"
           color-scheme="secondary"
-          class-names="button--emoji"
           @click="onEdit"
         />
         <woot-button
-          variant="clear"
+          variant="smooth"
           size="small"
           icon="ion-trash-b"
           color-scheme="secondary"
-          class-names="button--emoji"
           @click="onDelete"
         />
       </div>
@@ -111,12 +109,12 @@ export default {
   .actions {
     display: flex;
     visibility: hidden;
-  }
 
-  .button--emoji {
-    margin-left: var(--space-small);
-    height: var(--space-medium);
-    width: var(--space-medium);
+    .button {
+      margin-left: var(--space-small);
+      height: var(--space-medium);
+      width: var(--space-medium);
+    }
   }
 }
 
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue
index 2fe47a66e..49755d1d2 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ReminderItem.vue
@@ -23,20 +23,18 @@
         </div>
         <div class="actions">
           <woot-button
-            variant="clear"
+            variant="smooth"
             size="small"
             icon="ion-compose"
             color-scheme="secondary"
-            class-names="button--emoji"
             class="action-button"
             @click="onEdit"
           />
           <woot-button
-            variant="clear"
+            variant="smooth"
             size="small"
             icon="ion-trash-b"
             color-scheme="secondary"
-            class-names="button--emoji"
             class="action-button"
             @click="onDelete"
           />

From 77d4f86ec951ad2c631a33f48475ac5754d9fcce Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Wed, 9 Jun 2021 18:25:05 +0530
Subject: [PATCH 50/67] chore: Clean up contact note styles (#2404)

---
 .../contacts/components/ContactNote.stories.js    |  2 +-
 .../dashboard/contacts/components/ContactNote.vue | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js
index 00d766a49..36d97af1a 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js
@@ -24,7 +24,7 @@ export default {
       },
     },
     timeStamp: {
-      defaultValue: '1618046084',
+      defaultValue: 1618046084,
       control: {
         type: 'number',
       },
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
index fe0e30861..715b4e375 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
@@ -6,7 +6,7 @@
     <div class="footer">
       <div class="meta">
         <div :title="userName">
-          <Thumbnail :src="thumbnail" :username="userName" size="16px" />
+          <thumbnail :src="thumbnail" :username="userName" size="16px" />
         </div>
         <div class="date-wrap">
           <span>{{ readableTime }}</span>
@@ -15,14 +15,14 @@
       <div class="actions">
         <woot-button
           variant="smooth"
-          size="small"
+          size="tiny"
           icon="ion-compose"
           color-scheme="secondary"
           @click="onEdit"
         />
         <woot-button
           variant="smooth"
-          size="small"
+          size="tiny"
           icon="ion-trash-b"
           color-scheme="secondary"
           @click="onDelete"
@@ -33,14 +33,12 @@
 </template>
 
 <script>
-import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import timeMixin from 'dashboard/mixins/time';
-import WootButton from 'dashboard/components/ui/WootButton.vue';
 
 export default {
   components: {
     Thumbnail,
-    WootButton,
   },
 
   mixins: [timeMixin],
@@ -88,12 +86,13 @@ export default {
 <style lang="scss" scoped>
 .note__content {
   font-size: var(--font-size-mini);
-  margin-bottom: var(--space-small);
+  margin-bottom: var(--space-smaller);
 }
 
 .footer {
   display: flex;
   justify-content: space-between;
+  align-items: flex-end;
 
   .meta {
     display: flex;
@@ -112,8 +111,6 @@ export default {
 
     .button {
       margin-left: var(--space-small);
-      height: var(--space-medium);
-      width: var(--space-medium);
     }
   }
 }

From 174886671dbcab03a2c1edaa6a7b4e7a9638aa7b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 9 Jun 2021 21:26:23 +0530
Subject: [PATCH 51/67] feat: Add the ability to edit inbox name (#2406)

---
 .../dashboard/i18n/locale/en/inboxMgmt.json   | 12 ++++++++----
 .../dashboard/settings/inbox/Settings.vue     | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index f5d164324..09e4c9e9b 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website Domain",
           "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index f1ee1980c..a6c1701f2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -25,13 +25,10 @@
           @change="handleImageUpload"
         />
         <woot-input
-          v-if="isAWebWidgetInbox"
           v-model.trim="selectedInboxName"
           class="medium-9 columns"
-          :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.LABEL')"
-          :placeholder="
-            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.PLACEHOLDER')
-          "
+          :label="inboxNameLabel"
+          :placeholder="inboxNamePlaceHolder"
         />
         <woot-input
           v-if="isAWebWidgetInbox"
@@ -381,6 +378,18 @@ export default {
     messengerScript() {
       return createMessengerScript(this.inbox.page_id);
     },
+    inboxNameLabel() {
+      if (this.isAWebWidgetInbox) {
+        return this.$t('INBOX_MGMT.ADD.WEBSITE_NAME.LABEL');
+      }
+      return this.$t('INBOX_MGMT.ADD.CHANNEL_NAME.LABEL');
+    },
+    inboxNamePlaceHolder() {
+      if (this.isAWebWidgetInbox) {
+        return this.$t('INBOX_MGMT.ADD.WEBSITE_NAME.PLACEHOLDER');
+      }
+      return this.$t('INBOX_MGMT.ADD.CHANNEL_NAME.PLACEHOLDER');
+    },
   },
   watch: {
     $route(to) {

From 8ca63f0b79dbe3f1e227528fe5f8fe001f24eec8 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 10 Jun 2021 09:35:15 +0530
Subject: [PATCH 52/67] chore: Cleanup page-top-bar style conflicts (#2407)

* chore: Class name cleanup page-top-bar.

* prettier spacing fixes

* Review fixes and adds storybook

* Circleci fixes
---
 .../assets/scss/views/settings/inbox.scss     |  5 ---
 .../dashboard/components/layout/Sidebar.vue   |  4 ---
 .../widgets/SettingIntroBanner.stories.js     | 30 +++++++++++++++++
 .../components/widgets/SettingIntroBanner.vue | 33 +++++++++++++++++++
 .../dashboard/settings/inbox/Settings.vue     | 18 ++++------
 .../settings/inbox/components/AddCampaign.vue |  5 ---
 .../inbox/components/EditCampaign.vue         |  5 ---
 7 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/SettingIntroBanner.stories.js
 create mode 100644 app/javascript/dashboard/components/widgets/SettingIntroBanner.vue

diff --git a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
index 27ff6fb1f..cc2abcf9b 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
@@ -1,9 +1,5 @@
 .settings {
   overflow: auto;
-
-  .page-top-bar {
-    @include padding($space-normal $space-two $zero);
-  }
 }
 
 // Conversation header - Light BG
@@ -27,7 +23,6 @@
     @include flex-align($x: center, $y: middle);
     @include margin($zero);
   }
-
 }
 
 .wizard-box {
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index d448eac22..996494789 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -264,10 +264,6 @@ export default {
   .modal-container {
     width: 40rem;
   }
-
-  .page-top-bar {
-    padding-bottom: $space-two;
-  }
 }
 
 .account-selector {
diff --git a/app/javascript/dashboard/components/widgets/SettingIntroBanner.stories.js b/app/javascript/dashboard/components/widgets/SettingIntroBanner.stories.js
new file mode 100644
index 000000000..47286ae21
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/SettingIntroBanner.stories.js
@@ -0,0 +1,30 @@
+import SettingIntroBanner from './SettingIntroBanner';
+
+export default {
+  title: 'Components/Settings/Banner',
+  component: SettingIntroBanner,
+  argTypes: {
+    headerTitle: {
+      defaultValue: 'Acme Support',
+      control: {
+        type: 'text',
+      },
+    },
+    headerContent: {
+      defaultValue:
+        'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { SettingIntroBanner },
+  template: '<setting-intro-banner v-bind="$props" ></setting-intro-banner>',
+});
+
+export const Banner = Template.bind({});
+Banner.args = {};
diff --git a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
new file mode 100644
index 000000000..557880056
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="column page-top-banner">
+    <h2 class="page-sub-title">
+      {{ headerTitle }}
+    </h2>
+    <p v-if="headerContent" class="small-12 column">
+      {{ headerContent }}
+    </p>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    headerTitle: {
+      type: String,
+      default: '',
+    },
+    headerContent: {
+      type: String,
+      default: '',
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.page-top-banner {
+  border-bottom: 1px solid var(--color-border);
+  background: var(--color-background-light);
+  padding: var(--space-normal) var(--space-large) 0;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index a6c1701f2..4cd8a4d12 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settings columns container">
-    <woot-modal-header
+    <setting-intro-banner
       :header-image="inbox.avatarUrl"
       :header-title="inboxName"
     >
@@ -12,7 +12,7 @@
           :show-badge="false"
         />
       </woot-tabs>
-    </woot-modal-header>
+    </setting-intro-banner>
 
     <div v-if="selectedTabKey === 'inbox_settings'" class="settings--content">
       <settings-section
@@ -265,6 +265,7 @@ import { mapGetters } from 'vuex';
 import { createMessengerScript } from 'dashboard/helper/scriptGenerator';
 import configMixin from 'shared/mixins/configMixin';
 import alertMixin from 'shared/mixins/alertMixin';
+import SettingIntroBanner from 'dashboard/components/widgets/SettingIntroBanner';
 import SettingsSection from '../../../../components/SettingsSection';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import FacebookReauthorize from './facebook/Reauthorize';
@@ -274,6 +275,7 @@ import Campaign from './components/Campaign';
 
 export default {
   components: {
+    SettingIntroBanner,
     SettingsSection,
     FacebookReauthorize,
     PreChatFormSettings,
@@ -518,15 +520,9 @@ export default {
     }
   }
 
-  .page-top-bar {
-    @include background-light;
-    @include border-normal-bottom;
-    padding: $space-normal $space-large 0;
-
-    .tabs {
-      padding: 0;
-      margin-bottom: -1px;
-    }
+  .tabs {
+    padding: 0;
+    margin-bottom: -1px;
   }
 }
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
index a528c08d5..70be87feb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
@@ -207,8 +207,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.content-box .page-top-bar::v-deep {
-  padding: var(--space-large) var(--space-large) var(--space-zero);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
index 61c873ad4..143dc7a5a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
@@ -239,8 +239,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.content-box .page-top-bar::v-deep {
-  padding: var(--space-large) var(--space-large) var(--space-zero);
-}
-</style>

From b9e40d145236967d2aa7bfdca5b9d899e142ed49 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 10 Jun 2021 15:04:03 +0530
Subject: [PATCH 53/67] feat: Add an option to enable/disable email collect box
 (#2399)

* add email collect enabled migration

* migrations

* expose enable_email_collect field

* add select for email collect

* add enable_email condition on new conversation

* add default value true for enable_email_collect

* add specs for email collect enabled

* rereun migration

* code cleanup

* update token life span to 2 months

* revert uuid column
---
 .../api/v1/accounts/inboxes_controller.rb     |  4 ++--
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  6 ++++++
 .../dashboard/settings/inbox/Settings.vue     | 20 +++++++++++++++++++
 app/models/inbox.rb                           |  1 +
 .../hook_execution_service.rb                 |  2 +-
 app/views/api/v1/models/_inbox.json.jbuilder  |  1 +
 config/initializers/devise_token_auth.rb      |  2 +-
 ...0609133433_add_email_collect_to_inboxes.rb |  5 +++++
 db/schema.rb                                  |  3 ++-
 .../hook_execution_service_spec.rb            | 19 ++++++++++++++++--
 10 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20210609133433_add_email_collect_to_inboxes.rb

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 8a5f5b9b9..12c7a29e6 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -87,12 +87,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :avatar, :name, :greeting_message, :greeting_enabled, channel:
+    params.permit(:id, :avatar, :name, :greeting_message, :greeting_enabled, :enable_email_collect, channel:
       [:type, :website_url, :widget_color, :welcome_title, :welcome_tagline, :webhook_url, :email, :reply_time])
   end
 
   def inbox_update_params
-    params.permit(:enable_auto_assignment, :name, :avatar, :greeting_message, :greeting_enabled,
+    params.permit(:enable_auto_assignment, :enable_email_collect, :name, :avatar, :greeting_message, :greeting_enabled,
                   :working_hours_enabled, :out_of_office_message, :timezone,
                   channel: [
                     :website_url,
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 09e4c9e9b..8948adfc4 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -212,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
       }
     },
     "DELETE": {
@@ -248,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 4cd8a4d12..e44f75eb4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -138,6 +138,23 @@
           </p>
         </label>
 
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_EMAIL_COLLECT_BOX') }}
+          <select v-model="emailCollectEnabled">
+            <option :value="true">
+              {{ $t('INBOX_MGMT.EDIT.EMAIL_COLLECT_BOX.ENABLED') }}
+            </option>
+            <option :value="false">
+              {{ $t('INBOX_MGMT.EDIT.EMAIL_COLLECT_BOX.DISABLED') }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{
+              $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT')
+            }}
+          </p>
+        </label>
+
         <label class="medium-9 columns">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
           <select v-model="autoAssignment">
@@ -291,6 +308,7 @@ export default {
       greetingEnabled: true,
       greetingMessage: '',
       autoAssignment: false,
+      emailCollectEnabled: false,
       isAgentListUpdating: false,
       selectedInboxName: '',
       channelWebsiteUrl: '',
@@ -432,6 +450,7 @@ export default {
         this.greetingEnabled = this.inbox.greeting_enabled;
         this.greetingMessage = this.inbox.greeting_message;
         this.autoAssignment = this.inbox.enable_auto_assignment;
+        this.emailCollectEnabled = this.inbox.enable_email_collect;
         this.channelWebsiteUrl = this.inbox.website_url;
         this.channelWelcomeTitle = this.inbox.welcome_title;
         this.channelWelcomeTagline = this.inbox.welcome_tagline;
@@ -472,6 +491,7 @@ export default {
           id: this.currentInboxId,
           name: this.selectedInboxName,
           enable_auto_assignment: this.autoAssignment,
+          enable_email_collect: this.emailCollectEnabled,
           greeting_enabled: this.greetingEnabled,
           greeting_message: this.greetingMessage || '',
           channel: {
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index e1b330bbf..e331901cb 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -8,6 +8,7 @@
 #  channel_type           :string
 #  email_address          :string
 #  enable_auto_assignment :boolean          default(TRUE)
+#  enable_email_collect   :boolean          default(TRUE)
 #  greeting_enabled       :boolean          default(FALSE)
 #  greeting_message       :string
 #  name                   :string           not null
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index 53c334f88..9700ff78b 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -9,7 +9,7 @@ class MessageTemplates::HookExecutionService
     # ::MessageTemplates::Template::OutOfOffice.new(conversation: conversation).perform if should_send_out_of_office_message?
 
     ::MessageTemplates::Template::Greeting.new(conversation: conversation).perform if should_send_greeting?
-    ::MessageTemplates::Template::EmailCollect.new(conversation: conversation).perform if should_send_email_collect?
+    ::MessageTemplates::Template::EmailCollect.new(conversation: conversation).perform if inbox.enable_email_collect && should_send_email_collect?
   end
 
   private
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index db122de37..0a4148b53 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -5,6 +5,7 @@ json.channel_type resource.channel_type
 json.greeting_enabled resource.greeting_enabled
 json.greeting_message resource.greeting_message
 json.working_hours_enabled resource.working_hours_enabled
+json.enable_email_collect resource.enable_email_collect
 json.out_of_office_message resource.out_of_office_message
 json.working_hours resource.weekly_schedule
 json.timezone resource.timezone
diff --git a/config/initializers/devise_token_auth.rb b/config/initializers/devise_token_auth.rb
index b70738bf3..07904e621 100644
--- a/config/initializers/devise_token_auth.rb
+++ b/config/initializers/devise_token_auth.rb
@@ -7,7 +7,7 @@ DeviseTokenAuth.setup do |config|
 
   # By default, users will need to re-authenticate after 2 weeks. This setting
   # determines how long tokens will remain valid after they are issued.
-  # config.token_lifespan = 2.weeks
+  config.token_lifespan = 2.months
 
   # Sets the max number of concurrent devices per user, which is 10 by default.
   # After this limit is reached, the oldest tokens will be removed.
diff --git a/db/migrate/20210609133433_add_email_collect_to_inboxes.rb b/db/migrate/20210609133433_add_email_collect_to_inboxes.rb
new file mode 100644
index 000000000..f4da1f73e
--- /dev/null
+++ b/db/migrate/20210609133433_add_email_collect_to_inboxes.rb
@@ -0,0 +1,5 @@
+class AddEmailCollectToInboxes < ActiveRecord::Migration[6.0]
+  def change
+    add_column :inboxes, :enable_email_collect, :boolean, default: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 884c208d2..ec4849f74 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_05_27_173755) do
+ActiveRecord::Schema.define(version: 2021_06_09_133433) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -322,6 +322,7 @@ ActiveRecord::Schema.define(version: 2021_05_27_173755) do
     t.boolean "working_hours_enabled", default: false
     t.string "out_of_office_message"
     t.string "timezone", default: "UTC"
+    t.boolean "enable_email_collect", default: true
     t.index ["account_id"], name: "index_inboxes_on_account_id"
   end
 
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index 2b8748daf..435d6b4d3 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -7,7 +7,7 @@ describe ::MessageTemplates::HookExecutionService do
       conversation = create(:conversation, contact: contact)
 
       # ensure greeting hook is enabled and greeting_message is present
-      conversation.inbox.update(greeting_enabled: true, greeting_message: 'Hi, this is a greeting message')
+      conversation.inbox.update(greeting_enabled: true, enable_email_collect: true, greeting_message: 'Hi, this is a greeting message')
 
       email_collect_service = double
       greeting_service = double
@@ -55,7 +55,7 @@ describe ::MessageTemplates::HookExecutionService do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
       # ensure greeting hook is enabled
-      conversation.inbox.update(greeting_enabled: true)
+      conversation.inbox.update(greeting_enabled: true, enable_email_collect: true)
 
       email_collect_service = double
 
@@ -70,6 +70,21 @@ describe ::MessageTemplates::HookExecutionService do
       expect(::MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
       expect(email_collect_service).to have_received(:perform)
     end
+
+    it 'doesnot calls ::MessageTemplates::Template::EmailCollect when enable_email_collect form is disabled' do
+      contact = create(:contact, email: nil)
+      conversation = create(:conversation, contact: contact)
+
+      conversation.inbox.update(enable_email_collect: false)
+      # ensure prechat form is enabled
+      conversation.inbox.channel.update(pre_chat_form_enabled: true)
+      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
+
+      # described class gets called in message after commit
+      message = create(:message, conversation: conversation)
+
+      expect(::MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
+    end
   end
 
   # TODO: remove this if this hook is removed

From 5a95c74bf6f72970b6be5bf34acd2280c93e1273 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 10 Jun 2021 16:11:55 +0530
Subject: [PATCH 54/67] fix: Add missing translation in inbox settings page
 (#2411)

---
 .../routes/dashboard/settings/inbox/channels/Website.vue    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
index c992d38a0..4319c76e3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
@@ -15,13 +15,11 @@
     >
       <div class="medium-12 columns">
         <label>
-          {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.LABEL') }}
+          {{ $t('INBOX_MGMT.ADD.WEBSITE_NAME.LABEL') }}
           <input
             v-model.trim="inboxName"
             type="text"
-            :placeholder="
-              $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.PLACEHOLDER')
-            "
+            :placeholder="$t('INBOX_MGMT.ADD.WEBSITE_NAME.PLACEHOLDER')"
           />
         </label>
       </div>

From 534acfbf96778610b82146cb653b78fdc2a22d5b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 11 Jun 2021 11:44:31 +0530
Subject: [PATCH 55/67] chore: Ensure privilege validations for API endpoints
 (#2224)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/controllers/api/base_controller.rb        |   4 +
 .../contacts/contact_inboxes_controller.rb    |   1 +
 .../contacts/conversations_controller.rb      |   4 +-
 .../api/v1/accounts/contacts_controller.rb    |   3 +-
 .../accounts/conversations/base_controller.rb |   1 +
 .../v1/accounts/conversations_controller.rb   |  11 +-
 .../v1/accounts/inbox_members_controller.rb   |  16 ++-
 .../api/v1/accounts/inboxes_controller.rb     |   1 +
 .../accounts/integrations/apps_controller.rb  |   1 +
 .../accounts/integrations/slack_controller.rb |   1 +
 .../api/v2/accounts/reports_controller.rb     |   6 +
 app/finders/conversation_finder.rb            |  14 +-
 app/models/user.rb                            |   2 +-
 app/policies/conversation_policy.rb           |   5 +
 app/policies/inbox_policy.rb                  |  13 +-
 .../api/v1/accounts/agents_controller_spec.rb |  32 ++++-
 .../contact_inboxes_controller_spec.rb        |  10 +-
 .../v1/accounts/contacts_controller_spec.rb   |  21 ++-
 .../assignments_controller_spec.rb            |   8 +-
 .../conversations/labels_controller_spec.rb   |  13 +-
 .../conversations/messages_controller_spec.rb |  22 ++-
 .../accounts/conversations_controller_spec.rb | 135 +++++++++++++-----
 .../accounts/inbox_members_controller_spec.rb |  46 +++++-
 .../v1/accounts/inboxes_controller_spec.rb    |   4 +
 .../integrations/apps_controller_spec.rb      |   4 +-
 .../api/v2/accounts/report_controller_spec.rb |  74 +++++++---
 .../integrations/slack_request_spec.rb        |   2 +-
 27 files changed, 335 insertions(+), 119 deletions(-)
 create mode 100644 app/policies/conversation_policy.rb

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 0cfd7205b..937cd5502 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -16,4 +16,8 @@ class Api::BaseController < ApplicationController
 
     authorize(model)
   end
+
+  def check_admin_authorization?
+    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
+  end
 end
diff --git a/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb b/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
index 16686dbfe..fa5b271bf 100644
--- a/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
@@ -11,6 +11,7 @@ class Api::V1::Accounts::Contacts::ContactInboxesController < Api::V1::Accounts:
 
   def ensure_inbox
     @inbox = Current.account.inboxes.find(params[:inbox_id])
+    authorize @inbox, :show?
   end
 
   def ensure_contact
diff --git a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
index 576fbaa2f..4ccc14729 100644
--- a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
@@ -8,9 +8,7 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::
   private
 
   def inbox_ids
-    if Current.user.administrator?
-      Current.account.inboxes.pluck(:id)
-    elsif Current.user.agent?
+    if Current.user.administrator? || Current.user.agent?
       Current.user.assigned_inboxes.pluck(:id)
     else
       []
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index ac27314fc..46f6b83c7 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -48,7 +48,8 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def show; end
 
   def contactable_inboxes
-    @contactable_inboxes = Contacts::ContactableInboxesService.new(contact: @contact).get
+    @all_contactable_inboxes = Contacts::ContactableInboxesService.new(contact: @contact).get
+    @contactable_inboxes = @all_contactable_inboxes.select { |contactable_inbox| policy(contactable_inbox[:inbox]).show? }
   end
 
   def create
diff --git a/app/controllers/api/v1/accounts/conversations/base_controller.rb b/app/controllers/api/v1/accounts/conversations/base_controller.rb
index 2dae59abd..f521719ae 100644
--- a/app/controllers/api/v1/accounts/conversations/base_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/base_controller.rb
@@ -5,5 +5,6 @@ class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::Base
 
   def conversation
     @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
+    authorize @conversation.inbox, :show?
   end
 end
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 91381095d..9f4f0b45d 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
   include Events::Types
 
-  before_action :conversation, except: [:index]
+  before_action :conversation, except: [:index, :meta, :search, :create]
   before_action :contact_inbox, only: [:create]
 
   def index
@@ -79,21 +79,26 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def conversation
-    @conversation ||= Current.account.conversations.find_by(display_id: params[:id])
+    @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
+    authorize @conversation.inbox, :show?
   end
 
   def contact_inbox
     @contact_inbox = build_contact_inbox
 
     @contact_inbox ||= ::ContactInbox.find_by!(source_id: params[:source_id])
+    authorize @contact_inbox.inbox, :show?
   end
 
   def build_contact_inbox
     return if params[:contact_id].blank? || params[:inbox_id].blank?
 
+    inbox = Current.account.inboxes.find(params[:inbox_id])
+    authorize inbox, :show?
+
     ContactInboxBuilder.new(
       contact_id: params[:contact_id],
-      inbox_id: params[:inbox_id],
+      inbox_id: inbox.id,
       source_id: params[:source_id]
     ).perform
   end
diff --git a/app/controllers/api/v1/accounts/inbox_members_controller.rb b/app/controllers/api/v1/accounts/inbox_members_controller.rb
index f715c7040..27e31c855 100644
--- a/app/controllers/api/v1/accounts/inbox_members_controller.rb
+++ b/app/controllers/api/v1/accounts/inbox_members_controller.rb
@@ -3,15 +3,19 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
   before_action :current_agents_ids, only: [:create]
 
   def create
-    # update also done via same action
-    update_agents_list
-    head :ok
-  rescue StandardError => e
-    Rails.logger.debug "Rescued: #{e.inspect}"
-    render_could_not_create_error('Could not add agents to inbox')
+    authorize @inbox, :create?
+    begin
+      # update also done via same action
+      update_agents_list
+      head :ok
+    rescue StandardError => e
+      Rails.logger.debug "Rescued: #{e.inspect}"
+      render_could_not_create_error('Could not add agents to inbox')
+    end
   end
 
   def show
+    authorize @inbox, :show?
     @agents = Current.account.users.where(id: @inbox.members.select(:user_id))
   end
 
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 12c7a29e6..a51681617 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -62,6 +62,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def fetch_inbox
     @inbox = Current.account.inboxes.find(params[:id])
+    authorize @inbox, :show?
   end
 
   def fetch_agent_bot
diff --git a/app/controllers/api/v1/accounts/integrations/apps_controller.rb b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
index f88cc7c5f..7ec5cc5ec 100644
--- a/app/controllers/api/v1/accounts/integrations/apps_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
@@ -1,4 +1,5 @@
 class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseController
+  before_action :check_admin_authorization?
   before_action :fetch_apps, only: [:index]
   before_action :fetch_app, only: [:show]
 
diff --git a/app/controllers/api/v1/accounts/integrations/slack_controller.rb b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
index 5ded9f512..537ddd688 100644
--- a/app/controllers/api/v1/accounts/integrations/slack_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
@@ -1,4 +1,5 @@
 class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::BaseController
+  before_action :check_admin_authorization?
   before_action :fetch_hook, only: [:update, :destroy]
 
   def create
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 3203f34e9..8fc980255 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -1,4 +1,6 @@
 class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
+  before_action :check_authorization
+
   def account
     builder = V2::ReportBuilder.new(Current.account, account_report_params)
     data = builder.build
@@ -23,6 +25,10 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
 
   private
 
+  def check_authorization
+    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
+  end
+
   def account_summary_params
     {
       type: :account,
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 4336aff11..8791da5b9 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -48,15 +48,11 @@ class ConversationFinder
   private
 
   def set_inboxes
-    if params[:inbox_id]
-      @inbox_ids = current_account.inboxes.where(id: params[:inbox_id])
-    else
-      if @current_user.administrator?
-        @inbox_ids = current_account.inboxes.pluck(:id)
-      elsif @current_user.agent?
-        @inbox_ids = @current_user.assigned_inboxes.pluck(:id)
-      end
-    end
+    @inbox_ids = if params[:inbox_id]
+                   current_account.inboxes.where(id: params[:inbox_id])
+                 else
+                   @current_user.assigned_inboxes.pluck(:id)
+                 end
   end
 
   def set_assignee_type
diff --git a/app/models/user.rb b/app/models/user.rb
index fefe8669d..460608178 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,7 +122,7 @@ class User < ApplicationRecord
   end
 
   def assigned_inboxes
-    inboxes.where(account_id: Current.account.id)
+    administrator? ? Current.account.inboxes : inboxes.where(account_id: Current.account.id)
   end
 
   def administrator?
diff --git a/app/policies/conversation_policy.rb b/app/policies/conversation_policy.rb
new file mode 100644
index 000000000..133cb3b02
--- /dev/null
+++ b/app/policies/conversation_policy.rb
@@ -0,0 +1,5 @@
+class ConversationPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+end
diff --git a/app/policies/inbox_policy.rb b/app/policies/inbox_policy.rb
index 0bfe6fe40..dd3aa9305 100644
--- a/app/policies/inbox_policy.rb
+++ b/app/policies/inbox_policy.rb
@@ -11,11 +11,7 @@ class InboxPolicy < ApplicationPolicy
     end
 
     def resolve
-      if @account_user.administrator?
-        scope.all
-      elsif @account_user.agent?
-        user.assigned_inboxes
-      end
+      user.assigned_inboxes
     end
   end
 
@@ -23,6 +19,13 @@ class InboxPolicy < ApplicationPolicy
     true
   end
 
+  def show?
+    # FIXME: for agent bots, lets bring this validation to policies as well in future
+    return true if @user.blank?
+
+    Current.user.assigned_inboxes.include? record
+  end
+
   def assignable_agents?
     true
   end
diff --git a/spec/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
index f0efad1e1..832840b34 100644
--- a/spec/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -2,6 +2,8 @@ require 'rails_helper'
 
 RSpec.describe 'Agents API', type: :request do
   let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
 
   describe 'GET /api/v1/accounts/{account.id}/agents' do
     context 'when it is an unauthenticated user' do
@@ -38,7 +40,13 @@ RSpec.describe 'Agents API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:admin) { create(:user, account: account, role: :administrator) }
+      it 'returns unauthorized for agents' do
+        delete "/api/v1/accounts/#{account.id}/agents/#{other_agent.id}",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
 
       it 'deletes an agent' do
         delete "/api/v1/accounts/#{account.id}/agents/#{other_agent.id}",
@@ -63,10 +71,17 @@ RSpec.describe 'Agents API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:admin) { create(:user, account: account, role: :administrator) }
-
       params = { name: 'TestUser' }
 
+      it 'returns unauthorized for agents' do
+        put "/api/v1/accounts/#{account.id}/agents/#{other_agent.id}",
+            params: params,
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
       it 'modifies an agent' do
         put "/api/v1/accounts/#{account.id}/agents/#{other_agent.id}",
             params: params,
@@ -91,10 +106,17 @@ RSpec.describe 'Agents API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:admin) { create(:user, account: account, role: :administrator) }
-
       params = { name: 'NewUser', email: Faker::Internet.email, role: :agent }
 
+      it 'returns unauthorized for agents' do
+        post "/api/v1/accounts/#{account.id}/agents",
+             params: params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
       it 'creates a new agent' do
         post "/api/v1/accounts/#{account.id}/agents",
              params: params,
diff --git a/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
index 6bf741347..80de09c40 100644
--- a/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/contact_inboxes', typ
   let(:contact) { create(:contact, account: account) }
   let(:channel_twilio_sms) { create(:channel_twilio_sms, account: account) }
   let(:channel_api) { create(:channel_api, account: account) }
-  let(:user) { create(:user, account: account) }
+  let(:agent) { create(:user, account: account) }
 
   describe 'GET /api/v1/accounts/{account.id}/contacts/:id/contact_inboxes' do
     context 'when unauthenticated user' do
@@ -15,12 +15,13 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/contact_inboxes', typ
       end
     end
 
-    context 'when user is logged in' do
+    context 'when authenticated user with access to inbox' do
       it 'creates a contact inbox' do
+        create(:inbox_member, inbox: channel_api.inbox, user: agent)
         expect do
           post "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/contact_inboxes",
                params: { inbox_id: channel_api.inbox.id },
-               headers: user.create_new_auth_token,
+               headers: agent.create_new_auth_token,
                as: :json
         end.to change(ContactInbox, :count).by(1)
 
@@ -29,10 +30,11 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/contact_inboxes', typ
       end
 
       it 'throws error for invalid source id' do
+        create(:inbox_member, inbox: channel_twilio_sms.inbox, user: agent)
         expect do
           post "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/contact_inboxes",
                params: { inbox_id: channel_twilio_sms.inbox.id },
-               headers: user.create_new_auth_token,
+               headers: agent.create_new_auth_token,
                as: :json
         end.to change(ContactInbox, :count).by(0)
 
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 8bc4e5724..12b58c90f 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -201,18 +201,29 @@ RSpec.describe 'Contacts API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:admin) { create(:user, account: account, role: :administrator) }
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let!(:twilio_sms) { create(:channel_twilio_sms, account: account) }
+      let!(:twilio_sms_inbox) { create(:inbox, channel: twilio_sms, account: account) }
+      let!(:twilio_whatsapp) { create(:channel_twilio_sms, medium: :whatsapp, account: account) }
+      let!(:twilio_whatsapp_inbox) { create(:inbox, channel: twilio_whatsapp, account: account) }
+
+      it 'shows the contactable inboxes which the user has access to' do
+        create(:inbox_member, user: agent, inbox: twilio_whatsapp_inbox)
 
-      it 'shows the contact' do
         inbox_service = double
         allow(Contacts::ContactableInboxesService).to receive(:new).and_return(inbox_service)
-        allow(inbox_service).to receive(:get).and_return({})
-        expect(inbox_service).to receive(:get).and_return({})
+        allow(inbox_service).to receive(:get).and_return([
+                                                           { source_id: '1123', inbox: twilio_sms_inbox },
+                                                           { source_id: '1123', inbox: twilio_whatsapp_inbox }
+                                                         ])
+        expect(inbox_service).to receive(:get)
         get "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/contactable_inboxes",
-            headers: admin.create_new_auth_token,
+            headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
+        # only the inboxes which agent has access to are shown
+        expect(JSON.parse(response.body)['payload'].pluck('inbox').pluck('id')).to eq([twilio_whatsapp_inbox.id])
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
index ad79a04ff..4e91b8d03 100644
--- a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
@@ -14,10 +14,14 @@ RSpec.describe 'Conversation Assignment API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to the inbox' do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:team) { create(:team, account: account) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'assigns a user to the conversation' do
         params = { assignee_id: agent.id }
 
@@ -48,6 +52,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
 
       before do
         conversation.update!(assignee: agent)
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
       end
 
       it 'unassigns the assignee from the conversation' do
@@ -69,6 +74,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
 
       before do
         conversation.update!(team: team)
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
       end
 
       it 'unassigns the team from the conversation' do
diff --git a/spec/controllers/api/v1/accounts/conversations/labels_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/labels_controller_spec.rb
index fad91ffbd..f91b3e3a1 100644
--- a/spec/controllers/api/v1/accounts/conversations/labels_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/labels_controller_spec.rb
@@ -17,9 +17,13 @@ RSpec.describe 'Conversation Label API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to the conversation' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'returns all the labels for the conversation' do
         get api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id),
             headers: agent.create_new_auth_token,
@@ -49,9 +53,14 @@ RSpec.describe 'Conversation Label API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to the conversation' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        conversation.update_labels('label1, label2')
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'creates labels for the conversation' do
         post api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id),
              params: { labels: %w[label3 label4] },
diff --git a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
index 93283dbb5..d32608ba2 100644
--- a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
@@ -15,9 +15,13 @@ RSpec.describe 'Conversation Messages API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to conversation' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'creates a new outgoing message' do
         params = { content: 'test-message', private: true }
 
@@ -124,9 +128,13 @@ RSpec.describe 'Conversation Messages API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to conversation' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'shows the conversation' do
         get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/messages",
             headers: agent.create_new_auth_token,
@@ -149,9 +157,13 @@ RSpec.describe 'Conversation Messages API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with access to conversation' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'deletes the message' do
         delete "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/messages/#{message.id}",
                headers: agent.create_new_auth_token,
@@ -166,6 +178,10 @@ RSpec.describe 'Conversation Messages API', type: :request do
     context 'when the message id is invalid' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
       it 'returns not found error' do
         delete "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/messages/99999",
                headers: agent.create_new_auth_token,
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 2ddd3f31a..6a0c419a2 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -119,8 +119,27 @@ RSpec.describe 'Conversations API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
 
-      it 'shows the conversation' do
+      it 'does not shows the conversation if you do not have access to it' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'shows the conversation if you are an administrator' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+            headers: administrator.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body, symbolize_names: true)[:id]).to eq(conversation.display_id)
+      end
+
+      it 'shows the conversation if you are an agent with access to inbox' do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
         get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
             headers: agent.create_new_auth_token,
             as: :json
@@ -149,57 +168,71 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
-      it 'creates a new conversation' do
+      it 'will not create a new conversation if agent does not have access to inbox' do
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
         additional_attributes = { test: 'test' }
         post "/api/v1/accounts/#{account.id}/conversations",
              headers: agent.create_new_auth_token,
              params: { source_id: contact_inbox.source_id, additional_attributes: additional_attributes },
              as: :json
-
-        expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body, symbolize_names: true)
-        expect(response_data[:additional_attributes]).to eq(additional_attributes)
+        expect(response).to have_http_status(:unauthorized)
       end
 
-      it 'creates a conversation in specificed status' do
-        allow(Rails.configuration.dispatcher).to receive(:dispatch)
-        post "/api/v1/accounts/#{account.id}/conversations",
-             headers: agent.create_new_auth_token,
-             params: { source_id: contact_inbox.source_id, status: 'bot' },
-             as: :json
+      context 'when it is an authenticated user who has access to the inbox' do
+        before do
+          create(:inbox_member, user: agent, inbox: inbox)
+        end
 
-        expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body, symbolize_names: true)
-        expect(response_data[:status]).to eq('bot')
-      end
+        it 'creates a new conversation' do
+          allow(Rails.configuration.dispatcher).to receive(:dispatch)
+          additional_attributes = { test: 'test' }
+          post "/api/v1/accounts/#{account.id}/conversations",
+               headers: agent.create_new_auth_token,
+               params: { source_id: contact_inbox.source_id, additional_attributes: additional_attributes },
+               as: :json
 
-      it 'creates a new conversation with message when message is passed' do
-        allow(Rails.configuration.dispatcher).to receive(:dispatch)
-        post "/api/v1/accounts/#{account.id}/conversations",
-             headers: agent.create_new_auth_token,
-             params: { source_id: contact_inbox.source_id, message: { content: 'hi' } },
-             as: :json
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+          expect(response_data[:additional_attributes]).to eq(additional_attributes)
+        end
 
-        expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body, symbolize_names: true)
-        expect(response_data[:additional_attributes]).to eq({})
-        expect(account.conversations.find_by(display_id: response_data[:id]).messages.first.content).to eq 'hi'
-      end
+        it 'creates a conversation in specificed status' do
+          allow(Rails.configuration.dispatcher).to receive(:dispatch)
+          post "/api/v1/accounts/#{account.id}/conversations",
+               headers: agent.create_new_auth_token,
+               params: { source_id: contact_inbox.source_id, status: 'bot' },
+               as: :json
 
-      it 'calls contact inbox builder if contact_id and inbox_id is present' do
-        builder = double
-        contact = create(:contact, account: account)
-        inbox = create(:inbox, account: account)
-        allow(Rails.configuration.dispatcher).to receive(:dispatch)
-        allow(ContactInboxBuilder).to receive(:new).and_return(builder)
-        allow(builder).to receive(:perform)
-        expect(builder).to receive(:perform)
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+          expect(response_data[:status]).to eq('bot')
+        end
 
-        post "/api/v1/accounts/#{account.id}/conversations",
-             headers: agent.create_new_auth_token,
-             params: { contact_id: contact.id, inbox_id: inbox.id },
-             as: :json
+        it 'creates a new conversation with message when message is passed' do
+          allow(Rails.configuration.dispatcher).to receive(:dispatch)
+          post "/api/v1/accounts/#{account.id}/conversations",
+               headers: agent.create_new_auth_token,
+               params: { source_id: contact_inbox.source_id, message: { content: 'hi' } },
+               as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+          expect(response_data[:additional_attributes]).to eq({})
+          expect(account.conversations.find_by(display_id: response_data[:id]).messages.outgoing.first.content).to eq 'hi'
+        end
+
+        it 'calls contact inbox builder if contact_id and inbox_id is present' do
+          builder = double
+          allow(Rails.configuration.dispatcher).to receive(:dispatch)
+          allow(ContactInboxBuilder).to receive(:new).and_return(builder)
+          allow(builder).to receive(:perform)
+          expect(builder).to receive(:perform)
+
+          post "/api/v1/accounts/#{account.id}/conversations",
+               headers: agent.create_new_auth_token,
+               params: { contact_id: contact.id, inbox_id: inbox.id },
+               as: :json
+        end
       end
     end
   end
@@ -218,6 +251,10 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'toggles the conversation status' do
         expect(conversation.status).to eq('open')
 
@@ -268,6 +305,10 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'toggles the conversation status' do
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_typing_status",
@@ -296,6 +337,10 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'updates last seen' do
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/update_last_seen",
              headers: agent.create_new_auth_token,
@@ -321,6 +366,10 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'mutes conversation' do
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/mute",
              headers: agent.create_new_auth_token,
@@ -347,6 +396,10 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'unmutes conversation' do
         post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/unmute",
              headers: agent.create_new_auth_token,
@@ -373,6 +426,10 @@ RSpec.describe 'Conversations API', type: :request do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:params) { { email: 'test@test.com' } }
 
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
       it 'mutes conversation' do
         mailer = double
         allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
diff --git a/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb b/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
index 565b0277f..1361f34b6 100644
--- a/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
@@ -13,14 +13,34 @@ RSpec.describe 'Inbox Member API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated agent' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      before do
+        create(:inbox_member, user: agent, inbox: inbox)
+      end
+
+      it 'returns unauthorized' do
+        params = { inbox_id: inbox.id, user_ids: [agent.id] }
+
+        post "/api/v1/accounts/#{account.id}/inbox_members",
+             headers: agent.create_new_auth_token,
+             params: params,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user with access to inbox' do
+      let(:administrator) { create(:user, account: account, role: :administrator) }
       let(:agent) { create(:user, account: account, role: :agent) }
 
       it 'modifies inbox members' do
         params = { inbox_id: inbox.id, user_ids: [agent.id] }
 
         post "/api/v1/accounts/#{account.id}/inbox_members",
-             headers: agent.create_new_auth_token,
+             headers: administrator.create_new_auth_token,
              params: params,
              as: :json
 
@@ -33,7 +53,7 @@ RSpec.describe 'Inbox Member API', type: :request do
         params = { inbox_id: nil, user_ids: [agent.id] }
 
         post "/api/v1/accounts/#{account.id}/inbox_members",
-             headers: agent.create_new_auth_token,
+             headers: administrator.create_new_auth_token,
              params: params,
              as: :json
 
@@ -44,7 +64,7 @@ RSpec.describe 'Inbox Member API', type: :request do
         params = { inbox_id: inbox.id, user_ids: ['invalid'] }
 
         post "/api/v1/accounts/#{account.id}/inbox_members",
-             headers: agent.create_new_auth_token,
+             headers: administrator.create_new_auth_token,
              params: params,
              as: :json
 
@@ -65,16 +85,30 @@ RSpec.describe 'Inbox Member API', type: :request do
       end
     end
 
-    context 'when it is an authenticated user' do
+    context 'when it is an authenticated user with out access to inbox' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
       it 'returns inbox member' do
+        get "/api/v1/accounts/#{account.id}/inbox_members/#{inbox.id}",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user with access to inbox' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns inbox member' do
+        create(:inbox_member, user: agent, inbox: inbox)
+
         get "/api/v1/accounts/#{account.id}/inbox_members/#{inbox.id}",
             headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)).to eq({ payload: inbox.inbox_members }.as_json)
+        expect(JSON.parse(response.body)['payload'].pluck('id')).to eq(inbox.inbox_members.pluck(:user_id))
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index a4143df25..1a5c31088 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -267,6 +267,10 @@ RSpec.describe 'Inboxes API', type: :request do
   describe 'GET /api/v1/accounts/{account.id}/inboxes/{inbox.id}/agent_bot' do
     let(:inbox) { create(:inbox, account: account) }
 
+    before do
+      create(:inbox_member, user: agent, inbox: inbox)
+    end
+
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
         get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/agent_bot"
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index c86163ccf..8f1716c32 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Integration Apps API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent) { create(:user, account: account, role: :administrator) }
 
       it 'returns all active apps' do
         first_app = Integrations::App.all.find(&:active?)
@@ -52,7 +52,7 @@ RSpec.describe 'Integration Apps API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent) { create(:user, account: account, role: :administrator) }
 
       it 'returns details of the app' do
         get api_v1_account_integrations_app_url(account_id: account.id, id: 'slack'),
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index f72b6639a..e6152dc8b 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -2,6 +2,8 @@ require 'rails_helper'
 
 RSpec.describe 'Reports API', type: :request do
   let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
   let!(:user) { create(:user, account: account) }
   let!(:inbox) { create(:inbox, account: account) }
   let(:inbox_member) { create(:inbox_member, user: user, inbox: inbox) }
@@ -21,21 +23,28 @@ RSpec.describe 'Reports API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'return timeseries metrics' do
-        params = {
-          metric: 'conversations_count',
-          type: :account,
-          since: Time.zone.today.to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
-        }
+      params = {
+        metric: 'conversations_count',
+        type: :account,
+        since: Time.zone.today.to_time.to_i.to_s,
+        until: Time.zone.today.to_time.to_i.to_s
+      }
 
+      it 'returns unauthorized for agents' do
         get "/api/v2/accounts/#{account.id}/reports/account",
             params: params,
             headers: agent.create_new_auth_token,
             as: :json
 
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'return timeseries metrics' do
+        get "/api/v2/accounts/#{account.id}/reports/account",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
 
@@ -56,20 +65,27 @@ RSpec.describe 'Reports API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'returns summary metrics' do
-        params = {
-          type: :account,
-          since: Time.zone.today.to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
-        }
+      params = {
+        type: :account,
+        since: Time.zone.today.to_time.to_i.to_s,
+        until: Time.zone.today.to_time.to_i.to_s
+      }
 
+      it 'returns unauthorized for agents' do
         get "/api/v2/accounts/#{account.id}/reports/account_summary",
             params: params,
             headers: agent.create_new_auth_token,
             as: :json
 
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns summary metrics' do
+        get "/api/v2/accounts/#{account.id}/reports/account_summary",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
 
@@ -88,18 +104,24 @@ RSpec.describe 'Reports API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
       params = {
         since: 30.days.ago.to_i.to_s,
         until: Time.zone.today.to_time.to_i.to_s
       }
 
-      it 'returns summary' do
+      it 'returns unauthorized for agents' do
         get "/api/v2/accounts/#{account.id}/reports/agents.csv",
             params: params,
             headers: agent.create_new_auth_token
 
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns summary' do
+        get "/api/v2/accounts/#{account.id}/reports/agents.csv",
+            params: params,
+            headers: admin.create_new_auth_token
+
         expect(response).to have_http_status(:success)
       end
     end
@@ -115,18 +137,24 @@ RSpec.describe 'Reports API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
       params = {
         since: 30.days.ago.to_i.to_s,
         until: Time.zone.today.to_time.to_i.to_s
       }
 
-      it 'returns summary' do
+      it 'returns unauthorized for agents' do
         get "/api/v2/accounts/#{account.id}/reports/inboxes",
             params: params,
             headers: agent.create_new_auth_token
 
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns summary' do
+        get "/api/v2/accounts/#{account.id}/reports/inboxes",
+            params: params,
+            headers: admin.create_new_auth_token
+
         expect(response).to have_http_status(:success)
       end
     end
diff --git a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
index c61c8d376..0815c6eba 100644
--- a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
+++ b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
   let(:account) { create(:account) }
-  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:agent) { create(:user, account: account, role: :administrator) }
   let!(:hook) { create(:integrations_hook, account: account) }
 
   describe 'POST /api/v1/accounts/{account.id}/integrations/slack' do

From e9fa9e5eff7a54b9a8772f8a18a5130255c0a4e3 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 11 Jun 2021 15:38:46 +0530
Subject: [PATCH 56/67] feat: Add assign to me button next to assign agents.
 (#2414)

---
 .../i18n/locale/en/conversation.json          |  1 +
 .../dashboard/conversation/ContactPanel.vue   | 58 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index b13404e91..f49b19ad5 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -110,6 +110,7 @@
   "CONVERSATION_SIDEBAR": {
     "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index ef2cd42cd..9f6ba39f8 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -9,9 +9,20 @@
         {{ $t('CONVERSATION_SIDEBAR.DETAILS_TITLE') }}
       </h4>
       <div class="multiselect-wrap--small">
-        <label class="multiselect__label">
-          {{ $t('CONVERSATION_SIDEBAR.ASSIGNEE_LABEL') }}
-        </label>
+        <div class="self-assign">
+          <label class="multiselect__label">
+            {{ $t('CONVERSATION_SIDEBAR.ASSIGNEE_LABEL') }}
+          </label>
+          <woot-button
+            v-if="showSelfAssign"
+            icon="ion-arrow-right-c"
+            variant="link"
+            class-names="button-content"
+            @click="onSelfAssign"
+          >
+            {{ $t('CONVERSATION_SIDEBAR.SELF_ASSIGN') }}
+          </woot-button>
+        </div>
         <multiselect
           v-model="assignedAgent"
           :options="agentsList"
@@ -155,6 +166,7 @@ export default {
     ...mapGetters({
       currentChat: 'getSelectedChat',
       teams: 'teams/getTeams',
+      currentUser: 'getCurrentUser',
       getAgents: 'inboxAssignableAgents/getAssignableAgents',
       uiFlags: 'inboxAssignableAgents/getUIFlags',
     }),
@@ -260,6 +272,15 @@ export default {
           });
       },
     },
+    showSelfAssign() {
+      if (!this.assignedAgent) {
+        return true;
+      }
+      if (this.assignedAgent.id !== this.currentUser.id) {
+        return true;
+      }
+      return false;
+    },
   },
   watch: {
     conversationId(newConversationId, prevConversationId) {
@@ -286,6 +307,29 @@ export default {
     openTranscriptModal() {
       this.showTranscriptModal = true;
     },
+    onSelfAssign() {
+      const {
+        account_id,
+        availability_status,
+        available_name,
+        email,
+        id,
+        name,
+        role,
+        thumbnail,
+      } = this.currentUser;
+      const selfAssign = {
+        account_id,
+        availability_status,
+        available_name,
+        email,
+        id,
+        name,
+        role,
+        thumbnail,
+      };
+      this.assignedAgent = selfAssign;
+    },
   },
 };
 </script>
@@ -375,4 +419,12 @@ export default {
     flex-shrink: 0;
   }
 }
+.self-assign {
+  display: flex;
+  justify-content: space-between;
+
+  .button-content {
+    margin-bottom: var(--space-small);
+  }
+}
 </style>

From 75d05e55ae0a131723b75217cdba96fbed653380 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 11 Jun 2021 17:11:13 +0530
Subject: [PATCH 57/67] Chore: Refactors sidebar styles (#2416)

* Chore: Refactors sidebar styles

* Removes unused i18n
---
 .../assets/scss/_foundation-settings.scss     | 10 +--
 .../dashboard/assets/scss/_typography.scss    |  2 +-
 .../widgets/conversation/ConversationBox.vue  |  1 +
 .../i18n/locale/en/conversation.json          |  1 -
 .../contacts/components/ContactInfoPanel.vue  | 14 ++--
 .../conversation/ContactConversations.vue     |  7 --
 .../conversation/ContactCustomAttributes.vue  |  2 +-
 .../conversation/ContactDetailsItem.vue       | 31 ++-----
 .../dashboard/conversation/ContactPanel.vue   | 84 +++++++++----------
 .../conversation/contact/ContactInfo.vue      | 42 +++-------
 .../conversation/contact/ContactInfoRow.vue   | 15 ++--
 .../conversation/contact/SocialIcons.vue      | 15 ++--
 .../conversation/labels/LabelBox.vue          | 14 +---
 13 files changed, 91 insertions(+), 147 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 0cd3f66d3..c74b9f05b 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -131,7 +131,7 @@ $header-text-rendering: optimizeLegibility;
 $small-font-size: 80%;
 $header-small-font-color: $medium-gray;
 $paragraph-lineheight: 1.45;
-$paragraph-margin-bottom: 1rem;
+$paragraph-margin-bottom: var(--space-small);
 $paragraph-text-rendering: optimizeLegibility;
 $code-color: $black;
 $code-font-family: $font-family-monospace;
@@ -345,21 +345,21 @@ $fieldset-padding: $space-two;
 $fieldset-margin: $space-one $zero;
 $legend-padding: rem-calc(0 3);
 $form-spacing: $space-normal;
-$helptext-color: $header-color;
+$helptext-color: $color-body;
 $helptext-font-size: $font-size-small;
 $helptext-font-style: italic;
-$input-prefix-color: $header-color;
+$input-prefix-color: $color-body;
 $input-prefix-background: var(--b-100);
 $input-prefix-border: 1px solid $color-border;
 $input-prefix-padding: 1rem;
-$form-label-color: $header-color;
+$form-label-color: $color-body;
 $form-label-font-size: rem-calc(14);
 $form-label-font-weight: $font-weight-medium;
 $form-label-line-height: 1.8;
 $select-background: $white;
 $select-triangle-color: $dark-gray;
 $select-radius: var(--border-radius-normal);
-$input-color: $header-color;
+$input-color: $color-body;
 $input-placeholder-color: $light-gray;
 $input-font-family: inherit;
 $input-font-size: $font-size-default;
diff --git a/app/javascript/dashboard/assets/scss/_typography.scss b/app/javascript/dashboard/assets/scss/_typography.scss
index 8c6d2e0f2..abab48564 100644
--- a/app/javascript/dashboard/assets/scss/_typography.scss
+++ b/app/javascript/dashboard/assets/scss/_typography.scss
@@ -19,7 +19,7 @@
 }
 
 .text-muted {
-  color: $color-gray;
+  color: var(--s-300);
 }
 
 a {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 4b143dc83..440f6e1e5 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -121,6 +121,7 @@ export default {
     width: 100%;
     height: 100%;
     max-width: 100%;
+    padding: var(--space-normal) var(--space-two);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index f49b19ad5..976d1395a 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -108,7 +108,6 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
     "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 32082532e..62970ec64 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -47,18 +47,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
-
+::v-deep {
+  .contact--profile {
+    padding-bottom: var(--space-slab);
+    margin-bottom: var(--space-normal);
+  }
+}
 .contact--panel {
-  @include border-normal-left;
-
   background: white;
   font-size: var(--font-size-small);
   overflow-y: auto;
   overflow: auto;
   position: relative;
-  padding: var(--space-one);
+  border-left: 1px solid var(--color-border);
+  padding: var(--space-medium) var(--space-two);
 }
 
 .close-button {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
index 960a503ca..54cef7362 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
@@ -77,13 +77,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
-
-.contact-conversation--panel {
-  padding: 0 var(--space-slab) var(--space-two);
-}
-
 .contact-conversation__wrap {
   margin-left: var(--space-medium);
 }
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
index ee14a9761..bc3550817 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
@@ -46,7 +46,7 @@ export default {
 
 <style scoped>
 .custom-attributes--panel {
-  padding: 0 var(--space-slab) var(--space-slab);
+  margin-bottom: var(--space-normal);
 }
 
 .conv-details--item {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
index cbdfbc535..f84f0e3fb 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
@@ -1,17 +1,11 @@
 <template>
   <div class="conv-details--item">
     <h4 class="conv-details--item__label text-block-title">
-      <div class="title--icon">
+      <span class="title--icon">
         <emoji-or-icon :icon="icon" :emoji="emoji" />
-        {{ title }}
-      </div>
-      <button
-        v-if="showEdit"
-        class="button clear small edit-button"
-        @click="onEdit"
-      >
-        {{ $t('CONTACT_PANEL.EDIT_LABEL') }}
-      </button>
+        <span>{{ title }}</span>
+      </span>
+      <slot name="button"></slot>
     </h4>
     <div v-if="value" class="conv-details--item__value">
       <slot>
@@ -33,28 +27,17 @@ export default {
     icon: { type: String, default: '' },
     emoji: { type: String, default: '' },
     value: { type: [String, Number], default: '' },
-    showEdit: { type: Boolean, default: false },
-  },
-  methods: {
-    onEdit() {
-      this.$emit('edit');
-    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
-
 .conv-details--item {
-  padding-bottom: var(--space-normal);
-
+  overflow: auto;
   .conv-details--item__label {
     align-items: center;
     display: flex;
     justify-content: space-between;
-    margin-bottom: var(--space-smaller);
 
     .edit-button {
       padding: 0;
@@ -64,11 +47,13 @@ export default {
   .conv-details--item__value {
     word-break: break-all;
     margin-left: var(--space-medium);
+    margin-bottom: var(--space-normal);
   }
 
   .title--icon .icon--emoji,
   .title--icon .icon--font {
-    margin-right: var(--space-small);
+    display: inline-block;
+    width: var(--space-medium);
   }
 
   .title--icon {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index 9f6ba39f8..a8642fa15 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -5,24 +5,25 @@
     </span>
     <contact-info :contact="contact" :channel-type="channelType" />
     <div class="conversation--actions">
-      <h4 class="sub-block-title">
-        {{ $t('CONVERSATION_SIDEBAR.DETAILS_TITLE') }}
-      </h4>
       <div class="multiselect-wrap--small">
-        <div class="self-assign">
-          <label class="multiselect__label">
-            {{ $t('CONVERSATION_SIDEBAR.ASSIGNEE_LABEL') }}
-          </label>
-          <woot-button
-            v-if="showSelfAssign"
-            icon="ion-arrow-right-c"
-            variant="link"
-            class-names="button-content"
-            @click="onSelfAssign"
-          >
-            {{ $t('CONVERSATION_SIDEBAR.SELF_ASSIGN') }}
-          </woot-button>
-        </div>
+        <contact-details-item
+          :title="$t('CONVERSATION_SIDEBAR.ASSIGNEE_LABEL')"
+          icon="ion-headphone"
+          emoji="🧑‍🚀"
+        >
+          <template v-slot:button>
+            <woot-button
+              v-if="showSelfAssign"
+              icon="ion-arrow-right-c"
+              variant="link"
+              size="small"
+              class-names="button-content"
+              @click="onSelfAssign"
+            >
+              {{ $t('CONVERSATION_SIDEBAR.SELF_ASSIGN') }}
+            </woot-button>
+          </template>
+        </contact-details-item>
         <multiselect
           v-model="assignedAgent"
           :options="agentsList"
@@ -46,9 +47,11 @@
         </multiselect>
       </div>
       <div class="multiselect-wrap--small">
-        <label class="multiselect__label">
-          {{ $t('CONVERSATION_SIDEBAR.TEAM_LABEL') }}
-        </label>
+        <contact-details-item
+          :title="$t('CONVERSATION_SIDEBAR.TEAM_LABEL')"
+          icon="ion-ios-people"
+          emoji="🎢"
+        />
         <multiselect
           v-model="assignedTeam"
           :options="teamsList"
@@ -344,17 +347,27 @@ export default {
   overflow-y: auto;
   overflow: auto;
   position: relative;
-  padding: $space-one;
 
   i {
     margin-right: $space-smaller;
   }
 }
 
-.multiselect-wrap--small {
-  &::v-deep .multiselect__element {
-    span {
-      width: 100%;
+::v-deep {
+  .contact--profile {
+    padding-bottom: var(--space-slab);
+    margin-bottom: var(--space-normal);
+    border-bottom: 1px solid var(--color-border-light);
+  }
+  .multiselect-wrap--small {
+    .multiselect {
+      padding-left: var(--space-medium);
+      box-sizing: border-box;
+    }
+    .multiselect__element {
+      span {
+        width: 100%;
+      }
     }
   }
 }
@@ -367,10 +380,6 @@ export default {
   color: $color-heading;
 }
 
-.conversation--details {
-  padding: 0 var(--space-slab);
-}
-
 .conversation--labels {
   padding: $space-medium;
 
@@ -398,17 +407,10 @@ export default {
   justify-content: center;
 }
 
-.sub-block-title {
-  margin-bottom: var(--space-small);
-}
-
 .conversation--actions {
-  padding: 0 var(--space-normal) var(--space-smaller);
+  margin-bottom: var(--space-normal);
 }
 
-.multiselect__label {
-  margin-bottom: var(--space-smaller);
-}
 .option__desc {
   display: flex;
   align-items: center;
@@ -419,12 +421,4 @@ export default {
     flex-shrink: 0;
   }
 }
-.self-assign {
-  display: flex;
-  justify-content: space-between;
-
-  .button-content {
-    margin-bottom: var(--space-small);
-  }
-}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 2a0fe61bb..7ddcde7c0 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -3,19 +3,18 @@
     <div class="contact--info">
       <thumbnail
         :src="contact.thumbnail"
-        size="64px"
-        :badge="channelType"
+        size="56px"
         :username="contact.name"
         :status="contact.availability_status"
       />
 
       <div class="contact--details">
-        <div class="contact--name">
+        <h3 class="sub-block-title contact--name">
           {{ contact.name }}
-        </div>
-        <div v-if="additionalAttributes.description" class="contact--bio">
+        </h3>
+        <p v-if="additionalAttributes.description" class="contact--bio">
           {{ additionalAttributes.description }}
-        </div>
+        </p>
         <social-icons :social-profiles="socialProfiles" />
         <div class="contact--metadata">
           <contact-info-row
@@ -52,7 +51,7 @@
       <woot-button
         v-if="!showNewMessage"
         class="edit-contact"
-        variant="clear link"
+        variant="link"
         size="small"
         @click="toggleEditModal"
       >
@@ -61,6 +60,7 @@
       <div v-else class="contact-actions">
         <woot-button
           class="new-message"
+          variant="smooth"
           size="small expanded"
           @click="toggleConversationModal"
         >
@@ -152,7 +152,7 @@ export default {
 @import '~dashboard/assets/scss/mixins';
 .contact--profile {
   align-items: flex-start;
-  padding: var(--space-normal) var(--space-normal);
+  margin-bottom: var(--space-normal);
 
   .user-thumbnail-box {
     margin-right: $space-normal;
@@ -162,46 +162,26 @@ export default {
 .contact--details {
   margin-top: $space-small;
   width: 100%;
-
-  p {
-    margin-bottom: 0;
-  }
 }
 
 .contact--info {
-  align-items: flex-start;
-  display: flex;
-  flex-direction: column;
   text-align: left;
 }
 
 .contact--name {
-  @include text-ellipsis;
   text-transform: capitalize;
   white-space: normal;
-  font-weight: $font-weight-bold;
-  font-size: $font-size-default;
-}
-
-.contact--bio {
-  margin: $space-small 0 0;
 }
 
 .contact--metadata {
-  margin: var(--space-normal) 0 0;
+  margin-bottom: var(--space-small);
 }
 
-.social--icons {
-  i {
-    font-size: $font-weight-normal;
-  }
-}
 .contact-actions {
-  margin: var(--space-small) 0;
+  margin-top: var(--space-small);
 }
 .button.edit-contact {
-  margin-left: var(--space-two);
-  padding-left: var(--space-micro);
+  margin-left: var(--space-medium);
 }
 
 .button.new-message {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index 3cdc48d6b..269ab1293 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -69,23 +69,21 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import '~dashboard/assets/scss/variables';
-
 .contact-info--row {
   .contact-info--icon {
-    font-size: $font-size-default;
-    min-width: $space-medium;
+    font-size: var(--font-size-default);
+    min-width: var(--space-medium);
   }
 }
 
 .contact-info--details {
   display: flex;
   align-items: center;
-  margin-bottom: var(--space-one);
-  color: $color-body;
+  margin-bottom: var(--space-small);
+  color: var(--color-body);
 
   .copy-icon {
-    margin-left: $space-one;
+    margin-left: var(--space-smaller);
   }
 
   &.a {
@@ -97,6 +95,7 @@ export default {
 
 .contact-info--details .icon--emoji,
 .contact-info--details .icon--font {
-  margin-right: var(--space-small);
+  display: inline-block;
+  width: var(--space-medium);
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
index 99c9ad83b..ef309499c 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
@@ -42,15 +42,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '~dashboard/assets/scss/variables';
-
-.contact--social-icon {
-  font-size: $font-size-medium;
-  padding-right: $space-slab;
-  color: $color-body;
-}
-
 .social--icons {
-  margin-top: $space-small;
+  margin-bottom: var(--space-small);
+}
+.contact--social-icon {
+  font-size: var(--font-size-medium);
+  padding-right: var(--space-slab);
+  color: var(--color-body);
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index a3686fc11..56aef8547 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="contact-conversation--panel sidebar-labels-wrap">
+  <div class="sidebar-labels-wrap">
     <div
       v-if="!conversationUiFlags.isFetching"
       class="contact-conversation--list"
@@ -150,22 +150,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
-
-.contact-conversation--panel {
-  padding: var(--space-micro) var(--space-slab) var(--space-one)
-    var(--space-slab);
+.sidebar-labels-wrap {
+  margin-bottom: var(--space-normal);
 }
-
 .contact-conversation--list {
   width: 100%;
 
   .label-wrap {
-    margin-left: var(--space-two);
+    margin-left: var(--space-medium);
     position: relative;
     line-height: var(--space-medium);
-    bottom: var(--space-small);
 
     .dropdown-wrap {
       display: flex;

From fe2af370e01a8588ffbddc10cad2f2be97346e22 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Mon, 14 Jun 2021 09:49:17 +0530
Subject: [PATCH 58/67] Feat: Show notes panel on crm page (#2320)

* Feat: Show notes panel on CRM page

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/dashboard/api/contactNotes.js  |   9 ++
 .../assets/scss/_foundation-custom.scss       |   1 +
 .../contact/components/ManageLayout.vue       |  24 ++--
 .../modules/notes/NotesOnContactPage.vue      |  43 +++++++
 .../notes}/components/AddNote.vue             |   0
 .../notes}/components/ContactNote.vue         |   0
 .../notes}/components/NoteList.vue            |   8 +-
 .../notes/stories}/AddNote.stories.js         |   2 +-
 .../notes/stories}/ContactNote.stories.js     |   2 +-
 .../notes/stories}/NoteList.stories.js        |   6 +-
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/contactNotes.js   | 107 ++++++++++++++++++
 .../specs/contactNotes/actions.spec.js        |  78 +++++++++++++
 .../modules/specs/contactNotes/fixtures.js    |  21 ++++
 .../specs/contactNotes/getters.spec.js        |  24 ++++
 .../specs/contactNotes/mutations.spec.js      |  37 ++++++
 .../dashboard/store/mutation-types.js         |   7 ++
 17 files changed, 352 insertions(+), 19 deletions(-)
 create mode 100644 app/javascript/dashboard/api/contactNotes.js
 create mode 100644 app/javascript/dashboard/modules/notes/NotesOnContactPage.vue
 rename app/javascript/dashboard/{routes/dashboard/contacts => modules/notes}/components/AddNote.vue (100%)
 rename app/javascript/dashboard/{routes/dashboard/contacts => modules/notes}/components/ContactNote.vue (100%)
 rename app/javascript/dashboard/{routes/dashboard/contacts => modules/notes}/components/NoteList.vue (86%)
 rename app/javascript/dashboard/{routes/dashboard/contacts/components => modules/notes/stories}/AddNote.stories.js (89%)
 rename app/javascript/dashboard/{routes/dashboard/contacts/components => modules/notes/stories}/ContactNote.stories.js (94%)
 rename app/javascript/dashboard/{routes/dashboard/contacts/components => modules/notes/stories}/NoteList.stories.js (91%)
 create mode 100644 app/javascript/dashboard/store/modules/contactNotes.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactNotes/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactNotes/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactNotes/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactNotes/mutations.spec.js

diff --git a/app/javascript/dashboard/api/contactNotes.js b/app/javascript/dashboard/api/contactNotes.js
new file mode 100644
index 000000000..9508ea9dc
--- /dev/null
+++ b/app/javascript/dashboard/api/contactNotes.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class ContactNotes extends ApiClient {
+  constructor() {
+    super('contact_notes', { accountScoped: true });
+  }
+}
+
+export default new ContactNotes();
diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index d8909a181..6fc3961fc 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -8,6 +8,7 @@
 }
 
 .card {
+  margin-bottom: var(--space-small);
   padding: var(--space-small);
 }
 
diff --git a/app/javascript/dashboard/modules/contact/components/ManageLayout.vue b/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
index 363ed19df..239a190f1 100644
--- a/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
+++ b/app/javascript/dashboard/modules/contact/components/ManageLayout.vue
@@ -4,27 +4,28 @@
       <contact-panel v-if="!uiFlags.isFetchingItem" :contact="contact" />
     </div>
     <div class="center"></div>
-    <div class="right"></div>
+    <div class="right">
+      <contact-notes :contact-id="Number(contactId)" />
+    </div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import ContactPanel from './ContactPanel';
+import ContactNotes from 'dashboard/modules/notes/NotesOnContactPage';
 
 export default {
   components: {
     ContactPanel,
+    ContactNotes,
   },
   props: {
     contactId: {
       type: [String, Number],
-      default: 0,
+      required: true,
     },
   },
-  data() {
-    return {};
-  },
   computed: {
     ...mapGetters({
       uiFlags: 'contacts/getUIFlags',
@@ -38,13 +39,12 @@ export default {
     },
   },
   mounted() {
-    this.getContactDetails();
+    this.fetchContactDetails();
   },
   methods: {
-    getContactDetails() {
-      if (this.contactId) {
-        this.$store.dispatch('contacts/show', { id: this.contactId });
-      }
+    fetchContactDetails() {
+      const { contactId: id } = this;
+      this.$store.dispatch('contacts/show', { id });
     },
   },
 };
@@ -67,4 +67,8 @@ export default {
   border-right: 1px solid var(--color-border);
   border-left: 1px solid var(--color-border);
 }
+
+.right {
+  padding: var(--space-normal);
+}
 </style>
diff --git a/app/javascript/dashboard/modules/notes/NotesOnContactPage.vue b/app/javascript/dashboard/modules/notes/NotesOnContactPage.vue
new file mode 100644
index 000000000..256f9435e
--- /dev/null
+++ b/app/javascript/dashboard/modules/notes/NotesOnContactPage.vue
@@ -0,0 +1,43 @@
+<template>
+  <note-list :notes="notes" @add="onAdd" @delete="onDelete" />
+</template>
+
+<script>
+import NoteList from './components/NoteList';
+
+export default {
+  components: {
+    NoteList,
+  },
+  props: {
+    contactId: {
+      type: Number,
+      required: true,
+    },
+  },
+  computed: {
+    notes() {
+      return this.$store.getters['contactNotes/getAllNotesByContact'](
+        this.contactId
+      );
+    },
+  },
+  mounted() {
+    this.fetchContactNotes();
+  },
+  methods: {
+    fetchContactNotes() {
+      const { contactId } = this;
+      if (contactId) this.$store.dispatch('contactNotes/get', { contactId });
+    },
+    onAdd(content) {
+      const { contactId } = this;
+      this.$store.dispatch('contactNotes/create', { content, contactId });
+    },
+    onDelete(noteId) {
+      const { contactId } = this;
+      this.$store.dispatch('contactNotes/delete', { noteId, contactId });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue b/app/javascript/dashboard/modules/notes/components/AddNote.vue
similarity index 100%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.vue
rename to app/javascript/dashboard/modules/notes/components/AddNote.vue
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue b/app/javascript/dashboard/modules/notes/components/ContactNote.vue
similarity index 100%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.vue
rename to app/javascript/dashboard/modules/notes/components/ContactNote.vue
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.vue b/app/javascript/dashboard/modules/notes/components/NoteList.vue
similarity index 86%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.vue
rename to app/javascript/dashboard/modules/notes/components/NoteList.vue
index 4b6df9d6c..656ee3a35 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.vue
+++ b/app/javascript/dashboard/modules/notes/components/NoteList.vue
@@ -17,7 +17,7 @@
         @delete="onDeleteNote"
       />
       <div class="button-wrap">
-        <woot-button variant="clear link" class="button" @click="onclick">
+        <woot-button variant="link" @click="onclick">
           {{ $t('NOTES.FOOTER.BUTTON') }}
           <i class="ion-arrow-right-c" />
         </woot-button>
@@ -48,13 +48,13 @@ export default {
       this.$emit('show');
     },
     onAddNote(value) {
-      this.$emit('addNote', value);
+      this.$emit('add', value);
     },
     onEditNote(value) {
-      this.$emit('editNote', value);
+      this.$emit('edit', value);
     },
     onDeleteNote(value) {
-      this.$emit('deleteNote', value);
+      this.$emit('delete', value);
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.stories.js b/app/javascript/dashboard/modules/notes/stories/AddNote.stories.js
similarity index 89%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.stories.js
rename to app/javascript/dashboard/modules/notes/stories/AddNote.stories.js
index 6dc059167..1f547d59e 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/AddNote.stories.js
+++ b/app/javascript/dashboard/modules/notes/stories/AddNote.stories.js
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import AddNote from './AddNote.vue';
+import AddNote from '../components/AddNote.vue';
 
 export default {
   title: 'Components/Notes/Add',
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js b/app/javascript/dashboard/modules/notes/stories/ContactNote.stories.js
similarity index 94%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js
rename to app/javascript/dashboard/modules/notes/stories/ContactNote.stories.js
index 36d97af1a..71c3abd81 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactNote.stories.js
+++ b/app/javascript/dashboard/modules/notes/stories/ContactNote.stories.js
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import ContactNote from './ContactNote.vue';
+import ContactNote from '../components/ContactNote.vue';
 
 export default {
   title: 'Components/Notes/Note',
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.stories.js b/app/javascript/dashboard/modules/notes/stories/NoteList.stories.js
similarity index 91%
rename from app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.stories.js
rename to app/javascript/dashboard/modules/notes/stories/NoteList.stories.js
index 7f2797bed..c9b8d6345 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/NoteList.stories.js
+++ b/app/javascript/dashboard/modules/notes/stories/NoteList.stories.js
@@ -1,15 +1,15 @@
 import { action } from '@storybook/addon-actions';
-import noteList from './NoteList';
+import NoteList from '../components/NoteList';
 
 export default {
   title: 'Components/Notes/List',
-  component: noteList,
+  component: NoteList,
   argTypes: {},
 };
 
 const Template = (args, { argTypes }) => ({
   props: Object.keys(argTypes),
-  components: { noteList },
+  components: { NoteList },
   template:
     '<note-list v-bind="$props" @addNote="onAddNote" @editNote="onEditNote" @deleteNote="onDeleteNote" @show="onClick"></note-list>',
 });
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 09718c41b..867dcecf8 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -27,6 +27,7 @@ import webhooks from './modules/webhooks';
 import teams from './modules/teams';
 import teamMembers from './modules/teamMembers';
 import campaigns from './modules/campaigns';
+import contactNotes from './modules/contactNotes';
 
 Vue.use(Vuex);
 export default new Vuex.Store({
@@ -57,5 +58,6 @@ export default new Vuex.Store({
     teams,
     teamMembers,
     campaigns,
+    contactNotes,
   },
 });
diff --git a/app/javascript/dashboard/store/modules/contactNotes.js b/app/javascript/dashboard/store/modules/contactNotes.js
new file mode 100644
index 000000000..da4555e0d
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contactNotes.js
@@ -0,0 +1,107 @@
+import * as types from '../mutation-types';
+import Vue from 'vue';
+import ContactNotesAPI from '../../api/contactNotes';
+
+export const state = {
+  records: {},
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getAllNotesByContact: _state => contactId => {
+    return _state.records[contactId] || [];
+  },
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+};
+
+export const actions = {
+  async get({ commit }, { contactId }) {
+    commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+      isFetching: true,
+    });
+    try {
+      const { data } = await ContactNotesAPI.get(contactId);
+      commit(types.default.SET_CONTACT_NOTES, { contactId, data });
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+        isFetching: false,
+      });
+    }
+  },
+
+  async create({ commit }, { contactId, content }) {
+    commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+      isCreating: true,
+    });
+    try {
+      const { data } = await ContactNotesAPI.create({
+        content,
+        contactId,
+      });
+      commit(types.default.ADD_CONTACT_NOTE, {
+        contactId,
+        data,
+      });
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+        isCreating: false,
+      });
+    }
+  },
+
+  async delete({ commit }, { noteId, contactId }) {
+    commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+      isDeleting: true,
+    });
+    try {
+      await ContactNotesAPI.delete(contactId, noteId);
+      commit(types.default.DELETE_CONTACT_NOTE, { contactId, noteId });
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.default.SET_CONTACT_NOTES_UI_FLAG, {
+        isDeleting: false,
+      });
+    }
+  },
+};
+
+export const mutations = {
+  [types.default.SET_CONTACT_NOTES_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.default.SET_CONTACT_NOTES]($state, { data, contactId }) {
+    Vue.set($state.records, contactId, data);
+  },
+  [types.default.ADD_CONTACT_NOTE]($state, { data, contactId }) {
+    const contactNotes = $state.records[contactId] || [];
+    $state.records[contactId] = [...contactNotes, data];
+  },
+  [types.default.DELETE_CONTACT_NOTE]($state, { noteId, contactId }) {
+    const contactNotes = $state.records[contactId];
+    const withoutDeletedNote = contactNotes.filter(note => note.id !== noteId);
+    $state.records[contactId] = [...withoutDeletedNote];
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/contactNotes/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contactNotes/actions.spec.js
new file mode 100644
index 000000000..166d723c2
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactNotes/actions.spec.js
@@ -0,0 +1,78 @@
+import axios from 'axios';
+import { actions } from '../../contactNotes';
+import * as types from '../../../mutation-types';
+import notesData from './fixtures';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: notesData });
+      await actions.get({ commit }, { contactId: 23 });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isFetching: true }],
+        [types.default.SET_CONTACT_NOTES, { contactId: 23, data: notesData }],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.get({ commit }, { contactId: 23 })).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isFetching: true }],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: { id: 2, content: 'hi' } });
+      await actions.create({ commit }, { contactId: 1, content: 'hi' });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isCreating: true }],
+        [
+          types.default.ADD_CONTACT_NOTE,
+          { contactId: 1, data: { id: 2, content: 'hi' } },
+        ],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.create({ commit }, { contactId: 1, content: 'hi' })
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isCreating: true }],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: notesData[0] });
+      await actions.delete({ commit }, { contactId: 1, noteId: 2 });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_CONTACT_NOTE, { contactId: 1, noteId: 2 }],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, { contactId: 1, noteId: 2 })
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_CONTACT_NOTES_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/contactNotes/fixtures.js b/app/javascript/dashboard/store/modules/specs/contactNotes/fixtures.js
new file mode 100644
index 000000000..ec895621f
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactNotes/fixtures.js
@@ -0,0 +1,21 @@
+export default [
+  {
+    id: 12345,
+    content: 'It is a long established fact that a reader will be distracted.',
+    user: {
+      name: 'John Doe',
+      thumbnail: 'https://randomuser.me/api/portraits/men/69.jpg',
+    },
+    created_at: 1618046084,
+  },
+  {
+    id: 12346,
+    content:
+      'It is simply dummy text of the printing and typesetting industry.',
+    user: {
+      name: 'Pearl Cruz',
+      thumbnail: 'https://randomuser.me/api/portraits/women/29.jpg',
+    },
+    created_at: 1616046076,
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/specs/contactNotes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contactNotes/getters.spec.js
new file mode 100644
index 000000000..f0eb7e3ce
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactNotes/getters.spec.js
@@ -0,0 +1,24 @@
+import { getters } from '../../contactNotes';
+import notesData from './fixtures';
+
+describe('#getters', () => {
+  it('getAllNotesByContact', () => {
+    const state = { records: { 1: notesData } };
+    expect(getters.getAllNotesByContact(state)(1)).toEqual(notesData);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isCreating: false,
+        isDeleting: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isCreating: false,
+      isDeleting: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/contactNotes/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contactNotes/mutations.spec.js
new file mode 100644
index 000000000..27c54d79b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactNotes/mutations.spec.js
@@ -0,0 +1,37 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../contactNotes';
+import allNotes from './fixtures';
+
+describe('#mutations', () => {
+  describe('#SET_CONTACT_NOTES', () => {
+    it('set allNotes records', () => {
+      const state = { records: {} };
+      mutations[types.SET_CONTACT_NOTES](state, {
+        data: allNotes,
+        contactId: 1,
+      });
+      expect(state.records).toEqual({ 1: allNotes });
+    });
+  });
+
+  describe('#ADD_CONTACT_NOTE', () => {
+    it('push newly created note to the store', () => {
+      const state = { records: { 1: [allNotes[0]] } };
+      mutations[types.ADD_CONTACT_NOTE](state, {
+        data: allNotes[1],
+        contactId: 1,
+      });
+      expect(state.records[1]).toEqual([allNotes[0], allNotes[1]]);
+    });
+  });
+  describe('#DELETE_CONTACT_NOTE', () => {
+    it('Delete existing note from records', () => {
+      const state = { records: { 1: [{ id: 2 }] } };
+      mutations[types.DELETE_CONTACT_NOTE](state, {
+        noteId: 2,
+        contactId: 1,
+      });
+      expect(state.records[1]).toEqual([]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 152959cb2..f2d101302 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -154,4 +154,11 @@ export default {
   SET_CAMPAIGNS: 'SET_CAMPAIGNS',
   ADD_CAMPAIGN: 'ADD_CAMPAIGN',
   EDIT_CAMPAIGN: 'EDIT_CAMPAIGN',
+
+  // Contact notes
+  SET_CONTACT_NOTES_UI_FLAG: 'SET_CONTACT_NOTES_UI_FLAG',
+  SET_CONTACT_NOTES: 'SET_CONTACT_NOTES',
+  ADD_CONTACT_NOTE: 'ADD_CONTACT_NOTE',
+  EDIT_CONTACT_NOTE: 'EDIT_CONTACT_NOTE',
+  DELETE_CONTACT_NOTE: 'DELETE_CONTACT_NOTE',
 };

From d21c1c773b26eb87cdc938a3e8bcf596a778c3ab Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:36:00 +0530
Subject: [PATCH 59/67] feat: Ability to add label for contact page (#2350)

* feat: Ability to add label for contact page

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 app/javascript/dashboard/api/contacts.js      |   8 ++
 .../dashboard/api/specs/contacts.spec.js      |  19 +++
 .../widgets/LabelSelector.stories.js          |  67 ++++++++++
 .../components/widgets/LabelSelector.vue      | 116 ++++++++++++++++++
 .../dashboard/i18n/locale/en/contact.json     |  19 ++-
 .../contacts/components/ContactInfoPanel.vue  |  11 +-
 .../contacts/components/ContactLabels.vue     |  89 ++++++++++++++
 .../conversation/labels/LabelBox.vue          |   5 +-
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/contactLabels.js  |  89 ++++++++++++++
 .../specs/contactLabels/actions.spec.js       |  73 +++++++++++
 .../specs/contactLabels/getters.spec.js       |  24 ++++
 .../specs/contactLabels/mutations.spec.js     |  29 +++++
 .../dashboard/store/mutation-types.js         |   4 +
 .../components/ui/dropdown/AddLabel.vue       |   2 +-
 .../components/ui/label/LabelDropdown.vue     |   4 -
 .../components/ui/label/LabelDropdownItem.vue |  33 +++--
 17 files changed, 562 insertions(+), 32 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/LabelSelector.stories.js
 create mode 100644 app/javascript/dashboard/components/widgets/LabelSelector.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ContactLabels.vue
 create mode 100644 app/javascript/dashboard/store/modules/contactLabels.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactLabels/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactLabels/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/contactLabels/mutations.spec.js

diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index 1a66db0e1..cc8448873 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -18,6 +18,14 @@ class ContactAPI extends ApiClient {
     return axios.get(`${this.url}/${contactId}/contactable_inboxes`);
   }
 
+  getContactLabels(contactId) {
+    return axios.get(`${this.url}/${contactId}/labels`);
+  }
+
+  updateContactLabels(contactId, labels) {
+    return axios.post(`${this.url}/${contactId}/labels`, { labels });
+  }
+
   search(search = '', page = 1, sortAttr = 'name') {
     return axios.get(
       `${this.url}/search?q=${search}&page=${page}&sort=${sortAttr}`
diff --git a/app/javascript/dashboard/api/specs/contacts.spec.js b/app/javascript/dashboard/api/specs/contacts.spec.js
index ae1e1e0e1..a7080a634 100644
--- a/app/javascript/dashboard/api/specs/contacts.spec.js
+++ b/app/javascript/dashboard/api/specs/contacts.spec.js
@@ -34,6 +34,25 @@ describe('#ContactsAPI', () => {
         '/api/v1/contacts/1/contactable_inboxes'
       );
     });
+
+    it('#getContactLabels', () => {
+      contactAPI.getContactLabels(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/labels'
+      );
+    });
+
+    it('#updateContactLabels', () => {
+      const labels = ['support-query'];
+      contactAPI.updateContactLabels(1, labels);
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/contacts/1/labels',
+        {
+          labels,
+        }
+      );
+    });
+
     it('#search', () => {
       contactAPI.search('leads', 1, 'date');
       expect(context.axiosMock.get).toHaveBeenCalledWith(
diff --git a/app/javascript/dashboard/components/widgets/LabelSelector.stories.js b/app/javascript/dashboard/components/widgets/LabelSelector.stories.js
new file mode 100644
index 000000000..77ca54b25
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/LabelSelector.stories.js
@@ -0,0 +1,67 @@
+import { action } from '@storybook/addon-actions';
+import LabelSelector from './LabelSelector';
+
+export default {
+  title: 'Components/Label/Contact Label',
+  component: LabelSelector,
+  argTypes: {
+    contactId: {
+      control: {
+        type: 'text ,number',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { LabelSelector },
+  template:
+    '<label-selector v-bind="$props" @add="onAdd" @remove="onRemove"></label-selector>',
+});
+
+export const ContactLabel = Template.bind({});
+ContactLabel.args = {
+  onAdd: action('Added'),
+  onRemove: action('Removed'),
+  allLabels: [
+    {
+      id: '1',
+      title: 'sales',
+      description: '',
+      color: '#0a5dd1',
+    },
+    {
+      id: '2',
+      title: 'refund',
+      description: '',
+      color: '#8442f5',
+    },
+    {
+      id: '3',
+      title: 'testing',
+      description: '',
+      color: '#f542f5',
+    },
+    {
+      id: '4',
+      title: 'scheduled',
+      description: '',
+      color: '#42d1f5',
+    },
+  ],
+  savedLabels: [
+    {
+      id: '2',
+      title: 'refund',
+      description: '',
+      color: '#8442f5',
+    },
+    {
+      id: '4',
+      title: 'scheduled',
+      description: '',
+      color: '#42d1f5',
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/components/widgets/LabelSelector.vue b/app/javascript/dashboard/components/widgets/LabelSelector.vue
new file mode 100644
index 000000000..8a6270bb8
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/LabelSelector.vue
@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <h6 class="text-block-title">
+      <i class="title-icon ion-pricetags" />
+      {{ $t('CONTACT_PANEL.LABELS.CONTACT.TITLE') }}
+    </h6>
+    <div v-on-clickaway="closeDropdownLabel" class="label-wrap">
+      <add-label @add="toggleLabels" />
+      <woot-label
+        v-for="label in savedLabels"
+        :key="label.id"
+        :title="label.title"
+        :description="label.description"
+        :show-close="true"
+        :bg-color="label.color"
+        @click="removeItem"
+      />
+      <div class="dropdown-wrap">
+        <div
+          :class="{ 'dropdown-pane--open': showSearchDropdownLabel }"
+          class="dropdown-pane"
+        >
+          <label-dropdown
+            v-if="showSearchDropdownLabel"
+            :account-labels="allLabels"
+            :selected-labels="selectedLabels"
+            @add="addItem"
+            @remove="removeItem"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import AddLabel from 'shared/components/ui/dropdown/AddLabel';
+import LabelDropdown from 'shared/components/ui/label/LabelDropdown';
+import { mixin as clickaway } from 'vue-clickaway';
+
+export default {
+  components: {
+    AddLabel,
+    LabelDropdown,
+  },
+
+  mixins: [clickaway],
+
+  props: {
+    allLabels: {
+      type: Array,
+      default: () => [],
+    },
+    savedLabels: {
+      type: Array,
+      default: () => [],
+    },
+  },
+
+  data() {
+    return {
+      showSearchDropdownLabel: false,
+    };
+  },
+
+  computed: {
+    selectedLabels() {
+      return this.savedLabels.map(label => label.title);
+    },
+  },
+
+  methods: {
+    addItem(label) {
+      this.$emit('add', label);
+    },
+
+    removeItem(label) {
+      this.$emit('remove', label);
+    },
+
+    toggleLabels() {
+      this.showSearchDropdownLabel = !this.showSearchDropdownLabel;
+    },
+
+    closeDropdownLabel() {
+      this.showSearchDropdownLabel = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title-icon {
+  margin-right: var(--space-smaller);
+}
+
+.label-wrap {
+  position: relative;
+  margin-left: var(--space-two);
+  line-height: var(--space-medium);
+
+  .dropdown-wrap {
+    display: flex;
+    position: absolute;
+    margin-right: var(--space-medium);
+    top: var(--space-medium);
+    width: 100%;
+    left: -1px;
+
+    .dropdown-pane {
+      width: 100%;
+      box-sizing: border-box;
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 949637088..84e6303fc 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Previous Conversations"
     },
     "LABELS": {
-      "TITLE": "Conversation Labels",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 62970ec64..3ddfc0a59 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -8,6 +8,7 @@
       v-if="hasContactAttributes"
       :custom-attributes="contact.custom_attributes"
     />
+    <contact-label :contact-id="contact.id" class="contact-labels" />
     <contact-conversations
       v-if="contact.id"
       :contact-id="contact.id"
@@ -20,12 +21,14 @@
 import ContactConversations from 'dashboard/routes/dashboard/conversation/ContactConversations';
 import ContactInfo from 'dashboard/routes/dashboard/conversation/contact/ContactInfo';
 import ContactCustomAttributes from 'dashboard/routes/dashboard/conversation/ContactCustomAttributes';
+import ContactLabel from 'dashboard/routes/dashboard/contacts/components/ContactLabels.vue';
 
 export default {
   components: {
     ContactCustomAttributes,
     ContactConversations,
     ContactInfo,
+    ContactLabel,
   },
   props: {
     contact: {
@@ -61,6 +64,10 @@ export default {
   position: relative;
   border-left: 1px solid var(--color-border);
   padding: var(--space-medium) var(--space-two);
+  
+  .contact-labels {
+    padding-bottom: var(--space-normal);
+  }
 }
 
 .close-button {
@@ -79,10 +86,6 @@ export default {
   padding: 0 var(--space-normal);
 }
 
-.contact-conversation--panel {
-  height: 100%;
-}
-
 .contact--mute {
   color: var(--r-400);
   display: block;
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactLabels.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactLabels.vue
new file mode 100644
index 000000000..8ac65b462
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactLabels.vue
@@ -0,0 +1,89 @@
+<template>
+  <label-selector
+    :all-labels="allLabels"
+    :saved-labels="savedLabels"
+    @add="addItem"
+    @remove="removeItem"
+  />
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import LabelSelector from 'dashboard/components/widgets/LabelSelector.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: { LabelSelector },
+  mixins: [alertMixin],
+  props: {
+    contactId: {
+      type: [String, Number],
+      required: true,
+    },
+  },
+
+  computed: {
+    savedLabels() {
+      const result = this.$store.getters['contactLabels/getContactLabels'](
+        this.contactId
+      );
+      return result.map(value => {
+        return this.allLabels.find(label => label.title === value);
+      });
+    },
+
+    ...mapGetters({
+      labelUiFlags: 'contactLabels/getUIFlags',
+      allLabels: 'labels/getLabels',
+    }),
+  },
+
+  watch: {
+    contactId(newContactId, prevContactId) {
+      if (newContactId && newContactId !== prevContactId) {
+        this.fetchLabels(newContactId);
+      }
+    },
+  },
+
+  mounted() {
+    const { contactId } = this;
+    this.fetchLabels(contactId);
+  },
+
+  methods: {
+    async onUpdateLabels(selectedLabels) {
+      try {
+        await this.$store.dispatch('contactLabels/update', {
+          contactId: this.contactId,
+          labels: selectedLabels,
+        });
+      } catch (error) {
+        this.showAlert(this.$t('CONTACT_PANEL.LABELS.CONTACT.ERROR'));
+      }
+    },
+
+    addItem(value) {
+      const result = this.savedLabels.map(item => item.title);
+      result.push(value.title);
+      this.onUpdateLabels(result);
+    },
+
+    removeItem(value) {
+      const result = this.savedLabels
+        .map(label => label.title)
+        .filter(label => label !== value);
+      this.onUpdateLabels(result);
+    },
+
+    async fetchLabels(contactId) {
+      if (!contactId) {
+        return;
+      }
+      this.$store.dispatch('contactLabels/get', contactId);
+    },
+  },
+};
+</script>
+
+<style></style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index 56aef8547..162f853ed 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -5,7 +5,7 @@
       class="contact-conversation--list"
     >
       <contact-details-item
-        :title="$t('CONTACT_PANEL.LABELS.TITLE')"
+        :title="$t('CONTACT_PANEL.LABELS.CONVERSATION.TITLE')"
         icon="ion-pricetags"
         emoji="🏷️"
       />
@@ -30,7 +30,6 @@
               v-if="showSearchDropdownLabel"
               :account-labels="accountLabels"
               :selected-labels="savedLabels"
-              :conversation-id="conversationId"
               @add="addItem"
               @remove="removeItem"
             />
@@ -61,7 +60,7 @@ export default {
   mixins: [clickaway],
   props: {
     conversationId: {
-      type: [String, Number],
+      type: Number,
       required: true,
     },
   },
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 867dcecf8..2dcf1f9e3 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -7,6 +7,7 @@ import auth from './modules/auth';
 import cannedResponse from './modules/cannedResponse';
 import contactConversations from './modules/contactConversations';
 import contacts from './modules/contacts';
+import contactLabels from './modules/contactLabels';
 import notifications from './modules/notifications';
 import conversationLabels from './modules/conversationLabels';
 import conversationMetadata from './modules/conversationMetadata';
@@ -38,6 +39,7 @@ export default new Vuex.Store({
     cannedResponse,
     contactConversations,
     contacts,
+    contactLabels,
     notifications,
     conversationLabels,
     conversationMetadata,
diff --git a/app/javascript/dashboard/store/modules/contactLabels.js b/app/javascript/dashboard/store/modules/contactLabels.js
new file mode 100644
index 000000000..8ee6c09a6
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contactLabels.js
@@ -0,0 +1,89 @@
+import Vue from 'vue';
+import types from '../mutation-types';
+import ContactAPI from '../../api/contacts';
+
+const state = {
+  records: {},
+  uiFlags: {
+    isFetching: false,
+    isUpdating: false,
+    isError: false,
+  },
+};
+
+export const getters = {
+  getUIFlags($state) {
+    return $state.uiFlags;
+  },
+  getContactLabels: $state => id => {
+    return $state.records[Number(id)] || [];
+  },
+};
+
+export const actions = {
+  get: async ({ commit }, contactId) => {
+    commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+      isFetching: true,
+    });
+    try {
+      const response = await ContactAPI.getContactLabels(contactId);
+      commit(types.SET_CONTACT_LABELS, {
+        id: contactId,
+        data: response.data.payload,
+      });
+      commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+        isFetching: false,
+      });
+    } catch (error) {
+      commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+        isFetching: false,
+      });
+    }
+  },
+  update: async ({ commit }, { contactId, labels }) => {
+    commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+      isUpdating: true,
+    });
+    try {
+      const response = await ContactAPI.updateContactLabels(contactId, labels);
+      commit(types.SET_CONTACT_LABELS, {
+        id: contactId,
+        data: response.data.payload,
+      });
+      commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+        isUpdating: false,
+        isError: false,
+      });
+    } catch (error) {
+      commit(types.SET_CONTACT_LABELS_UI_FLAG, {
+        isUpdating: false,
+        isError: true,
+      });
+      throw new Error(error);
+    }
+  },
+
+  setContactLabel({ commit }, { id, data }) {
+    commit(types.SET_CONTACT_LABELS, { id, data });
+  },
+};
+
+export const mutations = {
+  [types.SET_CONTACT_LABELS_UI_FLAG]($state, data) {
+    $state.uiFlags = {
+      ...$state.uiFlags,
+      ...data,
+    };
+  },
+  [types.SET_CONTACT_LABELS]: ($state, { id, data }) => {
+    Vue.set($state.records, id, data);
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/contactLabels/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contactLabels/actions.spec.js
new file mode 100644
index 000000000..0f5222603
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactLabels/actions.spec.js
@@ -0,0 +1,73 @@
+import axios from 'axios';
+import { actions } from '../../contactLabels';
+import * as types from '../../../mutation-types';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({
+        data: { payload: ['customer-success', 'on-hold'] },
+      });
+      await actions.get({ commit }, 1);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isFetching: true }],
+
+        [
+          types.default.SET_CONTACT_LABELS,
+          { id: 1, data: ['customer-success', 'on-hold'] },
+        ],
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isFetching: true }],
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#update', () => {
+    it('updates correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({
+        data: { payload: { contactId: '1', labels: ['on-hold'] } },
+      });
+      await actions.update({ commit }, { contactId: '1', labels: ['on-hold'] });
+
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isUpdating: true }],
+        [
+          types.default.SET_CONTACT_LABELS,
+          {
+            id: '1',
+            data: { contactId: '1', labels: ['on-hold'] },
+          },
+        ],
+        [
+          types.default.SET_CONTACT_LABELS_UI_FLAG,
+          { isUpdating: false, isError: false },
+        ],
+      ]);
+    });
+
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.update({ commit }, { contactId: '1', labels: ['on-hold'] })
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_LABELS_UI_FLAG, { isUpdating: true }],
+        [
+          types.default.SET_CONTACT_LABELS_UI_FLAG,
+          { isUpdating: false, isError: true },
+        ],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/contactLabels/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contactLabels/getters.spec.js
new file mode 100644
index 000000000..9acb0decf
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactLabels/getters.spec.js
@@ -0,0 +1,24 @@
+import { getters } from '../../contactLabels';
+
+describe('#getters', () => {
+  it('getContactLabels', () => {
+    const state = {
+      records: { 1: ['customer-success', 'on-hold'] },
+    };
+    expect(getters.getContactLabels(state)(1)).toEqual([
+      'customer-success',
+      'on-hold',
+    ]);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/contactLabels/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contactLabels/mutations.spec.js
new file mode 100644
index 000000000..099281363
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/contactLabels/mutations.spec.js
@@ -0,0 +1,29 @@
+import * as types from '../../../mutation-types';
+import { mutations } from '../../contactLabels';
+
+describe('#mutations', () => {
+  describe('#SET_CONTACT_LABELS_UI_FLAG', () => {
+    it('set ui flags', () => {
+      const state = { uiFlags: { isFetching: true } };
+      mutations[types.default.SET_CONTACT_LABELS_UI_FLAG](state, {
+        isFetching: false,
+      });
+      expect(state.uiFlags).toEqual({
+        isFetching: false,
+      });
+    });
+  });
+
+  describe('#SET_CONTACT_LABELS', () => {
+    it('set contact labels', () => {
+      const state = { records: {} };
+      mutations[types.default.SET_CONTACT_LABELS](state, {
+        id: 1,
+        data: ['customer-success', 'on-hold'],
+      });
+      expect(state.records).toEqual({
+        1: ['customer-success', 'on-hold'],
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index f2d101302..7ccb6bccb 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -119,6 +119,10 @@ export default {
   SET_CONTACT_CONVERSATIONS: 'SET_CONTACT_CONVERSATIONS',
   ADD_CONTACT_CONVERSATION: 'ADD_CONTACT_CONVERSATION',
 
+  // Contact Label
+  SET_CONTACT_LABELS_UI_FLAG: 'SET_CONTACT_LABELS_UI_FLAG',
+  SET_CONTACT_LABELS: 'SET_CONTACT_LABELS',
+
   // Conversation Label
   SET_CONVERSATION_LABELS_UI_FLAG: 'SET_CONVERSATION_LABELS_UI_FLAG',
   SET_CONVERSATION_LABELS: 'SET_CONVERSATION_LABELS',
diff --git a/app/javascript/shared/components/ui/dropdown/AddLabel.vue b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
index 4254749c1..9b54450d9 100644
--- a/app/javascript/shared/components/ui/dropdown/AddLabel.vue
+++ b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
@@ -2,7 +2,7 @@
   <woot-button variant="link" class="label--add" @click="addLabel">
     <woot-label
       color-scheme="secondary"
-      :title="$t('CONTACT_PANEL.LABELS.MODAL.ADD_BUTTON')"
+      :title="$t('CONTACT_PANEL.LABELS.CONVERSATION.ADD_BUTTON')"
       icon="ion-plus-round"
     />
   </woot-button>
diff --git a/app/javascript/shared/components/ui/label/LabelDropdown.vue b/app/javascript/shared/components/ui/label/LabelDropdown.vue
index a6e2dd131..58bcda4c6 100644
--- a/app/javascript/shared/components/ui/label/LabelDropdown.vue
+++ b/app/javascript/shared/components/ui/label/LabelDropdown.vue
@@ -41,10 +41,6 @@ export default {
   },
 
   props: {
-    conversationId: {
-      type: [String, Number],
-      required: true,
-    },
     accountLabels: {
       type: Array,
       default: () => [],
diff --git a/app/javascript/shared/components/ui/label/LabelDropdownItem.vue b/app/javascript/shared/components/ui/label/LabelDropdownItem.vue
index e692bfd0b..68f2528e5 100644
--- a/app/javascript/shared/components/ui/label/LabelDropdownItem.vue
+++ b/app/javascript/shared/components/ui/label/LabelDropdownItem.vue
@@ -9,9 +9,11 @@
               class="label-color--display"
               :style="{ backgroundColor: color }"
             />
-            <span>{{ title }}</span>
+            <span class="label-text" :title="title">{{ title }}</span>
+          </div>
+          <div>
+            <i v-if="selected" class="icon ion-checkmark-round" />
           </div>
-          <i v-if="selected" class="icon ion-checkmark-round" />
         </div>
       </woot-button>
     </div>
@@ -47,9 +49,14 @@ export default {
 .item-wrap {
   display: flex;
 
+  ::v-deep .button__content {
+    width: 100%;
+  }
+
   .button-wrap {
     display: flex;
     justify-content: space-between;
+    width: 100%;
 
     &.active {
       display: flex;
@@ -59,14 +66,24 @@ export default {
 
     .name-label-wrap {
       display: flex;
-    }
+      min-width: 0;
+      width: 100%;
 
-    .label-color--display {
-      margin-right: var(--space-small);
-    }
+      .label-color--display {
+        margin-right: var(--space-small);
+      }
 
-    .icon {
-      font-size: var(--font-size-small);
+      .label-text {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        line-height: 1.1;
+        padding-right: var(--space-small);
+      }
+
+      .icon {
+        font-size: var(--font-size-small);
+      }
     }
   }
 

From fe3f1c3a40ff0c90318e4a4f3101910d5a0c3b8c Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Mon, 14 Jun 2021 10:37:01 +0530
Subject: [PATCH 60/67]  Chore: Update style for new message buton (#2423)

- Changes button style for new message and edit contact in contact page side panel
---
 .../routes/dashboard/conversation/contact/ContactInfo.vue      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 7ddcde7c0..6b2ba6139 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -60,14 +60,13 @@
       <div v-else class="contact-actions">
         <woot-button
           class="new-message"
-          variant="smooth"
           size="small expanded"
           @click="toggleConversationModal"
         >
           {{ $t('CONTACT_PANEL.NEW_MESSAGE') }}
         </woot-button>
         <woot-button
-          variant="hollow"
+          variant="smooth"
           size="small expanded"
           @click="toggleEditModal"
         >

From a56aa5656d6f49dbfbd18a905cb264da4ca7aab9 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Mon, 14 Jun 2021 16:48:33 +0530
Subject: [PATCH 61/67] chore: Fixes contact panel scroll issue (#2424)

---
 .../routes/dashboard/contacts/components/ContactInfoPanel.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 3ddfc0a59..3078e7fda 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -57,6 +57,7 @@ export default {
   }
 }
 .contact--panel {
+  height: 100%;
   background: white;
   font-size: var(--font-size-small);
   overflow-y: auto;
@@ -64,7 +65,7 @@ export default {
   position: relative;
   border-left: 1px solid var(--color-border);
   padding: var(--space-medium) var(--space-two);
-  
+
   .contact-labels {
     padding-bottom: var(--space-normal);
   }

From 0f377da1091d54fd42d95cd71d59950b086143d6 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 15 Jun 2021 14:14:59 +0530
Subject: [PATCH 62/67] feat: Add an option to delete campaigns (#2402)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/accounts/campaigns_controller.rb   |   5 +
 .../dashboard/i18n/locale/en/campaign.json    |  13 ++
 .../settings/inbox/components/AddCampaign.vue | 207 ++++++++---------
 .../settings/inbox/components/Campaign.vue    |  46 +++-
 .../inbox/components/CampaignsTable.vue       |  14 +-
 .../inbox/components/EditCampaign.vue         | 212 ++++++++----------
 .../dashboard/store/modules/campaigns.js      |  12 +
 .../modules/specs/campaigns/actions.spec.js   |  22 ++
 .../modules/specs/campaigns/mutations.spec.js |   8 +
 .../dashboard/store/mutation-types.js         |   1 +
 config/routes.rb                              |   2 +-
 .../v1/accounts/campaigns_controller_spec.rb  |  36 +++
 12 files changed, 334 insertions(+), 244 deletions(-)

diff --git a/app/controllers/api/v1/accounts/campaigns_controller.rb b/app/controllers/api/v1/accounts/campaigns_controller.rb
index c4555017d..5c58d3f51 100644
--- a/app/controllers/api/v1/accounts/campaigns_controller.rb
+++ b/app/controllers/api/v1/accounts/campaigns_controller.rb
@@ -10,6 +10,11 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
     @campaign = Current.account.campaigns.create!(campaign_params)
   end
 
+  def destroy
+    @campaign.destroy
+    head :ok
+  end
+
   def show; end
 
   def update
diff --git a/app/javascript/dashboard/i18n/locale/en/campaign.json b/app/javascript/dashboard/i18n/locale/en/campaign.json
index 2eed61b19..f1c249669 100644
--- a/app/javascript/dashboard/i18n/locale/en/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/en/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Update",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
index 70be87feb..ea067fa3e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/AddCampaign.vue
@@ -1,132 +1,112 @@
 <template>
-  <modal :show.sync="show" :on-close="onClose">
-    <div class="column content-box">
-      <woot-modal-header
-        :header-title="$t('CAMPAIGN.ADD.TITLE')"
-        :header-content="$t('CAMPAIGN.ADD.DESC')"
-      />
-      <form class="row" @submit.prevent="addCampaign">
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.title.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.TITLE.LABEL') }}
-            <input
-              v-model.trim="title"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.TITLE.PLACEHOLDER')"
-              @input="$v.title.$touch"
-            />
-          </label>
-        </div>
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="$t('CAMPAIGN.ADD.TITLE')"
+      :header-content="$t('CAMPAIGN.ADD.DESC')"
+    />
+    <form class="row" @submit.prevent="addCampaign">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="title"
+          :label="$t('CAMPAIGN.ADD.FORM.TITLE.LABEL')"
+          type="text"
+          :class="{ error: $v.title.$error }"
+          :error="$v.title.$error ? $t('CAMPAIGN.ADD.FORM.TITLE.ERROR') : ''"
+          :placeholder="$t('CAMPAIGN.ADD.FORM.TITLE.PLACEHOLDER')"
+          @blur="$v.title.$touch"
+        />
 
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.message.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.LABEL') }}
-            <textarea
-              v-model.trim="message"
-              rows="5"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.MESSAGE.PLACEHOLDER')"
-              @input="$v.message.$touch"
-            />
-          </label>
-        </div>
+        <label :class="{ error: $v.message.$error }">
+          {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.LABEL') }}
+          <textarea
+            v-model="message"
+            rows="5"
+            type="text"
+            :placeholder="$t('CAMPAIGN.ADD.FORM.MESSAGE.PLACEHOLDER')"
+            @blur="$v.message.$touch"
+          />
+          <span v-if="$v.message.$error" class="message">
+            {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.ERROR') }}
+          </span>
+        </label>
 
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.selectedSender.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.LABEL') }}
-            <select v-model="selectedSender">
-              <option
-                v-for="sender in sendersAndBotList"
-                :key="sender.name"
-                :value="sender.id"
-              >
-                {{ sender.name }}
-              </option>
-            </select>
-            <span v-if="$v.selectedSender.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.ERROR') }}
-            </span>
-          </label>
-        </div>
+        <label :class="{ error: $v.selectedSender.$error }">
+          {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.LABEL') }}
+          <select v-model="selectedSender">
+            <option
+              v-for="sender in sendersAndBotList"
+              :key="sender.name"
+              :value="sender.id"
+            >
+              {{ sender.name }}
+            </option>
+          </select>
+          <span v-if="$v.selectedSender.$error" class="message">
+            {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.ERROR') }}
+          </span>
+        </label>
 
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.endPoint.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.END_POINT.LABEL') }}
-            <input
-              v-model.trim="endPoint"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.END_POINT.PLACEHOLDER')"
-              @input="$v.endPoint.$touch"
-            />
-            <span v-if="$v.endPoint.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.END_POINT.ERROR') }}
-            </span>
-          </label>
-        </div>
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.timeOnPage.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.LABEL') }}
-            <input
-              v-model.trim="timeOnPage"
-              type="number"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.PLACEHOLDER')"
-              @input="$v.timeOnPage.$touch"
-            />
-            <span v-if="$v.timeOnPage.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.ERROR') }}
-            </span>
-          </label>
-        </div>
+        <woot-input
+          v-model="endPoint"
+          :label="$t('CAMPAIGN.ADD.FORM.END_POINT.LABEL')"
+          type="text"
+          :class="{ error: $v.endPoint.$error }"
+          :error="
+            $v.endPoint.$error ? $t('CAMPAIGN.ADD.FORM.END_POINT.ERROR') : ''
+          "
+          :placeholder="$t('CAMPAIGN.ADD.FORM.END_POINT.PLACEHOLDER')"
+          @blur="$v.endPoint.$touch"
+        />
+        <woot-input
+          v-model="timeOnPage"
+          :label="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.LABEL')"
+          type="text"
+          :class="{ error: $v.timeOnPage.$error }"
+          :error="
+            $v.timeOnPage.$error
+              ? $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.ERROR')
+              : ''
+          "
+          :placeholder="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.PLACEHOLDER')"
+          @blur="$v.timeOnPage.$touch"
+        />
+        <label>
+          <input
+            v-model="enabled"
+            type="checkbox"
+            value="enabled"
+            name="enabled"
+          />
+          {{ $t('CAMPAIGN.ADD.FORM.ENABLED') }}
+        </label>
+      </div>
 
-        <div class="medium-12 columns">
-          <label>
-            <input
-              v-model="enabled"
-              type="checkbox"
-              value="enabled"
-              name="enabled"
-            />
-            {{ $t('CAMPAIGN.ADD.FORM.ENABLED') }}
-          </label>
-        </div>
-
-        <div class="modal-footer">
-          <div class="medium-12 columns">
-            <woot-submit-button
-              :disabled="buttonDisabled"
-              :loading="uiFlags.isCreating"
-              :button-text="$t('CAMPAIGN.ADD.CREATE_BUTTON_TEXT')"
-            />
-            <button class="button clear" @click.prevent="onClose">
-              {{ $t('CAMPAIGN.ADD.CANCEL_BUTTON_TEXT') }}
-            </button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </modal>
+      <div class="modal-footer">
+        <woot-button
+          :is-disabled="buttonDisabled"
+          :is-loading="uiFlags.isCreating"
+        >
+          {{ $t('CAMPAIGN.ADD.CREATE_BUTTON_TEXT') }}
+        </woot-button>
+        <woot-button variant="clear" @click.prevent="onClose">
+          {{ $t('CAMPAIGN.ADD.CANCEL_BUTTON_TEXT') }}
+        </woot-button>
+      </div>
+    </form>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import { required, url, minLength } from 'vuelidate/lib/validators';
-import Modal from 'dashboard/components/Modal';
 import alertMixin from 'shared/mixins/alertMixin';
-
 export default {
-  components: {
-    Modal,
-  },
   mixins: [alertMixin],
   props: {
     senderList: {
       type: Array,
       default: () => [],
     },
-    onClose: {
-      type: Function,
-      default: () => {},
-    },
   },
   data() {
     return {
@@ -158,7 +138,6 @@ export default {
       required,
     },
   },
-
   computed: {
     ...mapGetters({
       uiFlags: 'campaigns/getUIFlags',
@@ -183,8 +162,10 @@ export default {
       ];
     },
   },
-
   methods: {
+    onClose() {
+      this.$emit('on-close');
+    },
     async addCampaign() {
       try {
         await this.$store.dispatch('campaigns/create', {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/Campaign.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/Campaign.vue
index 6692384dd..322d15231 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/Campaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/Campaign.vue
@@ -9,33 +9,44 @@
       :campaigns="records"
       :show-empty-result="showEmptyResult"
       :is-loading="uiFlags.isFetching"
-      :on-edit-click="openEditPopup"
+      @on-edit-click="openEditPopup"
+      @on-delete-click="openDeletePopup"
     />
 
     <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
-      <add-campaign :on-close="hideAddPopup" :sender-list="selectedAgents" />
+      <add-campaign :sender-list="selectedAgents" @on-close="hideAddPopup" />
     </woot-modal>
     <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
       <edit-campaign
-        :on-close="hideEditPopup"
         :selected-campaign="selectedCampaign"
         :sender-list="selectedAgents"
+        @on-close="hideEditPopup"
       />
     </woot-modal>
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="$t('CAMPAIGN.DELETE.CONFIRM.TITLE')"
+      :message="$t('CAMPAIGN.DELETE.CONFIRM.MESSAGE')"
+      :confirm-text="$t('CAMPAIGN.DELETE.CONFIRM.YES')"
+      :reject-text="$t('CAMPAIGN.DELETE.CONFIRM.NO')"
+    />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
 import AddCampaign from './AddCampaign';
 import CampaignsTable from './CampaignsTable';
 import EditCampaign from './EditCampaign';
-
 export default {
   components: {
     AddCampaign,
     CampaignsTable,
     EditCampaign,
   },
+  mixins: [alertMixin],
   props: {
     selectedAgents: {
       type: Array,
@@ -48,6 +59,7 @@ export default {
       showAddPopup: false,
       showEditPopup: false,
       selectedCampaign: {},
+      showDeleteConfirmationPopup: false,
     };
   },
   computed: {
@@ -81,6 +93,28 @@ export default {
     hideEditPopup() {
       this.showEditPopup = false;
     },
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
+      this.selectedCampaign = response;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    confirmDeletion() {
+      this.closeDeletePopup();
+      const {
+        row: { id },
+      } = this.selectedCampaign;
+      this.deleteCampaign(id);
+    },
+    async deleteCampaign(id) {
+      try {
+        await this.$store.dispatch('campaigns/delete', id);
+        this.showAlert(this.$t('CAMPAIGN.DELETE.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('CAMPAIGN.DELETE.API.ERROR_MESSAGE'));
+      }
+    },
   },
 };
 </script>
@@ -91,4 +125,8 @@ export default {
   justify-content: flex-end;
   padding-bottom: var(--space-one);
 }
+
+.content-box .page-top-bar::v-deep {
+  padding: var(--space-large) var(--space-large) var(--space-zero);
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
index 9c903183f..3e1855cb4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/CampaignsTable.vue
@@ -44,10 +44,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    onEditClick: {
-      type: Function,
-      default: () => {},
-    },
   },
 
   data() {
@@ -140,10 +136,18 @@ export default {
                 icon="ion-edit"
                 color-scheme="secondary"
                 classNames="grey-btn"
-                onClick={() => this.onEditClick(row)}
+                onClick={() => this.$emit('on-edit-click', row)}
               >
                 {this.$t('CAMPAIGN.LIST.BUTTONS.EDIT')}
               </WootButton>
+              <WootButton
+                variant="link"
+                icon="ion-close-circled"
+                color-scheme="secondary"
+                onClick={() => this.$emit('on-delete-click', row)}
+              >
+                {this.$t('CAMPAIGN.LIST.BUTTONS.DELETE')}
+              </WootButton>
             </div>
           ),
         },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
index 143dc7a5a..7696bc836 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/EditCampaign.vue
@@ -1,132 +1,101 @@
 <template>
-  <modal :show.sync="show" :on-close="onClose">
-    <div class="column content-box">
-      <woot-modal-header :header-title="pageTitle" />
-      <form class="row" @submit.prevent="editCampaign">
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.title.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.TITLE.LABEL') }}
-            <input
-              v-model.trim="title"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.TITLE.PLACEHOLDER')"
-              @input="$v.title.$touch"
-            />
-            <span v-if="$v.title.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.TITLE.ERROR') }}
-            </span>
-          </label>
-        </div>
-
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.message.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.LABEL') }}
-            <textarea
-              v-model.trim="message"
-              rows="5"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.MESSAGE.PLACEHOLDER')"
-              @input="$v.message.$touch"
-            />
-            <span v-if="$v.message.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.ERROR') }}
-            </span>
-          </label>
-        </div>
-
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.selectedSender.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.LABEL') }}
-            <select v-model="selectedSender">
-              <option
-                v-for="sender in sendersAndBotList"
-                :key="sender.name"
-                :value="sender.id"
-              >
-                {{ sender.name }}
-              </option>
-            </select>
-            <span v-if="$v.selectedSender.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.ERROR') }}
-            </span>
-          </label>
-        </div>
-
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.endPoint.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.END_POINT.LABEL') }}
-            <input
-              v-model.trim="endPoint"
-              type="text"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.END_POINT.PLACEHOLDER')"
-              @input="$v.endPoint.$touch"
-            />
-            <span v-if="$v.endPoint.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.END_POINT.ERROR') }}
-            </span>
-          </label>
-        </div>
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.timeOnPage.$error }">
-            {{ $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.LABEL') }}
-            <input
-              v-model.trim="timeOnPage"
-              type="number"
-              :placeholder="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.PLACEHOLDER')"
-              @input="$v.timeOnPage.$touch"
-            />
-            <span v-if="$v.timeOnPage.$error" class="message">
-              {{ $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.ERROR') }}
-            </span>
-          </label>
-        </div>
-
-        <div class="medium-12 columns">
-          <label>
-            <input
-              v-model="enabled"
-              type="checkbox"
-              value="enabled"
-              name="enabled"
-            />
-            {{ $t('CAMPAIGN.ADD.FORM.ENABLED') }}
-          </label>
-        </div>
-
-        <div class="modal-footer">
-          <woot-button :disabled="buttonDisabled" :loading="uiFlags.isCreating">
-            {{ $t('CAMPAIGN.EDIT.UPDATE_BUTTON_TEXT') }}
-          </woot-button>
-          <woot-button
-            class="button clear"
-            :disabled="buttonDisabled"
-            :loading="uiFlags.isCreating"
-            @click.prevent="onClose"
-          >
-            {{ $t('CAMPAIGN.ADD.CANCEL_BUTTON_TEXT') }}
-          </woot-button>
-        </div>
-      </form>
-    </div>
-  </modal>
+  <div class="column content-box">
+    <woot-modal-header :header-title="pageTitle" />
+    <form class="row" @submit.prevent="editCampaign">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="title"
+          :label="$t('CAMPAIGN.ADD.FORM.TITLE.LABEL')"
+          type="text"
+          :class="{ error: $v.title.$error }"
+          :error="$v.title.$error ? $t('CAMPAIGN.ADD.FORM.TITLE.ERROR') : ''"
+          :placeholder="$t('CAMPAIGN.ADD.FORM.TITLE.PLACEHOLDER')"
+          @blur="$v.title.$touch"
+        />
+        <label :class="{ error: $v.message.$error }">
+          {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.LABEL') }}
+          <textarea
+            v-model.trim="message"
+            rows="5"
+            type="text"
+            :placeholder="$t('CAMPAIGN.ADD.FORM.MESSAGE.PLACEHOLDER')"
+            @input="$v.message.$touch"
+          />
+          <span v-if="$v.message.$error" class="message">
+            {{ $t('CAMPAIGN.ADD.FORM.MESSAGE.ERROR') }}
+          </span>
+        </label>
+        <label :class="{ error: $v.selectedSender.$error }">
+          {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.LABEL') }}
+          <select v-model="selectedSender">
+            <option
+              v-for="sender in sendersAndBotList"
+              :key="sender.name"
+              :value="sender.id"
+            >
+              {{ sender.name }}
+            </option>
+          </select>
+          <span v-if="$v.selectedSender.$error" class="message">
+            {{ $t('CAMPAIGN.ADD.FORM.SENT_BY.ERROR') }}
+          </span>
+        </label>
+        <woot-input
+          v-model="endPoint"
+          :label="$t('CAMPAIGN.ADD.FORM.END_POINT.LABEL')"
+          type="text"
+          :class="{ error: $v.endPoint.$error }"
+          :error="
+            $v.endPoint.$error ? $t('CAMPAIGN.ADD.FORM.END_POINT.ERROR') : ''
+          "
+          :placeholder="$t('CAMPAIGN.ADD.FORM.END_POINT.PLACEHOLDER')"
+          @blur="$v.endPoint.$touch"
+        />
+        <woot-input
+          v-model="timeOnPage"
+          :label="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.LABEL')"
+          type="text"
+          :class="{ error: $v.timeOnPage.$error }"
+          :error="
+            $v.timeOnPage.$error
+              ? $t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.ERROR')
+              : ''
+          "
+          :placeholder="$t('CAMPAIGN.ADD.FORM.TIME_ON_PAGE.PLACEHOLDER')"
+          @blur="$v.timeOnPage.$touch"
+        />
+        <label>
+          <input
+            v-model="enabled"
+            type="checkbox"
+            value="enabled"
+            name="enabled"
+          />
+          {{ $t('CAMPAIGN.ADD.FORM.ENABLED') }}
+        </label>
+      </div>
+      <div class="modal-footer">
+        <woot-button
+          :is-disabled="buttonDisabled"
+          :is-loading="uiFlags.isCreating"
+        >
+          {{ $t('CAMPAIGN.EDIT.UPDATE_BUTTON_TEXT') }}
+        </woot-button>
+        <woot-button variant="clear" @click.prevent="onClose">
+          {{ $t('CAMPAIGN.ADD.CANCEL_BUTTON_TEXT') }}
+        </woot-button>
+      </div>
+    </form>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import { required, url, minLength } from 'vuelidate/lib/validators';
-import Modal from 'dashboard/components/Modal';
 import alertMixin from 'shared/mixins/alertMixin';
-
 export default {
-  components: {
-    Modal,
-  },
   mixins: [alertMixin],
   props: {
-    onClose: {
-      type: Function,
-      default: () => {},
-    },
     selectedCampaign: {
       type: Object,
       default: () => {},
@@ -166,7 +135,6 @@ export default {
       required,
     },
   },
-
   computed: {
     ...mapGetters({
       uiFlags: 'campaigns/getUIFlags',
@@ -200,6 +168,9 @@ export default {
     this.setFormValues();
   },
   methods: {
+    onClose() {
+      this.$emit('on-close');
+    },
     setFormValues() {
       const {
         title,
@@ -215,7 +186,6 @@ export default {
       this.selectedSender = (sender && sender.id) || 0;
       this.enabled = enabled;
     },
-
     async editCampaign() {
       try {
         await this.$store.dispatch('campaigns/update', {
diff --git a/app/javascript/dashboard/store/modules/campaigns.js b/app/javascript/dashboard/store/modules/campaigns.js
index fd8aa6f97..f0285aa46 100644
--- a/app/javascript/dashboard/store/modules/campaigns.js
+++ b/app/javascript/dashboard/store/modules/campaigns.js
@@ -54,6 +54,17 @@ export const actions = {
       commit(types.SET_CAMPAIGN_UI_FLAG, { isUpdating: false });
     }
   },
+  delete: async ({ commit }, id) => {
+    commit(types.SET_CAMPAIGN_UI_FLAG, { isDeleting: true });
+    try {
+      await CampaignsAPI.delete(id);
+      commit(types.DELETE_CAMPAIGN, id);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_CAMPAIGN_UI_FLAG, { isDeleting: false });
+    }
+  },
 };
 
 export const mutations = {
@@ -67,6 +78,7 @@ export const mutations = {
   [types.ADD_CAMPAIGN]: MutationHelpers.create,
   [types.SET_CAMPAIGNS]: MutationHelpers.set,
   [types.EDIT_CAMPAIGN]: MutationHelpers.update,
+  [types.DELETE_CAMPAIGN]: MutationHelpers.destroy,
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/campaigns/actions.spec.js b/app/javascript/dashboard/store/modules/specs/campaigns/actions.spec.js
index ad9b647b2..413d86793 100644
--- a/app/javascript/dashboard/store/modules/specs/campaigns/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/campaigns/actions.spec.js
@@ -68,4 +68,26 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: campaignList[0] });
+      await actions.delete({ commit }, campaignList[0].id);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CAMPAIGN_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_CAMPAIGN, campaignList[0].id],
+        [types.default.SET_CAMPAIGN_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, campaignList[0].id)
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CAMPAIGN_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_CAMPAIGN_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/campaigns/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/campaigns/mutations.spec.js
index e01359c78..cb293af8f 100644
--- a/app/javascript/dashboard/store/modules/specs/campaigns/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/campaigns/mutations.spec.js
@@ -30,4 +30,12 @@ describe('#mutations', () => {
       expect(state.records[0].message).toEqual('Hey, What brings you today');
     });
   });
+
+  describe('#DELETE_LABEL', () => {
+    it('delete campaign record', () => {
+      const state = { records: [campaigns[0]] };
+      mutations[types.DELETE_CAMPAIGN](state, 1);
+      expect(state.records).toEqual([]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 7ccb6bccb..657c6ec57 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -158,6 +158,7 @@ export default {
   SET_CAMPAIGNS: 'SET_CAMPAIGNS',
   ADD_CAMPAIGN: 'ADD_CAMPAIGN',
   EDIT_CAMPAIGN: 'EDIT_CAMPAIGN',
+  DELETE_CAMPAIGN: 'DELETE_CAMPAIGN',
 
   // Contact notes
   SET_CONTACT_NOTES_UI_FLAG: 'SET_CONTACT_NOTES_UI_FLAG',
diff --git a/config/routes.rb b/config/routes.rb
index fba20286f..bdeaf7c01 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -49,7 +49,7 @@ Rails.application.routes.draw do
             end
           end
           resources :canned_responses, except: [:show, :edit, :new]
-          resources :campaigns, only: [:index, :create, :show, :update]
+          resources :campaigns, only: [:index, :create, :show, :update, :destroy]
 
           namespace :channels do
             resource :twilio_channel, only: [:create]
diff --git a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
index 5a90929d5..ebe7d4dae 100644
--- a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
@@ -145,4 +145,40 @@ RSpec.describe 'Campaigns API', type: :request do
       end
     end
   end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/campaigns/:id' do
+    let(:inbox) { create(:inbox, account: account) }
+    let!(:campaign) { create(:campaign, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/campaigns/#{campaign.display_id}",
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
+
+      it 'return unauthorized if agent' do
+        delete "/api/v1/accounts/#{account.id}/campaigns/#{campaign.display_id}",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'delete campaign if admin' do
+        delete "/api/v1/accounts/#{account.id}/campaigns/#{campaign.display_id}",
+               headers: administrator.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(::Campaign.exists?(campaign.display_id)).to eq false
+      end
+    end
+  end
 end

From 853db60f8eb6291f68f1aed1152e9ddd56d2eb58 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 15 Jun 2021 20:09:17 +0530
Subject: [PATCH 63/67] feat: Add Public APIs for API Channel (#2375)

---
 .rubocop.yml                                  |  1 +
 app/builders/contact_builder.rb               |  7 +-
 .../api/v1/widget/messages_controller.rb      |  1 +
 .../api/v1/inboxes/contacts_controller.rb     | 48 +++++++++++++
 .../v1/inboxes/conversations_controller.rb    | 24 +++++++
 .../api/v1/inboxes/messages_controller.rb     | 68 +++++++++++++++++++
 .../public/api/v1/inboxes_controller.rb       | 23 +++++++
 app/controllers/public_controller.rb          |  3 +
 app/models/channel/api.rb                     | 21 ++++--
 app/models/channel/web_widget.rb              |  1 +
 .../v1/inboxes/contacts/create.json.jbuilder  |  2 +
 .../v1/inboxes/contacts/show.json.jbuilder    |  2 +
 .../v1/inboxes/contacts/update.json.jbuilder  |  2 +
 .../conversations/create.json.jbuilder        |  1 +
 .../inboxes/conversations/index.json.jbuilder |  3 +
 .../v1/inboxes/messages/create.json.jbuilder  |  1 +
 .../v1/inboxes/messages/index.json.jbuilder   |  3 +
 .../v1/inboxes/messages/update.json.jbuilder  |  1 +
 .../api/v1/models/_contact.json.jbuilder      |  4 ++
 .../api/v1/models/_conversation.json.jbuilder | 10 +++
 .../api/v1/models/_message.json.jbuilder      |  9 +++
 config/environments/development.rb            |  3 +
 config/environments/production.rb             |  9 ++-
 config/routes.rb                              | 18 +++++
 .../20210602182058_add_hmac_to_api_channel.rb | 19 ++++++
 db/schema.rb                                  |  6 ++
 .../api/v1/inbox/contacts_controller_spec.rb  | 40 +++++++++++
 .../v1/inbox/conversations_controller_spec.rb | 28 ++++++++
 .../api/v1/inbox/messages_controller_spec.rb  | 57 ++++++++++++++++
 29 files changed, 404 insertions(+), 11 deletions(-)
 create mode 100644 app/controllers/public/api/v1/inboxes/contacts_controller.rb
 create mode 100644 app/controllers/public/api/v1/inboxes/conversations_controller.rb
 create mode 100644 app/controllers/public/api/v1/inboxes/messages_controller.rb
 create mode 100644 app/controllers/public/api/v1/inboxes_controller.rb
 create mode 100644 app/controllers/public_controller.rb
 create mode 100644 app/views/public/api/v1/inboxes/contacts/create.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/contacts/show.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/contacts/update.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/conversations/create.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/conversations/index.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/messages/create.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/messages/index.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/messages/update.json.jbuilder
 create mode 100644 app/views/public/api/v1/models/_contact.json.jbuilder
 create mode 100644 app/views/public/api/v1/models/_conversation.json.jbuilder
 create mode 100644 app/views/public/api/v1/models/_message.json.jbuilder
 create mode 100644 db/migrate/20210602182058_add_hmac_to_api_channel.rb
 create mode 100644 spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb
 create mode 100644 spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb
 create mode 100644 spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 77bd4ad18..4bec94c82 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -54,6 +54,7 @@ Rails/ApplicationController:
     - 'app/controllers/widget_tests_controller.rb'
     - 'app/controllers/widgets_controller.rb'
     - 'app/controllers/platform_controller.rb'
+    - 'app/controllers/public_controller.rb'
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
   Exclude:
diff --git a/app/builders/contact_builder.rb b/app/builders/contact_builder.rb
index f7fcdfb12..92c706a8a 100644
--- a/app/builders/contact_builder.rb
+++ b/app/builders/contact_builder.rb
@@ -1,5 +1,5 @@
 class ContactBuilder
-  pattr_initialize [:source_id!, :inbox!, :contact_attributes!]
+  pattr_initialize [:source_id!, :inbox!, :contact_attributes!, :hmac_verified]
 
   def perform
     contact_inbox = inbox.contact_inboxes.find_by(source_id: source_id)
@@ -18,7 +18,8 @@ class ContactBuilder
     ::ContactInbox.create!(
       contact_id: contact.id,
       inbox_id: inbox.id,
-      source_id: source_id
+      source_id: source_id,
+      hmac_verified: hmac_verified || false
     )
   end
 
@@ -28,7 +29,7 @@ class ContactBuilder
 
   def create_contact
     account.contacts.create!(
-      name: contact_attributes[:name],
+      name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
       phone_number: contact_attributes[:phone_number],
       email: contact_attributes[:email],
       identifier: contact_attributes[:identifier],
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index fc55b0c1b..991b2f428 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -58,6 +58,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   end
 
   def permitted_params
+    # timestamp parameter is used in create conversation method
     params.permit(:id, :before, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
   end
 
diff --git a/app/controllers/public/api/v1/inboxes/contacts_controller.rb b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
new file mode 100644
index 000000000..6932386fd
--- /dev/null
+++ b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
@@ -0,0 +1,48 @@
+class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesController
+  before_action :contact_inbox, except: [:create]
+  before_action :process_hmac
+
+  def create
+    source_id = params[:source_id] || SecureRandom.uuid
+    @contact_inbox = ::ContactBuilder.new(
+      source_id: source_id,
+      inbox: @inbox_channel.inbox,
+      contact_attributes: permitted_params.except(:identifier, :identifier_hash)
+    ).perform
+  end
+
+  def show; end
+
+  def update
+    contact_identify_action = ContactIdentifyAction.new(
+      contact: @contact_inbox.contact,
+      params: permitted_params.to_h.deep_symbolize_keys.except(:identifier)
+    )
+    render json: contact_identify_action.perform
+  end
+
+  private
+
+  def contact_inbox
+    @contact_inbox = @inbox_channel.inbox.contact_inboxes.find_by!(source_id: params[:id])
+  end
+
+  def process_hmac
+    return if params[:identifier_hash].blank? && !@inbox_channel.hmac_mandatory
+    raise StandardError, 'HMAC failed: Invalid Identifier Hash Provided' unless valid_hmac?
+
+    @contact_inbox.update(hmac_verified: true) if @contact_inbox.present?
+  end
+
+  def valid_hmac?
+    params[:identifier_hash] == OpenSSL::HMAC.hexdigest(
+      'sha256',
+      @inbox_channel.hmac_token,
+      params[:identifier].to_s
+    )
+  end
+
+  def permitted_params
+    params.permit(:identifier, :identifier_hash, :email, :name, :avatar_url, custom_attributes: {})
+  end
+end
diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
new file mode 100644
index 000000000..a399bc749
--- /dev/null
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -0,0 +1,24 @@
+class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::InboxesController
+  def index
+    @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
+  end
+
+  def create
+    @conversation = create_conversation
+  end
+
+  private
+
+  def create_conversation
+    ::Conversation.create!(conversation_params)
+  end
+
+  def conversation_params
+    {
+      account_id: @contact_inbox.contact.account_id,
+      inbox_id: @contact_inbox.inbox_id,
+      contact_id: @contact_inbox.contact_id,
+      contact_inbox_id: @contact_inbox.id
+    }
+  end
+end
diff --git a/app/controllers/public/api/v1/inboxes/messages_controller.rb b/app/controllers/public/api/v1/inboxes/messages_controller.rb
new file mode 100644
index 000000000..65a21183a
--- /dev/null
+++ b/app/controllers/public/api/v1/inboxes/messages_controller.rb
@@ -0,0 +1,68 @@
+class Public::Api::V1::Inboxes::MessagesController < Public::Api::V1::InboxesController
+  before_action :set_message, only: [:update]
+
+  def index
+    @messages = @conversation.nil? ? [] : message_finder.perform
+  end
+
+  def create
+    @message = @conversation.messages.new(message_params)
+    @message.save
+    build_attachment
+  end
+
+  def update
+    @message.update!(message_update_params)
+  rescue StandardError => e
+    render json: { error: @contact.errors, message: e.message }.to_json, status: 500
+  end
+
+  private
+
+  def build_attachment
+    return if params[:attachments].blank?
+
+    params[:attachments].each do |uploaded_attachment|
+      attachment = @message.attachments.new(
+        account_id: @message.account_id,
+        file_type: helpers.file_type(uploaded_attachment&.content_type)
+      )
+      attachment.file.attach(uploaded_attachment)
+    end
+    @message.save!
+  end
+
+  def message_finder_params
+    {
+      filter_internal_messages: true,
+      before: params[:before]
+    }
+  end
+
+  def message_finder
+    @message_finder ||= MessageFinder.new(@conversation, message_finder_params)
+  end
+
+  def message_update_params
+    params.permit(submitted_values: [:name, :title, :value])
+  end
+
+  def permitted_params
+    params.permit(:content, :echo_id)
+  end
+
+  def set_message
+    @message = @conversation.messages.find(params[:id])
+  end
+
+  def message_params
+    {
+      account_id: @conversation.account_id,
+      sender: @contact_inbox.contact,
+      content: permitted_params[:content],
+      inbox_id: @conversation.inbox_id,
+      echo_id: permitted_params[:echo_id],
+      message_type: :incoming
+    }
+  end
+end
diff --git a/app/controllers/public/api/v1/inboxes_controller.rb b/app/controllers/public/api/v1/inboxes_controller.rb
new file mode 100644
index 000000000..a57e72e40
--- /dev/null
+++ b/app/controllers/public/api/v1/inboxes_controller.rb
@@ -0,0 +1,23 @@
+class Public::Api::V1::InboxesController < PublicController
+  before_action :set_inbox_channel
+  before_action :set_contact_inbox
+  before_action :set_conversation
+
+  private
+
+  def set_inbox_channel
+    @inbox_channel = ::Channel::Api.find_by!(identifier: params[:inbox_id])
+  end
+
+  def set_contact_inbox
+    return if params[:contact_id].blank?
+
+    @contact_inbox = @inbox_channel.inbox.contact_inboxes.find_by!(source_id: params[:contact_id])
+  end
+
+  def set_conversation
+    return if params[:conversation_id].blank?
+
+    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:conversation_id])
+  end
+end
diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
new file mode 100644
index 000000000..615a5d610
--- /dev/null
+++ b/app/controllers/public_controller.rb
@@ -0,0 +1,3 @@
+class PublicController < ActionController::Base
+  skip_before_action :verify_authenticity_token
+end
diff --git a/app/models/channel/api.rb b/app/models/channel/api.rb
index 672d8f383..7899da789 100644
--- a/app/models/channel/api.rb
+++ b/app/models/channel/api.rb
@@ -2,11 +2,19 @@
 #
 # Table name: channel_api
 #
-#  id          :bigint           not null, primary key
-#  webhook_url :string
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :integer          not null
+#  id             :bigint           not null, primary key
+#  hmac_mandatory :boolean          default(FALSE)
+#  hmac_token     :string
+#  identifier     :string
+#  webhook_url    :string
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  account_id     :integer          not null
+#
+# Indexes
+#
+#  index_channel_api_on_hmac_token  (hmac_token) UNIQUE
+#  index_channel_api_on_identifier  (identifier) UNIQUE
 #
 
 class Channel::Api < ApplicationRecord
@@ -15,6 +23,9 @@ class Channel::Api < ApplicationRecord
   validates :account_id, presence: true
   belongs_to :account
 
+  has_secure_token :identifier
+  has_secure_token :hmac_token
+
   has_one :inbox, as: :channel, dependent: :destroy
 
   def name
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 1f632cd51..793544531 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -4,6 +4,7 @@
 #
 #  id                    :integer          not null, primary key
 #  feature_flags         :integer          default(3), not null
+#  hmac_mandatory        :boolean          default(FALSE)
 #  hmac_token            :string
 #  pre_chat_form_enabled :boolean          default(FALSE)
 #  pre_chat_form_options :jsonb
diff --git a/app/views/public/api/v1/inboxes/contacts/create.json.jbuilder b/app/views/public/api/v1/inboxes/contacts/create.json.jbuilder
new file mode 100644
index 000000000..256b588a5
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/contacts/create.json.jbuilder
@@ -0,0 +1,2 @@
+json.source_id @contact_inbox.source_id
+json.partial! 'public/api/v1/models/contact.json.jbuilder', resource: @contact_inbox.contact
diff --git a/app/views/public/api/v1/inboxes/contacts/show.json.jbuilder b/app/views/public/api/v1/inboxes/contacts/show.json.jbuilder
new file mode 100644
index 000000000..256b588a5
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/contacts/show.json.jbuilder
@@ -0,0 +1,2 @@
+json.source_id @contact_inbox.source_id
+json.partial! 'public/api/v1/models/contact.json.jbuilder', resource: @contact_inbox.contact
diff --git a/app/views/public/api/v1/inboxes/contacts/update.json.jbuilder b/app/views/public/api/v1/inboxes/contacts/update.json.jbuilder
new file mode 100644
index 000000000..256b588a5
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/contacts/update.json.jbuilder
@@ -0,0 +1,2 @@
+json.source_id @contact_inbox.source_id
+json.partial! 'public/api/v1/models/contact.json.jbuilder', resource: @contact_inbox.contact
diff --git a/app/views/public/api/v1/inboxes/conversations/create.json.jbuilder b/app/views/public/api/v1/inboxes/conversations/create.json.jbuilder
new file mode 100644
index 000000000..81d59cde5
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/conversations/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'public/api/v1/models/conversation.json.jbuilder', resource: @conversation
diff --git a/app/views/public/api/v1/inboxes/conversations/index.json.jbuilder b/app/views/public/api/v1/inboxes/conversations/index.json.jbuilder
new file mode 100644
index 000000000..97942b57b
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/conversations/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @conversations do |conversation|
+  json.partial! 'public/api/v1/models/conversation.json.jbuilder', resource: conversation
+end
diff --git a/app/views/public/api/v1/inboxes/messages/create.json.jbuilder b/app/views/public/api/v1/inboxes/messages/create.json.jbuilder
new file mode 100644
index 000000000..8b138e948
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/messages/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'public/api/v1/models/message.json.jbuilder', resource: @message
diff --git a/app/views/public/api/v1/inboxes/messages/index.json.jbuilder b/app/views/public/api/v1/inboxes/messages/index.json.jbuilder
new file mode 100644
index 000000000..124c79e2d
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/messages/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @messages do |message|
+  json.partial! 'public/api/v1/models/message.json.jbuilder', resource: message
+end
diff --git a/app/views/public/api/v1/inboxes/messages/update.json.jbuilder b/app/views/public/api/v1/inboxes/messages/update.json.jbuilder
new file mode 100644
index 000000000..8b138e948
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/messages/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'public/api/v1/models/message.json.jbuilder', resource: @message
diff --git a/app/views/public/api/v1/models/_contact.json.jbuilder b/app/views/public/api/v1/models/_contact.json.jbuilder
new file mode 100644
index 000000000..aa8abf2e2
--- /dev/null
+++ b/app/views/public/api/v1/models/_contact.json.jbuilder
@@ -0,0 +1,4 @@
+json.id resource.id
+json.name resource.name
+json.email resource.email
+json.pubsub_token resource.pubsub_token
diff --git a/app/views/public/api/v1/models/_conversation.json.jbuilder b/app/views/public/api/v1/models/_conversation.json.jbuilder
new file mode 100644
index 000000000..7029238d9
--- /dev/null
+++ b/app/views/public/api/v1/models/_conversation.json.jbuilder
@@ -0,0 +1,10 @@
+json.id resource.display_id
+json.inbox_id resource.inbox_id
+json.contact_last_seen_at resource.contact_last_seen_at.to_i
+json.status resource.status
+json.messages do
+  json.array! resource.messages do |message|
+    json.partial! 'public/api/v1/models/message.json.jbuilder', resource: message
+  end
+end
+json.contact resource.contact
diff --git a/app/views/public/api/v1/models/_message.json.jbuilder b/app/views/public/api/v1/models/_message.json.jbuilder
new file mode 100644
index 000000000..8aa42aba3
--- /dev/null
+++ b/app/views/public/api/v1/models/_message.json.jbuilder
@@ -0,0 +1,9 @@
+json.id resource.id
+json.content resource.content
+json.message_type resource.message_type_before_type_cast
+json.content_type resource.content_type
+json.content_attributes resource.content_attributes
+json.created_at resource.created_at.to_i
+json.conversation_id resource.conversation.display_id
+json.attachments resource.attachments.map(&:push_event_data) if resource.attachments.present?
+json.sender resource.sender.push_event_data if resource.sender
diff --git a/config/environments/development.rb b/config/environments/development.rb
index a03f8f2b4..eab9c411d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -85,4 +85,7 @@ Rails.application.configure do
       resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
     end
   end
+
+  # ref : https://medium.com/@emikaijuin/connecting-to-action-cable-without-rails-d39a8aaa52d5
+  config.action_cable.disable_request_forgery_protection = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index c812e7d10..c60fff3e6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -42,9 +42,12 @@ Rails.application.configure do
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
-  if ENV['FRONTEND_URL'].present?
-    config.action_cable.allowed_request_origins = [ENV['FRONTEND_URL'], %r{https?://#{URI.parse(ENV['FRONTEND_URL']).host}(:[0-9]+)?}]
-  end
+
+  # to enable connecting to the API channel public APIs
+  config.action_cable.disable_request_forgery_protection = true
+  # if ENV['FRONTEND_URL'].present?
+  #   config.action_cable.allowed_request_origins = [ENV['FRONTEND_URL'], %r{https?://#{URI.parse(ENV['FRONTEND_URL']).host}(:[0-9]+)?}]
+  # end
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = ActiveModel::Type::Boolean.new.cast(ENV.fetch('FORCE_SSL', false))
diff --git a/config/routes.rb b/config/routes.rb
index bdeaf7c01..82876ceba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -199,6 +199,24 @@ Rails.application.routes.draw do
     end
   end
 
+  # ----------------------------------------------------------------------
+  # Routes for inbox APIs Exposed to contacts
+  namespace :public, defaults: { format: 'json' } do
+    namespace :api do
+      namespace :v1 do
+        resources :inboxes do
+          scope module: :inboxes do
+            resources :contacts, only: [:create, :show, :update] do
+              resources :conversations, only: [:index, :create] do
+                resources :messages, only: [:index, :create, :update]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
   # ----------------------------------------------------------------------
   # Used in mailer templates
   resource :app, only: [:index] do
diff --git a/db/migrate/20210602182058_add_hmac_to_api_channel.rb b/db/migrate/20210602182058_add_hmac_to_api_channel.rb
new file mode 100644
index 000000000..f441c2829
--- /dev/null
+++ b/db/migrate/20210602182058_add_hmac_to_api_channel.rb
@@ -0,0 +1,19 @@
+class AddHmacToApiChannel < ActiveRecord::Migration[6.0]
+  def change
+    add_column :channel_api, :identifier, :string
+    add_index :channel_api, :identifier, unique: true
+    add_column :channel_api, :hmac_token, :string
+    add_index :channel_api, :hmac_token, unique: true
+    add_column :channel_api, :hmac_mandatory, :boolean, default: false
+    add_column :channel_web_widgets, :hmac_mandatory, :boolean, default: false
+    set_up_existing_api_channels
+  end
+
+  def set_up_existing_api_channels
+    ::Channel::Api.find_in_batches do |api_channels_batch|
+      Rails.logger.info "migrated till #{api_channels_batch.first.id}\n"
+      api_channels_batch.map(&:regenerate_hmac_token)
+      api_channels_batch.map(&:regenerate_identifier)
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ec4849f74..4edb50157 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -143,6 +143,11 @@ ActiveRecord::Schema.define(version: 2021_06_09_133433) do
     t.string "webhook_url"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "identifier"
+    t.string "hmac_token"
+    t.boolean "hmac_mandatory", default: false
+    t.index ["hmac_token"], name: "index_channel_api_on_hmac_token", unique: true
+    t.index ["identifier"], name: "index_channel_api_on_identifier", unique: true
   end
 
   create_table "channel_email", force: :cascade do |t|
@@ -201,6 +206,7 @@ ActiveRecord::Schema.define(version: 2021_06_09_133433) do
     t.string "hmac_token"
     t.boolean "pre_chat_form_enabled", default: false
     t.jsonb "pre_chat_form_options", default: {}
+    t.boolean "hmac_mandatory", default: false
     t.index ["hmac_token"], name: "index_channel_web_widgets_on_hmac_token", unique: true
     t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
   end
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb b/spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb
new file mode 100644
index 000000000..284d21c83
--- /dev/null
+++ b/spec/controllers/platform/api/v1/public/api/v1/inbox/contacts_controller_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+RSpec.describe 'Public Inbox Contacts API', type: :request do
+  let!(:api_channel) { create(:channel_api) }
+  let!(:contact) { create(:contact) }
+  let!(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: api_channel.inbox) }
+
+  describe 'POST /public/api/v1/inboxes/{identifier}/contact' do
+    it 'creates a contact and return the source id' do
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['source_id']).not_to eq nil
+      expect(data['pubsub_token']).not_to eq nil
+    end
+  end
+
+  describe 'GET /public/api/v1/inboxes/{identifier}/contact/{source_id}' do
+    it 'gets a contact when present' do
+      get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['source_id']).to eq contact_inbox.source_id
+      expect(data['pubsub_token']).to eq contact.pubsub_token
+    end
+  end
+
+  describe 'PATCH /public/api/v1/inboxes/{identifier}/contact/{source_id}' do
+    it 'updates a contact when present' do
+      patch "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}",
+            params: { name: 'John Smith' }
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['name']).to eq 'John Smith'
+    end
+  end
+end
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb
new file mode 100644
index 000000000..1250ba526
--- /dev/null
+++ b/spec/controllers/platform/api/v1/public/api/v1/inbox/conversations_controller_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
+  let!(:api_channel) { create(:channel_api) }
+  let!(:contact) { create(:contact) }
+  let!(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: api_channel.inbox) }
+
+  describe 'GET /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations' do
+    it 'return the conversations for that contact' do
+      create(:conversation, contact_inbox: contact_inbox)
+      get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data.length).to eq 1
+    end
+  end
+
+  describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations' do
+    it 'creates a conversation for that contact' do
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['id']).not_to eq nil
+    end
+  end
+end
diff --git a/spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb b/spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb
new file mode 100644
index 000000000..7390d4dd9
--- /dev/null
+++ b/spec/controllers/platform/api/v1/public/api/v1/inbox/messages_controller_spec.rb
@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request do
+  let!(:api_channel) { create(:channel_api) }
+  let!(:contact) { create(:contact) }
+  let!(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: api_channel.inbox) }
+  let!(:conversation)  { create(:conversation, contact: contact, contact_inbox: contact_inbox) }
+
+  describe 'GET /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}/messages' do
+    it 'return the messages for that conversation' do
+      2.times.each { create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation) }
+
+      get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data.length).to eq 2
+    end
+  end
+
+  describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}/messages' do
+    it 'creates a message in the conversation' do
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages",
+           params: { content: 'hello' }
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['content']).to eq('hello')
+    end
+
+    it 'creates attachment message in conversation' do
+      file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages",
+           params: { content: 'hello', attachments: [file] }
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['content']).to eq('hello')
+
+      expect(conversation.messages.last.attachments.first.file.present?).to eq(true)
+      expect(conversation.messages.last.attachments.first.file_type).to eq('image')
+    end
+  end
+
+  describe 'PATCH /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}/messages/{id}' do
+    it 'creates a message in the conversation' do
+      message = create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation)
+      patch "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/" \
+            "#{conversation.display_id}/messages/#{message.id}",
+            params: { submitted_values: [{ title: 'test' }] }
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['content_attributes']['submitted_values'].first['title']).to eq 'test'
+    end
+  end
+end

From fb2f3ff89fc9358e103d7fe2caae270ecfd7b5ce Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 15 Jun 2021 20:09:42 +0530
Subject: [PATCH 64/67] feat: Create campaign conversation only if user
 interacts with the bubble  (#2335)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/sdk/IFrameHelper.js            | 10 +++++
 app/javascript/widget/App.vue                 | 38 ++++++++++++++++++-
 app/javascript/widget/api/campaign.js         |  3 +-
 .../widget/components/UnreadMessage.vue       | 15 +++++++-
 .../widget/helpers/campaignTimer.js           |  5 +--
 .../widget/store/modules/campaign.js          | 25 +++++++++++-
 .../store/modules/conversation/getters.js     |  3 ++
 .../modules/specs/campaign/actions.spec.js    | 36 ++++++++++++++++--
 .../modules/specs/campaign/getters.spec.js    | 36 ++++++++++++++++++
 .../modules/specs/campaign/mutations.spec.js  | 10 ++++-
 .../specs/conversation/getters.spec.js        | 11 ++++++
 app/javascript/widget/views/Router.vue        | 13 ++++++-
 app/javascript/widget/views/Unread.vue        | 22 ++++++++++-
 .../v1/widget/campaigns/index.json.jbuilder   |  2 +
 14 files changed, 211 insertions(+), 18 deletions(-)

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 8c02491e9..b15516017 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -156,6 +156,16 @@ export const IFrameHelper = {
       }
     },
 
+    setCampaignMode: () => {
+      const { isOpen } = window.$chatwoot;
+      const toggleValue = true;
+      if (!isOpen) {
+        onBubbleClick({ toggleValue });
+        const holderEl = document.querySelector('.woot-widget-holder');
+        addClass(holderEl, 'has-unread-view');
+      }
+    },
+
     resetUnreadMode: () => {
       IFrameHelper.sendMessage('unset-unread-view');
       IFrameHelper.events.removeUnreadClass();
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index df1341f2c..b7d67dad8 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -1,6 +1,7 @@
 <template>
   <router
     :show-unread-view="showUnreadView"
+    :show-campaign-view="showCampaignView"
     :is-mobile="isMobile"
     :has-fetched="hasFetched"
     :unread-message-count="unreadMessageCount"
@@ -17,6 +18,7 @@ import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import Router from './views/Router';
 import { getLocale } from './helpers/urlParamsHelper';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
+import { isEmptyObject } from 'widget/helpers/utils';
 
 export default {
   name: 'App',
@@ -26,6 +28,7 @@ export default {
   data() {
     return {
       showUnreadView: false,
+      showCampaignView: false,
       isMobile: false,
       hideMessageBubble: false,
       widgetPosition: 'right',
@@ -35,8 +38,10 @@ export default {
   computed: {
     ...mapGetters({
       hasFetched: 'agent/getHasFetched',
+      messageCount: 'conversation/getMessageCount',
       unreadMessageCount: 'conversation/getUnreadMessageCount',
       campaigns: 'campaign/getCampaigns',
+      activeCampaign: 'campaign/getActiveCampaign',
     }),
     isLeftAligned() {
       const isLeft = this.widgetPosition === 'left';
@@ -49,6 +54,11 @@ export default {
       return RNHelper.isRNWebView();
     },
   },
+  watch: {
+    activeCampaign() {
+      this.setCampaignView();
+    },
+  },
   mounted() {
     const { websiteToken, locale } = window.chatwootWebChannel;
     this.setLocale(locale);
@@ -69,11 +79,12 @@ export default {
     this.$store.dispatch('conversationAttributes/get');
     this.setWidgetColor(window.chatwootWebChannel);
     this.registerUnreadEvents();
+    this.registerCampaignEvents();
   },
   methods: {
     ...mapActions('appConfig', ['setWidgetColor']),
     ...mapActions('conversation', ['fetchOldConversations', 'setUserLastSeen']),
-    ...mapActions('campaign', ['startCampaigns']),
+    ...mapActions('campaign', ['initCampaigns', 'executeCampaign']),
     ...mapActions('agent', ['fetchAvailableAgents']),
     scrollConversationToBottom() {
       const container = this.$el.querySelector('.conversation-wrap');
@@ -110,9 +121,30 @@ export default {
         this.setUserLastSeen();
       });
     },
+    registerCampaignEvents() {
+      bus.$on('on-campaign-view-clicked', campaignId => {
+        const { websiteToken } = window.chatwootWebChannel;
+        this.showCampaignView = false;
+        this.showUnreadView = false;
+        this.unsetUnreadView();
+        this.setUserLastSeen();
+        this.executeCampaign({ campaignId, websiteToken });
+      });
+    },
     setPopoutDisplay(showPopoutButton) {
       this.showPopoutButton = showPopoutButton;
     },
+    setCampaignView() {
+      const { messageCount, activeCampaign } = this;
+      const isCampaignReadyToExecute =
+        !isEmptyObject(activeCampaign) && !messageCount;
+      if (this.isIFrame && isCampaignReadyToExecute) {
+        this.showCampaignView = true;
+        IFrameHelper.sendMessage({
+          event: 'setCampaignMode',
+        });
+      }
+    },
     setUnreadView() {
       const { unreadMessageCount } = this;
       if (this.isIFrame && unreadMessageCount > 0) {
@@ -156,7 +188,7 @@ export default {
           this.scrollConversationToBottom();
         } else if (message.event === 'change-url') {
           const { referrerURL, referrerHost } = message;
-          this.startCampaigns({ currentURL: referrerURL, websiteToken });
+          this.initCampaigns({ currentURL: referrerURL, websiteToken });
           window.referrerURL = referrerURL;
           bus.$emit(BUS_EVENTS.SET_REFERRER_HOST, referrerHost);
         } else if (message.event === 'toggle-close-button') {
@@ -183,8 +215,10 @@ export default {
           this.setBubbleLabel();
         } else if (message.event === 'set-unread-view') {
           this.showUnreadView = true;
+          this.showCampaignView = false;
         } else if (message.event === 'unset-unread-view') {
           this.showUnreadView = false;
+          this.showCampaignView = false;
         }
       });
     },
diff --git a/app/javascript/widget/api/campaign.js b/app/javascript/widget/api/campaign.js
index 7aad71171..00116a6b2 100644
--- a/app/javascript/widget/api/campaign.js
+++ b/app/javascript/widget/api/campaign.js
@@ -7,8 +7,7 @@ const getCampaigns = async websiteToken => {
   return result;
 };
 
-const triggerCampaign = async ({ campaignId }) => {
-  const { websiteToken } = window.chatwootWebChannel;
+const triggerCampaign = async ({ campaignId, websiteToken }) => {
   const urlData = endPoints.triggerCampaign({ websiteToken, campaignId });
 
   await API.post(
diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index 06d7ce8df..e8ee1cca4 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="chat-bubble-wrap">
-    <div class="chat-bubble agent">
+    <button class="chat-bubble agent" @click="onClickMessage">
       <div v-if="showSender" class="row--agent-block">
         <thumbnail
           :src="avatarUrl"
@@ -12,7 +12,7 @@
         <span class="company--name"> {{ companyName }}</span>
       </div>
       <div class="message-content" v-html="formatMessage(message, false)"></div>
-    </div>
+    </button>
   </div>
 </template>
 
@@ -38,6 +38,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    campaignId: {
+      type: Number,
+      default: null,
+    },
   },
   computed: {
     companyName() {
@@ -76,6 +80,11 @@ export default {
     isSenderExist(sender) {
       return sender && !isEmptyObject(sender);
     },
+    onClickMessage() {
+      if (this.campaignId) {
+        bus.$emit('on-campaign-view-clicked', this.campaignId);
+      }
+    },
   },
 };
 </script>
@@ -84,7 +93,9 @@ export default {
 .chat-bubble {
   max-width: 85%;
   padding: $space-normal;
+  cursor: pointer;
 }
+
 .row--agent-block {
   align-items: center;
   display: flex;
diff --git a/app/javascript/widget/helpers/campaignTimer.js b/app/javascript/widget/helpers/campaignTimer.js
index 11197f1d1..9e587345a 100644
--- a/app/javascript/widget/helpers/campaignTimer.js
+++ b/app/javascript/widget/helpers/campaignTimer.js
@@ -1,5 +1,4 @@
-import { triggerCampaign } from 'widget/api/campaign';
-
+import store from '../store';
 class CampaignTimer {
   constructor() {
     this.campaignTimers = [];
@@ -10,7 +9,7 @@ class CampaignTimer {
     campaigns.forEach(campaign => {
       const { timeOnPage, id: campaignId } = campaign;
       this.campaignTimers[campaignId] = setTimeout(() => {
-        triggerCampaign({ campaignId });
+        store.dispatch('campaign/startCampaign', { campaignId });
       }, timeOnPage * 1000);
     });
   };
diff --git a/app/javascript/widget/store/modules/campaign.js b/app/javascript/widget/store/modules/campaign.js
index ebfd90fac..8fe7f06e2 100644
--- a/app/javascript/widget/store/modules/campaign.js
+++ b/app/javascript/widget/store/modules/campaign.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { getCampaigns } from 'widget/api/campaign';
+import { getCampaigns, triggerCampaign } from 'widget/api/campaign';
 import campaignTimer from 'widget/helpers/campaignTimer';
 import {
   formatCampaigns,
@@ -11,6 +11,7 @@ const state = {
     isError: false,
     hasFetched: false,
   },
+  activeCampaign: {},
 };
 
 const resetCampaignTimers = (campaigns, currentURL) => {
@@ -26,6 +27,7 @@ const resetCampaignTimers = (campaigns, currentURL) => {
 export const getters = {
   getHasFetched: $state => $state.uiFlags.hasFetched,
   getCampaigns: $state => $state.records,
+  getActiveCampaign: $state => $state.activeCampaign,
 };
 
 export const actions = {
@@ -41,7 +43,7 @@ export const actions = {
       commit('setHasFetched', true);
     }
   },
-  startCampaigns: async (
+  initCampaigns: async (
     { getters: { getCampaigns: campaigns }, dispatch },
     { currentURL, websiteToken }
   ) => {
@@ -51,12 +53,31 @@ export const actions = {
       resetCampaignTimers(campaigns, currentURL);
     }
   },
+  startCampaign: async (
+    { getters: { getCampaigns: campaigns }, commit },
+    { campaignId }
+  ) => {
+    const campaign = campaigns.find(item => item.id === campaignId);
+    commit('setActiveCampaign', campaign);
+  },
+
+  executeCampaign: async ({ commit }, { campaignId, websiteToken }) => {
+    try {
+      await triggerCampaign({ campaignId, websiteToken });
+      commit('setActiveCampaign', {});
+    } catch (error) {
+      commit('setError', true);
+    }
+  },
 };
 
 export const mutations = {
   setCampaigns($state, data) {
     Vue.set($state, 'records', data);
   },
+  setActiveCampaign($state, data) {
+    Vue.set($state, 'activeCampaign', data);
+  },
   setError($state, value) {
     Vue.set($state.uiFlags, 'isError', value);
   },
diff --git a/app/javascript/widget/store/modules/conversation/getters.js b/app/javascript/widget/store/modules/conversation/getters.js
index 2ba30d9f4..165584c1c 100644
--- a/app/javascript/widget/store/modules/conversation/getters.js
+++ b/app/javascript/widget/store/modules/conversation/getters.js
@@ -27,6 +27,9 @@ export const getters = {
     }));
   },
   getIsFetchingList: _state => _state.uiFlags.isFetchingList,
+  getMessageCount: _state => {
+    return Object.values(_state.conversations).length;
+  },
   getUnreadMessageCount: _state => {
     const { userLastSeenAt } = _state.meta;
     const count = Object.values(_state.conversations).filter(chat => {
diff --git a/app/javascript/widget/store/modules/specs/campaign/actions.spec.js b/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
index 2a01dbf83..ab5a74702 100644
--- a/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
@@ -39,14 +39,14 @@ describe('#actions', () => {
     });
   });
 
-  describe('#startCampaigns', () => {
+  describe('#initCampaigns', () => {
     const actionParams = {
       websiteToken: 'XDsafmADasd',
       currentURL: 'https://chatwoot.com',
     };
 
     it('sends correct actions if campaigns are empty', async () => {
-      await actions.startCampaigns(
+      await actions.initCampaigns(
         { dispatch, getters: { getCampaigns: [] } },
         actionParams
       );
@@ -54,7 +54,7 @@ describe('#actions', () => {
       expect(campaignTimer.initTimers).not.toHaveBeenCalled();
     });
     it('resets time if campaigns are available', async () => {
-      await actions.startCampaigns(
+      await actions.initCampaigns(
         { dispatch, getters: { getCampaigns: campaigns } },
         actionParams
       );
@@ -64,4 +64,34 @@ describe('#actions', () => {
       });
     });
   });
+  describe('#startCampaign', () => {
+    it('reset campaign if campaign id is not present in the campaign list', async () => {
+      await actions.startCampaign(
+        { dispatch, getters: { getCampaigns: campaigns }, commit },
+        { campaignId: 32 }
+      );
+      expect(commit.mock.calls).toEqual([['setActiveCampaign', undefined]]);
+    });
+    it('start campaign if campaign id passed', async () => {
+      await actions.startCampaign(
+        { dispatch, getters: { getCampaigns: campaigns }, commit },
+        { campaignId: 1 }
+      );
+      expect(commit.mock.calls).toEqual([['setActiveCampaign', campaigns[0]]]);
+    });
+  });
+  describe('#executeCampaign', () => {
+    it('sends correct actions if  execute campaign API is success', async () => {
+      const params = { campaignId: 12, websiteToken: 'XDsafmADasd' };
+      API.post.mockResolvedValue({});
+      await actions.executeCampaign({ commit }, params);
+      expect(commit.mock.calls).toEqual([['setActiveCampaign', {}]]);
+    });
+    it('sends correct actions if  execute campaign API is failed', async () => {
+      const params = { campaignId: 12, websiteToken: 'XDsafmADasd' };
+      API.post.mockRejectedValue({ message: 'Authentication required' });
+      await actions.executeCampaign({ commit }, params);
+      expect(commit.mock.calls).toEqual([['setError', true]]);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/campaign/getters.spec.js b/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
index 60af8cced..2d027426c 100644
--- a/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
@@ -1,5 +1,6 @@
 import { getters } from '../../campaign';
 import { campaigns } from './data';
+jest.mock('widget/store/index.js');
 
 describe('#getters', () => {
   it('getCampaigns', () => {
@@ -93,4 +94,39 @@ describe('#getters', () => {
       },
     ]);
   });
+
+  it('getActiveCampaign', () => {
+    const state = {
+      records: campaigns[0],
+    };
+    expect(getters.getCampaigns(state)).toEqual({
+      id: 1,
+      title: 'Welcome',
+      description: null,
+      account_id: 1,
+      inbox: {
+        id: 37,
+        channel_id: 1,
+        name: 'Chatwoot',
+        channel_type: 'Channel::WebWidget',
+      },
+      sender: {
+        account_id: 1,
+        availability_status: 'offline',
+        confirmed: true,
+        email: 'sojan@chatwoot.com',
+        available_name: 'Sojan',
+        id: 10,
+        name: 'Sojan',
+      },
+      message: 'Hey, What brings you today',
+      enabled: true,
+      trigger_rules: {
+        url: 'https://github.com',
+        time_on_page: 10,
+      },
+      created_at: '2021-05-03T04:53:36.354Z',
+      updated_at: '2021-05-03T04:53:36.354Z',
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js b/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
index fc8c585c9..1ca364751 100644
--- a/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
@@ -1,6 +1,6 @@
 import { mutations } from '../../campaign';
 import { campaigns } from './data';
-
+jest.mock('widget/store/index.js');
 describe('#mutations', () => {
   describe('#setCampaigns', () => {
     it('set campaign records', () => {
@@ -25,4 +25,12 @@ describe('#mutations', () => {
       expect(state.uiFlags.hasFetched).toEqual(true);
     });
   });
+
+  describe('#setActiveCampaign', () => {
+    it('set active campaign', () => {
+      const state = { records: [] };
+      mutations.setActiveCampaign(state, campaigns[0]);
+      expect(state.activeCampaign).toEqual(campaigns[0]);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
index e2df3c7f0..da116fe66 100644
--- a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
@@ -434,4 +434,15 @@ describe('#getters', () => {
       ]);
     });
   });
+
+  it('getMessageCount', () => {
+    const state = {
+      conversations: {
+        1: {
+          content: 'hey, how are you?',
+        },
+      },
+    };
+    expect(getters.getMessageCount(state)).toEqual(1);
+  });
 });
diff --git a/app/javascript/widget/views/Router.vue b/app/javascript/widget/views/Router.vue
index 97b93d4da..7d98bb66f 100644
--- a/app/javascript/widget/views/Router.vue
+++ b/app/javascript/widget/views/Router.vue
@@ -9,13 +9,13 @@
     }"
   >
     <home
-      v-if="!showUnreadView"
+      v-if="showHomePage"
       :has-fetched="hasFetched"
       :unread-message-count="unreadMessageCount"
       :show-popout-button="showPopoutButton"
     />
     <unread
-      v-else
+      :show-unread-view="showUnreadView"
       :has-fetched="hasFetched"
       :unread-message-count="unreadMessageCount"
       :hide-message-bubble="hideMessageBubble"
@@ -50,6 +50,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showCampaignView: {
+      type: Boolean,
+      default: false,
+    },
     hideMessageBubble: {
       type: Boolean,
       default: false,
@@ -63,5 +67,10 @@ export default {
       default: false,
     },
   },
+  computed: {
+    showHomePage() {
+      return !this.showUnreadView && !this.showCampaignView;
+    },
+  },
 };
 </script>
diff --git a/app/javascript/widget/views/Unread.vue b/app/javascript/widget/views/Unread.vue
index d93118b8b..808215d6d 100644
--- a/app/javascript/widget/views/Unread.vue
+++ b/app/javascript/widget/views/Unread.vue
@@ -12,12 +12,14 @@
     </div>
     <div class="unread-messages">
       <unread-message
-        v-for="(message, index) in unreadMessages"
+        v-for="(message, index) in allMessages"
         :key="message.id"
+        :message-type="message.messageType"
         :message-id="message.id"
         :show-sender="!index"
         :sender="message.sender"
         :message="getMessageContent(message)"
+        :campaign-id="message.campaignId"
       />
     </div>
 
@@ -60,10 +62,15 @@ export default {
       type: Boolean,
       default: false,
     },
+    showUnreadView: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters({
       unreadMessages: 'conversation/getUnreadTextMessages',
+      campaign: 'campaign/getActiveCampaign',
     }),
     showCloseButton() {
       return this.unreadMessageCount && this.hideMessageBubble;
@@ -72,6 +79,19 @@ export default {
       const [firstMessage] = this.unreadMessages;
       return firstMessage.sender || {};
     },
+    allMessages() {
+      if (this.showUnreadView) {
+        return this.unreadMessages;
+      }
+      const { sender, id: campaignId, message: content } = this.campaign;
+      return [
+        {
+          content,
+          sender,
+          campaignId,
+        },
+      ];
+    },
   },
   methods: {
     openFullView() {
diff --git a/app/views/api/v1/widget/campaigns/index.json.jbuilder b/app/views/api/v1/widget/campaigns/index.json.jbuilder
index 0d7aa24e3..48a551490 100644
--- a/app/views/api/v1/widget/campaigns/index.json.jbuilder
+++ b/app/views/api/v1/widget/campaigns/index.json.jbuilder
@@ -1,4 +1,6 @@
 json.array! @campaigns do |campaign|
   json.id campaign.display_id
   json.trigger_rules campaign.trigger_rules
+  json.message campaign.message
+  json.sender campaign.sender&.slice(:name, :avatar_url)
 end

From e41957ae02c27a6ebce11e02642a468fa5b9d33b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 15 Jun 2021 21:23:16 +0530
Subject: [PATCH 65/67] fix: Campaign message is hiding the conversation view
 after opening the widget (#2428)

* Fix the widget triggered- campain collision

* fix spelling mistakes
---
 app/javascript/widget/App.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index b7d67dad8..60c02076f 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -33,6 +33,7 @@ export default {
       hideMessageBubble: false,
       widgetPosition: 'right',
       showPopoutButton: false,
+      isWebWidgetTriggered: false,
     };
   },
   computed: {
@@ -137,7 +138,9 @@ export default {
     setCampaignView() {
       const { messageCount, activeCampaign } = this;
       const isCampaignReadyToExecute =
-        !isEmptyObject(activeCampaign) && !messageCount;
+        !isEmptyObject(activeCampaign) &&
+        !messageCount &&
+        !this.isWebWidgetTriggered;
       if (this.isIFrame && isCampaignReadyToExecute) {
         this.showCampaignView = true;
         IFrameHelper.sendMessage({
@@ -162,7 +165,11 @@ export default {
     createWidgetEvents(message) {
       const { eventName } = message;
       const isWidgetTriggerEvent = eventName === 'webwidget.triggered';
-      if (isWidgetTriggerEvent && this.showUnreadView) {
+      this.isWebWidgetTriggered = true;
+      if (
+        isWidgetTriggerEvent &&
+        (this.showUnreadView || this.showCampaignView)
+      ) {
         return;
       }
       this.setUserLastSeen();

From 7a7f6234b1572b699572c50569bf111ed5a7944e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 15 Jun 2021 22:15:18 +0530
Subject: [PATCH 66/67] chore: Enable Polish (pl), update translations (#2403)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/ar/campaign.json    |  13 +
 .../dashboard/i18n/locale/ar/contact.json     |  39 ++-
 .../i18n/locale/ar/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  19 +-
 .../i18n/locale/ar/integrationApps.json       |  62 ++++
 .../i18n/locale/ar/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ar/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ar/settings.json    |   6 +
 .../i18n/locale/ar/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ca/campaign.json    |  13 +
 .../dashboard/i18n/locale/ca/contact.json     |  39 ++-
 .../i18n/locale/ca/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  19 +-
 .../i18n/locale/ca/integrationApps.json       |  62 ++++
 .../i18n/locale/ca/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ca/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ca/settings.json    |   6 +
 .../i18n/locale/ca/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/cs/campaign.json    |  13 +
 .../dashboard/i18n/locale/cs/contact.json     |  39 ++-
 .../i18n/locale/cs/conversation.json          |   2 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  19 +-
 .../i18n/locale/cs/integrationApps.json       |  62 ++++
 .../i18n/locale/cs/integrations.json          |  18 ++
 .../dashboard/i18n/locale/cs/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/cs/settings.json    |   6 +
 .../i18n/locale/cs/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/da/campaign.json    |  13 +
 .../dashboard/i18n/locale/da/contact.json     |  39 ++-
 .../i18n/locale/da/conversation.json          |   2 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  19 +-
 .../i18n/locale/da/integrationApps.json       |  62 ++++
 .../i18n/locale/da/integrations.json          |  18 ++
 .../dashboard/i18n/locale/da/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/da/settings.json    |   6 +
 .../i18n/locale/da/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/de/campaign.json    |  15 +-
 .../dashboard/i18n/locale/de/contact.json     |  55 ++--
 .../i18n/locale/de/conversation.json          |   2 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  19 +-
 .../i18n/locale/de/integrationApps.json       |  62 ++++
 .../i18n/locale/de/integrations.json          |  18 ++
 .../dashboard/i18n/locale/de/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/de/report.json      |   6 +-
 .../dashboard/i18n/locale/de/settings.json    |   6 +
 .../i18n/locale/de/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/el/campaign.json    |  13 +
 .../dashboard/i18n/locale/el/contact.json     |  57 ++--
 .../i18n/locale/el/conversation.json          |   4 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  21 +-
 .../i18n/locale/el/integrationApps.json       |  62 ++++
 .../i18n/locale/el/integrations.json          |  18 ++
 .../dashboard/i18n/locale/el/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/el/settings.json    |   6 +
 .../i18n/locale/el/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/es/campaign.json    |  13 +
 .../dashboard/i18n/locale/es/contact.json     |  39 ++-
 .../i18n/locale/es/conversation.json          |   2 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |  19 +-
 .../i18n/locale/es/integrationApps.json       |  62 ++++
 .../i18n/locale/es/integrations.json          |  18 ++
 .../dashboard/i18n/locale/es/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/es/settings.json    |   6 +
 .../i18n/locale/es/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/fa/campaign.json    |  13 +
 .../dashboard/i18n/locale/fa/contact.json     |  39 ++-
 .../i18n/locale/fa/conversation.json          |   2 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  19 +-
 .../i18n/locale/fa/integrationApps.json       |  62 ++++
 .../i18n/locale/fa/integrations.json          |  18 ++
 .../dashboard/i18n/locale/fa/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/fa/settings.json    |   6 +
 .../i18n/locale/fa/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/fi/campaign.json    |  13 +
 .../dashboard/i18n/locale/fi/contact.json     |  39 ++-
 .../i18n/locale/fi/conversation.json          |   2 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  19 +-
 .../i18n/locale/fi/integrationApps.json       |  62 ++++
 .../i18n/locale/fi/integrations.json          |  18 ++
 .../dashboard/i18n/locale/fi/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/fi/settings.json    |   6 +
 .../i18n/locale/fi/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/fr/campaign.json    |  13 +
 .../dashboard/i18n/locale/fr/contact.json     |  39 ++-
 .../i18n/locale/fr/conversation.json          |   2 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  19 +-
 .../i18n/locale/fr/integrationApps.json       |  62 ++++
 .../i18n/locale/fr/integrations.json          |  18 ++
 .../dashboard/i18n/locale/fr/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/fr/settings.json    |   6 +
 .../i18n/locale/fr/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/he/agentMgmt.json   |  96 ++++++
 .../dashboard/i18n/locale/he/campaign.json    |  92 ++++++
 .../dashboard/i18n/locale/he/cannedMgmt.json  |  76 +++++
 .../dashboard/i18n/locale/he/chatlist.json    |  86 +++++
 .../dashboard/i18n/locale/he/contact.json     | 207 ++++++++++++
 .../i18n/locale/he/conversation.json          | 118 +++++++
 .../i18n/locale/he/generalSettings.json       |  75 +++++
 .../dashboard/i18n/locale/he/inboxMgmt.json   | 306 ++++++++++++++++++
 .../i18n/locale/he/integrationApps.json       |  62 ++++
 .../i18n/locale/he/integrations.json          |  79 +++++
 .../dashboard/i18n/locale/he/labelsMgmt.json  |  70 ++++
 .../dashboard/i18n/locale/he/login.json       |  21 ++
 .../dashboard/i18n/locale/he/report.json      |  56 ++++
 .../i18n/locale/he/resetPassword.json         |  15 +
 .../i18n/locale/he/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/he/settings.json    | 160 +++++++++
 .../dashboard/i18n/locale/he/signup.json      |  38 +++
 .../i18n/locale/he/teamsSettings.json         | 125 +++++++
 .../dashboard/i18n/locale/he/webhooks.json    |   5 +
 .../dashboard/i18n/locale/hi/campaign.json    |  13 +
 .../dashboard/i18n/locale/hi/contact.json     |  39 ++-
 .../i18n/locale/hi/conversation.json          |   2 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  19 +-
 .../i18n/locale/hi/integrationApps.json       |  62 ++++
 .../i18n/locale/hi/integrations.json          |  18 ++
 .../dashboard/i18n/locale/hi/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/hi/settings.json    |   6 +
 .../i18n/locale/hi/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/hu/campaign.json    |  13 +
 .../dashboard/i18n/locale/hu/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/hu/contact.json     |  57 ++--
 .../i18n/locale/hu/conversation.json          |   2 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  19 +-
 .../i18n/locale/hu/integrationApps.json       |  62 ++++
 .../i18n/locale/hu/integrations.json          |  18 ++
 .../dashboard/i18n/locale/hu/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/hu/settings.json    |   6 +
 .../i18n/locale/hu/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/id/campaign.json    |  15 +-
 .../dashboard/i18n/locale/id/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/id/contact.json     |  67 ++--
 .../i18n/locale/id/conversation.json          |  18 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |  35 +-
 .../i18n/locale/id/integrationApps.json       |  62 ++++
 .../i18n/locale/id/integrations.json          |  18 ++
 .../dashboard/i18n/locale/id/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/id/report.json      |   6 +-
 .../dashboard/i18n/locale/id/settings.json    |  16 +-
 .../i18n/locale/id/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/it/campaign.json    |  13 +
 .../dashboard/i18n/locale/it/contact.json     |  39 ++-
 .../i18n/locale/it/conversation.json          |   2 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |  19 +-
 .../i18n/locale/it/integrationApps.json       |  62 ++++
 .../i18n/locale/it/integrations.json          |  18 ++
 .../dashboard/i18n/locale/it/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/it/settings.json    |   6 +
 .../i18n/locale/it/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ja/campaign.json    |  13 +
 .../dashboard/i18n/locale/ja/contact.json     |  39 ++-
 .../i18n/locale/ja/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |  19 +-
 .../i18n/locale/ja/integrationApps.json       |  62 ++++
 .../i18n/locale/ja/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ja/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ja/settings.json    |   6 +
 .../i18n/locale/ja/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ko/campaign.json    |  17 +-
 .../dashboard/i18n/locale/ko/contact.json     |  41 ++-
 .../i18n/locale/ko/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  19 +-
 .../i18n/locale/ko/integrationApps.json       |  62 ++++
 .../i18n/locale/ko/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ko/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ko/settings.json    |   6 +
 .../i18n/locale/ko/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ml/campaign.json    |  13 +
 .../dashboard/i18n/locale/ml/contact.json     |  39 ++-
 .../i18n/locale/ml/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  19 +-
 .../i18n/locale/ml/integrationApps.json       |  62 ++++
 .../i18n/locale/ml/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ml/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ml/settings.json    |   6 +
 .../i18n/locale/ml/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ne/campaign.json    |  13 +
 .../dashboard/i18n/locale/ne/contact.json     |  39 ++-
 .../i18n/locale/ne/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |  19 +-
 .../i18n/locale/ne/integrationApps.json       |  62 ++++
 .../i18n/locale/ne/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ne/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ne/settings.json    |   6 +
 .../i18n/locale/ne/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/nl/campaign.json    |  13 +
 .../dashboard/i18n/locale/nl/contact.json     |  39 ++-
 .../i18n/locale/nl/conversation.json          |   2 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  19 +-
 .../i18n/locale/nl/integrationApps.json       |  62 ++++
 .../i18n/locale/nl/integrations.json          |  18 ++
 .../dashboard/i18n/locale/nl/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/nl/settings.json    |   6 +
 .../i18n/locale/nl/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/no/campaign.json    |  13 +
 .../dashboard/i18n/locale/no/contact.json     |  39 ++-
 .../i18n/locale/no/conversation.json          |   2 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |  19 +-
 .../i18n/locale/no/integrationApps.json       |  62 ++++
 .../i18n/locale/no/integrations.json          |  18 ++
 .../dashboard/i18n/locale/no/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/no/settings.json    |   6 +
 .../i18n/locale/no/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/pl/campaign.json    |  25 +-
 .../dashboard/i18n/locale/pl/contact.json     |  39 ++-
 .../i18n/locale/pl/conversation.json          |   2 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  19 +-
 .../i18n/locale/pl/integrationApps.json       |  62 ++++
 .../i18n/locale/pl/integrations.json          |  18 ++
 .../dashboard/i18n/locale/pl/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/pl/settings.json    |   6 +
 .../i18n/locale/pl/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/pt/campaign.json    |  13 +
 .../dashboard/i18n/locale/pt/contact.json     |  39 ++-
 .../i18n/locale/pt/conversation.json          |   2 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  19 +-
 .../i18n/locale/pt/integrationApps.json       |  62 ++++
 .../i18n/locale/pt/integrations.json          |  18 ++
 .../dashboard/i18n/locale/pt/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/pt/settings.json    |   6 +
 .../i18n/locale/pt/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/pt_BR/campaign.json |  75 +++--
 .../dashboard/i18n/locale/pt_BR/contact.json  |  79 +++--
 .../i18n/locale/pt_BR/conversation.json       |   2 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  41 ++-
 .../i18n/locale/pt_BR/integrationApps.json    |  62 ++++
 .../i18n/locale/pt_BR/integrations.json       |  18 ++
 .../i18n/locale/pt_BR/labelsMgmt.json         |   4 +-
 .../dashboard/i18n/locale/pt_BR/report.json   |   6 +-
 .../dashboard/i18n/locale/pt_BR/settings.json |   6 +
 .../i18n/locale/pt_BR/teamsSettings.json      |   1 +
 .../dashboard/i18n/locale/ro/campaign.json    |  13 +
 .../dashboard/i18n/locale/ro/contact.json     |  39 ++-
 .../i18n/locale/ro/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  19 +-
 .../i18n/locale/ro/integrationApps.json       |  62 ++++
 .../i18n/locale/ro/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ro/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ro/settings.json    |   6 +
 .../i18n/locale/ro/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ru/campaign.json    |  13 +
 .../dashboard/i18n/locale/ru/contact.json     |  39 ++-
 .../i18n/locale/ru/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  19 +-
 .../i18n/locale/ru/integrationApps.json       |  62 ++++
 .../i18n/locale/ru/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ru/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ru/settings.json    |   6 +
 .../i18n/locale/ru/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/sk/campaign.json    |  13 +
 .../dashboard/i18n/locale/sk/contact.json     |  39 ++-
 .../i18n/locale/sk/conversation.json          |   2 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  19 +-
 .../i18n/locale/sk/integrationApps.json       |  62 ++++
 .../i18n/locale/sk/integrations.json          |  18 ++
 .../dashboard/i18n/locale/sk/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/sk/settings.json    |   6 +
 .../i18n/locale/sk/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/sv/campaign.json    |  13 +
 .../dashboard/i18n/locale/sv/contact.json     |  39 ++-
 .../i18n/locale/sv/conversation.json          |   2 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  19 +-
 .../i18n/locale/sv/integrationApps.json       |  62 ++++
 .../i18n/locale/sv/integrations.json          |  18 ++
 .../dashboard/i18n/locale/sv/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/sv/settings.json    |   6 +
 .../i18n/locale/sv/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/ta/campaign.json    |  13 +
 .../dashboard/i18n/locale/ta/contact.json     |  39 ++-
 .../i18n/locale/ta/conversation.json          |   2 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  19 +-
 .../i18n/locale/ta/integrationApps.json       |  62 ++++
 .../i18n/locale/ta/integrations.json          |  18 ++
 .../dashboard/i18n/locale/ta/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ta/settings.json    |   6 +
 .../i18n/locale/ta/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/th/campaign.json    |  13 +
 .../dashboard/i18n/locale/th/contact.json     |  39 ++-
 .../i18n/locale/th/conversation.json          |   2 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |  19 +-
 .../i18n/locale/th/integrationApps.json       |  62 ++++
 .../i18n/locale/th/integrations.json          |  18 ++
 .../dashboard/i18n/locale/th/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/th/settings.json    |   6 +
 .../i18n/locale/th/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/tr/campaign.json    |  13 +
 .../dashboard/i18n/locale/tr/contact.json     |  39 ++-
 .../i18n/locale/tr/conversation.json          |   2 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  19 +-
 .../i18n/locale/tr/integrationApps.json       |  62 ++++
 .../i18n/locale/tr/integrations.json          |  18 ++
 .../dashboard/i18n/locale/tr/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/tr/settings.json    |   6 +
 .../i18n/locale/tr/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/uk/campaign.json    |  13 +
 .../dashboard/i18n/locale/uk/contact.json     |  39 ++-
 .../i18n/locale/uk/conversation.json          |   2 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |  19 +-
 .../i18n/locale/uk/integrationApps.json       |  62 ++++
 .../i18n/locale/uk/integrations.json          |  18 ++
 .../dashboard/i18n/locale/uk/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/uk/settings.json    |   6 +
 .../i18n/locale/uk/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/vi/campaign.json    |  13 +
 .../dashboard/i18n/locale/vi/contact.json     |  43 ++-
 .../i18n/locale/vi/conversation.json          |   2 +-
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  19 +-
 .../i18n/locale/vi/integrationApps.json       |  62 ++++
 .../i18n/locale/vi/integrations.json          |  18 ++
 .../dashboard/i18n/locale/vi/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/vi/settings.json    |   6 +
 .../i18n/locale/vi/teamsSettings.json         |   1 +
 .../dashboard/i18n/locale/zh_CN/campaign.json |  13 +
 .../dashboard/i18n/locale/zh_CN/contact.json  |  39 ++-
 .../i18n/locale/zh_CN/conversation.json       |   2 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |  19 +-
 .../i18n/locale/zh_CN/integrationApps.json    |  62 ++++
 .../i18n/locale/zh_CN/integrations.json       |  18 ++
 .../i18n/locale/zh_CN/labelsMgmt.json         |   4 +-
 .../dashboard/i18n/locale/zh_CN/settings.json |   6 +
 .../i18n/locale/zh_CN/teamsSettings.json      |   1 +
 .../dashboard/i18n/locale/zh_TW/campaign.json |  15 +-
 .../i18n/locale/zh_TW/cannedMgmt.json         |  22 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |  65 ++--
 .../i18n/locale/zh_TW/conversation.json       |   8 +-
 .../i18n/locale/zh_TW/generalSettings.json    |   6 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |  49 +--
 .../i18n/locale/zh_TW/integrationApps.json    |  62 ++++
 .../i18n/locale/zh_TW/integrations.json       |  18 ++
 .../i18n/locale/zh_TW/labelsMgmt.json         |   4 +-
 .../dashboard/i18n/locale/zh_TW/report.json   |   6 +-
 .../dashboard/i18n/locale/zh_TW/settings.json |  24 +-
 .../dashboard/i18n/locale/zh_TW/signup.json   |   8 +-
 .../i18n/locale/zh_TW/teamsSettings.json      |  27 +-
 app/javascript/widget/i18n/locale/ar.json     |   7 +-
 app/javascript/widget/i18n/locale/ca.json     |   7 +-
 app/javascript/widget/i18n/locale/cs.json     |   7 +-
 app/javascript/widget/i18n/locale/da.json     |   7 +-
 app/javascript/widget/i18n/locale/de.json     |   9 +-
 app/javascript/widget/i18n/locale/el.json     |   7 +-
 app/javascript/widget/i18n/locale/es.json     |   7 +-
 app/javascript/widget/i18n/locale/fa.json     |  21 +-
 app/javascript/widget/i18n/locale/fi.json     |   7 +-
 app/javascript/widget/i18n/locale/fr.json     |   7 +-
 app/javascript/widget/i18n/locale/he.json     |  60 ++++
 app/javascript/widget/i18n/locale/hi.json     |   7 +-
 app/javascript/widget/i18n/locale/hu.json     |   7 +-
 app/javascript/widget/i18n/locale/id.json     |  11 +-
 app/javascript/widget/i18n/locale/it.json     |   7 +-
 app/javascript/widget/i18n/locale/ja.json     |   7 +-
 app/javascript/widget/i18n/locale/ko.json     |  23 +-
 app/javascript/widget/i18n/locale/ml.json     |   7 +-
 app/javascript/widget/i18n/locale/ne.json     |   7 +-
 app/javascript/widget/i18n/locale/nl.json     |   7 +-
 app/javascript/widget/i18n/locale/no.json     |   7 +-
 app/javascript/widget/i18n/locale/pl.json     |   7 +-
 app/javascript/widget/i18n/locale/pt.json     |   7 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |   9 +-
 app/javascript/widget/i18n/locale/ro.json     |   7 +-
 app/javascript/widget/i18n/locale/ru.json     |   7 +-
 app/javascript/widget/i18n/locale/sk.json     |   7 +-
 app/javascript/widget/i18n/locale/sv.json     |   7 +-
 app/javascript/widget/i18n/locale/ta.json     |   7 +-
 app/javascript/widget/i18n/locale/th.json     |   7 +-
 app/javascript/widget/i18n/locale/tr.json     |   7 +-
 app/javascript/widget/i18n/locale/uk.json     |   7 +-
 app/javascript/widget/i18n/locale/vi.json     |   7 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |   7 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |  11 +-
 config/initializers/languages.rb              |   3 +-
 config/locales/ar.yml                         |   5 +-
 config/locales/ca.yml                         |   5 +-
 config/locales/cs.yml                         |   5 +-
 config/locales/da.yml                         |   5 +-
 config/locales/de.yml                         |   5 +-
 config/locales/devise.he.yml                  |  63 ++++
 config/locales/el.yml                         |   3 +
 config/locales/es.yml                         |   5 +-
 config/locales/fa.yml                         |   7 +-
 config/locales/fi.yml                         |   5 +-
 config/locales/fr.yml                         |   5 +-
 config/locales/he.yml                         |  84 +++++
 config/locales/hi.yml                         |   5 +-
 config/locales/hu.yml                         |   5 +-
 config/locales/id.yml                         |  19 +-
 config/locales/it.yml                         |   5 +-
 config/locales/ja.yml                         |   5 +-
 config/locales/ko.yml                         |   9 +-
 config/locales/ml.yml                         |   5 +-
 config/locales/ne.yml                         |   5 +-
 config/locales/nl.yml                         |   5 +-
 config/locales/no.yml                         |   5 +-
 config/locales/pl.yml                         |   5 +-
 config/locales/pt.yml                         |   5 +-
 config/locales/pt_BR.yml                      |   7 +-
 config/locales/ro.yml                         |   5 +-
 config/locales/ru.yml                         |   5 +-
 config/locales/sk.yml                         |   5 +-
 config/locales/sv.yml                         |   5 +-
 config/locales/ta.yml                         |   5 +-
 config/locales/th.yml                         |   5 +-
 config/locales/tr.yml                         |   5 +-
 config/locales/uk.yml                         |   5 +-
 config/locales/vi.yml                         |   5 +-
 config/locales/zh_CN.yml                      |   5 +-
 config/locales/zh_TW.yml                      |  37 ++-
 406 files changed, 7491 insertions(+), 952 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/campaign.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/teamsSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/integrationApps.json
 create mode 100644 app/javascript/widget/i18n/locale/he.json
 create mode 100644 config/locales/devise.he.yml
 create mode 100644 config/locales/he.yml

diff --git a/app/javascript/dashboard/i18n/locale/ar/campaign.json b/app/javascript/dashboard/i18n/locale/ar/campaign.json
index d8943ac0f..6b0aa1efd 100644
--- a/app/javascript/dashboard/i18n/locale/ar/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ar/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف?",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "تحديث",
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 51bd4e9d8..b4b4d394a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "المحادثات السابقة"
     },
     "LABELS": {
-      "TITLE": "وسوم المحادثة",
-      "MODAL": {
-        "TITLE": "الوسوم الخاصة بـ",
-        "ACTIVE_LABELS": "تم إضافة الوسوم للمحادثة",
-        "INACTIVE_LABELS": "الوسوم المتاحة في الحساب",
-        "REMOVE": "انقر على أيقونة X لإزالة الوسم",
-        "ADD": "اضغط على أيقونة + لإضافة وسوم",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "تحديث الوسوم",
-        "UPDATE_ERROR": "تعذر تحديث الوسوم، الرجاء المحاولة مرة أخرى."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "وسوم المحادثة",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "لا يوجد وسوم في الحساب.",
-      "NO_AVAILABLE_LABELS": "لا يوجد وسوم مضافة لهذه المحادثة.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "عرض التفاصيل"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "المحادثات"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "سمات مخصصة",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 324a8d56d..99c38282c 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "تفاصيل المحادثة",
     "ASSIGNEE_LABEL": "الوكيل المكلف",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "العضو المكلف",
     "SELECT": {
       "PLACEHOLDER": "لا شيء"
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index f438d84da..087f6cd0b 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "اسم صندوق الوارد لقناة التواصل",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "اسم الموقع",
+        "PLACEHOLDER": "أدخل اسم موقع الويب الخاص بك (مثال: Acme Inc)"
+      },
       "FB": {
         "HELP": "ملحوظة: بالمصادقة على حسابك، فنحن يمكننا فقط الوصول إلى الرسائل الواردة لصفحتك. لا يستطيع Chatwoot أبداً بأي شكل من الأشكال الوصول إلى رسائلك الخاصة في حسابك الشخصي.",
         "CHOOSE_PAGE": "اختر صفحة",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "الصورة الرمزية للقناة"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "اسم الموقع",
-          "PLACEHOLDER": "أدخل اسم موقع الويب الخاص بك (مثال: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "نطاق الموقع",
           "PLACEHOLDER": "أدخل نطاق موقعك الإلكتروني (مثال: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "مفعل",
         "DISABLED": "معطّل"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "مفعل",
+        "DISABLED": "معطّل"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "تأكيد الحذف",
         "MESSAGE": "هل أنت متأكد من الحذف ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "نعم، احذف ",
         "NO": "لا، احتفظ "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "موظف الدعم",
       "INBOX_AGENTS_SUB_TEXT": "إضافة أو إزالة موظفين من قناة التواصل هذه",
       "UPDATE": "تحديث",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "تفعيل الإسناد التلقائي",
       "INBOX_UPDATE_TITLE": "إعدادات قناة التواصل",
       "INBOX_UPDATE_SUB_TEXT": "تحديث إعدادات قناة التواصل",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrationApps.json b/app/javascript/dashboard/i18n/locale/ar/integrationApps.json
new file mode 100644
index 000000000..f254d4959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "مفعل",
+      "DISABLED": "معطّل"
+    },
+    "CONFIGURE": "تهيئة",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "هل أنت متأكد من الحذف?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "نعم، احذف",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "حذف"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "إنشاء",
+        "CANCEL": "إلغاء"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "ربط الاتصال"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 2680a1825..a0805e5f7 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -17,6 +17,24 @@
           "الإجراءات"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "تعديل",
+        "TITLE": "Edit webhook",
+        "CANCEL": "إلغاء",
+        "DESC": "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. الرجاء إدخال عنوان URL صالح لتكوين callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "رابط Webhook",
+            "PLACEHOLDER": "مثال: https://example/api/webhook",
+            "ERROR": "الرجاء إدخال عنوان URL صالح"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+        }
+      },
       "ADD": {
         "CANCEL": "إلغاء",
         "TITLE": "إضافة webhook جديد",
diff --git a/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
index 0ee269f2a..f90b5e1b7 100644
--- a/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "اسم الوسم",
         "PLACEHOLDER": "اسم الوسم",
-        "ERROR": "اسم الوسم مطلوب"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "الوصف",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index a9d8aa3a1..48f45bcdf 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "الرجاء إدخال عنوان بريد إلكتروني صحيح",
         "PLACEHOLDER": "الرجاء إدخال عنوان البريد الإلكتروني الخاص بك، سيتم عرضه في المحادثات"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "كلمة المرور",
         "ERROR": "الرجاء إدخال كلمة مرور بطول 6 أحرف أو أكثر",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "الردود السريعة",
     "INTEGRATIONS": "خيارات الربط",
     "ACCOUNT_SETTINGS": "إعدادات الحساب",
+    "APPLICATIONS": "Applications",
     "LABELS": "الوسوم",
     "TEAMS": "الفرق"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json
index d9b6732f0..ee1c14a8f 100644
--- a/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "هل أنت متأكد من أنك تريد حذف - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "سيؤدي حذف الفريق إلى إزالة مهمة الفريق من المحادثات التي تم تعيينها لهذا الفريق.",
         "YES": "حذف ",
         "NO": "إلغاء"
diff --git a/app/javascript/dashboard/i18n/locale/ca/campaign.json b/app/javascript/dashboard/i18n/locale/ca/campaign.json
index 4ca3b69b8..9fd2390c3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ca/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Esborrar",
+      "CONFIRM": {
+        "TITLE": "Confirma l'esborrat",
+        "MESSAGE": "N'estàs segur?",
+        "YES": "Si, esborra ",
+        "NO": "No, segueix "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Actualitza",
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 2e13eabcd..c39462d78 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Converses prèvies"
     },
     "LABELS": {
-      "TITLE": "Etiquetes de converses",
-      "MODAL": {
-        "TITLE": "Etiquetes per a",
-        "ACTIVE_LABELS": "S'han afegit etiquetes a la conversa",
-        "INACTIVE_LABELS": "Etiquetes disponibles al compte",
-        "REMOVE": "Fes clic a la icona X per eliminar l'etiqueta",
-        "ADD": "Fes clic a la icona + per afegir l'etiqueta",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Actualitza les etiquetes",
-        "UPDATE_ERROR": "No s'han pogut actualitzar les etiquetes, torna-ho a provar."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Etiquetes de converses",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "No hi ha cap etiqueta definida al compte.",
-      "NO_AVAILABLE_LABELS": "No hi ha etiquetes afegides a aquesta conversa.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "converses"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Atributs personalitzats",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 4fe6e3d07..bd4ecd3e4 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 04eaacf40..5b3ca8b2c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nom de la safata d'entrada",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nom del lloc web",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PD: Al iniciar la sessió, només accediu als missatges de la vostra pàgina. Chatwoot mai no podrà accedir als vostres missatges privats.",
         "CHOOSE_PAGE": "Trieu la pàgina",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar del canal"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nom del lloc web",
-          "PLACEHOLDER": "Introduïu el nom del vostre lloc web (per exemple, Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domini del lloc web",
           "PLACEHOLDER": "Introduïu el vostre domini de lloc web (pe: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Habilita",
         "DISABLED": "Inhabilita"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Habilita",
+        "DISABLED": "Inhabilita"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur? ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Si, esborra ",
         "NO": "No, segueix "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Afegir o eliminar agents d'aquesta safata d'entrada",
       "UPDATE": "Actualitza",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Activa l'assignació automàtica",
       "INBOX_UPDATE_TITLE": "Configuració de la safata d'entrada",
       "INBOX_UPDATE_SUB_TEXT": "Actualitza la configuració de la safata d'entrada",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrationApps.json b/app/javascript/dashboard/i18n/locale/ca/integrationApps.json
new file mode 100644
index 000000000..bf5ffcfc4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Habilita",
+      "DISABLED": "Inhabilita"
+    },
+    "CONFIGURE": "Configura",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "N'estàs segur?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Si, esborra",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Esborrar"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Crear",
+        "CANCEL": "Cancel·la"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connectar"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index e15fe654f..6a155d0c2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -17,6 +17,24 @@
           "Accions"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edita",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel·la",
+        "DESC": "Els esdeveniments de Webhook us proporcionen informació en temps real sobre el que passa al vostre compte de Chatwoot. Introduïu una URL vàlid per configurar un callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL del webhook",
+            "PLACEHOLDER": "Exemple: https://example/api/webhook",
+            "ERROR": "Introduïu una URL vàlid"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancel·la",
         "TITLE": "Afegir un nou webhook",
diff --git a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
index b6b2e544a..0bf0fa973 100644
--- a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nom de l'etiqueta",
         "PLACEHOLDER": "Nom de l'etiqueta",
-        "ERROR": "El nom de l’etiqueta és obligatori"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Descripció",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index d606fbb64..2a136cfb4 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Introduïu una adreça de correu electrònic vàlida",
         "PLACEHOLDER": "Introduïu la vostra adreça de correu electrònic, que es mostrarà a les converses"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Contrasenya",
         "ERROR": "Introduïu una contrasenya d'una longitud de 6 o més",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Respostes predeterminades",
     "INTEGRATIONS": "Integracions",
     "ACCOUNT_SETTINGS": "Configuració del compte",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiquetes",
     "TEAMS": "Equips"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
index 136f082d3..ff4eb7197 100644
--- a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Suprimeix ",
         "NO": "Cancel·la"
diff --git a/app/javascript/dashboard/i18n/locale/cs/campaign.json b/app/javascript/dashboard/i18n/locale/cs/campaign.json
index b6b1008cb..ea653d2c3 100644
--- a/app/javascript/dashboard/i18n/locale/cs/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/cs/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Vymazat",
+      "CONFIRM": {
+        "TITLE": "Potvrdit odstranění",
+        "MESSAGE": "Opravdu chcete odstranit?",
+        "YES": "Ano, odstranit ",
+        "NO": "Ne, zachovat "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Aktualizovat",
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 958167be3..5c105ad8c 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Předchozí konverzace"
     },
     "LABELS": {
-      "TITLE": "Štítky konverzace",
-      "MODAL": {
-        "TITLE": "Štítky pro",
-        "ACTIVE_LABELS": "Štítky přidány do konverzace",
-        "INACTIVE_LABELS": "Štítky dostupné v účtu",
-        "REMOVE": "Kliknutím na ikonu X odstraníte štítek",
-        "ADD": "Kliknutím na ikonu + přidáte štítek",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Aktualizovat štítky",
-        "UPDATE_ERROR": "Nelze aktualizovat štítky, zkuste to znovu."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "V účtu nejsou definovány žádné další štítky.",
-      "NO_AVAILABLE_LABELS": "Do této konverzace nebyly přidány žádné štítky.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Zobrazit detaily"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "konverzace"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Vlastní atributy",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 168112874..14b17cf7e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Detail konverzací",
     "ASSIGNEE_LABEL": "Přiřazený agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Přiřazený tým",
     "SELECT": {
       "PLACEHOLDER": "Nic"
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 4cd8a58e2..559352bcc 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Název schránky",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Přihlášením získáme přístup pouze ke zprávám vaší stránky. Vaše soukromé zprávy nikdy nemohou být přístupné Chatwoot.",
         "CHOOSE_PAGE": "Vybrat stránku",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar kanálu"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Název webu",
-          "PLACEHOLDER": "Zadejte název webové stránky (např. Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Doména webových stránek",
           "PLACEHOLDER": "Zadejte doménu webu (např. acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Povoleno",
         "DISABLED": "Zakázáno"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Povoleno",
+        "DISABLED": "Zakázáno"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Potvrdit odstranění",
         "MESSAGE": "Opravdu chcete odstranit ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ano, odstranit ",
         "NO": "Ne, zachovat "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenti",
       "INBOX_AGENTS_SUB_TEXT": "Přidat nebo odebrat agenty z této složky doručené pošty",
       "UPDATE": "Aktualizovat",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Povolit automatické přiřazení",
       "INBOX_UPDATE_TITLE": "Nastavení doručené pošty",
       "INBOX_UPDATE_SUB_TEXT": "Aktualizujte nastavení doručené pošty",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrationApps.json b/app/javascript/dashboard/i18n/locale/cs/integrationApps.json
new file mode 100644
index 000000000..3d62d1798
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Povoleno",
+      "DISABLED": "Zakázáno"
+    },
+    "CONFIGURE": "Konfigurace",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Opravdu chcete odstranit?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ano, odstranit",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Zrušit",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Vymazat"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Zrušit"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 921d5bdbd..86fa337b7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -17,6 +17,24 @@
           "Akce"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Upravit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Zrušit",
+        "DESC": "Události webhooku vám poskytují reálné informace o tom, co se děje ve vašem Chatwoot účtu. Zadejte prosím platnou URL pro nastavení hovoru.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL webového háčku",
+            "PLACEHOLDER": "Příklad: https://example/api/webhook",
+            "ERROR": "Zadejte prosím platnou URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+        }
+      },
       "ADD": {
         "CANCEL": "Zrušit",
         "TITLE": "Přidat nový webový háček",
diff --git a/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
index 5e176d392..9f0571c58 100644
--- a/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 0b9ad887f..059c2fd1d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Zadejte prosím platnou e-mailovou adresu",
         "PLACEHOLDER": "Prosím, zadejte vaši e-mailovou adresu, bude zobrazena v konverzacích"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Heslo",
         "ERROR": "Zadejte prosím heslo o délce 6 nebo více",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Konzervované odpovědi",
     "INTEGRATIONS": "Integrace",
     "ACCOUNT_SETTINGS": "Nastavení účtu",
+    "APPLICATIONS": "Applications",
     "LABELS": "Štítky",
     "TEAMS": "Týmy"
   },
diff --git a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
index 10288a6fb..a94cdd289 100644
--- a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Vymazat ",
         "NO": "Zrušit"
diff --git a/app/javascript/dashboard/i18n/locale/da/campaign.json b/app/javascript/dashboard/i18n/locale/da/campaign.json
index c1a829bc4..11560f1e6 100644
--- a/app/javascript/dashboard/i18n/locale/da/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/da/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Slet",
+      "CONFIRM": {
+        "TITLE": "Bekræft Sletning",
+        "MESSAGE": "Er du sikker på du vil slette?",
+        "YES": "Ja, Slet ",
+        "NO": "Nej, Behold "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Opdater",
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index e1712ed49..a678d9a6e 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Tidligere Samtaler"
     },
     "LABELS": {
-      "TITLE": "Samtale Etiketter",
-      "MODAL": {
-        "TITLE": "Etiketter til",
-        "ACTIVE_LABELS": "Etiketter føjet til samtalen",
-        "INACTIVE_LABELS": "Etiketter tilgængelige på kontoen",
-        "REMOVE": "Klik på X-ikonet for at fjerne etiketten",
-        "ADD": "Klik på + ikonet for at tilføje etiketten",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Opdater etiketter",
-        "UPDATE_ERROR": "Etiketter kunne ikke opdateres. Prøv igen."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Samtale Etiketter",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Der er ikke defineret flere etiketter på kontoen.",
-      "NO_AVAILABLE_LABELS": "Der er ingen etiketter tilføjet til denne samtale.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "samtaler"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Brugerdefinerede Egenskaber",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 859b94c81..b6e38aa30 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index f1930095b..d8178b209 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Indbakke Navn",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Websted Navn",
+        "PLACEHOLDER": "Indtast dit websted navn (fx: Firma ApS)"
+      },
       "FB": {
         "HELP": "PS: Ved at logge ind får vi kun adgang til din sides beskeder. Dine private beskeder kan aldrig tilgås af Chatwoot.",
         "CHOOSE_PAGE": "Vælg Side",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanal Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Websted Navn",
-          "PLACEHOLDER": "Indtast dit websted navn (fx: Firma ApS)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Hjemmeside Domæne",
           "PLACEHOLDER": "Indtast dit website domæne (fx: ditfirma.dk)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Aktiveret",
         "DISABLED": "Deaktiveret"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Aktiveret",
+        "DISABLED": "Deaktiveret"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Bekræft Sletning",
         "MESSAGE": "Er du sikker på du vil slette ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ja, Slet ",
         "NO": "Nej, Behold "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Tilføj eller fjern agenter fra denne indbakke",
       "UPDATE": "Opdater",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Aktiver automatisk tildeling",
       "INBOX_UPDATE_TITLE": "Indbakke Indstillinger",
       "INBOX_UPDATE_SUB_TEXT": "Opdater dine indbakkeindstillinger",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrationApps.json b/app/javascript/dashboard/i18n/locale/da/integrationApps.json
new file mode 100644
index 000000000..711c8a146
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Aktiveret",
+      "DISABLED": "Deaktiveret"
+    },
+    "CONFIGURE": "Konfigurer",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Er du sikker på du vil slette?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ja, Slet",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Annuller",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Slet"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Opret",
+        "CANCEL": "Annuller"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Tilslut"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 593f9b070..42d160f93 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -17,6 +17,24 @@
           "Handlinger"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Rediger",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Annuller",
+        "DESC": "Webhook-begivenheder giver dig realtidsoplysninger om, hvad der sker på din Chatwoot-konto. Angiv en gyldig URL for at konfigurere et callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
+            "ERROR": "Angiv en gyldig URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+        }
+      },
       "ADD": {
         "CANCEL": "Annuller",
         "TITLE": "Tilføj ny webhook",
diff --git a/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
index 09869d094..a7a65b654 100644
--- a/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Etiket Navn",
         "PLACEHOLDER": "Etiket Navn",
-        "ERROR": "Etiketnavn er påkrævet"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Beskrivelse",
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 6c2af34fc..fd2aecb8a 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Indtast venligst en gyldig e-mailadresse",
         "PLACEHOLDER": "Indtast venligst din e-mailadresse, dette vil blive vist i samtaler"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Adgangskode",
         "ERROR": "Indtast en adgangskode med længde 6 eller flere",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Standardsvar Svar",
     "INTEGRATIONS": "Integrationer",
     "ACCOUNT_SETTINGS": "Kontoindstillinger",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiketter",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
index b58c532b8..2609e8d52 100644
--- a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Slet ",
         "NO": "Annuller"
diff --git a/app/javascript/dashboard/i18n/locale/de/campaign.json b/app/javascript/dashboard/i18n/locale/de/campaign.json
index 18b8cfe4c..b990f8ca4 100644
--- a/app/javascript/dashboard/i18n/locale/de/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/de/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Löschen",
+      "CONFIRM": {
+        "TITLE": "Löschung bestätigen",
+        "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
+        "YES": "Ja, löschen ",
+        "NO": "Nein, behalten "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Kampagne erfolgreich gelöscht",
+        "ERROR_MESSAGE": "Die Kampagne konnte nicht gelöscht werden. Bitte versuchen Sie es später noch einmal."
+      }
+    },
     "EDIT": {
       "TITLE": "Kampagne bearbeiten",
       "UPDATE_BUTTON_TEXT": "Aktualisieren",
@@ -52,7 +65,7 @@
     },
     "LIST": {
       "LOADING_MESSAGE": "Lade Kampagnen...",
-      "404": "There are no campaigns created for this inbox.",
+      "404": "Es wurden keine Kampagnen für diesen Posteingang erstellt.",
       "TABLE_HEADER": {
         "TITLE": "Titel",
         "MESSAGE": "Nachricht",
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 82ced872a..b81a85a2d 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Vorherige Gespräche"
     },
     "LABELS": {
-      "TITLE": "Konversationsetiketten",
-      "MODAL": {
-        "TITLE": "Labels für",
-        "ACTIVE_LABELS": "Labels zur Unterhaltung hinzugefügt",
-        "INACTIVE_LABELS": "Verfügbare Labels im Konto",
-        "REMOVE": "Klicken Sie auf das X-Symbol, um das Label zu entfernen",
-        "ADD": "Klicken Sie auf das + Symbol, um ein Label hinzuzufügen",
-        "ADD_BUTTON": "Label hinzufügen",
-        "UPDATE_BUTTON": "Labels aktualisieren",
-        "UPDATE_ERROR": "Etiketten konnten nicht aktualisiert werden. Versuchen Sie es erneut."
+      "CONTACT": {
+        "TITLE": "Kontakt-Labels",
+        "ERROR": "Labels konnten nicht aktualisiert werden"
+      },
+      "CONVERSATION": {
+        "TITLE": "Konversationsetiketten",
+        "ADD_BUTTON": "Label hinzufügen"
       },
-      "NO_LABELS_TO_ADD": "Es sind keine weiteren Labels im Konto definiert.",
-      "NO_AVAILABLE_LABELS": "Zu dieser Unterhaltung wurden noch keine Labels hinzugefügt.",
       "LABEL_SELECT": {
         "TITLE": "Label hinzufügen",
         "PLACEHOLDER": "Labels suchen",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Details anzeigen"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Hinzufügen",
+      "TITLE": "Shift + Enter um eine Aufgabe zu erstellen"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Fälligkeitsdatum",
+      "LABEL_TITLE": "Typ festlegen"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notizen"
@@ -168,23 +173,33 @@
       "BUTTON": "Alle Notizen anzeigen"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Aktivitäten"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notizen",
+      "PILL_BUTTON_EVENTS": "Veranstaltungen",
+      "PILL_BUTTON_CONVO": "gespräche"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Benutzerdefinierte Attribute",
-    "BUTTON": "Add custom attribute",
+    "BUTTON": "Eigenes Attribut hinzufügen",
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Eigenes Attribut erstellen",
+      "DESC": "Füge diesem Kontakt benutzerdefinierte Informationen hinzu."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Attribut hinzufügen",
       "CANCEL": "Stornieren",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Benutzerdefinierter Attributname",
+        "PLACEHOLDER": "Eg: Shopify Id",
+        "ERROR": "Ungültiger eigener Attributname"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
+        "LABEL": "Attributwert",
         "PLACEHOLDER": "Eg: 11901 "
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 548b3f971..757798fa9 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Unterhaltungsdetails",
     "ASSIGNEE_LABEL": "Zugewiesener Agent",
+    "SELF_ASSIGN": "Mir zuweisen",
     "TEAM_LABEL": "Zugewiesenes Team",
     "SELECT": {
       "PLACEHOLDER": "Keine"
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 36e162e77..fb842b085 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Posteingang-Name",
+        "PLACEHOLDER": "Geben Sie den Namen für Ihren Posteingang ein (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Webseiten-Name",
+        "PLACEHOLDER": "Geben Sie den Namen Ihrer Website ein (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Durch die Anmeldung erhalten wir nur Zugriff auf die Nachrichten Ihrer Seite. Auf Ihre privaten Nachrichten kann Chatwoot niemals zugreifen.",
         "CHOOSE_PAGE": "Seite auswählen",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanal-Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Webseiten-Name",
-          "PLACEHOLDER": "Geben Sie den Namen Ihrer Website ein (eg: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website-Domain",
           "PLACEHOLDER": "Geben Sie Ihre Website-Domain ein (eg: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Aktiviert",
         "DISABLED": "Behindert"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Aktiviert",
+        "DISABLED": "Behindert"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest ",
+        "PLACE_HOLDER": "Bitte geben Sie {inboxName} zur Bestätigung ein",
         "YES": "Ja, löschen",
         "NO": "Nein, behalten "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenten",
       "INBOX_AGENTS_SUB_TEXT": "Hinzufügen oder Entfernen von Agenten zu diesem Posteingang",
       "UPDATE": "Aktualisieren",
+      "ENABLE_EMAIL_COLLECT_BOX": "E-Mail-Sammelbox aktivieren",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Aktiviere oder deaktiviere die E-Mail-Sammelbox bei einer neuen Unterhaltung",
       "AUTO_ASSIGNMENT": "Aktivieren Sie die automatische Zuweisung",
       "INBOX_UPDATE_TITLE": "Posteingangseinstellungen",
       "INBOX_UPDATE_SUB_TEXT": "Posteingangseinstellungen aktualisieren",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrationApps.json b/app/javascript/dashboard/i18n/locale/de/integrationApps.json
new file mode 100644
index 000000000..e6090ad5d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Integrationen werden abgerufen",
+    "NO_HOOK_CONFIGURED": "Es wurden keine %{integrationId} Integrationen in diesem Konto konfiguriert.",
+    "HEADER": "Anwendungen",
+    "STATUS": {
+      "ENABLED": "Aktiviert",
+      "DISABLED": "Behindert"
+    },
+    "CONFIGURE": "Konfigurieren",
+    "ADD_BUTTON": "Neuen Hook hinzufügen",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Löschen bestätigen",
+        "ACCOUNT": "Verbindung trennen"
+      },
+      "MESSAGE": {
+        "INBOX": "Bist du sicher, das du das löschen möchtest?",
+        "ACCOUNT": "Sind Sie sicher, dass Sie die Verbindung trennen möchten?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ja, löschen",
+        "ACCOUNT": "Ja, Verbindung trennen"
+      },
+      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook wurde erfolgreich gelöscht",
+        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Hooks werden abgerufen",
+      "INBOX": "Posteingang",
+      "DELETE": {
+        "BUTTON_TEXT": "Löschen"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Eingang auswählen",
+          "PLACEHOLDER": "Eingang auswählen"
+        },
+        "SUBMIT": "Erstellen",
+        "CANCEL": "Stornieren"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integrations-Hook erfolgreich hinzugefügt",
+        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Verbinden"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Verbindung trennen"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow ist eine Sprachverständnis-Plattform, die es einfach macht, eine interaktive Benutzeroberfläche in Ihre mobile App, Web-Anwendung, Gerät, Bot, interaktives Voice-Antwort-System etc. zu integrieren. <br /> <br /> Die Dialogflow-Integration mit %{installationName} ermöglicht es Ihnen, einen Dialogfluss-Bot mit Ihren Posteingängen zu verknüpfen. Dieser Bot erlaubt es Ihnen, eingehende Anfragen zunächst zu bearbeiten und diese bei Bedarf an einen Agenten zu übergeben. Dialogflow kann zur Qualifizierung der Leads, zur Reduzierung der Arbeitsbelastung von Agenten durch häufig gestellte Fragen usw. genutzt werden. <br /> <br /> Um Dialogflow hinzuzufügen, müssen Sie ein Service-Konto in Ihrer Google-Projekt-Konsole erstellen und die Zugangsdaten freigeben. Weitere Informationen finden Sie in der Dialogflow-Dokumentation."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index e91cb2453..a330bd221 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -17,6 +17,24 @@
           "Aktionen"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Bearbeiten",
+        "TITLE": "Webhook bearbeiten",
+        "CANCEL": "Stornieren",
+        "DESC": "Webhook-Ereignisse bieten Ihnen Echtzeitinformationen darüber, was in Ihrem Chatwoot-Konto passiert. Bitte geben Sie eine gültige URL ein, um einen Rückruf zu konfigurieren.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook-URL",
+            "PLACEHOLDER": "Beispiel: https://example/api/webhook",
+            "ERROR": "Bitte geben Sie eine gültige URL ein"
+          },
+          "SUBMIT": "Webhook bearbeiten"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL erfolgreich aktualisiert",
+          "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+        }
+      },
       "ADD": {
         "CANCEL": "Stornieren",
         "TITLE": "Neuen Webhook hinzufügen",
diff --git a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
index b847fb8a4..65292fde1 100644
--- a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Labelname",
         "PLACEHOLDER": "Labelname",
-        "ERROR": "Labelname ist erforderlich"
+        "REQUIRED_ERROR": "Labelname ist erforderlich",
+        "MINIMUM_LENGTH_ERROR": "Mindestlänge 2 wird benötigt",
+        "VALID_ERROR": "Nur Buchstaben, Zahlen, Binde- und Unterstriche sind erlaubt"
       },
       "DESCRIPTION": {
         "LABEL": "Beschreibung",
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index 0d458f43c..6dadebd7c 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -41,15 +41,15 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Die letzten 3 Monate"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Die letzten 6 Monate"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Letztes Jahr"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index fc56dfddf..02480427b 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
         "PLACEHOLDER": "Bitte geben Sie Ihre E-Mail-Adresse ein, diese wird in Gesprächen angezeigt"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Aktuelles Passwort",
+        "ERROR": "Bitte geben Sie das aktuelle Passwort ein",
+        "PLACEHOLDER": "Bitte geben Sie das aktuelle Passwort ein"
+      },
       "PASSWORD": {
         "LABEL": "Passwort",
         "ERROR": "Bitte geben Sie ein Passwort mit einer Länge von 6 oder mehr ein",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Vorgefertigte Antworten",
     "INTEGRATIONS": "Integrationen",
     "ACCOUNT_SETTINGS": "Kontoeinstellungen",
+    "APPLICATIONS": "Anwendungen",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
index 780baf225..db44473e1 100644
--- a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Sind Sie sicher, dass Sie %{teamName} löschen möchten",
+        "PLACE_HOLDER": "Bitte geben Sie {teamName} zur Bestätigung ein",
         "MESSAGE": "Das Löschen des Teams wird die Teamzuordnung aus den Gesprächen entfernen, die diesem Team zugewiesen wurden.",
         "YES": "Löschen ",
         "NO": "Stornieren"
diff --git a/app/javascript/dashboard/i18n/locale/el/campaign.json b/app/javascript/dashboard/i18n/locale/el/campaign.json
index 7e027454e..e74e217e4 100644
--- a/app/javascript/dashboard/i18n/locale/el/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/el/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα. Παρακαλώ δοκιμάστε ξανά."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Διαγραφή",
+      "CONFIRM": {
+        "TITLE": "Επιβεβαίωση Διαγραφής",
+        "MESSAGE": "Είσαστε σίγουροι για την διαγραφή?",
+        "YES": "Ναι, Διέγραψε τον/την ",
+        "NO": "Όχι, Κράτησε τον/την"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Η καμπάνια διαγράφηκε επιτυχώς",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η διαγραφή της καμπάνιας. Παρακαλώ προσπαθήστε ξανά αργότερα."
+      }
+    },
     "EDIT": {
       "TITLE": "Επεξεργασία καμπάνιας",
       "UPDATE_BUTTON_TEXT": "Ενημέρωση",
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 199080639..1e50c3f9f 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Προηγούμενες συνομιλίες"
     },
     "LABELS": {
-      "TITLE": "Ετικέτες συνομιλίας",
-      "MODAL": {
-        "TITLE": "Ετικέτες για",
-        "ACTIVE_LABELS": "Προστέθηκαν ετικέτες στην συνομιλία",
-        "INACTIVE_LABELS": "Υπάρχουν διαθέσιμες ετικέτες στον λογαριασμό",
-        "REMOVE": "Πατήστε στο εικονίδιο X για να απομακρύνετε την ετικέτα",
-        "ADD": "Πατήστε στο εικονίδιο + για να προσθέστε την ετικέτα",
-        "ADD_BUTTON": "Προσθήκη Ετικετών",
-        "UPDATE_BUTTON": "Ενημέρωση Ετικετών",
-        "UPDATE_ERROR": "Δεν μπορούν να ενημερωθούν οι ετικέτες, προσπαθήστε ξανά."
+      "CONTACT": {
+        "TITLE": "Ετικέτες Επαφών",
+        "ERROR": "Δεν ήταν δυνατή η ενημέρωση ετικετών"
+      },
+      "CONVERSATION": {
+        "TITLE": "Ετικέτες συνομιλίας",
+        "ADD_BUTTON": "Προσθήκη Ετικετών"
       },
-      "NO_LABELS_TO_ADD": "Δεν υπάρχουν άλλες ετικέτες στον λογαριασμό.",
-      "NO_AVAILABLE_LABELS": "Δεν υπάρχουν προστεθεί ετικέτες στην συνομιλία.",
       "LABEL_SELECT": {
         "TITLE": "Προσθήκη Ετικετών",
         "PLACEHOLDER": "Αναζήτηση ετικετών",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Προβολή λεπτομεριών"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Προσθήκη",
+      "TITLE": "Shift + Enter για δημιουργία εργασίας"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Ημερομηνία λήξης",
+      "LABEL_TITLE": "Ορισμός τύπου"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Σημειώσεις"
@@ -168,24 +173,34 @@
       "BUTTON": "Εμφάνιση όλων των σημειώσεων"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Δραστηριότητες"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "σημειώσεις",
+      "PILL_BUTTON_EVENTS": "συμβάντα",
+      "PILL_BUTTON_CONVO": "συζητήσεις"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Προσαρμοζόμενες Ιδιότητες",
-    "BUTTON": "Add custom attribute",
+    "BUTTON": "Προσθήκη προσαρμοσμένης ιδιότητας",
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Δημιουργία προσαρμοσμένης ιδιότητας",
+      "DESC": "Προσθέστε προσαρμοσμένες πληροφορίες σε αυτήν την επαφή."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Προσθήκη ιδιότητας",
       "CANCEL": "Άκυρο",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Όνομα προσαρμοσμένης ιδιότητας",
+        "PLACEHOLDER": "π.χ.: shopify id",
+        "ERROR": "Μη έγκυρο όνομα προσαρμοσμένης ιδιότητας"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "Τιμή ιδιότητας",
+        "PLACEHOLDER": "π.χ.: 11901 "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 1dfaaa212..0b8925564 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -6,7 +6,7 @@
     "NO_INBOX_1": "Γεια σας! Δεν έχετε προσθέσει κάποιο κιβώτιο εισερχομένων ακόμη.",
     "NO_INBOX_2": " για να ξεκινήσετε",
     "NO_INBOX_AGENT": "Ω όχι! Φαίνεται ότι δεν είστε μέλος κάποιου κιβωτίου εισερχμένων. Απευθυνθείτε στον διαχειριστή",
-    "SEARCH_MESSAGES": "Αναζήτηση μηνυμάτων στις σινομιλίες",
+    "SEARCH_MESSAGES": "Αναζήτηση μηνυμάτων στις συνομιλίες",
     "SEARCH": {
       "TITLE": "Αναζήτηση μηνυμάτων",
       "LOADING_MESSAGE": "Σύμπτυξη δεδομένων...",
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Λεπτομέρειες συνομιλίας",
     "ASSIGNEE_LABEL": "Ανατεθειμένο σε Πράκτορα",
+    "SELF_ASSIGN": "Ανάθεση σε μένα",
     "TEAM_LABEL": "Ανατεθειμένο σε Ομάδα",
     "SELECT": {
       "PLACEHOLDER": "Κανένα"
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 38a134024..30812408f 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Όνομα Κιβωτίου",
+        "PLACEHOLDER": "Συμπληρώστε την ονομασία του κιβωτίου σας (π. χ: Ελληνικό Μεσογειακό Πανεπιστήμιο)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Όνομα Ιστοσελίδας",
+        "PLACEHOLDER": "Συμπληρώστε την ονομασία της ιστοσελίδας σας (π.χ: Ελληνικό Μεσογειακό Πανεπιστήμιο)"
+      },
       "FB": {
         "HELP": "ΥΓ: Με την είσοδο, θα έχουμε πρόσβαση μόνο στα μηνύματα της σελίδας σας. Τα ιδιωτικά μηνύματά σας ποτέ δεν προσπελαστούν από το Chatwoot.",
         "CHOOSE_PAGE": "Διάλεξε Σελίδα",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar Καναλιού"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Ονομασία Ιστοσελίδας",
-          "PLACEHOLDER": "Συμπληρώστε την ονομασία της ιστοσελίδας σας (π.χ: Ελληνικό Μεσογειακό Πανεπιστήμιο)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domain Ιστοσελίδας",
           "PLACEHOLDER": "Συμπληρώστε το domain της Ιστοσελίδας σας (π.χ: hmu.gr)"
@@ -88,7 +92,7 @@
         "SUBMIT_BUTTON": "Δημιουργία Κιβωτίου"
       },
       "TWILIO": {
-        "TITLE": "SMS κανάλι από το Twilio",
+        "TITLE": "Κανάλι Twilio SMS/Whatsapp",
         "DESC": "Ενσωματώστε το Twilio και αρχίστε να υποστηρίζετε τους πελάτες σας μέσω SMS.",
         "ACCOUNT_SID": {
           "LABEL": "SID Λογαριασμού",
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Ενεργό",
         "DISABLED": "Ανενεργό"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Ενεργό",
+        "DISABLED": "Ανενεργό"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Επιβεβαίωση Διαγραφής",
         "MESSAGE": "Είσαστε σίγουρος για την διαγραφή ",
+        "PLACE_HOLDER": "Παρακαλώ πληκτρολογήστε {inboxName} για επιβεβαίωση",
         "YES": "Ναι, Διέγραψε το ",
         "NO": "Όχι, Κράτησε τον/την"
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Πράκτορες",
       "INBOX_AGENTS_SUB_TEXT": "Προσθέστε ή αφαιρέστε πράκτορες σε αυτό το κιβώτιο",
       "UPDATE": "Ενημέρωση",
+      "ENABLE_EMAIL_COLLECT_BOX": "Ενεργοποιήσετε το πλαίσιο συλλογής email",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Ενεργοποίηση ή απενεργοποίηση του πλαισίου συλλογής μηνυμάτων ηλεκτρονικού ταχυδρομείου στη νέα συνομιλία",
       "AUTO_ASSIGNMENT": "Επιτρέπεται η αυτόματη αντιστοίχιση",
       "INBOX_UPDATE_TITLE": "Ρυθμίσεις Κιβωτίου",
       "INBOX_UPDATE_SUB_TEXT": "Ενημερώστε τις ρυθμίσεις του κιβωτίου σας",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrationApps.json b/app/javascript/dashboard/i18n/locale/el/integrationApps.json
new file mode 100644
index 000000000..bb88b8c37
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Λήψη Indegrations",
+    "NO_HOOK_CONFIGURED": "Δεν υπάρχουν %{integrationId} integrations ρυθμισμένες σε αυτόν το λογαριασμό.",
+    "HEADER": "Εφαρμογές",
+    "STATUS": {
+      "ENABLED": "Ενεργό",
+      "DISABLED": "Ανενεργό"
+    },
+    "CONFIGURE": "Διαμόρφωση",
+    "ADD_BUTTON": "Προσθήκη νέου hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Επιβεβαίωση Διαγραφής",
+        "ACCOUNT": "Αποσύνδεση"
+      },
+      "MESSAGE": {
+        "INBOX": "Είσαστε σίγουροι για την διαγραφή?",
+        "ACCOUNT": "Είστε βέβαιοι ότι θα αποσυνδεθείτε;"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ναι, Διέγραψε το",
+        "ACCOUNT": "Ναι, Αποσύνδεση"
+      },
+      "CANCEL_BUTTON_TEXT": "Άκυρο",
+      "API": {
+        "SUCCESS_MESSAGE": "Το hook διαγράφηκε επιτυχώς",
+        "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Λήψη Integrations",
+      "INBOX": "Εισερχόμενα",
+      "DELETE": {
+        "BUTTON_TEXT": "Διαγραφή"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Επιλογή Εισερχομένων",
+          "PLACEHOLDER": "Επιλογή Εισερχομένων"
+        },
+        "SUBMIT": "Δημιουργία",
+        "CANCEL": "Άκυρο"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Το Integration hook προστέθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Σύνδεση"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Αποσύνδεση"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Το Dialogflow είναι μια φυσική πλατφόρμα κατανόησης γλωσσών που διευκολύνει το σχεδιασμό και την ενσωμάτωση ενός περιβάλλοντος χρήστη συνομιλίας στην εφαρμογή για το κινητό σας, web εφαρμογή, συσκευή, bot, διαδραστικό σύστημα απόκρισης φωνής, κ. τ. λ. <br /> <br /> Το Dialogflow με το %{installationName} σάς επιτρέπει να ρυθμίσετε ένα bot ροής διαλόγου με τα εισερχόμενά σας, το οποίο επιτρέπει στο bot να χειρίζεται αρχικά τα ερωτήματα και να τα παραδίδει σε έναν πράκτορα όταν χρειάζεται. Η ροή του διαλόγου μπορεί να χρησιμοποιηθεί για να καθορίσει ροές, να μειώσει τον φόρτο εργασίας των πρακτόρων παρέχοντας συχνές ερωτήσεις κλπ. <br /> <br /> Για να προσθέσετε το DialogFlow, πρέπει να δημιουργήσετε έναν λογαριασμό υπηρεσίας στην κονσόλα του έργου σας στη Google και να μοιραστείτε τα διαπιστευτήρια. Για περισσότερες πληροφορίες, ανατρέξτε στα έγγραφα ροής διαλόγου."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 298c22349..7f5f7b6f2 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -17,6 +17,24 @@
           "ΕΝΕΡΓΕΙΕΣ"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Επεξεργασία",
+        "TITLE": "Επεξεργασία webhook",
+        "CANCEL": "Άκυρο",
+        "DESC": "Τα συμβάντα Webhook μας εφοδιάζουν με πληροφορίες πραγματικού χρόνου σχετικά με το τι συμβαίνει στο λογαριασμό σας στο Chatwoot. Παρακαλώ εισάγετε ένα έγκυρο URL στην σχετική ρύθμιση.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Σύνδεσμος Webhook",
+            "PLACEHOLDER": "Παράδειγμα: https://www.hmu.gr/api/webhook",
+            "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο URL"
+          },
+          "SUBMIT": "Επεξεργασία webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Το URL Webhook ενημερώθηκε με επιτυχία",
+          "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+        }
+      },
       "ADD": {
         "CANCEL": "Άκυρο",
         "TITLE": "Προσθήκη Νέου webhook",
diff --git a/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
index a6bb56165..65f417e39 100644
--- a/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Όνομα Ετικέτας",
         "PLACEHOLDER": "Όνομα ετικέτας",
-        "ERROR": "Το Όνομα Ετικέτας είναι απαραίτητο"
+        "REQUIRED_ERROR": "Το Όνομα Ετικέτας είναι απαραίτητο",
+        "MINIMUM_LENGTH_ERROR": "Απαιτείται ελάχιστο μήκος 2 χαρακτήρες",
+        "VALID_ERROR": "Επιτρέπονται μόνο γράμματα, αριθμοί, παύλα και υπογράμμιση"
       },
       "DESCRIPTION": {
         "LABEL": "Περιγραφή",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index cce89bea9..d6875e198 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email",
         "PLACEHOLDER": "Εισάγετε το Email σας, όπως θα εμφανίζεται στις συνομιλίες σας"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Τρέχων κωδικός πρόσβασης",
+        "ERROR": "Παρακαλώ εισάγετε τον τρέχοντα κωδικό πρόσβασης",
+        "PLACEHOLDER": "Παρακαλώ εισάγετε τον τρέχοντα κωδικό πρόσβασης"
+      },
       "PASSWORD": {
         "LABEL": "Κωδικός (Password)",
         "ERROR": "Παρακαλώ εισάγετε κωδικό τουλάχιστον 6 χαρακτήρων",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Έτοιμες Απαντήσεις",
     "INTEGRATIONS": "Ενοποιήσεις",
     "ACCOUNT_SETTINGS": "Ρυθμίσεις Λογαριασμού",
+    "APPLICATIONS": "Εφαρμογές",
     "LABELS": "Ετικέτες",
     "TEAMS": "Ομάδες"
   },
diff --git a/app/javascript/dashboard/i18n/locale/el/teamsSettings.json b/app/javascript/dashboard/i18n/locale/el/teamsSettings.json
index f78357a93..1cfe735cd 100644
--- a/app/javascript/dashboard/i18n/locale/el/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Είστε σίγουροι ότι θέλετε να διαγράψετε την ομάδα %{teamName}",
+        "PLACE_HOLDER": "Παρακαλώ πληκτρολογήστε {teamName} για επιβεβαίωση",
         "MESSAGE": "Διαγράφοντας την ομάδα θα αφαιρέσετε και τις αναθέσεις συνομιλιών σε αυτήν την ομάδα.",
         "YES": "Διαγραφή ",
         "NO": "Άκυρο"
diff --git a/app/javascript/dashboard/i18n/locale/es/campaign.json b/app/javascript/dashboard/i18n/locale/es/campaign.json
index 2c11ca20e..90a461be5 100644
--- a/app/javascript/dashboard/i18n/locale/es/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/es/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "Se presentó un error. Por favor intente nuevamente."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Eliminar",
+      "CONFIRM": {
+        "TITLE": "Confirmar eliminación",
+        "MESSAGE": "¿Está seguro de eliminar?",
+        "YES": "Sí, eliminar ",
+        "NO": "No, mantenerlo "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaña borrada satisfactoriamente",
+        "ERROR_MESSAGE": "La campaña no se pudo borrar. Intente nuevamente más tarde."
+      }
+    },
     "EDIT": {
       "TITLE": "Editar campaña",
       "UPDATE_BUTTON_TEXT": "Actualizar",
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index b8f1b2ccb..6bf649381 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Conversaciones anteriores"
     },
     "LABELS": {
-      "TITLE": "Etiquetas de conversación",
-      "MODAL": {
-        "TITLE": "Etiquetas para",
-        "ACTIVE_LABELS": "Etiquetas añadidas a la conversación",
-        "INACTIVE_LABELS": "Etiquetas disponibles en la cuenta",
-        "REMOVE": "Haga clic en el icono X para quitar la etiqueta",
-        "ADD": "Haga clic en el icono + para añadir la etiqueta",
-        "ADD_BUTTON": "Añadir etiquetas",
-        "UPDATE_BUTTON": "Actualizar etiquetas",
-        "UPDATE_ERROR": "No se han podido actualizar las etiquetas, inténtelo de nuevo."
+      "CONTACT": {
+        "TITLE": "Etiqueta de Contacto",
+        "ERROR": "No se pudo actualizar etiquetas de contacto"
+      },
+      "CONVERSATION": {
+        "TITLE": "Etiquetas de conversación",
+        "ADD_BUTTON": "Añadir etiquetas"
       },
-      "NO_LABELS_TO_ADD": "No hay más etiquetas definidas en la cuenta.",
-      "NO_AVAILABLE_LABELS": "No hay etiquetas añadidas a esta conversación.",
       "LABEL_SELECT": {
         "TITLE": "Añadir etiquetas",
         "PLACEHOLDER": "Buscar etiquetas",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Ver detalles"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Añadir",
+      "TITLE": "Shift + Enter para crear una tarea"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Fecha límite",
+      "LABEL_TITLE": "Establecer el tipo"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notas"
@@ -168,6 +173,16 @@
       "BUTTON": "Ver todas las notas"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Actividades"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notas",
+      "PILL_BUTTON_EVENTS": "Eventos",
+      "PILL_BUTTON_CONVO": "conversaciones"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Atributos personalizados",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 580875007..0b7318d67 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Detalles de la conversación",
     "ASSIGNEE_LABEL": "Agente asignado",
+    "SELF_ASSIGN": "Asignar a mi",
     "TEAM_LABEL": "Equipo asignado",
     "SELECT": {
       "PLACEHOLDER": "Ninguna"
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 0e4fa0824..c9dc764f4 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nombre de la bandeja de entrada",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nombre del sitio web",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Al iniciar sesión, sólo tenemos acceso a los mensajes de tu Página. Tus mensajes privados nunca pueden ser accedidos por Chatwoot.",
         "CHOOSE_PAGE": "Elegir página",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar del canal"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nombre del sitio web",
-          "PLACEHOLDER": "Introduzca el nombre de su sitio web (por ejemplo: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Dominio del sitio web",
           "PLACEHOLDER": "Introduzca el dominio de su sitio web (por ejemplo: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Activado",
         "DISABLED": "Deshabilitado"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Activado",
+        "DISABLED": "Deshabilitado"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirmar eliminación",
         "MESSAGE": "¿Está seguro de eliminar ",
+        "PLACE_HOLDER": "Por favor, escriba {inboxName} para confirmar",
         "YES": "Sí, eliminar ",
         "NO": "No, mantenerlo "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Añadir o quitar agentes de esta bandeja de entrada",
       "UPDATE": "Actualizar",
+      "ENABLE_EMAIL_COLLECT_BOX": "Activar caja de recolección de correo electrónico",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Activar o desactivar la caja de recolección de correo electrónico",
       "AUTO_ASSIGNMENT": "Activar asignación automática",
       "INBOX_UPDATE_TITLE": "Ajustes de la Bandeja de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Actualizar la configuración de tu bandeja de entrada",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrationApps.json b/app/javascript/dashboard/i18n/locale/es/integrationApps.json
new file mode 100644
index 000000000..d4c77180c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Obteniendo integraciones",
+    "NO_HOOK_CONFIGURED": "No hay integraciones de %{integrationId} configuradas en ésta cuenta.",
+    "HEADER": "Aplicaciones",
+    "STATUS": {
+      "ENABLED": "Activado",
+      "DISABLED": "Deshabilitado"
+    },
+    "CONFIGURE": "Configurar",
+    "ADD_BUTTON": "Añadir un nuevo hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirme eliminación",
+        "ACCOUNT": "Desconectar"
+      },
+      "MESSAGE": {
+        "INBOX": "¿Está seguro de eliminar?",
+        "ACCOUNT": "¿Está seguro en desconectar?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Sí, eliminar",
+        "ACCOUNT": "Si, desconectar"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook borrado correctamente",
+        "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Obteniendo hooks de integración",
+      "INBOX": "Bandeja de entrada",
+      "DELETE": {
+        "BUTTON_TEXT": "Eliminar"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Seleccione una bandeja de entrada",
+          "PLACEHOLDER": "Seleccione una bandeja de entrada"
+        },
+        "SUBMIT": "Crear",
+        "CANCEL": "Cancelar"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Hook de integración añadida correctamente",
+        "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Conectar"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Desconectar"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow es una plataforma de comprensión del lenguaje natural que facilita el diseño e integración de una interfaz de usuario conversacional en su aplicación móvil, aplicación web, dispositivo, bot, sistema interactivo de respuesta de voz, etc. <br /> <br /> La integración de Dialogflow con %{installationName} le permite configurar un bot de Dialogflow con sus bandejas de entrada que permite al bot manejar las consultas inicialmente y entregarlas a un agente cuando sea necesario. El dialogflow se puede utilizar para calificar a los clientes potenciales, reducir la carga de trabajo de los agentes proporcionando preguntas frecuentes, etc. <br /> <br /> Para añadir Dialogflow, necesita crear una cuenta de servicio en la consola del proyecto de Google y compartir las credenciales. Consulte la documentación de Dialogflow para obtener más información."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 8290ff360..c22a1582d 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -17,6 +17,24 @@
           "Acciones"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Editar",
+        "TITLE": "Editar Webhook",
+        "CANCEL": "Cancelar",
+        "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL de Webhook",
+            "PLACEHOLDER": "Ejemplo: https://example/api/webhook",
+            "ERROR": "Por favor, introduzca una URL válida"
+          },
+          "SUBMIT": "Editar Webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "URL del webhook actualizado correctamente",
+          "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancelar",
         "TITLE": "Añadir nuevo webhook",
diff --git a/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
index 905afe254..ca8c848c9 100644
--- a/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nombre de la etiqueta",
         "PLACEHOLDER": "Nombre de la etiqueta",
-        "ERROR": "Nombre de la etiqueta es obligatorio"
+        "REQUIRED_ERROR": "Nombre de la etiqueta es obligatorio",
+        "MINIMUM_LENGTH_ERROR": "La longitud mínima es de 2 caracteres",
+        "VALID_ERROR": "Sólo letras, números, guión y guión bajo son permitidos"
       },
       "DESCRIPTION": {
         "LABEL": "Descripción",
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 7eab53122..7ca0181b8 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Por favor, introduzca una dirección de correo válida",
         "PLACEHOLDER": "Por favor, introduzca su dirección de correo electrónico, esto se mostrará en las conversaciones"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Contraseña actual",
+        "ERROR": "Por favor, introduzca su contraseña actual",
+        "PLACEHOLDER": "Por favor, introduzca su contraseña actual"
+      },
       "PASSWORD": {
         "LABEL": "Contraseña",
         "ERROR": "Por favor, introduzca una contraseña de longitud 6 o más",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Respuestas predefinidas",
     "INTEGRATIONS": "Integraciones",
     "ACCOUNT_SETTINGS": "Configuración de la cuenta",
+    "APPLICATIONS": "Aplicaciones",
     "LABELS": "Etiquetas",
     "TEAMS": "Equipos"
   },
diff --git a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
index 1756c510c..e59f3ed2f 100644
--- a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "¿Está seguro que quiere borrar - %{teamName}?",
+        "PLACE_HOLDER": "Por favor escriba {teamName} para confirmar",
         "MESSAGE": "Al borrar el equipo se quitara la asignación del equipo en las conversaciones asignadas a éste equipo.",
         "YES": "Eliminar ",
         "NO": "Cancelar"
diff --git a/app/javascript/dashboard/i18n/locale/fa/campaign.json b/app/javascript/dashboard/i18n/locale/fa/campaign.json
index 07ef8ee5c..c2646e422 100644
--- a/app/javascript/dashboard/i18n/locale/fa/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/fa/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "CONFIRM": {
+        "TITLE": "تاییدیه حذف",
+        "MESSAGE": "مطمئن هستید که حذف شود?",
+        "YES": "بله، حذف شود ",
+        "NO": "نه، بماند "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "اعمال شود",
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index bbe09162c..67130d3f4 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "گفتگوهای قبلی"
     },
     "LABELS": {
-      "TITLE": "برچسب‌های گفتگو",
-      "MODAL": {
-        "TITLE": "برچسب‌ها برای",
-        "ACTIVE_LABELS": "برچسب‌ها اضافه شد به گفتگو",
-        "INACTIVE_LABELS": "برچسب‌های موجود در حساب‌کاربری",
-        "REMOVE": "برای پاک کردن برچسب، روی آیکون X کلیک کنید",
-        "ADD": "برای افزودن برچسب بر روی آیکون + کلیک کنید",
-        "ADD_BUTTON": "افزودن برچسب‌ها",
-        "UPDATE_BUTTON": "تغییر برچسب‌ها",
-        "UPDATE_ERROR": "برچسب‌ها تغییری نکردند، لطفا بعدا امتحان کنید."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "برچسب‌های گفتگو",
+        "ADD_BUTTON": "افزودن برچسب‌ها"
       },
-      "NO_LABELS_TO_ADD": "هیچ برچسبی در حساب‌کاربری تعریف نشده است.",
-      "NO_AVAILABLE_LABELS": "هیچ برچسبی به این گفتگو اضافه نشده است.",
       "LABEL_SELECT": {
         "TITLE": "افزودن برچسب‌ها",
         "PLACEHOLDER": "جستجو برچسب‌ها",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "مشاهده جزئیات"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "افزودن",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "گفتگوها"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "ویژگی‌های سفارشی",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 3fdadf399..090d258fd 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index fba260284..7ce451254 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "عنوان صندوق ورودی",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "عنوان سایت",
+        "PLACEHOLDER": "عنوان سایت خود را وارد کنید (به عنوان مثال: Acme Inc)"
+      },
       "FB": {
         "HELP": "پانویس: با وارد شدن ما فقط به پیام‌های صفحه دسترسی پیدا می‌کنیم. پیام‌های خصوصی شما را هرگز نخواهیم دید",
         "CHOOSE_PAGE": "انتخاب صفحه",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "آواتار کانال"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "عنوان سایت",
-          "PLACEHOLDER": "عنوان سایت خود را وارد کنید (به عنوان مثال: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "دامنه سایت",
           "PLACEHOLDER": "دامنه سایت خود را وارد کنید (به عنوان مثال: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "فعال",
         "DISABLED": "غیرفعال"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "فعال",
+        "DISABLED": "غیرفعال"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "تاییدیه حذف",
         "MESSAGE": "مطمئن هستید که حذف شود ",
+        "PLACE_HOLDER": "برای تایید لطفا {inboxName} را تایپ کنید",
         "YES": "بله، حذف شود ",
         "NO": "نه، بماند "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "اپراتورها",
       "INBOX_AGENTS_SUB_TEXT": "اضافه کردن یا حذف کردن دسترسی اپراتور به صندوق ورودی",
       "UPDATE": "اعمال شود",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "فعال کردن واگذاری خودکار گفتگو به اپراتورها",
       "INBOX_UPDATE_TITLE": "تنظیمات صندوق ورودی",
       "INBOX_UPDATE_SUB_TEXT": "تغییر پارامترهای صندوق ورودی",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrationApps.json b/app/javascript/dashboard/i18n/locale/fa/integrationApps.json
new file mode 100644
index 000000000..fa92d122f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "فعال",
+      "DISABLED": "غیرفعال"
+    },
+    "CONFIGURE": "تنظیمات",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "مطمئن هستید که حذف شود?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "بله، حذف شود",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "انصراف",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "صندوق ورودی",
+      "DELETE": {
+        "BUTTON_TEXT": "حذف"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "ايجاد كردن",
+        "CANCEL": "انصراف"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "اتصال"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 8d725f206..0c6c38840 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -17,6 +17,24 @@
           "رویدادها"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "ویرایش",
+        "TITLE": "Edit webhook",
+        "CANCEL": "انصراف",
+        "DESC": "رویدادهای وب هوک اطلاعات لحظه‌ای حساب چت ووت شما را منتقل می‌کنند. لطفا آدرس URL صحیحی وارد کنید.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "آدرس URL وب هوک",
+            "PLACEHOLDER": "به عنوان مثال: https://example/api/webhook",
+            "ERROR": "لطفا آدرس URL صحیحی وارد کنید"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
+        }
+      },
       "ADD": {
         "CANCEL": "انصراف",
         "TITLE": "اضافه کردن وب هوک جدید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
index bdca400d6..9dae44f4b 100644
--- a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "نام برچسب",
         "PLACEHOLDER": "نام برچسب",
-        "ERROR": "نام برچسب لازم است"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "توضیحات",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 48afb901c..b67274d99 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید",
         "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید، این ایمیل در گفتگوها دیده می‌شود"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "رمز عبور",
         "ERROR": "رمز عبور می‌بایست ۶ کاراکتر یا بیشتر باشد",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "پاسخ‌های آماده",
     "INTEGRATIONS": "برنامه‌های تلفیق شده",
     "ACCOUNT_SETTINGS": "تنظیمات حساب",
+    "APPLICATIONS": "Applications",
     "LABELS": "برچسب‌ها",
     "TEAMS": "تیم‌ها"
   },
diff --git a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
index 1983e9614..fdf867295 100644
--- a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "برای تایید لطفا {teamName} را تایپ کنید",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "حذف ",
         "NO": "انصراف"
diff --git a/app/javascript/dashboard/i18n/locale/fi/campaign.json b/app/javascript/dashboard/i18n/locale/fi/campaign.json
index 57e3bcf44..e97f38b24 100644
--- a/app/javascript/dashboard/i18n/locale/fi/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/fi/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Poista",
+      "CONFIRM": {
+        "TITLE": "Vahvista poistaminen",
+        "MESSAGE": "Oletko varma että haluat poistaa?",
+        "YES": "Kyllä, poista ",
+        "NO": "Ei, säilytä "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Päivitä",
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 48db74762..044d8e78e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Edelliset keskustelut"
     },
     "LABELS": {
-      "TITLE": "Keskustelutunnisteet",
-      "MODAL": {
-        "TITLE": "Tunnisteet kohteelle",
-        "ACTIVE_LABELS": "Keskusteluun lisätyt tunnisteet",
-        "INACTIVE_LABELS": "Tilissä saatavilla olevat tunnisteet",
-        "REMOVE": "Napsauta X-kuvaketta poistaaksesi tunnisteen",
-        "ADD": "Napsauta + kuvaketta lisätäksesi tunnisteen",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Päivitä tunnisteet",
-        "UPDATE_ERROR": "Tunnisteita ei voitu päivittää, yritä uudelleen."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Keskustelutunnisteet",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Tällä tilillä ei ole enempää tunnisteita.",
-      "NO_AVAILABLE_LABELS": "Tälle keskustelulle ei ole lisätty tunnisteita.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "keskustelut"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Mukautetut attribuutit",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 16bd54c4b..6c02b3b3c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index b858cd044..7b63acfbf 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Kansion nimi",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Sivuston nimi",
+        "PLACEHOLDER": "Anna sivuston nimi (esim. Acme Oy)"
+      },
       "FB": {
         "HELP": "PS: Kirjautumalla sisään saamme vain pääsyn sivusi viesteihin. Chatwoot ei koskaan näe yksityisviestejäsi.",
         "CHOOSE_PAGE": "Valitse sivu",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanavan avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Sivuston nimi",
-          "PLACEHOLDER": "Anna sivuston nimi (esim. Acme Oy)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Sivuston verkkotunnus",
           "PLACEHOLDER": "Anna sivuston verkkotunnus (esim. acme.fi)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Käytössä",
         "DISABLED": "Pois käytöstä"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Käytössä",
+        "DISABLED": "Pois käytöstä"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Vahvista poistaminen",
         "MESSAGE": "Oletko varma että haluat poistaa ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Kyllä, poista ",
         "NO": "Ei, säilytä "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Edustajat",
       "INBOX_AGENTS_SUB_TEXT": "Lisää tai poista edustajia tästä saapuneet-kansiosta",
       "UPDATE": "Päivitä",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Ota automaattinen delegointi käyttöön",
       "INBOX_UPDATE_TITLE": "Postilaatikon tiedot",
       "INBOX_UPDATE_SUB_TEXT": "Päivitä postilaatikon asetukset",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrationApps.json b/app/javascript/dashboard/i18n/locale/fi/integrationApps.json
new file mode 100644
index 000000000..ac9f76d68
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Käytössä",
+      "DISABLED": "Pois käytöstä"
+    },
+    "CONFIGURE": "Määrittele",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Oletko varma että haluat poistaa?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Kyllä, poista",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Peruuta",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Poista"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Luo",
+        "CANCEL": "Peruuta"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Yhdistä"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index bf1ebac70..386ee11a8 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -17,6 +17,24 @@
           "Toiminnot"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Muokkaa",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Peruuta",
+        "DESC": "Webhook-tapahtumat antavat sinulle reaaliaikaista tietoa siitä, mitä Chatwot-tililläsi tapahtuu. Syötä kelvollinen URL-osoite, jotta voit määrittää callbackin.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhookin URL",
+            "PLACEHOLDER": "Esimerkki: https://example/api/webhook",
+            "ERROR": "Anna kelvollinen URL-osoite"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+        }
+      },
       "ADD": {
         "CANCEL": "Peruuta",
         "TITLE": "Lisää uusi webhook",
diff --git a/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
index 4f8b983ee..cdfca1a19 100644
--- a/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Tunnisteen nimi",
         "PLACEHOLDER": "Tunnisteen nimi",
-        "ERROR": "Tunnisteen nimi on pakollinen"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Kuvaus",
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 8f03d0c4d..302d2e035 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Ole hyvä ja syötä validi sähköposti",
         "PLACEHOLDER": "Sähköposti, joka näytetään keskusteluissa"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Salasana",
         "ERROR": "Anna salasana jonka pituus on 6 tai enemmän",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Tallennetut vastaukset",
     "INTEGRATIONS": "Integraatiot",
     "ACCOUNT_SETTINGS": "Tilin asetukset",
+    "APPLICATIONS": "Applications",
     "LABELS": "Tunnisteet",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
index a7b26e1e8..21565fe3e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Poista ",
         "NO": "Peruuta"
diff --git a/app/javascript/dashboard/i18n/locale/fr/campaign.json b/app/javascript/dashboard/i18n/locale/fr/campaign.json
index 80a2b1796..cabd2ce49 100644
--- a/app/javascript/dashboard/i18n/locale/fr/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/fr/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Supprimer",
+      "CONFIRM": {
+        "TITLE": "Confirmer la suppression",
+        "MESSAGE": "Êtes-vous sûr de vouloir supprimer?",
+        "YES": "Oui, supprimer ",
+        "NO": "Non, Conserver "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Mettre à jour",
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index dff214bed..918b292b0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Conversations précédentes"
     },
     "LABELS": {
-      "TITLE": "Étiquettes de conversation",
-      "MODAL": {
-        "TITLE": "Étiquettes pour",
-        "ACTIVE_LABELS": "Étiquettes ajoutées à la conversation",
-        "INACTIVE_LABELS": "Étiquettes disponibles dans le compte",
-        "REMOVE": "Cliquez sur l'icône X pour supprimer l'étiquette",
-        "ADD": "Cliquez sur l'icône + pour ajouter l'étiquette",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Mettre à jour les étiquettes",
-        "UPDATE_ERROR": "Impossible de mettre à jour les étiquettes. Veuillez réessayer."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Étiquettes de conversation",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Il n'y a pas d'autres étiquettes définies dans le compte.",
-      "NO_AVAILABLE_LABELS": "Aucune étiquette n'a été ajoutée à cette conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Voir les détails"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Attributs personnalisés",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index f979fa808..3f269b836 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Détails de la conversation",
     "ASSIGNEE_LABEL": "Agent Assigné",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Équipe assignée",
     "SELECT": {
       "PLACEHOLDER": "Aucun"
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 82a6d7dff..3a37cdcad 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nom de la boîte de réception",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nom du site Web",
+        "PLACEHOLDER": "Entrez le nom de votre site Web (ex : Acme Inc)"
+      },
       "FB": {
         "HELP": "PS : En vous connectant, nous avons seulement accès aux messages de votre page. Vos messages privés ne peuvent jamais être consultés par Chatwoot.",
         "CHOOSE_PAGE": "Choisir la page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar du canal"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nom du site Web",
-          "PLACEHOLDER": "Entrez le nom de votre site Web (ex : Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domaine du site Web",
           "PLACEHOLDER": "Entrez le domaine de votre site Web (ex : acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Activé",
         "DISABLED": "Désactivé"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Activé",
+        "DISABLED": "Désactivé"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirmer la suppression",
         "MESSAGE": "Êtes-vous sûr de vouloir supprimer ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Oui, supprimer ",
         "NO": "Non, Conserver "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Ajouter ou supprimer des agents de cette boîte de réception",
       "UPDATE": "Mettre à jour",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Activer l'assignation automatique",
       "INBOX_UPDATE_TITLE": "Paramètres de boîtes de réception",
       "INBOX_UPDATE_SUB_TEXT": "Mettre à jour les paramètres de votre boîte de réception",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrationApps.json b/app/javascript/dashboard/i18n/locale/fr/integrationApps.json
new file mode 100644
index 000000000..ec047a23f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Activé",
+      "DISABLED": "Désactivé"
+    },
+    "CONFIGURE": "Configurer",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Êtes-vous sûr de vouloir supprimer?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Oui, supprimer",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Annuler",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Supprimer"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Créer",
+        "CANCEL": "Annuler"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connecter"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 646056cf5..32c860922 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -17,6 +17,24 @@
           "Actions"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Modifier",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Annuler",
+        "DESC": "Les événements Webhook vous fournissent des informations en temps réel sur ce qui se passe dans votre compte Chatwoot. Veuillez entrer une URL valide pour configurer un callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL du Webhook",
+            "PLACEHOLDER": "Exemple : https://exemple/api/webhook",
+            "ERROR": "Veuillez entrer une URL valide"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+        }
+      },
       "ADD": {
         "CANCEL": "Annuler",
         "TITLE": "Ajouter un nouveau webhook",
diff --git a/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
index 2d1628648..cd25a727a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nom de l'étiquette",
         "PLACEHOLDER": "Nom de l'étiquette",
-        "ERROR": "Le nom de l'étiquette est requis"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 1400965e3..326e0dad3 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Veuillez saisir une adresse de courriel valide",
         "PLACEHOLDER": "Veuillez entrer votre adresse de courriel, cela sera affiché dans les conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Mot de passe",
         "ERROR": "Veuillez entrer un mot de passe de 6 caractères ou plus",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Réponses standardisées",
     "INTEGRATIONS": "Intégrations",
     "ACCOUNT_SETTINGS": "Paramètres du compte",
+    "APPLICATIONS": "Applications",
     "LABELS": "Étiquettes",
     "TEAMS": "Équipes"
   },
diff --git a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
index 7e81d9ed0..122371db3 100644
--- a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Supprimer ",
         "NO": "Annuler"
diff --git a/app/javascript/dashboard/i18n/locale/he/agentMgmt.json b/app/javascript/dashboard/i18n/locale/he/agentMgmt.json
new file mode 100644
index 000000000..ef673c7a5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/agentMgmt.json
@@ -0,0 +1,96 @@
+{
+  "AGENT_MGMT": {
+    "HEADER": "סוכנים",
+    "HEADER_BTN_TXT": "הוסף סוכן",
+    "LOADING": "טוען רשימת סוכנים",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "AGENT_TYPES": {
+      "ADMINISTRATOR": "אדמין",
+      "AGENT": "סוכן"
+    },
+    "LIST": {
+      "404": "אין סוכנים המקושרים לחשבון זה",
+      "TITLE": "נהל סוכנים בצוות שלך",
+      "DESC": "אתה יכול להוסיף/להסיר סוכנים לצוות שלך.",
+      "NAME": "שם",
+      "EMAIL": "מייל",
+      "STATUS": "מצב",
+      "ACTIONS": "פעולות",
+      "VERIFIED": "אומת",
+      "VERIFICATION_PENDING": "מחכה לאימות"
+    },
+    "ADD": {
+      "TITLE": "הוסף סוכן לצוות שלך",
+      "DESC": "אתה יכול להוסיף אנשים אשר יוכלו לטפל בתמיכה בתיבות שלך.",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "FORM": {
+        "NAME": {
+          "LABEL": "שם סוכן",
+          "PLACEHOLDER": "אנא הכנס את שם הסוכן"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "תפקיד",
+          "PLACEHOLDER": "אנא בחר תפקיד",
+          "ERROR": "תפקיד שדה חובה"
+        },
+        "EMAIL": {
+          "LABEL": "כתובת מייל",
+          "PLACEHOLDER": "אנא הכנס כתובת מייל של הסוכן"
+        },
+        "SUBMIT": "הוסף סוכן"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "סוכן הוסף בהצלחה",
+        "EXIST_MESSAGE": "המייל בשימוש, אנא נסה כתובת מייל אחרת",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "API": {
+        "SUCCESS_MESSAGE": "סוכן נמחק בהצלחה",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      },
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      }
+    },
+    "EDIT": {
+      "TITLE": "ערוך סוכן",
+      "FORM": {
+        "NAME": {
+          "LABEL": "שם סוכן",
+          "PLACEHOLDER": "אנא הכנס את שם הסוכן"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "תפקיד",
+          "PLACEHOLDER": "אנא בחר תפקיד",
+          "ERROR": "תפקיד שדה חובה"
+        },
+        "EMAIL": {
+          "LABEL": "כתובת מייל",
+          "PLACEHOLDER": "אנא הכנס כתובת מייל של הסוכן"
+        },
+        "SUBMIT": "ערוך סוכן"
+      },
+      "BUTTON_TEXT": "ערוך",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "API": {
+        "SUCCESS_MESSAGE": "סוכן עודכן בהצלחה",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "אפס ססמה",
+        "ADMIN_SUCCESS_MESSAGE": "מייל עם הוראות איפוס ססמא נשלח לסוכן",
+        "SUCCESS_MESSAGE": "ססמת הסוכן אופסה בהצלחה",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "לא נמצא סוכן."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/campaign.json b/app/javascript/dashboard/i18n/locale/he/campaign.json
new file mode 100644
index 000000000..b9b2447df
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/campaign.json
@@ -0,0 +1,92 @@
+{
+  "CAMPAIGN": {
+    "HEADER": "קמפיין",
+    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
+    "HEADER_BTN_TXT": "צור קמפיין",
+    "ADD": {
+      "TITLE": "צור קמפיין",
+      "DESC": "הודעות יזומות מאפשרות ללקוח לשלוח הודעות לאנשי הקשר שלהם דבר אשר יגרום לשיחות נוספות.",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "CREATE_BUTTON_TEXT": "צור",
+      "FORM": {
+        "TITLE": {
+          "LABEL": "כותרת",
+          "PLACEHOLDER": "אנא הכנס כותרת לקמפיין",
+          "ERROR": "כותרת שדה חובה"
+        },
+        "MESSAGE": {
+          "LABEL": "הודעה",
+          "PLACEHOLDER": "אנא הכנס הודעה לקמפיין",
+          "ERROR": "הודעה שדה חובה"
+        },
+        "SENT_BY": {
+          "LABEL": "נשלח על ידי",
+          "PLACEHOLDER": "אנא בחר תוכן לקמפיין",
+          "ERROR": "שולח שדה חובה"
+        },
+        "END_POINT": {
+          "LABEL": "URL",
+          "PLACEHOLDER": "אנא הכנס כתובת URL",
+          "ERROR": "אנא הכנס כתובת URL חוקית"
+        },
+        "TIME_ON_PAGE": {
+          "LABEL": "זמן על הדף (שניות)",
+          "PLACEHOLDER": "אנא הכנס זמן",
+          "ERROR": "זמן על הדף שדה חובה"
+        },
+        "ENABLED": "הפעל קמפיין",
+        "SUBMIT": "הוסף קמפיין"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "קמפיין נוצר בהצלחה",
+        "ERROR_MESSAGE": "היתה שגיאה. בקשה נסה שוב."
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק?",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
+    "EDIT": {
+      "TITLE": "ערוך קמפיין",
+      "UPDATE_BUTTON_TEXT": "עדכן",
+      "API": {
+        "SUCCESS_MESSAGE": "קמפיין עודכן בהצלחה",
+        "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
+      }
+    },
+    "LIST": {
+      "LOADING_MESSAGE": "טוען קמפיינים...",
+      "404": "אין קמפיינים שנוצרו עבור תיבה זו.",
+      "TABLE_HEADER": {
+        "TITLE": "כותרת",
+        "MESSAGE": "הודעה",
+        "STATUS": "מצב",
+        "SENDER": "שולח",
+        "URL": "URL",
+        "TIME_ON_PAGE": "זמן(שניות)",
+        "CREATED_AT": "נוצר בזמן"
+      },
+      "BUTTONS": {
+        "ADD": "הוסף",
+        "EDIT": "ערוך",
+        "DELETE": "מחק"
+      },
+      "STATUS": {
+        "ENABLED": "מופעל",
+        "DISABLED": "כבוי"
+      },
+      "SENDER": {
+        "BOT": "בוט"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
new file mode 100644
index 000000000..af48f1607
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "HEADER": "Canned Responses",
+    "HEADER_BTN_TXT": "Add Canned Response",
+    "LOADING": "Fetching Canned Responses",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation . </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "LIST": {
+      "404": "There are no canned responses available in this account.",
+      "TITLE": "Manage canned responses",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "TABLE_HEADER": [
+        "Short Code",
+        "Content",
+        "פעולות"
+      ]
+    },
+    "ADD": {
+      "TITLE": "Add Canned Response",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a shortcode",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "שלח"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response added successfully",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Canned Response",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a shortcode",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "שלח"
+      },
+      "BUTTON_TEXT": "ערוך",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response updated successfully",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned response deleted successfully",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      },
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
new file mode 100644
index 000000000..f477a70bc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -0,0 +1,86 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "Fetching conversations",
+    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
+    "EOF": "כל השיחות נטענו 🎉",
+    "LIST": {
+      "404": "אין שיחות פעילות בקבוצה הזו."
+    },
+    "TAB_HEADING": "שיחות",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "STATUS_TABS": [
+      {
+        "NAME": "פתח",
+        "KEY": "openCount"
+      },
+      {
+        "NAME": "נפתרה",
+        "KEY": "allConvCount"
+      }
+    ],
+    "ASSIGNEE_TYPE_TABS": [
+      {
+        "NAME": "Mine",
+        "KEY": "me",
+        "COUNT_KEY": "mineCount"
+      },
+      {
+        "NAME": "לא הוקצתה",
+        "KEY": "unassigned",
+        "COUNT_KEY": "unAssignedCount"
+      },
+      {
+        "NAME": "הכל",
+        "KEY": "all",
+        "COUNT_KEY": "allCount"
+      }
+    ],
+    "CHAT_STATUS_ITEMS": [
+      {
+        "TEXT": "פתח",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "נפתרה",
+        "VALUE": "resolved"
+      },
+      {
+        "TEXT": "בוט",
+        "VALUE": "בוט"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "הודעת תמונה"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "קובץ מצורף"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    },
+    "RECEIVED_VIA_EMAIL": "Received via email",
+    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
+    "REPLY_TO_TWEET": "Reply to this tweet",
+    "NO_MESSAGES": "No Messages",
+    "NO_CONTENT": "No content available"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
new file mode 100644
index 000000000..9e5181198
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -0,0 +1,207 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "כתובת מייל",
+    "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "דפדפן",
+    "OS": "מערכת הפעלה",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "IP_ADDRESS": "IP Address",
+    "NEW_MESSAGE": "New message",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
+      },
+      "LABEL_SELECT": {
+        "TITLE": "Add Labels",
+        "PLACEHOLDER": "Search labels",
+        "NO_RESULT": "No labels found"
+      }
+    },
+    "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "Send Transcript",
+    "EDIT_LABEL": "ערוך"
+  },
+  "EDIT_CONTACT": {
+    "BUTTON_LABEL": "Edit Contact",
+    "TITLE": "Edit contact",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
+    "FORM": {
+      "SUBMIT": "שלח",
+      "CANCEL": "ביטול",
+      "AVATAR": {
+        "LABEL": "Contact Avatar"
+      },
+      "NAME": {
+        "PLACEHOLDER": "Enter the full name of the contact",
+        "LABEL": "שם מלא"
+      },
+      "BIO": {
+        "PLACEHOLDER": "Enter the bio of the contact",
+        "LABEL": "Bio"
+      },
+      "EMAIL_ADDRESS": {
+        "PLACEHOLDER": "Enter the email address of the contact",
+        "LABEL": "כתובת מייל"
+      },
+      "PHONE_NUMBER": {
+        "PLACEHOLDER": "Enter the phone number of the contact",
+        "LABEL": "Phone Number",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Phone number should be either empty or of E.164 format"
+      },
+      "LOCATION": {
+        "PLACEHOLDER": "Enter the location of the contact",
+        "LABEL": "Location"
+      },
+      "COMPANY_NAME": {
+        "PLACEHOLDER": "Enter the company name",
+        "LABEL": "Company Name"
+      },
+      "SOCIAL_PROFILES": {
+        "FACEBOOK": {
+          "PLACEHOLDER": "Enter the Facebook username",
+          "LABEL": "Facebook"
+        },
+        "TWITTER": {
+          "PLACEHOLDER": "Enter the Twitter username",
+          "LABEL": "Twitter"
+        },
+        "LINKEDIN": {
+          "PLACEHOLDER": "Enter the LinkedIn username",
+          "LABEL": "LinkedIn"
+        },
+        "GITHUB": {
+          "PLACEHOLDER": "Enter the Github username",
+          "LABEL": "Github"
+        }
+      }
+    },
+    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "NEW_CONVERSATION": {
+    "BUTTON_LABEL": "Start conversation",
+    "TITLE": "New conversation",
+    "DESC": "Start a new conversation by sending a new message.",
+    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "FORM": {
+      "TO": {
+        "LABEL": "To"
+      },
+      "INBOX": {
+        "LABEL": "Inbox",
+        "ERROR": "Select an inbox"
+      },
+      "MESSAGE": {
+        "LABEL": "הודעה",
+        "PLACEHOLDER": "Write your message here",
+        "ERROR": "Message can't be empty"
+      },
+      "SUBMIT": "Send message",
+      "CANCEL": "ביטול",
+      "SUCCESS_MESSAGE": "Message sent!",
+      "ERROR_MESSAGE": "Couldn't send! try again"
+    }
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": {
+        "NAME": "שם",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "שיחות",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "כתובת מייל"
+      },
+      "VIEW_DETAILS": "View details"
+    }
+  },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "הוסף",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "HEADER": {
+      "TITLE": "Notes"
+    },
+    "ADD": {
+      "BUTTON": "Add",
+      "PLACEHOLDER": "Add a note",
+      "TITLE": "Shift + Enter to create a note"
+    },
+    "FOOTER": {
+      "BUTTON": "View all notes"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "שיחות"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "TITLE": "Custom Attributes",
+    "BUTTON": "Add custom attribute",
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "ביטול",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
new file mode 100644
index 000000000..2cc9a49a5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -0,0 +1,118 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "No results found."
+    },
+    "UNREAD_MESSAGES": "Unread Messages",
+    "UNREAD_MESSAGE": "Unread Message",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
+    "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",
+    "LAST_INCOMING_TWEET": "You are replying to the last incoming tweet",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "הורד",
+    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "NO_RESPONSE": "No response",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN_ACTION": "פתח",
+      "OPEN": "More",
+      "CLOSE": "סגור",
+      "DETAILS": "details"
+    },
+    "RESOLVE_DROPDOWN": {
+      "OPEN_BOT": "Open with bot"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet",
+      "TIP_FORMAT_ICON": "Show rich text editor",
+      "TIP_EMOJI_ICON": "Show emoji selector",
+      "TIP_ATTACH_ICON": "Attach files",
+      "ENTER_TO_SEND": "Enter to send"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "SENT_BY": "Sent by:",
+    "ASSIGNMENT": {
+      "SELECT_AGENT": "בחר סוכן",
+      "REMOVE": "Remove",
+      "ASSIGN": "Assign"
+    }
+  },
+  "EMAIL_TRANSCRIPT": {
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "שלח",
+    "CANCEL": "ביטול",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "FORM": {
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "EMAIL": {
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
+      }
+    }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
new file mode 100644
index 000000000..f3792ed3d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -0,0 +1,75 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Account settings",
+    "SUBMIT": "Update settings",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Could not update settings, try again!",
+      "SUCCESS": "Successfully updated account settings"
+    },
+    "FORM": {
+      "ERROR": "Please fix form errors",
+      "GENERAL_SECTION": {
+        "TITLE": "General settings",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "Account name",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": "Please enter a valid account name"
+      },
+      "LANGUAGE": {
+        "LABEL": "Site language (Beta)",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Incoming Email Domain",
+        "PLACEHOLDER": "The domain where you will receive the emails",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
+      "FEATURES": {
+        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+      }
+    },
+    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance."
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "התראות",
+    "MARK_ALL_DONE": "Mark All Done",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading notifications...",
+      "404": "No Notifications",
+      "TABLE_HEADER": [
+        "שם",
+        "Phone Number",
+        "שיחות",
+        "Last Contacted"
+      ]
+    },
+    "TYPE_LABEL": {
+      "conversation_creation": "New conversation",
+      "conversation_assignment": "Conversation Assigned",
+      "assigned_conversation_new_message": "New Message",
+      "conversation_mention": "Mention"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
new file mode 100644
index 000000000..f0ff404de
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -0,0 +1,306 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inboxes",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "LIST": {
+      "404": "There are no inboxes attached to this account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Choose Channel",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Create Inbox",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Add Agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "You are all set to go!"
+      }
+    ],
+    "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
+      "FB": {
+        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
+        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PLACEHOLDER": "Select a page from the list",
+        "INBOX_NAME": "Inbox Name",
+        "ADD_NAME": "Add a name for your inbox",
+        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_A_VALUE": "Pick a value"
+      },
+      "TWITTER": {
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Website channel",
+        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Website Domain",
+          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Welcome Heading",
+          "PLACEHOLDER": "Hi there !"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget Color",
+          "PLACEHOLDER": "Update the widget color used in widget"
+        },
+        "SUBMIT_BUTTON": "Create inbox"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/Whatsapp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Account SID",
+          "PLACEHOLDER": "Please enter your Twilio Account SID",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Please enter your Twilio Auth Token",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+        }
+      },
+      "API_CHANNEL": {
+        "TITLE": "API Channel",
+        "DESC": "Integrate with API channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "PLACEHOLDER": "Webhook URL"
+        },
+        "SUBMIT_BUTTON": "Create API Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the api channel"
+        }
+      },
+      "EMAIL_CHANNEL": {
+        "TITLE": "Email Channel",
+        "DESC": "Integrate you email inbox.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "EMAIL": {
+          "LABEL": "אימייל",
+          "SUBTITLE": "Email where your customers sends you support tickets",
+          "PLACEHOLDER": "אימייל"
+        },
+        "SUBMIT_BUTTON": "Create Email Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the email channel"
+        },
+        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently, we support Website live chat widgets, Facebook Pages, Twitter profiles and Whatsapp as platforms. We have more platforms like Email, Telegram and Line in the works, which will be out soon."
+      },
+      "AGENTS": {
+        "TITLE": "סוכנים",
+        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
+        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "PICK_AGENTS": "Pick agents for the inbox"
+      },
+      "DETAILS": {
+        "TITLE": "Inbox Details",
+        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+      },
+      "FINISH": {
+        "TITLE": "Nailed It!",
+        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Authenticating you with Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Creating your Inbox...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Inbox..."
+    },
+    "FINISH": {
+      "TITLE": "Your Inbox is ready!",
+      "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."
+    },
+    "REAUTH": "Reauthorize",
+    "VIEW": "View",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
+        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "מופעל",
+        "DISABLED": "כבוי"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "TABS": {
+      "SETTINGS": "הגדרות",
+      "COLLABORATORS": "Collaborators",
+      "CONFIGURATION": "Configuration",
+      "CAMPAIGN": "קמפיין",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
+    },
+    "SETTINGS": "הגדרות",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+    },
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "INBOX_AGENTS": "סוכנים",
+      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
+      "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
+      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_DESCRIPTION": "Inorder validate the users identity, the SDK allows you to pass an `identity_hash` for each user. You can generate HMAC using 'sha256' with the key shown here."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/integrationApps.json b/app/javascript/dashboard/i18n/locale/he/integrationApps.json
new file mode 100644
index 000000000..bd0f8fc3e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "מופעל",
+      "DISABLED": "כבוי"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "האם אתה בטוח שברצונך למחוק?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "כן, מחק",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "מחק"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "צור",
+        "CANCEL": "ביטול"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "התחבר"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
new file mode 100644
index 000000000..d01e57955
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -0,0 +1,79 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "LOADING": "Fetching attached webhooks",
+      "SEARCH_404": "There are no items matching this query",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
+      "LIST": {
+        "404": "There are no webhooks configured for this account.",
+        "TITLE": "Manage webhooks",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "פעולות"
+        ]
+      },
+      "EDIT": {
+        "BUTTON_TEXT": "ערוך",
+        "TITLE": "Edit webhook",
+        "CANCEL": "ביטול",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "אנא הכנס כתובת URL חוקית"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+        }
+      },
+      "ADD": {
+        "CANCEL": "ביטול",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "מחק",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+        },
+        "CONFIRM": {
+          "TITLE": "אשר מחיקה",
+          "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+          "YES": "כן, מחק ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "התחבר"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/he/labelsMgmt.json
new file mode 100644
index 000000000..a884bb6ea
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/labelsMgmt.json
@@ -0,0 +1,70 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "LIST": {
+      "404": "There are no labels available in this account.",
+      "TITLE": "Manage labels",
+      "DESC": "Labels let you group the conversations together.",
+      "TABLE_HEADER": [
+        "שם",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "ערוך",
+      "CREATE": "Create",
+      "DELETE": "מחק",
+      "CANCEL": "ביטול"
+    },
+    "ADD": {
+      "TITLE": "Add label",
+      "DESC": "Labels let you group the conversations together.",
+      "API": {
+        "SUCCESS_MESSAGE": "Label added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit label",
+      "API": {
+        "SUCCESS_MESSAGE": "Label updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/login.json b/app/javascript/dashboard/i18n/locale/he/login.json
new file mode 100644
index 000000000..453121796
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "התחבר ל Woot",
+    "EMAIL": {
+      "LABEL": "אימייל",
+      "PLACEHOLDER": "מייל לדוגמא: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "סיסמה",
+      "PLACEHOLDER": "סיסמה"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "נכנסת בהצלחה",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר",
+      "UNAUTH": "שם משתמש / סיסמה שגויים. נסה שוב"
+    },
+    "FORGOT_PASSWORD": "שכחת את הסיסמה?",
+    "CREATE_NEW_ACCOUNT": "צור חשבון",
+    "SUBMIT": "התחבר"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
new file mode 100644
index 000000000..b3788bda3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -0,0 +1,56 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "שיחות",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/resetPassword.json b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
new file mode 100644
index 000000000..3167e5794
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "אפס ססמה",
+    "EMAIL": {
+      "LABEL": "אימייל",
+      "PLACEHOLDER": "הזן בבקשה את האימייל שלך",
+      "ERROR": "Please enter a valid email"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+    },
+    "SUBMIT": "שלח"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
new file mode 100644
index 000000000..e69ecc95c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "סיסמה",
+      "PLACEHOLDER": "סיסמה",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+    },
+    "SUBMIT": "שלח"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
new file mode 100644
index 000000000..102a18671
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -0,0 +1,160 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "סיסמה",
+        "NOTE": "Updating your password would reset your logins in multiple devices.",
+        "BTN_TEXT": "Change password"
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ENABLE_AUDIO": "Play audio notification when a new conversation is created or new messages arrives"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Email Notifications",
+        "NOTE": "Update your email notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "שלח התראה באימייל כאשר שיחה מוקצית עבורי",
+        "CONVERSATION_CREATION": "שלח התראה באימייל כאשר נפתחת שיחה חדשה",
+        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראה באימייל כאשר יש הודעה חדשה בשיחה המוקצית עבורי"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Push Notifications",
+        "NOTE": "Update your push notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "שלח התראת פוש כאשר שיחה מוקצית עבורי",
+        "CONVERSATION_CREATION": "שלח התראת פוש כאשר נפתחת שיחה חדשה",
+        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראת פוש כאשר יש הודעה חדשה בשיחה המוקצית עבורי",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your full name",
+        "ERROR": "Please enter a valid full name",
+        "PLACEHOLDER": "Please enter your full name"
+      },
+      "DISPLAY_NAME": {
+        "LABEL": "Display name",
+        "ERROR": "Please enter a valid display name",
+        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "זמינות",
+        "STATUSES_LIST": [
+          "מחובר",
+          "עסוק",
+          "לא מחובר"
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Your email address",
+        "ERROR": "Please enter a valid email address",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
+      "PASSWORD": {
+        "LABEL": "סיסמה",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_ACCOUNTS": "החלף חשבון",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "התנתק"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "הורד",
+      "UPLOADING": "מעלה..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "שלח"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "שיחות",
+    "REPORTS": "Reports",
+    "CONTACTS": "Contacts",
+    "SETTINGS": "הגדרות",
+    "HOME": "בית",
+    "AGENTS": "סוכנים",
+    "INBOXES": "Inboxes",
+    "NOTIFICATIONS": "התראות",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
+    "LABELS": "Labels",
+    "TEAMS": "Teams"
+  },
+  "CREATE_ACCOUNT": {
+    "NEW_ACCOUNT": "New Account",
+    "SELECTOR_SUBTITLE": "Create a new account",
+    "API": {
+      "SUCCESS_MESSAGE": "Account created successfully",
+      "EXIST_MESSAGE": "Account already exists",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Account Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "שלח"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/signup.json b/app/javascript/dashboard/i18n/locale/he/signup.json
new file mode 100644
index 000000000..1131163f6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/signup.json
@@ -0,0 +1,38 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Register an account",
+    "TITLE": "Register",
+    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Account name",
+      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
+      "ERROR": "Account name is too short"
+    },
+    "FULL_NAME": {
+      "LABEL": "Full name",
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Work email",
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Email address is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "סיסמה",
+      "PLACEHOLDER": "סיסמה",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+    },
+    "SUBMIT": "שלח",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/teamsSettings.json b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
new file mode 100644
index 000000000..7c40ee5bb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
@@ -0,0 +1,125 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "מייל",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "מחק",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "ביטול"
+      }
+    },
+    "SETTINGS": "הגדרות",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/webhooks.json b/app/javascript/dashboard/i18n/locale/he/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/campaign.json b/app/javascript/dashboard/i18n/locale/hi/campaign.json
index 2eed61b19..f1c249669 100644
--- a/app/javascript/dashboard/i18n/locale/hi/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/hi/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Update",
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 80a33f25a..84e6303fc 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Previous Conversations"
     },
     "LABELS": {
-      "TITLE": "Conversation Labels",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index b13404e91..976d1395a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index e03e40f39..06eeb3d5d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website Domain",
           "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
         "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Yes, Delete ",
         "NO": "No, Keep "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrationApps.json b/app/javascript/dashboard/i18n/locale/hi/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 8e158982a..c75454f9e 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -17,6 +17,24 @@
           "Actions"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancel",
         "TITLE": "Add new webhook",
diff --git a/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
index b0dbe439f..db12fa32a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 1bdccd786..f2d285291 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Please enter a valid email address",
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Password",
         "ERROR": "Please enter a password of length 6 or more",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
index 5ba108626..44c843815 100644
--- a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Delete ",
         "NO": "Cancel"
diff --git a/app/javascript/dashboard/i18n/locale/hu/campaign.json b/app/javascript/dashboard/i18n/locale/hu/campaign.json
index 3dd1c8833..565758c36 100644
--- a/app/javascript/dashboard/i18n/locale/hu/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/hu/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Törlés",
+      "CONFIRM": {
+        "TITLE": "Törlés megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli?",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Frissítés",
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 35f293fc6..05687afc2 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -81,6 +81,6 @@
     "VIEW_TWEET_IN_TWITTER": "Üzenet megtekintése Twitteren",
     "REPLY_TO_TWEET": "Válasz",
     "NO_MESSAGES": "Nincs üzenet",
-    "NO_CONTENT": "No content available"
+    "NO_CONTENT": "Nincs elérhető tartalom"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index c91e66fdb..36fb7a632 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -12,29 +12,24 @@
     "INITIATED_FROM": "Kezdeményezve",
     "INITIATED_AT": "Kezdeményezve",
     "IP_ADDRESS": "IP cím",
-    "NEW_MESSAGE": "New message",
+    "NEW_MESSAGE": "Új üzenet",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Nincs megelőző beszélgetés ezzel a kontakttal.",
       "TITLE": "Korábbi beszélgetések"
     },
     "LABELS": {
-      "TITLE": "Beszélgetés cimkék",
-      "MODAL": {
-        "TITLE": "Kapcsolódó cimkék",
-        "ACTIVE_LABELS": "A beszélgetéshez hozzáadott cimkék",
-        "INACTIVE_LABELS": "A fiókhoz tartozó cimkék",
-        "REMOVE": "Kattints az X ikonra a cimke eltávolításához",
-        "ADD": "Kattints a + ikonra a cimke hozzáadásához",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Cimkék frissítése",
-        "UPDATE_ERROR": "Cimke frissítés sikertelen, kérjük próbáld később."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Beszélgetés cimkék",
+        "ADD_BUTTON": "Címkék hozzáadása"
       },
-      "NO_LABELS_TO_ADD": "Ebben a fiókban már nincsenek további cimkék.",
-      "NO_AVAILABLE_LABELS": "Nincs több cimke ehhez a beszélgetéshez.",
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Címkék hozzáadása",
+        "PLACEHOLDER": "Címkék keresése",
+        "NO_RESULT": "Nem találtunk címkét"
       }
     },
     "MUTE_CONTACT": "Beszélgetés elnémítása",
@@ -76,8 +71,8 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "A kontakt telefonszámának megadása",
         "LABEL": "Telefonszám",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
-        "ERROR": "Phone number should be either empty or of E.164 format"
+        "HELP": "A telefonszámnak E.164 formátumúnak kell lennie, pl: +[+][országkód][körzetszám][helyi telefonszám]",
+        "ERROR": "A telefonszámnak üresnek vagy E.164 formátumúnak kell lennie"
       },
       "LOCATION": {
         "PLACEHOLDER": "A kontakt helyének megadása",
@@ -111,10 +106,10 @@
     "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
+    "BUTTON_LABEL": "Beszélgetés megkezdése",
     "TITLE": "Új beszélgetés",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "DESC": "Kezdjen új beszélgetést egy új üzenet küldésével.",
+    "NO_INBOX": "Nem találtam postafiókot, hogy új beszélgetést kezdeményezzek ezzel a kapcsolattal.",
     "FORM": {
       "TO": {
         "LABEL": "To"
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Részletek megtekintése"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "beszélgetések"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Egyedi atribútumok",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 5a1e2829f..e85c1e889 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Beszélgetés részletei",
     "ASSIGNEE_LABEL": "Hozzárendelt ügynök",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Hozzárendelt csapat",
     "SELECT": {
       "PLACEHOLDER": "Nincs"
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 615516429..6ef55fd89 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Fiók név",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website név",
+        "PLACEHOLDER": "Add meg weboldalad nevét (pl.: Példa Kft.)"
+      },
       "FB": {
         "HELP": "UI: A bejelentkezéseddel csak az oldalad üzeneteihez kapunk hozzáférést. Privát üzeneteidhez sosem férhet hozzá a Chatwoot.",
         "CHOOSE_PAGE": "Oldal kiválasztása",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Csatorna avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website név",
-          "PLACEHOLDER": "Add meg weboldalad nevét (pl.: Példa Kft.)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website domain",
           "PLACEHOLDER": "Add meg weboldalad domainjét (pl.: példa.hu)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Engedélyezve",
         "DISABLED": "Letiltva"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Engedélyezve",
+        "DISABLED": "Letiltva"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Törlés megerősítése",
         "MESSAGE": "Biztos abban, hogy törli ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Igen, Törlés ",
         "NO": "Nem, Mégse "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Ügynökök",
       "INBOX_AGENTS_SUB_TEXT": "Ügynökök hosszáadása vagy eltávolítása az inboxból",
       "UPDATE": "Frissítés",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Automata hozzárendelés engedélyezése",
       "INBOX_UPDATE_TITLE": "Fiókbeállítások",
       "INBOX_UPDATE_SUB_TEXT": "Frissítsd az inbox beállításaidat",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrationApps.json b/app/javascript/dashboard/i18n/locale/hu/integrationApps.json
new file mode 100644
index 000000000..f9ecce799
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Engedélyezve",
+      "DISABLED": "Letiltva"
+    },
+    "CONFIGURE": "Beállítások",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Biztos abban, hogy törli?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Igen, Törlés",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Mégse",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Törlés"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Létrehozás",
+        "CANCEL": "Mégse"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Kapcsolódás"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index a381ebf74..d302cb056 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -17,6 +17,24 @@
           "Műveletek"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Szerkesztés",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Mégse",
+        "DESC": "Webhook események valós idejű információt adnak arról, hogy mi történik a Chatwoot fiókodban. Kérünk a visszahívás beállításánál egy helyes URL-t adj meg.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Például: https://példa.com/api/webhook",
+            "ERROR": "Kérjük helyes URL-t adj meg"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+        }
+      },
       "ADD": {
         "CANCEL": "Mégse",
         "TITLE": "Új webhook hozzáadása",
diff --git a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
index 74384ebbf..ee580bc96 100644
--- a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Cimke neve",
         "PLACEHOLDER": "Cimke neve",
-        "ERROR": "A cimke nevének megadása kötelező"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Leírás",
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 7566e6d95..8579e726c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Kérjük helyes e-mailcímet adj meg",
         "PLACEHOLDER": "Kérjük add meg az e-mailcímet amit a beszélgetésekben szeretnél megjeleníteni"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Jelszó",
         "ERROR": "Kérjük 6 karakternél hosszabb jelszót adj meg",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Mentett válaszok",
     "INTEGRATIONS": "Integrációk",
     "ACCOUNT_SETTINGS": "Fiókbeállítások",
+    "APPLICATIONS": "Applications",
     "LABELS": "Cimkék",
     "TEAMS": "Csapatok"
   },
diff --git a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
index b3dff8d62..1b12b20d5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Biztosan törölni akarod: %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "A csapat letörlése a hozzárendelt beszélgetéseket is eltávolítja.",
         "YES": "Törlés ",
         "NO": "Mégse"
diff --git a/app/javascript/dashboard/i18n/locale/id/campaign.json b/app/javascript/dashboard/i18n/locale/id/campaign.json
index 9703a7ce0..f6dcf4386 100644
--- a/app/javascript/dashboard/i18n/locale/id/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/id/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Hapus",
+      "CONFIRM": {
+        "TITLE": "Konfirmasi Penghapusan",
+        "MESSAGE": "Apakah Anda yakin untuk menghapus?",
+        "YES": "Ya, Hapus ",
+        "NO": "Tidak, Simpan "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Perbarui",
@@ -63,7 +76,7 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Tambah",
         "EDIT": "Edit",
         "DELETE": "Hapus"
       },
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index 0fa657567..5d0a70e15 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -81,6 +81,6 @@
     "VIEW_TWEET_IN_TWITTER": "Lihat tweet di Twitter",
     "REPLY_TO_TWEET": "Balas tweet ini",
     "NO_MESSAGES": "Tidak Ada Pesan",
-    "NO_CONTENT": "No content available"
+    "NO_CONTENT": "Tidak ada konten yang tersedia"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 3cf9c5872..07129ad7f 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -12,29 +12,24 @@
     "INITIATED_FROM": "Dimulai dari",
     "INITIATED_AT": "Dimulai pada",
     "IP_ADDRESS": "IP Address",
-    "NEW_MESSAGE": "New message",
+    "NEW_MESSAGE": "Pesan baru",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Tidak ada percakapan sebelumnya yang terkait dengan kontak ini.",
       "TITLE": "Percakapan Sebelumnya"
     },
     "LABELS": {
-      "TITLE": "Label Percakapan",
-      "MODAL": {
-        "TITLE": "Label untuk",
-        "ACTIVE_LABELS": "Label ditambahkan ke percakapan",
-        "INACTIVE_LABELS": "Label tersedia di akun",
-        "REMOVE": "Klik ikon X untuk menghapus label",
-        "ADD": "Klik ikon + untuk menambah label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Memperbaharui label",
-        "UPDATE_ERROR": "Tidak dapat memperbarui label, coba lagi."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Label Percakapan",
+        "ADD_BUTTON": "Tambah label"
       },
-      "NO_LABELS_TO_ADD": "Tidak ada lagi label yang ditentukan di akun.",
-      "NO_AVAILABLE_LABELS": "Tidak ada label yang ditambahkan ke percakapan ini.",
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Tambah label",
+        "PLACEHOLDER": "Cari label",
+        "NO_RESULT": "Tidak ada label"
       }
     },
     "MUTE_CONTACT": "Mute Percakapan",
@@ -111,27 +106,27 @@
     "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
+    "BUTTON_LABEL": "Mulai Percakapan",
     "TITLE": "Percakapan baru",
     "DESC": "Start a new conversation by sending a new message.",
     "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Ke"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Kotak masuk",
+        "ERROR": "Pilih kotak masuk"
       },
       "MESSAGE": {
         "LABEL": "Pesan",
         "PLACEHOLDER": "Write your message here",
         "ERROR": "Message can't be empty"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Kirim pesan",
       "CANCEL": "Batalkan",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUCCESS_MESSAGE": "Pesan terkirim!",
+      "ERROR_MESSAGE": "Tidak dapat mengirim! coba lagi"
     }
   },
   "CONTACTS_PAGE": {
@@ -155,19 +150,39 @@
       "VIEW_DETAILS": "Lihat detail"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Tambah",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "Catatan"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
+      "BUTTON": "Tambah",
+      "PLACEHOLDER": "Tambahkan Catatan",
       "TITLE": "Shift + Enter to create a note"
     },
     "FOOTER": {
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "catatan",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "percakapan"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Atribut Kustom",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 99c5168b0..32428267e 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Mencari pesan",
       "LOADING_MESSAGE": "Mengolah data...",
       "PLACEHOLDER": "Ketik teks apa saja untuk mencari pesan",
-      "NO_MATCHING_RESULTS": "No results found."
+      "NO_MATCHING_RESULTS": "Tidak ada hasil ditemukan."
     },
     "UNREAD_MESSAGES": "Pesan Belum Terbaca",
     "UNREAD_MESSAGE": "Pesan Belum Terbaca",
@@ -20,7 +20,7 @@
     "LOADING_CONVERSATIONS": "Memuat Percakapan",
     "CANNOT_REPLY": "Anda tidak dapat membalas karena",
     "24_HOURS_WINDOW": "Pembatasan jendela pesan 24 jam",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Anda hanya dapat membalas percakapan ini menggunakan pesan template karena",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Pembatasan jendela pesan 24 jam",
     "LAST_INCOMING_TWEET": "Anda membalas tweet masuk terakhir",
     "REPLYING_TO": "Anda membalas:",
@@ -37,7 +37,7 @@
       "DETAILS": "detail"
     },
     "RESOLVE_DROPDOWN": {
-      "OPEN_BOT": "Open with bot"
+      "OPEN_BOT": "Buka dengan bot"
     },
     "FOOTER": {
       "MSG_INPUT": "Shift + enter untuk baris baru. Mulailah dengan '/' untuk memilih Canned Response.",
@@ -57,8 +57,8 @@
     "VISIBLE_TO_AGENTS": "Catatan Pribadi: Hanya terlihat oleh Anda dan tim Anda",
     "CHANGE_STATUS": "Status percakapan berubah",
     "CHANGE_AGENT": "Petugas Percakapan berubah",
-    "CHANGE_TEAM": "Conversation team changed",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "CHANGE_TEAM": "Tim percakapan berubah",
+    "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
     "SENT_BY": "Dikirim oleh:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Pilih Agen",
@@ -108,11 +108,11 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Agen Ditugaskan",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Tim Ditugaskan",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Tidak ada"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index aa79cbbc8..7b624d13a 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nama Kotak Masuk",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nama Website",
+        "PLACEHOLDER": "Masukkan nama situs web Anda (misalnya: Acme Inc)"
+      },
       "FB": {
         "HELP": "NB: Dengan masuk, kami hanya mendapatkan akses ke pesan Halaman Anda. Pesan pribadi Anda tidak akan pernah bisa diakses oleh Chatwoot.",
         "CHOOSE_PAGE": "Pilih Halaman",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar Channel"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nama Website",
-          "PLACEHOLDER": "Masukkan nama situs web Anda (misalnya: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domain Website",
           "PLACEHOLDER": "Masukkan domain situs web Anda (misalnya: acme.com)"
@@ -194,7 +198,7 @@
       "TITLE": "Kotak Masuk anda sudah siap!",
       "MESSAGE": "Anda sekarang dapat menangani pelanggan Anda melalui Channel baru Anda. Selamat mendukung ",
       "BUTTON_TEXT": "Pergi ke Kotak Masuk",
-      "MORE_SETTINGS": "More settings",
+      "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."
     },
     "REAUTH": "Otorisasi ulang",
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Diaktifkan",
         "DISABLED": "Nonaktif"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Diaktifkan",
+        "DISABLED": "Nonaktif"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Konfirmasi Penghapusan",
         "MESSAGE": "Apakah Anda yakin untuk menghapus ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ya, Hapus ",
         "NO": "Tidak, Simpan "
       },
@@ -227,7 +236,7 @@
       "SETTINGS": "Pengaturan",
       "COLLABORATORS": "Kolaborator",
       "CONFIGURATION": "Konfigurasi",
-      "CAMPAIGN": "Campaigns",
+      "CAMPAIGN": "Kampanye",
       "PRE_CHAT_FORM": "Formulir Pra Obrolan",
       "BUSINESS_HOURS": "Jam Kerja"
     },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agen",
       "INBOX_AGENTS_SUB_TEXT": "Tambahkan atau hapus agen dari kotak masuk ini",
       "UPDATE": "Perbarui",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Aktifkan penugasan otomatis",
       "INBOX_UPDATE_TITLE": "Pengaturan Kotak Masuk",
       "INBOX_UPDATE_SUB_TEXT": "Perbarui pengaturan kotak masuk Anda",
@@ -277,12 +288,12 @@
       "TITLE": "Atur ketersediaan Anda",
       "SUBTITLE": "Atur ketersediaan Anda di widget livechat",
       "WEEKLY_TITLE": "Tetapkan jam mingguan Anda",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TIMEZONE_LABEL": "Pilih zona waktu",
+      "UPDATE": "Perbarui pengaturan jam kerja",
+      "TOGGLE_AVAILABILITY": "Aktifkan ketersediaan bisnis untuk kotak masuk ini",
+      "UNAVAILABLE_MESSAGE_LABEL": "Pesan tidak tersedia untuk pengunjung",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Kami tidak tersedia saat ini. Tinggalkan pesan kami akan merespon setelah kami kembali.",
+      "TOGGLE_HELP": "Mengaktifkan ketersediaan bisnis akan menunjukkan jam yang tersedia di widget obrolan langsung meskipun semua agen sedang offline. Di luar jam buka yang tersedia, pengunjung dapat diperingatkan dengan pesan dan formulir pra-obrolan.",
       "DAY": {
         "ENABLE": "Aktifkan ketersediaan untuk hari ini",
         "UNAVAILABLE": "Tidak tersedia",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrationApps.json b/app/javascript/dashboard/i18n/locale/id/integrationApps.json
new file mode 100644
index 000000000..a48125ec3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Diaktifkan",
+      "DISABLED": "Nonaktif"
+    },
+    "CONFIGURE": "Konfigurasi",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Apakah Anda yakin untuk menghapus?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ya, Hapus",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Batalkan",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Kotak masuk",
+      "DELETE": {
+        "BUTTON_TEXT": "Hapus"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Buat",
+        "CANCEL": "Batalkan"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index bedf7b990..a088bac90 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -17,6 +17,24 @@
           "Aksi"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Batalkan",
+        "DESC": "Acara Webhook memberi Anda informasi realtime tentang apa yang terjadi di akun Chatwoot Anda. Harap masukkan URL yang valid untuk mengkonfigurasi callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL Webhook",
+            "PLACEHOLDER": "Contoh: https://example/api/webhook",
+            "ERROR": "Harap masukkan URL yang valid"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+        }
+      },
       "ADD": {
         "CANCEL": "Batalkan",
         "TITLE": "Tambah webhook baru",
diff --git a/app/javascript/dashboard/i18n/locale/id/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/id/labelsMgmt.json
index 150384877..c5f97c71f 100644
--- a/app/javascript/dashboard/i18n/locale/id/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nama Label",
         "PLACEHOLDER": "Nama label",
-        "ERROR": "Nama Label dibutuhkan"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Deskripsi",
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index 27790ae5d..55e60d026 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -41,15 +41,15 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 bulan terakhir"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 bulan terakhir"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Tahun terakhir"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index e308b91c5..bd206b161 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -3,7 +3,7 @@
     "LINK": "Pengaturan Profil",
     "TITLE": "Pengaturan Profil",
     "BTN_TEXT": "Memperbaharui Profil",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "UPDATE_SUCCESS": "Profil Anda berhasil diperbarui",
     "PASSWORD_UPDATE_SUCCESS": "Kata sandi Anda berhasil diubah",
     "AFTER_EMAIL_CHANGED": "Profil Anda telah berhasil diperbarui, silakan masuk lagi dengan data akun yang baru diubah",
     "FORM": {
@@ -19,16 +19,16 @@
       "PASSWORD_SECTION": {
         "TITLE": "Kata Sandi",
         "NOTE": "Memperbarui kata sandi Anda akan mengatur ulang login Anda di beberapa perangkat.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Ubah kata sandi"
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
         "NOTE": "Token ini dapat digunakan jika Anda sedang membangun integrasi berbasis API"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "ENABLE_AUDIO": "Play audio notification when a new conversation is created or new messages arrives"
+        "TITLE": "Pemberitahuan Audio",
+        "NOTE": "Aktifkan notifikasi audio di dasbor untuk pesan dan percakapan baru.",
+        "ENABLE_AUDIO": "Putar pemberitahuan audio ketika percakapan baru dibuat atau pesan baru masuk"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Notifikasi Email",
@@ -78,6 +78,11 @@
         "ERROR": "Harap masukkan alamat email yang valid",
         "PLACEHOLDER": "Silakan masukkan alamat email Anda, ini akan ditampilkan dalam percakapan"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Kata Sandi",
         "ERROR": "Silakan masukkan sandi dengan panjang 6 karakter atau lebih",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrasi",
     "ACCOUNT_SETTINGS": "Pengaturan Akun",
+    "APPLICATIONS": "Applications",
     "LABELS": "Label",
     "TEAMS": "Tim"
   },
diff --git a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
index 29a6e89e7..30e446f57 100644
--- a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Hapus ",
         "NO": "Batalkan"
diff --git a/app/javascript/dashboard/i18n/locale/it/campaign.json b/app/javascript/dashboard/i18n/locale/it/campaign.json
index 3059eaa28..b81407e06 100644
--- a/app/javascript/dashboard/i18n/locale/it/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/it/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Cancellare",
+      "CONFIRM": {
+        "TITLE": "Conferma eliminazione",
+        "MESSAGE": "Sei sicuro di voler eliminare?",
+        "YES": "Sì, elimina ",
+        "NO": "No, Conserva "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Aggiornamento",
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 23beb5c9f..f21ec859d 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Conversazioni precedenti"
     },
     "LABELS": {
-      "TITLE": "Etichette conversazione",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversazioni"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index a94a58a50..390c54117 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 7e55f017e..6a852df62 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nome Posta In Arrivo",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Accedendo, abbiamo accesso solo ai messaggi della tua pagina. Chatwoot, non potrà accedere ai tuoi messaggi privati.",
         "CHOOSE_PAGE": "Scegli una Pagina",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Avatar del canale"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nome Sito Web",
-          "PLACEHOLDER": "Inserisci il nome del tuo sito web (es: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Dominio del Sito",
           "PLACEHOLDER": "Inserisci il dominio del tuo sito web (es: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Abilitato",
         "DISABLED": "Disabilitato"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Abilitato",
+        "DISABLED": "Disabilitato"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Sì, elimina ",
         "NO": "No, Conserva "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenti",
       "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi agenti da questa casella di posta",
       "UPDATE": "Aggiornamento",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Abilita assegnazione automatica",
       "INBOX_UPDATE_TITLE": "Impostazioni della Posta In Arrivo",
       "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni della posta in arrivo",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrationApps.json b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
new file mode 100644
index 000000000..5d47fbd91
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Abilitato",
+      "DISABLED": "Disabilitato"
+    },
+    "CONFIGURE": "Configurare",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Sei sicuro di voler eliminare?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Sì, elimina",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "annulla",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Cancellare"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "annulla"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connetti"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 3344e9f7d..c761143ad 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -17,6 +17,24 @@
           "azioni"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Modifica",
+        "TITLE": "Edit webhook",
+        "CANCEL": "annulla",
+        "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL del webhook",
+            "PLACEHOLDER": "Esempio: https://example/api/webhook",
+            "ERROR": "Inserisci un URL valido"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+        }
+      },
       "ADD": {
         "CANCEL": "annulla",
         "TITLE": "Aggiungi nuovo webhook",
diff --git a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
index ca917b832..d7d2af2d8 100644
--- a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 5a69b50b3..97129ac1d 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Inserisci un indirizzo email valido",
         "PLACEHOLDER": "Inserisci il tuo indirizzo email, che verrà visualizzato nelle conversazioni"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "password",
         "ERROR": "Inserisci una password di lunghezza 6 o più",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Risposte predefinite",
     "INTEGRATIONS": "Integrazioni",
     "ACCOUNT_SETTINGS": "Impostazioni Account",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
index dcda354f0..15eaf0737 100644
--- a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Cancellare ",
         "NO": "annulla"
diff --git a/app/javascript/dashboard/i18n/locale/ja/campaign.json b/app/javascript/dashboard/i18n/locale/ja/campaign.json
index d1553b40f..c4fb4eacd 100644
--- a/app/javascript/dashboard/i18n/locale/ja/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ja/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "削除",
+      "CONFIRM": {
+        "TITLE": "削除の確認",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "削除する ",
+        "NO": "いいえ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "更新",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index ed8639c1b..95a276840 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "前の会話"
     },
     "LABELS": {
-      "TITLE": "会話のラベル",
-      "MODAL": {
-        "TITLE": "ラベル：",
-        "ACTIVE_LABELS": "会話にラベルを追加",
-        "INACTIVE_LABELS": "アカウントで利用可能なラベル名",
-        "REMOVE": "ラベルを削除するには×アイコンをクリックします",
-        "ADD": "+アイコンをクリックしてラベルを追加",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "ラベルの更新",
-        "UPDATE_ERROR": "ラベルを更新できませんでした。再度お試し下さい。"
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "会話のラベル",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "アカウントに定義されているラベルがありません。",
-      "NO_AVAILABLE_LABELS": "この会話に追加されたラベルはありません。",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "会話データ"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "カスタム属性",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 98d68e95c..ee3e35d21 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 47bd7eaa6..223c3e8ef 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "受信トレイ名",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "ウェブサイト名",
+        "PLACEHOLDER": "ウェブサイト名を入力してください(例：Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: サインインすることで、私たちはあなたのページのメッセージにのみアクセスできます。あなたのプライベートメッセージはChatwootによってアクセスすることはできません。",
         "CHOOSE_PAGE": "ページを選択",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "チャネルアバター"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "ウェブサイト名",
-          "PLACEHOLDER": "ウェブサイト名を入力してください(例：Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "ウェブサイトのドメイン",
           "PLACEHOLDER": "ウェブサイトのドメインを入力してください(例：acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "有効です",
         "DISABLED": "無効です"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "有効です",
+        "DISABLED": "無効です"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "削除の確認",
         "MESSAGE": "削除してもよろしいですか？ ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "削除する ",
         "NO": "いいえ、保存しておきます "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "担当者",
       "INBOX_AGENTS_SUB_TEXT": "この受信トレイから担当者を追加または削除する",
       "UPDATE": "更新",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "自動割り当てを有効にする",
       "INBOX_UPDATE_TITLE": "受信トレイの設定",
       "INBOX_UPDATE_SUB_TEXT": "受信トレイの設定を更新する",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrationApps.json b/app/javascript/dashboard/i18n/locale/ja/integrationApps.json
new file mode 100644
index 000000000..bb280e287
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "有効です",
+      "DISABLED": "無効です"
+    },
+    "CONFIGURE": "設定",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "削除する",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "キャンセル",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "削除"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "作成",
+        "CANCEL": "キャンセル"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "接続"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index 3b2eb98ce..b4cbac8ed 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -17,6 +17,24 @@
           "操作"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "編集",
+        "TITLE": "Edit webhook",
+        "CANCEL": "キャンセル",
+        "DESC": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。コールバックを設定するには有効なURLを入力してください。",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "例: https://example/api/webhook",
+            "ERROR": "有効な URL を入力してください"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+        }
+      },
       "ADD": {
         "CANCEL": "キャンセル",
         "TITLE": "新しいWebhookを追加",
diff --git a/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
index 1a7dc5439..7ec36985d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "ラベル名",
         "PLACEHOLDER": "ラベル名",
-        "ERROR": "ラベル名は必須です"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "説明",
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 7230368cf..dcf87f61b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "正しいメールアドレスを入力してください",
         "PLACEHOLDER": "メールアドレスを入力してください。これは会話に表示されます"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "パスワード",
         "ERROR": "6文字以上のパスワードを入力してください",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "定型文",
     "INTEGRATIONS": "連携",
     "ACCOUNT_SETTINGS": "アカウント設定",
+    "APPLICATIONS": "Applications",
     "LABELS": "ラベル",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
index 5bf46ce54..33ff2487d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "削除 ",
         "NO": "キャンセル"
diff --git a/app/javascript/dashboard/i18n/locale/ko/campaign.json b/app/javascript/dashboard/i18n/locale/ko/campaign.json
index d8a2ed7ac..f3774be19 100644
--- a/app/javascript/dashboard/i18n/locale/ko/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ko/campaign.json
@@ -15,7 +15,7 @@
           "ERROR": "Title is required"
         },
         "MESSAGE": {
-          "LABEL": "Message",
+          "LABEL": "메시지",
           "PLACEHOLDER": "Please enter the message of campaign",
           "ERROR": "Message is required"
         },
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "삭제",
+      "CONFIRM": {
+        "TITLE": "삭제 확인",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "예, 삭제합니다. ",
+        "NO": "아니요, 유지해주세요. "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "업데이트",
@@ -55,7 +68,7 @@
       "404": "There are no campaigns created for this inbox.",
       "TABLE_HEADER": {
         "TITLE": "Title",
-        "MESSAGE": "Message",
+        "MESSAGE": "메시지",
         "STATUS": "상태",
         "SENDER": "Sender",
         "URL": "URL",
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 7af037f32..b63eb581a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "이전 대화"
     },
     "LABELS": {
-      "TITLE": "대화 라벨",
-      "MODAL": {
-        "TITLE": "라벨",
-        "ACTIVE_LABELS": "대화에 추가된 라벨",
-        "INACTIVE_LABELS": "계정에서 사용할 수 있는 라벨",
-        "REMOVE": "라벨을 제거하려면 X 아이콘을 클릭하십시오.",
-        "ADD": "라벨을 추가하려면 + 아이콘을 클릭하십시오.",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "라벨 업데이트",
-        "UPDATE_ERROR": "라벨을 업데이트할 수 없습니다. 다시 시도하십시오."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "대화 라벨",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "계정에는 더 이상 라벨이 정의되어 있지 않습니다.",
-      "NO_AVAILABLE_LABELS": "이 대화에 추가된 라벨이 없습니다.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -124,7 +119,7 @@
         "ERROR": "Select an inbox"
       },
       "MESSAGE": {
-        "LABEL": "Message",
+        "LABEL": "메시지",
         "PLACEHOLDER": "Write your message here",
         "ERROR": "Message can't be empty"
       },
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "상세보기"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "대화"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "사용자 지정 특성",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index cbc7722b6..91f4bf887 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "대화 내용",
     "ASSIGNEE_LABEL": "할당된 에이전트",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "할당된 팀",
     "SELECT": {
       "PLACEHOLDER": "없음"
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index f492f69f9..97561d33d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "받은 메시지함 이름",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "웹사이트 이름",
+        "PLACEHOLDER": "웹사이트 이름 입력 (예: Acme Inc)"
+      },
       "FB": {
         "HELP": "추신: 로그인을 함으로써, 우리는 오직 당신의 페이지의 메시지에 접근할 수 있다. 당신의 사적인 메시지에 Chatwoot는 절대 접근할 수 없습니다.",
         "CHOOSE_PAGE": "페이지 선택",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "채널 아바타"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "웹사이트 이름",
-          "PLACEHOLDER": "웹사이트 이름 입력 (예: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "웹사이트 도메인",
           "PLACEHOLDER": "웹사이트 도메인을 입력하십시오 (예: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "사용함",
         "DISABLED": "사용 안 함"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "사용함",
+        "DISABLED": "사용 안 함"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "삭제 확인",
         "MESSAGE": "삭제하시겠습니까? ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "예, 삭제합니다. ",
         "NO": "아니요, 유지해주세요. "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "에이전트",
       "INBOX_AGENTS_SUB_TEXT": "받은 메시지함에서 에이전트 추가 또는 제거",
       "UPDATE": "업데이트",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "자동 할당 사용",
       "INBOX_UPDATE_TITLE": "받은 메시지함 설정",
       "INBOX_UPDATE_SUB_TEXT": "받은 메시지함 설정 업데이트",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrationApps.json b/app/javascript/dashboard/i18n/locale/ko/integrationApps.json
new file mode 100644
index 000000000..1e433396b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "사용함",
+      "DISABLED": "사용 안 함"
+    },
+    "CONFIGURE": "구성",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "취소",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "삭제"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "만들기",
+        "CANCEL": "취소"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "연결"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 97034821e..907df1cac 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -17,6 +17,24 @@
           "액션"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "수정",
+        "TITLE": "Edit webhook",
+        "CANCEL": "취소",
+        "DESC": "웹훅 이벤트는 Chatwoot 계정에서 일어나는 일에 대한 실시간 정보를 제공합니다. 콜백을 구성하려면 유효한 URL을 입력하십시오.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "웹훅 URL",
+            "PLACEHOLDER": "예시: https://example/api/webhook",
+            "ERROR": "올바른 URL을 입력하십시오."
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+        }
+      },
       "ADD": {
         "CANCEL": "취소",
         "TITLE": "새 웹훅 추가",
diff --git a/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
index b046ccaee..55a48c71c 100644
--- a/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "라벨 이름",
         "PLACEHOLDER": "라벨 이름",
-        "ERROR": "라벨 이름이 필요함"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "내용",
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index b936d32c6..81f208e6d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "올바른 전자 메일 주소를 입력하십시오.",
         "PLACEHOLDER": "대화 중에 표시되는 이메일 주소를 입력하십시오."
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "비밀번호",
         "ERROR": "6글자 이상의 비밀번호를 입력하십시오.",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "미리 준비된 답변",
     "INTEGRATIONS": "통합",
     "ACCOUNT_SETTINGS": "계정 설정",
+    "APPLICATIONS": "Applications",
     "LABELS": "라벨",
     "TEAMS": "팀"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
index 200b8fb99..10cbef3c5 100644
--- a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "%{teamName}팀을 삭제하시겠습니까?",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "팀을 삭제하면 팀에 할당된 대화들에 대한 할당이 모두 해제됩니다.",
         "YES": "삭제 ",
         "NO": "취소"
diff --git a/app/javascript/dashboard/i18n/locale/ml/campaign.json b/app/javascript/dashboard/i18n/locale/ml/campaign.json
index 34628226f..e631dade2 100644
--- a/app/javascript/dashboard/i18n/locale/ml/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ml/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "ഇല്ലാതാക്കുക",
+      "CONFIRM": {
+        "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "അതെ, ഇല്ലാതാക്കുക ",
+        "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "അപ്‌ഡേറ്റ്",
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index cb96143b5..15bcf3595 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "മുമ്പത്തെ സംഭാഷണങ്ങൾ"
     },
     "LABELS": {
-      "TITLE": "സംഭാഷണ ലേബലുകൾ",
-      "MODAL": {
-        "TITLE": "ലേബലുകൾ",
-        "ACTIVE_LABELS": "സംഭാഷണത്തിലേക്ക് ലേബലുകൾ ചേർത്തു",
-        "INACTIVE_LABELS": "അക്കൗണ്ടിൽ ലേബലുകൾ ലഭ്യമാണ്",
-        "REMOVE": "ലേബൽ നീക്കംചെയ്യുന്നതിന് എക്സ് ഐക്കണിൽ ക്ലിക്കുചെയ്യുക",
-        "ADD": "ലേബൽ ചേർക്കാൻ + ഐക്കണിൽ ക്ലിക്കുചെയ്യുക",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "ലേബലുകൾ അപ്‌ഡേറ്റുചെയ്യുക",
-        "UPDATE_ERROR": "ലേബലുകൾ അപ്‌ഡേറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല, വീണ്ടും ശ്രമിക്കുക."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "സംഭാഷണ ലേബലുകൾ",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "അക്കൗണ്ടിൽ കൂടുതൽ ലേബലുകൾ നിർവചിച്ചിട്ടില്ല.",
-      "NO_AVAILABLE_LABELS": "ഈ സംഭാഷണത്തിലേക്ക് ലേബലുകളൊന്നും ചേർത്തിട്ടില്ല.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "സംഭാഷണങ്ങൾ"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index cb73dce8f..4a8d30d5a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 341b1a217..34f310ae4 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "ഇൻ‌ബോക്സ് നാമം",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "വെബ്‌സൈറ്റിന്റെ പേര്",
+        "PLACEHOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റിന്റെ പേര് നൽകുക (ഉദാ: പുണ്ണ്യാളൻ അഗർബത്തീസ്)"
+      },
       "FB": {
         "HELP": "സൈൻ ഇൻ ചെയ്യുന്നതിലൂടെ, നിങ്ങളുടെ പേജിന്റെ സന്ദേശങ്ങളിലേക്ക് മാത്രമേ ഞങ്ങൾക്ക് പ്രവേശനം ലഭിക്കൂ. നിങ്ങളുടെ സ്വകാര്യ സന്ദേശങ്ങൾ ഒരിക്കലും ചാറ്റ് വൂട്ട് ഉപയോഗിച്ച് ആക്സസ് ചെയ്യാൻ കഴിയില്ല.",
         "CHOOSE_PAGE": "പേജ് തിരഞ്ഞെടുക്കുക",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "ചാനൽ അവതാർ"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "വെബ്‌സൈറ്റിന്റെ പേര്",
-          "PLACEHOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റിന്റെ പേര് നൽകുക (ഉദാ: പുണ്ണ്യാളൻ അഗർബത്തീസ്)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "വെബ്സൈറ്റ് ഡൊമെയ്ൻ",
           "PLACEHOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റ് ഡൊമെയ്ൻ നൽകുക (ഉദാ: punnyalan.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
         "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+        "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
         "MESSAGE": "ഇല്ലാതാക്കണമെന്നു ഉറപ്പാണോ ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "അതെ, ഇല്ലാതാക്കുക ",
         "NO": "ഇല്ല, സൂക്ഷിക്കുക"
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "ഏജന്റുമാർ",
       "INBOX_AGENTS_SUB_TEXT": "ഈ ഇൻ‌ബോക്സിൽ നിന്ന് ഏജന്റുമാരെ ചേർക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക",
       "UPDATE": "അപ്‌ഡേറ്റ്",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "ഓട്ടോ അസൈൻമെന്റ് പ്രവർത്തനക്ഷമമാക്കുക",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrationApps.json b/app/javascript/dashboard/i18n/locale/ml/integrationApps.json
new file mode 100644
index 000000000..55991718a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+      "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+    },
+    "CONFIGURE": "കോൺഫിഗർ",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "അതെ, ഇല്ലാതാക്കുക",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "ഇല്ലാതാക്കുക"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "സൃഷ്ടിക്കുക",
+        "CANCEL": "റദ്ദാക്കുക"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "ബന്ധിപ്പിക്കുക"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 820493320..e0b2f82f5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -17,6 +17,24 @@
           "പ്രവർത്തനങ്ങൾ"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "എഡിറ്റുചെയ്യുക",
+        "TITLE": "Edit webhook",
+        "CANCEL": "റദ്ദാക്കുക",
+        "DESC": "നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ എന്താണ് സംഭവിക്കുന്നതെന്നതിനെക്കുറിച്ചുള്ള തത്സമയ വിവരങ്ങൾ വെബ്‌ഹൂക്ക് ഇവന്റുകൾ നൽകുന്നു. ഒരു കോൾബാക്ക് കോൺഫിഗർ ചെയ്യുന്നതിന് സാധുവായ ഒരു യുആർഎൽ നൽകുക.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
+            "PLACEHOLDER": "ഉദാഹരണം: https://example/api/webhook",
+            "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+        }
+      },
       "ADD": {
         "CANCEL": "റദ്ദാക്കുക",
         "TITLE": "പുതിയ വെബ്‌ഹൂക്ക് ഉണ്ടാക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
index 5f771fcce..dc9bb3d9c 100644
--- a/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "ലേബൽ നാമം",
         "PLACEHOLDER": "ലേബൽ നാമം",
-        "ERROR": "ലേബൽ നാമം ആവശ്യമാണ്"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "വിവരണം",
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 930d7c322..5e31e694e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ വിലാസം നൽകുക",
         "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ വിലാസം നൽകുക, ഇത് സംഭാഷണങ്ങളിൽ ദൃശ്യമാകും"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "പാസ്‌വേഡ്",
         "ERROR": "ദയവായി 6 അല്ലെങ്കിൽ അതിൽ കൂടുതൽ ദൈർഘ്യമുള്ള പാസ്‌വേഡ് നൽകുക",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "ക്യാൻഡ് പ്രതികരണങ്ങൾ",
     "INTEGRATIONS": "സംയോജനങ്ങൾ",
     "ACCOUNT_SETTINGS": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ",
+    "APPLICATIONS": "Applications",
     "LABELS": "ലേബലുകൾ",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
index 0e9a63213..5282ccdbb 100644
--- a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "ഇല്ലാതാക്കുക ",
         "NO": "റദ്ദാക്കുക"
diff --git a/app/javascript/dashboard/i18n/locale/ne/campaign.json b/app/javascript/dashboard/i18n/locale/ne/campaign.json
index 2eed61b19..f1c249669 100644
--- a/app/javascript/dashboard/i18n/locale/ne/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ne/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Update",
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 755bc1969..c523b75a6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Previous Conversations"
     },
     "LABELS": {
-      "TITLE": "Conversation Labels",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index b13404e91..976d1395a 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 4d0fcdffc..8948adfc4 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website Domain",
           "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
         "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Yes, Delete ",
         "NO": "No, Keep "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrationApps.json b/app/javascript/dashboard/i18n/locale/ne/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 8e158982a..c75454f9e 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -17,6 +17,24 @@
           "Actions"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancel",
         "TITLE": "Add new webhook",
diff --git a/app/javascript/dashboard/i18n/locale/ne/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ne/labelsMgmt.json
index b0dbe439f..db12fa32a 100644
--- a/app/javascript/dashboard/i18n/locale/ne/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 88c3034dc..ec0278f27 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Please enter a valid email address",
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Password",
         "ERROR": "Please enter a password of length 6 or more",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
index 5ba108626..44c843815 100644
--- a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Delete ",
         "NO": "Cancel"
diff --git a/app/javascript/dashboard/i18n/locale/nl/campaign.json b/app/javascript/dashboard/i18n/locale/nl/campaign.json
index 6314848a8..c1e700514 100644
--- a/app/javascript/dashboard/i18n/locale/nl/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/nl/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Verwijderen",
+      "CONFIRM": {
+        "TITLE": "Verwijderen bevestigen",
+        "MESSAGE": "Weet u zeker dat u wilt verwijderen?",
+        "YES": "Ja, verwijderen ",
+        "NO": "Nee, Behouden "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Vernieuwen",
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 8bee921d3..f0966fbcd 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Vorige gesprekken"
     },
     "LABELS": {
-      "TITLE": "Labels voor gesprekken",
-      "MODAL": {
-        "TITLE": "Labels voor",
-        "ACTIVE_LABELS": "Labels toegevoegd aan het gesprek",
-        "INACTIVE_LABELS": "Labels beschikbaar in het account",
-        "REMOVE": "Klik op het X-pictogram om het label te verwijderen",
-        "ADD": "Klik op + pictogram om het label toe te voegen",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Labels bijwerken",
-        "UPDATE_ERROR": "Kon labels niet updaten, probeer het opnieuw."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Labels voor gesprekken",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "Er zijn geen labels toegevoegd aan dit gesprek.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "gesprekken"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index cb9c359d0..f665e9458 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index f136d7153..1f0ddeab5 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website naam",
+        "PLACEHOLDER": "Voer de naam van je website in (bv. Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Door in te loggen krijgen we alleen toegang tot berichten van uw Pagina. Chatwood heeft nooit toegang tot je privéberichten.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website naam",
-          "PLACEHOLDER": "Voer de naam van je website in (bv. Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website domein",
           "PLACEHOLDER": "Voer uw website domein in (bv. acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Ingeschakeld",
         "DISABLED": "Uitgeschakeld"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Ingeschakeld",
+        "DISABLED": "Uitgeschakeld"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Verwijdering bevestigen",
         "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ja, verwijderen ",
         "NO": "No, Keep "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenten",
       "INBOX_AGENTS_SUB_TEXT": "Voeg agenten toe of verwijder ze uit deze inbox",
       "UPDATE": "Vernieuwen",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Automatische toewijzing inschakelen",
       "INBOX_UPDATE_TITLE": "Instellingen Postvak In",
       "INBOX_UPDATE_SUB_TEXT": "Update uw inbox instellingen",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrationApps.json b/app/javascript/dashboard/i18n/locale/nl/integrationApps.json
new file mode 100644
index 000000000..22ca277d6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Ingeschakeld",
+      "DISABLED": "Uitgeschakeld"
+    },
+    "CONFIGURE": "Configureren",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Weet u zeker dat u wilt verwijderen?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ja, verwijderen",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Annuleren",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Verwijderen"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Aanmaken",
+        "CANCEL": "Annuleren"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index ac1cf8630..2adad48f2 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -17,6 +17,24 @@
           "acties"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Bewerken",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Annuleren",
+        "DESC": "Webhook events bieden je realtime informatie over wat er gebeurt in je Chatwoot account. Voer een geldige URL in om een callback te configureren.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Voorbeeld: https://voorbeeld/api/webhook",
+            "ERROR": "Voer een geldige URL in"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+        }
+      },
       "ADD": {
         "CANCEL": "annuleren",
         "TITLE": "Nieuwe webhook toevoegen",
diff --git a/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
index 45f131f1c..5d7f6d19c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label naam",
         "PLACEHOLDER": "Label naam",
-        "ERROR": "Labelnaam is vereist"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Beschrijving",
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 984510aae..6c550266e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Voer een geldig e-mailadres in",
         "PLACEHOLDER": "Voer je e-mailadres in, dit zou worden weergegeven in gesprekken"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Wachtwoord",
         "ERROR": "Voer een wachtwoord in van 6 of meer",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Standaard antwoorden",
     "INTEGRATIONS": "Integraties",
     "ACCOUNT_SETTINGS": "Accountinstellingen",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labelen",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
index 464a03940..2d05f0dbe 100644
--- a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Verwijderen ",
         "NO": "Annuleren"
diff --git a/app/javascript/dashboard/i18n/locale/no/campaign.json b/app/javascript/dashboard/i18n/locale/no/campaign.json
index f3d9c1dc2..e0d8ffd3d 100644
--- a/app/javascript/dashboard/i18n/locale/no/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/no/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Slett",
+      "CONFIRM": {
+        "TITLE": "Bekreft sletting",
+        "MESSAGE": "Er du sikker på at du vil slette?",
+        "YES": "Ja, slett ",
+        "NO": "Nei, behold "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Oppdater",
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 5bff9e747..d629c6888 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Tidligere samtaler"
     },
     "LABELS": {
-      "TITLE": "Samtaleetiketter",
-      "MODAL": {
-        "TITLE": "Etiketter for",
-        "ACTIVE_LABELS": "Etiketter lagt til i samtalen",
-        "INACTIVE_LABELS": "Etiketter tilgjengelig i kontoen",
-        "REMOVE": "Klikk på X ikonet for å fjerne etiketten",
-        "ADD": "Klikk på + ikonet for å legge til etiketten",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Oppdater etiketter",
-        "UPDATE_ERROR": "Kunne ikke oppdatere etiketter, prøv på nytt."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Samtaleetiketter",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Det er ingen flere etiketter definert i kontoen.",
-      "NO_AVAILABLE_LABELS": "Det er ingen etiketter lagt til i denne samtalen.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "samtaler"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Egendefinerte verdier",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index c26bfde59..3e487acf0 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index ba825fb6d..10e71176b 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Navn på innboks",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nettstedsnavn",
+        "PLACEHOLDER": "Angi navnet på nettsiden (f. eks.: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Ved å logge inn får vi bare tilgang til meldingene til siden. Dine private meldinger vil aldri bli lest av Chatwoot.",
         "CHOOSE_PAGE": "Velg side",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanal profilbilde"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nettstedsnavn",
-          "PLACEHOLDER": "Angi navnet på nettsiden (f. eks.: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Nettstedets domene",
           "PLACEHOLDER": "Angi URL på nettsiden (f. eks.: acme.no)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Aktivert",
         "DISABLED": "Deaktivert"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Aktivert",
+        "DISABLED": "Deaktivert"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Bekreft sletting",
         "MESSAGE": "Er du sikker på at du vil slette ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ja, slett ",
         "NO": "Nei, behold "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Legg til eller fjern agenter fra denne innboksen",
       "UPDATE": "Oppdater",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Aktiver autotilordning",
       "INBOX_UPDATE_TITLE": "Innboksinnstillinger",
       "INBOX_UPDATE_SUB_TEXT": "Oppdater innboksinnstillinger",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrationApps.json b/app/javascript/dashboard/i18n/locale/no/integrationApps.json
new file mode 100644
index 000000000..1a4c1d5a5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Aktivert",
+      "DISABLED": "Deaktivert"
+    },
+    "CONFIGURE": "Konfigurer",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Er du sikker på at du vil slette?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ja, slett",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Slett"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Opprett",
+        "CANCEL": "Avbryt"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Koble til"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 6af20dca2..355551955 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -17,6 +17,24 @@
           "Handlinger"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Rediger",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Avbryt",
+        "DESC": "Webhook-hendelser gir deg sanntidsinformasjon om hva som skjer i din Chatwoot-konto. Skriv inn en gyldig nettadresse for å konfigurere en callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
+            "ERROR": "Vennligst skriv inn en gyldig URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+        }
+      },
       "ADD": {
         "CANCEL": "Avbryt",
         "TITLE": "Legg til ny webhook",
diff --git a/app/javascript/dashboard/i18n/locale/no/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/no/labelsMgmt.json
index 928a3502e..e672255a1 100644
--- a/app/javascript/dashboard/i18n/locale/no/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Etikettens navn",
         "PLACEHOLDER": "Etikettens navn",
-        "ERROR": "Etikettens navn må fylles ut"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Beskrivelse",
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 098c5100a..a0c16d647 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Vennligst skriv inn en gyldig e-postadresse",
         "PLACEHOLDER": "Vennligst skriv inn din e-postadresse, dette vises i samtaler"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Passord",
         "ERROR": "Skriv inn et passord som er 6 eller flere tegn langt",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Forhåndslagde svar",
     "INTEGRATIONS": "Integrasjoner",
     "ACCOUNT_SETTINGS": "Kontoinnstillinger",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiketter",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
index b168e3678..3469147dd 100644
--- a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Slett ",
         "NO": "Avbryt"
diff --git a/app/javascript/dashboard/i18n/locale/pl/campaign.json b/app/javascript/dashboard/i18n/locale/pl/campaign.json
index 581f2fd4e..8e38d4031 100644
--- a/app/javascript/dashboard/i18n/locale/pl/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/pl/campaign.json
@@ -42,25 +42,38 @@
         "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Usuń",
+      "CONFIRM": {
+        "TITLE": "Potwierdź usunięcie",
+        "MESSAGE": "Czy na pewno chcesz usunąć?",
+        "YES": "Tak, usuń ",
+        "NO": "Nie, zachowaj "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
-      "TITLE": "Edit campaign",
+      "TITLE": "Edytuj kampanię",
       "UPDATE_BUTTON_TEXT": "Aktualizuj",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "Kampania zaktualizowana pomyślnie",
         "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
+      "LOADING_MESSAGE": "Wczytywanie kampanii...",
       "404": "Brak kampanii stworzonych dla tej skrzynki odbiorczej.",
       "TABLE_HEADER": {
         "TITLE": "Tytuł",
         "MESSAGE": "Wiadomość",
         "STATUS": "Status",
-        "SENDER": "Sender",
+        "SENDER": "Nadawca",
         "URL": "Adres URL",
-        "TIME_ON_PAGE": "Time(Seconds)",
-        "CREATED_AT": "Created at"
+        "TIME_ON_PAGE": "Czas (sekundy)",
+        "CREATED_AT": "Utworzono"
       },
       "BUTTONS": {
         "ADD": "Dodaj",
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index bcdabc21c..e4d9753ba 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Poprzednie rozmowy"
     },
     "LABELS": {
-      "TITLE": "Etykiety konwersacji",
-      "MODAL": {
-        "TITLE": "Etykiety dla",
-        "ACTIVE_LABELS": "Etykiety dodane do rozmowy",
-        "INACTIVE_LABELS": "Etykiety dostępne na koncie",
-        "REMOVE": "Kliknij na ikonę X, aby usunąć etykietę",
-        "ADD": "Kliknij na ikonę +, aby dodać etykietę",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Zaktualizuj etykiety",
-        "UPDATE_ERROR": "Nie udało się zaktualizować etykiet, spróbuj ponownie."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Nie ma więcej etykiet zdefiniowanych na koncie.",
-      "NO_AVAILABLE_LABELS": "Do tej rozmowy nie dodano żadnych etykiet.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Wyświetl szczegóły"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Dodaj",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notatki"
@@ -168,6 +173,16 @@
       "BUTTON": "Wyświetl wszystkie notatki"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Aktywności"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notatki",
+      "PILL_BUTTON_EVENTS": "zdarzenia",
+      "PILL_BUTTON_CONVO": "rozmowy"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Niestandardowe atrybuty",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 15593e198..d3b5f6eab 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Szczegóły rozmowy",
     "ASSIGNEE_LABEL": "Przypisany Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Przypisany zespół",
     "SELECT": {
       "PLACEHOLDER": "Brak"
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index d17ab4b97..46fb7cc92 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nazwa skrzynki odbiorczej",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Logując się, uzyskujemy dostęp tylko do wiadomości Twojej strony. Chatwoot nigdy nie może uzyskać dostępu do prywatnych wiadomości.",
         "CHOOSE_PAGE": "Wybierz stronę",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Awatar kanału"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nazwa witryny",
-          "PLACEHOLDER": "Wprowadź nazwę swojej strony (np. Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domena strony internetowej",
           "PLACEHOLDER": "Wprowadź domenę witryny (np. acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Włączone",
         "DISABLED": "Wyłączone"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Włączone",
+        "DISABLED": "Wyłączone"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Potwierdź usunięcie",
         "MESSAGE": "Czy na pewno chcesz usunąć ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Tak, usuń ",
         "NO": "Nie, zachowaj "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenci",
       "INBOX_AGENTS_SUB_TEXT": "Dodaj lub usuń agentów z tej skrzynki odbiorczej",
       "UPDATE": "Aktualizuj",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Włącz automatyczne przypisanie",
       "INBOX_UPDATE_TITLE": "Ustawienia skrzynki odbiorczej",
       "INBOX_UPDATE_SUB_TEXT": "Zaktualizuj ustawienia skrzynki odbiorczej",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrationApps.json b/app/javascript/dashboard/i18n/locale/pl/integrationApps.json
new file mode 100644
index 000000000..75b4eacdc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Włączone",
+      "DISABLED": "Wyłączone"
+    },
+    "CONFIGURE": "Skonfiguruj",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Czy na pewno chcesz usunąć?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Tak, usuń",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Anuluj",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Skrzynka odbiorcza",
+      "DELETE": {
+        "BUTTON_TEXT": "Usuń"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Stwórz",
+        "CANCEL": "Anuluj"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Połącz"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 56be5c6b3..73bd899c7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -17,6 +17,24 @@
           "Akcje"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edytuj",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Anuluj",
+        "DESC": "Wydarzenia Webhook dostarczają informacji o tym, co dzieje się na Twoim koncie Chatwoot. Wprowadź poprawny adres URL, aby skonfigurować wywołanie zwrotne.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL webhooka",
+            "PLACEHOLDER": "Przykład: https://example/api/webhook",
+            "ERROR": "Wprowadź poprawny adres URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        }
+      },
       "ADD": {
         "CANCEL": "Anuluj",
         "TITLE": "Dodaj nowy webhook",
diff --git a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
index a5d35aa2f..49ac50347 100644
--- a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index a9c97167a..634b58819 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Wprowadź poprawny adres e-mail",
         "PLACEHOLDER": "Wprowadź swój adres e-mail, który będzie wyświetlany w rozmowach"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Hasło",
         "ERROR": "Wprowadź hasło o długości 6 lub więcej",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Gotowe odpowiedzi",
     "INTEGRATIONS": "Integracje",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
index 6b60eb857..dee797815 100644
--- a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Usuń ",
         "NO": "Anuluj"
diff --git a/app/javascript/dashboard/i18n/locale/pt/campaign.json b/app/javascript/dashboard/i18n/locale/pt/campaign.json
index 24a073a2c..7d38f9519 100644
--- a/app/javascript/dashboard/i18n/locale/pt/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/pt/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "excluir",
+      "CONFIRM": {
+        "TITLE": "Confirmar Exclusão",
+        "MESSAGE": "Tem certeza que deseja excluir?",
+        "YES": "Sim, excluir ",
+        "NO": "Não, Manter "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Atualização",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 71cd996f0..4b85c36cb 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Conversas anteriores"
     },
     "LABELS": {
-      "TITLE": "Rótulos da conversa",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Não foi possível atualizar os rótulos, tente novamente."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversas"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 81f1a1cd1..31ee92b4e 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index b7a59b7b4..6e6a4aba0 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nome do site",
+        "PLACEHOLDER": "Digite o nome do seu site (por exemplo: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: ao fazer login, só teremos acesso às mensagens da sua página. Suas mensagens privadas nunca poderão ser acessadas pelo Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nome do site",
-          "PLACEHOLDER": "Digite o nome do seu site (por exemplo: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domínio do site",
           "PLACEHOLDER": "Digite o domínio do seu site (por exemplo: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Ativado",
         "DISABLED": "Desabilitado"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desabilitado"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirmar Exclusão",
         "MESSAGE": "Tem certeza que deseja excluir ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Sim, excluir ",
         "NO": "Não, Manter "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "agentes",
       "INBOX_AGENTS_SUB_TEXT": "Adicionar ou remover agentes dessa caixa de entrada",
       "UPDATE": "Atualização",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Habilitar atribuição automática",
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações da caixa de entrada",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrationApps.json b/app/javascript/dashboard/i18n/locale/pt/integrationApps.json
new file mode 100644
index 000000000..d6aa1e7a4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Ativado",
+      "DISABLED": "Desabilitado"
+    },
+    "CONFIGURE": "Configurar",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Tem certeza que deseja excluir?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Sim, excluir",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "excluir"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Criar",
+        "CANCEL": "cancelar"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index c5e20dce6..5b0b12148 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -17,6 +17,24 @@
           "Ações."
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Alterar",
+        "TITLE": "Edit webhook",
+        "CANCEL": "cancelar",
+        "DESC": "Eventos Webhook fornecem informações em tempo real sobre o que está acontecendo em sua conta Chatwoot. Por favor, insira uma URL válida para configurar uma callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL do Webhook",
+            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
+            "ERROR": "Por favor, insira uma URL válida"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+        }
+      },
       "ADD": {
         "CANCEL": "cancelar",
         "TITLE": "Adicionar novo webhook",
diff --git a/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
index b00a9c435..742f0d71f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nome da etiqueta",
         "PLACEHOLDER": "Nome da etiqueta",
-        "ERROR": "Nome da etiqueta é obrigatório"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Descrição",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index d8af5373a..aed6f633b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Por favor, insira um endereço de e-mail válido",
         "PLACEHOLDER": "Por favor, insira seu endereço de e-mail, que será exibido em conversas"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Palavra-passe",
         "ERROR": "Por favor, digite uma senha de comprimento 6 ou mais",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Respostas Prontas",
     "INTEGRATIONS": "Integrações",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiquetas",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
index 7b4e18024..ae5211f76 100644
--- a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "excluir ",
         "NO": "cancelar"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json b/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
index 273032356..c57e63bbf 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
@@ -1,69 +1,82 @@
 {
   "CAMPAIGN": {
-    "HEADER": "Campaigns",
-    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
-    "HEADER_BTN_TXT": "Create a campaign",
+    "HEADER": "Campanhas",
+    "SIDEBAR_TXT": "As mensagens proativas permitem ao cliente enviar mensagens de saída para seus contatos, o que acionaria mais conversas. Clique em <b>Adicionar Campanha</b> para criar uma nova campanha. Também pode editar ou apagar uma campanha existente clicando no botão Editar ou Excluir.",
+    "HEADER_BTN_TXT": "Criar uma campanha",
     "ADD": {
-      "TITLE": "Create a campaign",
-      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "TITLE": "Criar uma campanha",
+      "DESC": "Mensagens proativas permitem ao cliente enviar mensagens de saída para seus contatos, o que acionaria mais conversas.",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "CREATE_BUTTON_TEXT": "Criar",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
-          "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "LABEL": "Título",
+          "PLACEHOLDER": "Por favor, digite o título da campanha",
+          "ERROR": "Título é obrigatório"
         },
         "MESSAGE": {
           "LABEL": "Messagem",
-          "PLACEHOLDER": "Please enter the message of campaign",
-          "ERROR": "Message is required"
+          "PLACEHOLDER": "Por favor, insira a mensagem da campanha",
+          "ERROR": "A mensagem é obrigatória"
         },
         "SENT_BY": {
           "LABEL": "Enviado por",
-          "PLACEHOLDER": "Please select the the content of campaign",
-          "ERROR": "Sender is required"
+          "PLACEHOLDER": "Por favor, selecione o conteúdo da campanha",
+          "ERROR": "Remetente é obrigatório"
         },
         "END_POINT": {
-          "LABEL": "URL",
-          "PLACEHOLDER": "Please enter the URL",
+          "LABEL": "URL:",
+          "PLACEHOLDER": "Por favor, insira a URL",
           "ERROR": "Por favor, insira uma URL válida"
         },
         "TIME_ON_PAGE": {
-          "LABEL": "Time on page(Seconds)",
-          "PLACEHOLDER": "Please enter the time",
-          "ERROR": "Time on page is required"
+          "LABEL": "Tempo na página (segundos)",
+          "PLACEHOLDER": "Por favor insira a hora",
+          "ERROR": "Tempo na página é necessário"
         },
-        "ENABLED": "Enable campaign",
-        "SUBMIT": "Add Campaign"
+        "ENABLED": "Ativar campanha",
+        "SUBMIT": "Adicionar Campanha"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign created successfully",
-        "ERROR_MESSAGE": "There was an error. Please try again."
+        "SUCCESS_MESSAGE": "Campanha criada com sucesso",
+        "ERROR_MESSAGE": "Houve um erro. Por favor, tente novamente."
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Excluir",
+      "CONFIRM": {
+        "TITLE": "Confirmar exclusão",
+        "MESSAGE": "Você tem certeza que deseja excluir?",
+        "YES": "Sim, excluir ",
+        "NO": "Não, Mantenha "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campanha excluída com sucesso",
+        "ERROR_MESSAGE": "Não foi possível excluir a campanha. Tente novamente mais tarde."
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
+      "TITLE": "Campanha Editar",
       "UPDATE_BUTTON_TEXT": "Atualizar",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "Campanha atualizada com sucesso",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
-      "404": "There are no campaigns created for this inbox.",
+      "LOADING_MESSAGE": "Carregando campanhas...",
+      "404": "Não há campanhas criadas para esta caixa de entrada.",
       "TABLE_HEADER": {
-        "TITLE": "Title",
+        "TITLE": "Título",
         "MESSAGE": "Messagem",
         "STATUS": "SItuação",
-        "SENDER": "Sender",
-        "URL": "URL",
-        "TIME_ON_PAGE": "Time(Seconds)",
-        "CREATED_AT": "Created at"
+        "SENDER": "Remetente",
+        "URL": "URL:",
+        "TIME_ON_PAGE": "Horário(segundos)",
+        "CREATED_AT": "Criado em"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Adicionar",
         "EDIT": "Alterar",
         "DELETE": "Excluir"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 8e9936a4c..124b70b8d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -18,23 +18,18 @@
       "TITLE": "Conversas anteriores"
     },
     "LABELS": {
-      "TITLE": "Marcador da conversa",
-      "MODAL": {
-        "TITLE": "Marcadores para",
-        "ACTIVE_LABELS": "Marcadores adicionados à conversa",
-        "INACTIVE_LABELS": "Marcadores disponíveis na conta",
-        "REMOVE": "Clique no ícone X para remover o marcador",
-        "ADD": "Clique no ícone + para adicionar o marcador",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Atualizar marcadores",
-        "UPDATE_ERROR": "Não foi possível atualizar os marcadores, tente novamente."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Marcador da conversa",
+        "ADD_BUTTON": "Adicionar marcador"
       },
-      "NO_LABELS_TO_ADD": "Não há mais marcadores definidos na conta.",
-      "NO_AVAILABLE_LABELS": "Não há marcadores adicionados a esta conversa.",
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Adicionar marcador",
+        "PLACEHOLDER": "Pesquisar marcador ",
+        "NO_RESULT": "Nenhum rótulo encontrado"
       }
     },
     "MUTE_CONTACT": "Silenciar Conversa",
@@ -155,36 +150,56 @@
       "VIEW_DETAILS": "Ver detalhes"
     }
   },
-  "NOTES": {
-    "HEADER": {
-      "TITLE": "Notes"
-    },
-    "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Adicionar",
+      "TITLE": "Shift + Enter to create a task"
     },
     "FOOTER": {
-      "BUTTON": "View all notes"
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "HEADER": {
+      "TITLE": "Observações"
+    },
+    "ADD": {
+      "BUTTON": "Adicionar",
+      "PLACEHOLDER": "Adicionar uma nota",
+      "TITLE": "Shift + Enter para criar uma nota"
+    },
+    "FOOTER": {
+      "BUTTON": "Ver todas as notas"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "observações",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversas"
     }
   },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Atributos Personalizados",
-    "BUTTON": "Add custom attribute",
+    "BUTTON": "Criar atributo personalizado",
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Criar atributo personalizado",
+      "DESC": "Adicionar informações personalizadas a este contato."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Adicionar atributo",
       "CANCEL": "Cancelar",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Atributos Personalizados",
+        "PLACEHOLDER": "Por exemplo: ID shopify",
+        "ERROR": "Nome de atributo personalizado inválido"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
+        "LABEL": "Valor do atributo",
         "PLACEHOLDER": "Eg: 11901 "
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 49c893a3b..f2b0c1018 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Detalhes das conversas",
     "ASSIGNEE_LABEL": "Agente atribuído",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Equipe Atribuída",
     "SELECT": {
       "PLACEHOLDER": "Nenhuma"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index d2696a4cb..dedb80e72 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nome da Caixa de Entrada",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Informe o nome do seu site (por exemplo: Acme Inc)"
+      },
       "FB": {
         "HELP": "Obs: ao fazer login, apenas temos acesso às mensagens da sua página. Suas mensagens privadas nunca podem ser acessadas pelo Chatwoot.",
         "CHOOSE_PAGE": "Escolher Página",
@@ -39,7 +47,7 @@
       },
       "TWITTER": {
         "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
+        "ERROR_MESSAGE": "Houve um erro ao conectar com o Twitter, por favor, tente novamente"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal do website",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Imagem do Canal"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nome do website",
-          "PLACEHOLDER": "Informe o nome do seu site (por exemplo: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domínio do website",
           "PLACEHOLDER": "Informe o domínio do seu site (por exemplo: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Ativado",
         "DISABLED": "Desativado"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desativado"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirmar exclusão",
         "MESSAGE": "Você tem certeza que deseja excluir ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Sim, excluir ",
         "NO": "Não, Mantenha "
       },
@@ -227,8 +236,8 @@
       "SETTINGS": "Configurações",
       "COLLABORATORS": "Colaboradores",
       "CONFIGURATION": "Configuração",
-      "CAMPAIGN": "Campaigns",
-      "PRE_CHAT_FORM": "Pre Chat Form",
+      "CAMPAIGN": "Campanhas",
+      "PRE_CHAT_FORM": "Formulário Chat Pré",
       "BUSINESS_HOURS": "Horário de funcionamento"
     },
     "SETTINGS": "Confirgurações",
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Adicionar ou remover agentes dessa caixa de entrada",
       "UPDATE": "Atualizar",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Habilitar atribuição automática",
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações de caixa de entrada",
@@ -257,32 +268,32 @@
       "MESSAGE_ERROR": "Ocorreu um erro, por favor tente novamente"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "Formulários de bate-papo permitem que você capture informações de usuário antes de iniciar uma conversa com você.",
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Ativar formulário de bate-papo antes",
         "OPTIONS": {
           "ENABLED": "Sim",
           "DISABLED": "Não"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Pré Mensagem de bate-papo",
+        "PLACEHOLDER": "Esta mensagem será visível para os usuários junto com o formulário"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "Os visitantes devem fornecer seu nome e endereço de e-mail antes de iniciar o bate-papo"
       }
     },
     "BUSINESS_HOURS": {
       "TITLE": "Definir a sua disponibilidade",
-      "SUBTITLE": "Set your availability on your livechat widget",
+      "SUBTITLE": "Defina a sua disponibilidade no widget livechat",
       "WEEKLY_TITLE": "Definir horas semanais",
       "TIMEZONE_LABEL": "Selecionar fuso horário",
       "UPDATE": "Atualizar configurações do horário comercial",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "TOGGLE_AVAILABILITY": "Permitir a disponibilidade de negócios para essa caixa de entrada",
       "UNAVAILABLE_MESSAGE_LABEL": "Mensagem indisponível para vistores",
       "UNAVAILABLE_MESSAGE_DEFAULT": "Nós estamos indisponíveis no momento. Deixe uma mensagem a ser respondida assim que voltarmos.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Permitir a disponibilidade de negócios mostrará as horas disponíveis no widget de bate-papo ao vivo, mesmo que todos os agentes estejam offline. Os vistores disponíveis horários externos podem ser avisados com uma mensagem e um formulário de pré-bate-papo.",
       "DAY": {
         "ENABLE": "Permitir a disponibilidade para este dia",
         "UNAVAILABLE": "Indisponível",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
new file mode 100644
index 000000000..bbfd20da6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Ativado",
+      "DISABLED": "Desativado"
+    },
+    "CONFIGURE": "Configurar",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Você tem certeza que deseja excluir?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Sim, excluir",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Caixa de Entrada",
+      "DELETE": {
+        "BUTTON_TEXT": "Excluir"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Criar",
+        "CANCEL": "Cancelar"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Conectar"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 8705c4487..498dbf8c7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -17,6 +17,24 @@
           "Ações"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Alterar",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancelar",
+        "DESC": "Webhook Os eventos fornecem informações em tempo real sobre o que está acontecendo na sua conta do Chatwoot. Digite um URL válido para configurar um retorno de chamada.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL do webhook",
+            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
+            "ERROR": "Por favor, insira uma URL válida"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancelar",
         "TITLE": "Adicionar novo webhook",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
index dc4bb1720..c29560eaa 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nome do marcador",
         "PLACEHOLDER": "Nome do marcador",
-        "ERROR": "Nome do Marcador é obrigatório"
+        "REQUIRED_ERROR": "O nome do marcador é obrigatório",
+        "MINIMUM_LENGTH_ERROR": "Tamanho mínimo 2 é necessário",
+        "VALID_ERROR": "Somente Letras, Números, Hífen e Sublinhado são permitidos"
       },
       "DESCRIPTION": {
         "LABEL": "Descrição",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 878b59eff..069b87139 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -41,15 +41,15 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Últimos 3 meses"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Últimos 6 meses"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Ano passado"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 11b6e066a..28c2ee8fa 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Por favor, insira um endereço de e-mail válido",
         "PLACEHOLDER": "Por favor, insira seu endereço de e-mail, que será exibido em conversas"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Senha atual",
+        "ERROR": "Por favor, digite a senha atual",
+        "PLACEHOLDER": "Por favor, digite a senha atual"
+      },
       "PASSWORD": {
         "LABEL": "Senha",
         "ERROR": "Por favor, digite uma senha de comprimento 6 ou mais",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Atalhos",
     "INTEGRATIONS": "Integrações",
     "ACCOUNT_SETTINGS": "Configurações da conta",
+    "APPLICATIONS": "Aplicações",
     "LABELS": "Marcadores",
     "TEAMS": "Times"
   },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
index d0f91f7b0..adca03848 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Tem certeza que deseja excluir - %{teamName}",
+        "PLACE_HOLDER": "Digite {teamName} para confirmar",
         "MESSAGE": "A exclusão do departamento irá remover a atribuição da equipe das conversas atribuídas a esse departamento.",
         "YES": "Excluir ",
         "NO": "Cancelar"
diff --git a/app/javascript/dashboard/i18n/locale/ro/campaign.json b/app/javascript/dashboard/i18n/locale/ro/campaign.json
index 3498e39b6..2cc4673f6 100644
--- a/app/javascript/dashboard/i18n/locale/ro/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ro/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Şterge",
+      "CONFIRM": {
+        "TITLE": "Confirmă ștergerea",
+        "MESSAGE": "Sigur doriți să ștergeți?",
+        "YES": "Da, șterge ",
+        "NO": "Nu, păstreaza"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Actualizare",
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index eeadba0a3..b34cd2bf3 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Conversații anterioare"
     },
     "LABELS": {
-      "TITLE": "Etichete conversație",
-      "MODAL": {
-        "TITLE": "Etichete pentru",
-        "ACTIVE_LABELS": "Etichete adăugate la conversație",
-        "INACTIVE_LABELS": "Etichete disponibile în cont",
-        "REMOVE": "Faceți clic pe pictograma X pentru a elimina eticheta",
-        "ADD": "Faceți clic pe + pictogramă pentru a adăuga eticheta",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Actualizare etichete",
-        "UPDATE_ERROR": "Nu s-au putut actualiza etichetele, încercați din nou."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Etichete conversație",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Nu mai sunt etichete definite în cont.",
-      "NO_AVAILABLE_LABELS": "Nu există etichete adăugate la această conversație.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversații"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 33996e694..85782d5f2 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 0a6ce34fb..3176536d0 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Nume Inbox",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Nume website",
+        "PLACEHOLDER": "Introduceți numele website-ului dvs. (de exemplu: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Prin conectare, vom avea acces doar la mesajele paginii tale. Mesajele tale private nu pot fi accesate niciodată de Chatwoot.",
         "CHOOSE_PAGE": "Alege pagina",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "avatar pentru canal"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Nume website",
-          "PLACEHOLDER": "Introduceți numele website-ului dvs. (de exemplu: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domeniu website",
           "PLACEHOLDER": "Introduceți domeniul website-ului (exemplu: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Activat",
         "DISABLED": "Dezactivat"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Activat",
+        "DISABLED": "Dezactivat"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirmă ștergerea",
         "MESSAGE": "Sigur doriți să ștergeți ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Da, șterge ",
         "NO": "Nu, păstreaza"
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenți",
       "INBOX_AGENTS_SUB_TEXT": "Adaugă sau elimină agenți din acest inbox",
       "UPDATE": "Actualizare",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Activare atribuire automată",
       "INBOX_UPDATE_TITLE": "Setări Inbox",
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrationApps.json b/app/javascript/dashboard/i18n/locale/ro/integrationApps.json
new file mode 100644
index 000000000..9fddc4487
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Activat",
+      "DISABLED": "Dezactivat"
+    },
+    "CONFIGURE": "Configurare",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Sigur doriți să ștergeți?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Da, șterge",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Renunță",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Şterge"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Creeaza",
+        "CANCEL": "Renunță"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Conectează-te"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index de1442ba0..fb16f804a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -17,6 +17,24 @@
           "Actiuni"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Editare",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Renunță",
+        "DESC": "Evenimentele Webhook vă oferă informații în timp real despre ce se întâmplă în contul dvs. Chatwoot. Introduceți un URL valid pentru a configura un callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL Webhook",
+            "PLACEHOLDER": "Exemplu: https://example/api/webhook",
+            "ERROR": "Te rog introdu un URL valid"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+        }
+      },
       "ADD": {
         "CANCEL": "Renunță",
         "TITLE": "Adaugă un nou webhook",
diff --git a/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
index 7da6a484a..f5a532966 100644
--- a/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Nume etichetă",
         "PLACEHOLDER": "Nume etichetă",
-        "ERROR": "Numele etichetei este necesar"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Descriere",
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index cd68e9896..ee28e40f2 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă",
         "PLACEHOLDER": "Te rugăm să introduci adresa ta de e-mail, aceasta va fi afișată în conversații"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Parola",
         "ERROR": "Te rugăm să introduci o parolă pentru lungimea de 6 caractere sau mai mult",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Răspunsuri predefinite",
     "INTEGRATIONS": "Integrări",
     "ACCOUNT_SETTINGS": "Setările contului",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etichete",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
index 095643bd7..d69c305cf 100644
--- a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Şterge ",
         "NO": "Renunță"
diff --git a/app/javascript/dashboard/i18n/locale/ru/campaign.json b/app/javascript/dashboard/i18n/locale/ru/campaign.json
index f355be5bb..42089230a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ru/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "Произошла ошибка. Пожалуйста, попробуйте еще раз."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Удалить",
+      "CONFIRM": {
+        "TITLE": "Подтвердите удаление",
+        "MESSAGE": "Вы точно хотите удалить?",
+        "YES": "Да, удалить ",
+        "NO": "Нет, не удалять "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Кампания успешно удалена",
+        "ERROR_MESSAGE": "Не удалось удалить кампанию. Повторите попытку позже."
+      }
+    },
     "EDIT": {
       "TITLE": "Редактировать кампанию",
       "UPDATE_BUTTON_TEXT": "Обновить",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index e903118c7..ae36dff4c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Предыдущие диалоги"
     },
     "LABELS": {
-      "TITLE": "Категории Диалога",
-      "MODAL": {
-        "TITLE": "Категории для",
-        "ACTIVE_LABELS": "Категории добавлены к диалогу",
-        "INACTIVE_LABELS": "Все категории",
-        "REMOVE": "Нажмите на иконку X для удаления категории",
-        "ADD": "Нажмите на значок +, чтобы добавить категорию",
-        "ADD_BUTTON": "Добавить метки",
-        "UPDATE_BUTTON": "Изменить категории",
-        "UPDATE_ERROR": "Не удалось обновить категории, попробуйте снова."
+      "CONTACT": {
+        "TITLE": "Ярлыки контактов",
+        "ERROR": "Не удалось обновить ярлыки"
+      },
+      "CONVERSATION": {
+        "TITLE": "Категории Диалога",
+        "ADD_BUTTON": "Добавить метки"
       },
-      "NO_LABELS_TO_ADD": "У вас больше нет категорий.",
-      "NO_AVAILABLE_LABELS": "У диалога больше нет категорий.",
       "LABEL_SELECT": {
         "TITLE": "Добавить метки",
         "PLACEHOLDER": "Поиск меток",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Просмотреть подробности"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Добавить",
+      "TITLE": "Shift + Enter для создания задачи"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Дата окончания",
+      "LABEL_TITLE": "Установить тип"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Заметки"
@@ -168,6 +173,16 @@
       "BUTTON": "Показать все заметки"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Действия"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "заметки",
+      "PILL_BUTTON_EVENTS": "события",
+      "PILL_BUTTON_CONVO": "диалоги"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Пользовательские атрибуты",
     "BUTTON": "Добавить пользовательский атрибут",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 4fd56f744..ac8581237 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Детали диалога",
     "ASSIGNEE_LABEL": "Назначенный агент",
+    "SELF_ASSIGN": "Назначить мне",
     "TEAM_LABEL": "Назначенная команда",
     "SELECT": {
       "PLACEHOLDER": "Ничего"
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 4a96cb928..3d8902b8b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Имя источника",
+        "PLACEHOLDER": "Введите имя папки \"Входящие\" (например: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Имя сайта",
+        "PLACEHOLDER": "Введите имя вашего сайта (например: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: После авторизации мы получим доступ только к вашим сообщениям на странице. Личные сообщения недоступны Chatwoot.",
         "CHOOSE_PAGE": "Выберите страницы",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Изображение"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Имя сайта",
-          "PLACEHOLDER": "Введите имя вашего сайта (например: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Домен сайта",
           "PLACEHOLDER": "Введите домен вашего сайта (например: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Включено",
         "DISABLED": "Выключено"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Включено",
+        "DISABLED": "Выключено"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Подтвердите удаление",
         "MESSAGE": "Вы точно хотите удалить ",
+        "PLACE_HOLDER": "Пожалуйста, введите {inboxName} для подтверждения",
         "YES": "Да, удалить ",
         "NO": "Нет, не удалять "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Операторы",
       "INBOX_AGENTS_SUB_TEXT": "Добавить или удалить агентов из этого источника",
       "UPDATE": "Обновить",
+      "ENABLE_EMAIL_COLLECT_BOX": "Включить ящик сбора почты",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Включение или отключение ящик для сбора почты в новой беседе",
       "AUTO_ASSIGNMENT": "Включить автоназначение",
       "INBOX_UPDATE_TITLE": "Настройки источника",
       "INBOX_UPDATE_SUB_TEXT": "Изменить настройки источника",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrationApps.json b/app/javascript/dashboard/i18n/locale/ru/integrationApps.json
new file mode 100644
index 000000000..e1c849e7f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Загрузка интеграций",
+    "NO_HOOK_CONFIGURED": "В этой учетной записи не настроено ни одной %{integrationId} интеграции.",
+    "HEADER": "Приложения",
+    "STATUS": {
+      "ENABLED": "Включено",
+      "DISABLED": "Выключено"
+    },
+    "CONFIGURE": "Настроить",
+    "ADD_BUTTON": "Добавить новый хук",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Подтвердите удаление",
+        "ACCOUNT": "Отключиться"
+      },
+      "MESSAGE": {
+        "INBOX": "Вы точно хотите удалить?",
+        "ACCOUNT": "Вы уверены, что хотите отключиться?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Да, удалить",
+        "ACCOUNT": "Да, отключить"
+      },
+      "CANCEL_BUTTON_TEXT": "Отменить",
+      "API": {
+        "SUCCESS_MESSAGE": "Вебхук удален",
+        "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Получение хуков",
+      "INBOX": "Электронная почта",
+      "DELETE": {
+        "BUTTON_TEXT": "Удалить"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Выбрать \"Входящий\" канал",
+          "PLACEHOLDER": "Выбрать \"Входящий\" канал"
+        },
+        "SUBMIT": "Создать",
+        "CANCEL": "Отменить"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Вебхук для интеграции успешно добавлен",
+        "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Подключить"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Отключиться"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow - это естественный язык, позволяющий легко проектировать и интегрировать разговорный интерфейс пользователя в мобильное приложение, веб-приложение, устройство, бот, интерактивная голосовая система и т. д. <br /> <br /> Интеграция Dialogflow с %{installationName} позволяет вам настроить бот для общения с вашими входящими каналами, что позволяет боту обрабатывать запросы и передавать их агентам при необходимости. Dialogflow может быть использован для определения лидов, сокращения рабочей нагрузки агентов путем предоставления часто задаваемых вопросов и т. д. <br /> <br /> Чтобы добавить Dialogflow, вам нужно создать учетную запись службы в консоли вашего проекта Google и поделиться учетными данными. Обратитесь к документации Dialogflow для получения дополнительной информации."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index c493157ae..2e279b181 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -17,6 +17,24 @@
           "Действия"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Редактировать",
+        "TITLE": "Редактировать вебхук",
+        "CANCEL": "Отменить",
+        "DESC": "Вебхуки позволяют получить вам информацию о том, что происходит в вашей учетной записи Chatwoot. Пожалуйста, введите корректный URL.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL вебхука",
+            "PLACEHOLDER": "Пример: https://example/api/webhook",
+            "ERROR": "Пожалуйста, введите правильный URL"
+          },
+          "SUBMIT": "Редактировать вебхук"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Вебхук добавлен",
+          "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+        }
+      },
       "ADD": {
         "CANCEL": "Отменить",
         "TITLE": "Добавить новый вебхук",
diff --git a/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
index 0fb8fd9ba..c606a73fa 100644
--- a/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Название категории",
         "PLACEHOLDER": "Название категории",
-        "ERROR": "Название категории обязательно"
+        "REQUIRED_ERROR": "Требуется название метки",
+        "MINIMUM_LENGTH_ERROR": "Минимальная длина 2 обязательна",
+        "VALID_ERROR": "Разрешены только алфавиты, числа, дефисы и подчеркивание"
       },
       "DESCRIPTION": {
         "LABEL": "Описание",
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 0c9535b72..450e310c0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Пожалуйста, введите действительный адрес электронной почты",
         "PLACEHOLDER": "Введите email, который будет отображаться в диалогах"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Текущий пароль",
+        "ERROR": "Пожалуйста, введите текущий пароль",
+        "PLACEHOLDER": "Пожалуйста, введите текущий пароль"
+      },
       "PASSWORD": {
         "LABEL": "Пароль",
         "ERROR": "Введите пароль из 6 или более символов",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Шаблонные ответы",
     "INTEGRATIONS": "Интеграции",
     "ACCOUNT_SETTINGS": "Настройки аккаунта",
+    "APPLICATIONS": "Приложения",
     "LABELS": "Категории",
     "TEAMS": "Команды"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json
index fa7236b31..0f26072ce 100644
--- a/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Вы уверены, что хотите удалить - %{teamName}",
+        "PLACE_HOLDER": "Пожалуйста, введите {teamName} для подтверждения",
         "MESSAGE": "Удаление команды снимет назначение команды из бесед, связанных с этой командой.",
         "YES": "Удалить ",
         "NO": "Отменить"
diff --git a/app/javascript/dashboard/i18n/locale/sk/campaign.json b/app/javascript/dashboard/i18n/locale/sk/campaign.json
index 2eed61b19..f1c249669 100644
--- a/app/javascript/dashboard/i18n/locale/sk/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/sk/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Update",
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 80a33f25a..84e6303fc 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Previous Conversations"
     },
     "LABELS": {
-      "TITLE": "Conversation Labels",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index b13404e91..976d1395a 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index e03e40f39..06eeb3d5d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website Domain",
           "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
         "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Yes, Delete ",
         "NO": "No, Keep "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrationApps.json b/app/javascript/dashboard/i18n/locale/sk/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index 8e158982a..c75454f9e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -17,6 +17,24 @@
           "Actions"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
       "ADD": {
         "CANCEL": "Cancel",
         "TITLE": "Add new webhook",
diff --git a/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
index b0dbe439f..db12fa32a 100644
--- a/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 1bdccd786..f2d285291 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Please enter a valid email address",
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Password",
         "ERROR": "Please enter a password of length 6 or more",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
index 5ba108626..44c843815 100644
--- a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Delete ",
         "NO": "Cancel"
diff --git a/app/javascript/dashboard/i18n/locale/sv/campaign.json b/app/javascript/dashboard/i18n/locale/sv/campaign.json
index 86fa42ea3..e3542b16f 100644
--- a/app/javascript/dashboard/i18n/locale/sv/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/sv/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Radera",
+      "CONFIRM": {
+        "TITLE": "Bekräfta borttagning",
+        "MESSAGE": "Är du säker på att ta bort?",
+        "YES": "Ja, ta bort ",
+        "NO": "Nej, behåll "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Uppdatera",
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index bea85ece1..05d42258c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Tidigare konversationer"
     },
     "LABELS": {
-      "TITLE": "Etiketter för konversation",
-      "MODAL": {
-        "TITLE": "Etiketter för",
-        "ACTIVE_LABELS": "Etiketter tillagda till konversationen",
-        "INACTIVE_LABELS": "Etiketter tillgängliga på kontot",
-        "REMOVE": "Klicka på X-ikonen för att ta bort etiketten",
-        "ADD": "Klicka på + ikonen för att lägga till etiketten",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Uppdatera etiketter",
-        "UPDATE_ERROR": "Kunde inte uppdatera etiketter, försök igen."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Det finns inga fler etiketter definierade på kontot.",
-      "NO_AVAILABLE_LABELS": "Det finns inga etiketter tillagda till denna konversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "konversationer"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Egna egenskaper",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 7fb4c1ccf..3990678cb 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 39a68c725..d185d0bc3 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inkorgsnamn",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Ange namnet på din webbplats (t.ex. Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: Genom att logga in får vi bara tillgång till din sidas meddelanden. Dina privata meddelanden kan aldrig nås av Chatwoot.",
         "CHOOSE_PAGE": "Välj sida",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanalavatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Webbplatsens namn",
-          "PLACEHOLDER": "Ange namnet på din webbplats (t.ex. Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Webbplatsens domän",
           "PLACEHOLDER": "Ange din webbplatsdomän (t.ex. acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Aktiverad",
         "DISABLED": "Inaktiverad"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Aktiverad",
+        "DISABLED": "Inaktiverad"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Bekräfta borttagning",
         "MESSAGE": "Är du säker på att ta bort ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Ja, ta bort ",
         "NO": "Nej, behåll "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Lägg till eller ta bort agenter från denna inkorg",
       "UPDATE": "Uppdatera",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Aktivera automatisk tilldelning",
       "INBOX_UPDATE_TITLE": "Inkorgsinställningar",
       "INBOX_UPDATE_SUB_TEXT": "Uppdatera inställningarna för din inkorg",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrationApps.json b/app/javascript/dashboard/i18n/locale/sv/integrationApps.json
new file mode 100644
index 000000000..e0f447142
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Aktiverad",
+      "DISABLED": "Inaktiverad"
+    },
+    "CONFIGURE": "Konfigurera",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Är du säker på att ta bort?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Ja, ta bort",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Radera"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Skapa",
+        "CANCEL": "Avbryt"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Anslut"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index f29c01c2c..166f9d527 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -17,6 +17,24 @@
           "Åtgärder"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Redigera",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Avbryt",
+        "DESC": "Webbhook-händelser ger dig realtidsinformation om vad som händer i ditt Chatwoot-konto. Ange en giltig URL för att konfigurera en callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Exempel: https://exempel/api/webhook",
+            "ERROR": "Ange en giltig URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+        }
+      },
       "ADD": {
         "CANCEL": "Avbryt",
         "TITLE": "Lägg till ny webhook",
diff --git a/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
index 706fd4141..23a082dac 100644
--- a/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Etikettnamn",
         "PLACEHOLDER": "Etikettnamn",
-        "ERROR": "Etikettnamn krävs"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Beskrivning",
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index afd2f9426..d8a5c1dc3 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Ange en giltig e-postadress",
         "PLACEHOLDER": "Ange din e-postadress, detta visas i konversationer"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Lösenord",
         "ERROR": "Ange ett lösenord med minst 6 tecken",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Svarsmallar",
     "INTEGRATIONS": "Integrationer",
     "ACCOUNT_SETTINGS": "Kontoinställningar",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiketter",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
index 1e4a7c6e7..a2050dc55 100644
--- a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Radera ",
         "NO": "Avbryt"
diff --git a/app/javascript/dashboard/i18n/locale/ta/campaign.json b/app/javascript/dashboard/i18n/locale/ta/campaign.json
index b1f2b0a66..3a74320cb 100644
--- a/app/javascript/dashboard/i18n/locale/ta/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ta/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "ஆம், நீக்கு ",
+        "NO": "இல்லை, வைத்திரு "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "புதுப்பிப்பு",
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index dd14b68e9..4b290a106 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "முந்தைய உரையாடல்கள்"
     },
     "LABELS": {
-      "TITLE": "உரையாடல் லேபிள்கள்",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "லேபிள்களைப் புதுப்பிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "உரையாடல் லேபிள்கள்",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "உரையாடல்கள்"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 58a71afa2..aee6efaa6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index d9253bd77..93e04b314 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "இன்பாக்ஸ் பெயர்",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
       "FB": {
         "HELP": "கவனத்திற்கு: உள்நுழைவதன் மூலம், உங்கள் பக்கத்தின் செய்திகளை மட்டுமே நாங்கள் அணுகுவோம். உங்கள் தனிப்பட்ட செய்திகளை ஒருபோதும் சாட்வூட்டால் அணுக முடியாது.",
         "CHOOSE_PAGE": "பக்கத்தைத் தேர்வுசெய்க",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "சேனல் அவதார்"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "வலைத்தளத்தின் பெயர்",
-          "PLACEHOLDER": "உங்கள் இணையதள பெயரை உள்ளிடவும் (eg: உதாரணமாக Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "இணையதள களம்",
           "PLACEHOLDER": "உங்கள் இணையதள களத்தை உள்ளிடவும் (eg: உதாரணமாக acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "இயக்கப்பட்டது",
         "DISABLED": "முடக்கப்பட்டது"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "இயக்கப்பட்டது",
+        "DISABLED": "முடக்கப்பட்டது"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
         "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "ஆம், நீக்கு ",
         "NO": "இல்லை, வைத்திரு "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "ஏஜென்ட்கள்",
       "INBOX_AGENTS_SUB_TEXT": "இந்த இன்பாக்ஸிலிருந்து ஏஜென்ட்களைச் சேர்க்கவும் அல்லது அகற்றவும்",
       "UPDATE": "புதுப்பிப்பு",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "தானாக ஒதுக்கீட்டை இயக்கு",
       "INBOX_UPDATE_TITLE": "இன்பாக்ஸ் அமைப்புகள்",
       "INBOX_UPDATE_SUB_TEXT": "உங்கள் இன்பாக்ஸ் அமைப்புகளைப் புதுப்பிக்கவும்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrationApps.json b/app/javascript/dashboard/i18n/locale/ta/integrationApps.json
new file mode 100644
index 000000000..d67f864ca
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "இயக்கப்பட்டது",
+      "DISABLED": "முடக்கப்பட்டது"
+    },
+    "CONFIGURE": "உள்ளமைக்கவும்",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "ரத்துசெய்"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index e596907b1..4425aa5ae 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -17,6 +17,24 @@
           "செயல்கள்"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "திருத்து",
+        "TITLE": "Edit webhook",
+        "CANCEL": "ரத்துசெய்",
+        "DESC": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. மீட்டமைக்க சரியான URL ஐ உள்ளிடவும்.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "வெப்ஹூக் URL",
+            "PLACEHOLDER": "உதாரணமாக: https://example/api/webhook",
+            "ERROR": "சரியான URL ஐ பதிவிடவும்"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+        }
+      },
       "ADD": {
         "CANCEL": "ரத்துசெய்",
         "TITLE": "புதிய வெப்ஹூக் சேர்க்கவும்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
index c450c0596..5b9118313 100644
--- a/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 98a583265..49020c1b7 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "சரியான ஈமெயில் முகவரியை பதிவிடவும்",
         "PLACEHOLDER": "தயவுசெய்து உங்கள் ஈ-மெயில் முகவரியை உள்ளிடவும், இது உரையாடல்களில் காண்பிக்கப்படும்"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "பாஸ்வேர்ட்",
         "ERROR": "6 அல்லது அதற்கு மேற்பட்ட நீள பாஸ்வேர்டை உள்ளிடவும்",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "பதிவு செய்யப்பட்ட பதில்கள்",
     "INTEGRATIONS": "சேர்ப்புகள்",
     "ACCOUNT_SETTINGS": "கணக்கின் அமைப்புகள்",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
index 1efb008b8..64a1ebbf4 100644
--- a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Delete ",
         "NO": "ரத்துசெய்"
diff --git a/app/javascript/dashboard/i18n/locale/th/campaign.json b/app/javascript/dashboard/i18n/locale/th/campaign.json
index 68e699fcf..9c985360c 100644
--- a/app/javascript/dashboard/i18n/locale/th/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/th/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "ลบ",
+      "CONFIRM": {
+        "TITLE": "ยืนยันการลบ",
+        "MESSAGE": "คุณต้องการที่จะลบไหม?",
+        "YES": "เอาเลย ",
+        "NO": "ไม่อะเก็บไว้ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "เเก้ไขเเคมเปญ",
       "UPDATE_BUTTON_TEXT": "อัพเดท",
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 60da05a91..49a4a20ab 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "การสนทนาก่อนหน้า"
     },
     "LABELS": {
-      "TITLE": "ป้ายกำกับการสนทนา",
-      "MODAL": {
-        "TITLE": "ป้ายกำกับสำหรับ",
-        "ACTIVE_LABELS": "เพิ่มป้ายกำกับไปสนทนา",
-        "INACTIVE_LABELS": "ป้ายกำกับที่ใช้ได้ในบัญชีนี้",
-        "REMOVE": "คลิกที่ X เพื่อลบป้ายกำกับ",
-        "ADD": "คลิกที่ + เพื่อเพิ่มป้ายกำกับ",
-        "ADD_BUTTON": "เพิ่มหัวข้อ",
-        "UPDATE_BUTTON": "อัพเดทป้ายกำกับ",
-        "UPDATE_ERROR": "ไม่สามารถอัพเดทป้านกำกับได้กรุณาลองใหม่"
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "ป้ายกำกับการสนทนา",
+        "ADD_BUTTON": "เพิ่มหัวข้อ"
       },
-      "NO_LABELS_TO_ADD": "ไม่มีป้ายกำกับที่กำหนดให้บัญชีนี้",
-      "NO_AVAILABLE_LABELS": "ไม่มีป้ายกำกับที่เพิ่มให้การสนทนานี้",
       "LABEL_SELECT": {
         "TITLE": "เพิ่มหัวข้อ",
         "PLACEHOLDER": "ค้นหาหัวข้อ",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "ดูรายละเอียด"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "เพิ่ม",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "โน้ต"
@@ -168,6 +173,16 @@
       "BUTTON": "ดูโน็ตทั้งหมด"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "โน้ต",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "การสนทนา"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "แอตทริบิวต์ที่กำหนดเอง",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 8192e1050..b0afb783c 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 93ea16b9d..f5e65fca8 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "ชื่อกล่องข้อความ",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "ชื่อเว็บไซต์",
+        "PLACEHOLDER": "กรอกชื่อเว็บไซต์ของคุณ (เช่น SnowBoltz Inc)"
+      },
       "FB": {
         "HELP": "ป. ล. เมื่อลงชื่อเข้าใช้เราจะสามารถเข้าถึงข้อความของเพจของคุณเท่านั้น Chatwoot ไม่สามารถเข้าถึงข้อความส่วนตัวของคุณได้",
         "CHOOSE_PAGE": "เลือกหน้า",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "รูปของช่อง"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "ชื่อเว็บไซต์",
-          "PLACEHOLDER": "กรอกชื่อเว็บไซต์ของคุณ (เช่น SnowBoltz Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "โดเมนเว็บไซต์",
           "PLACEHOLDER": "กรอกโดเมนเว็บไซต์ของคุณ (เช่น snowboltz.net)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "เปิด",
+        "DISABLED": "ปิด"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "ยืนยันการลบ",
         "MESSAGE": "คุณต้องการที่จะลบไหม ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "เอาเลย ",
         "NO": "ไม่อะเก็บไว้ "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "พนักงาน",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrationApps.json b/app/javascript/dashboard/i18n/locale/th/integrationApps.json
new file mode 100644
index 000000000..a25afc823
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "เปิด",
+      "DISABLED": "ปิด"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "คุณต้องการที่จะลบไหม?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "เอาเลย",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "ยกเลิก",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "กล่องข้อความ",
+      "DELETE": {
+        "BUTTON_TEXT": "ลบ"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "สร้าง",
+        "CANCEL": "ยกเลิก"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index f2f72b4d0..f13cb47dd 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -17,6 +17,24 @@
           "การกระทำ"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "เเก้ไข",
+        "TITLE": "Edit webhook",
+        "CANCEL": "ยกเลิก",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "ลิ้ง Webhook",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+        }
+      },
       "ADD": {
         "CANCEL": "ยกเลิก",
         "TITLE": "Add new webhook",
diff --git a/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
index b3f1494ba..65bfe71df 100644
--- a/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 60b2d1c30..c4ab1c02a 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Please enter a valid email address",
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Password",
         "ERROR": "Please enter a password of length 6 or more",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "คำตอบสำเร็จรูป",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
index b8163924b..37e099956 100644
--- a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "ลบ ",
         "NO": "ยกเลิก"
diff --git a/app/javascript/dashboard/i18n/locale/tr/campaign.json b/app/javascript/dashboard/i18n/locale/tr/campaign.json
index 99727f30a..955e6c431 100644
--- a/app/javascript/dashboard/i18n/locale/tr/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/tr/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Sil",
+      "CONFIRM": {
+        "TITLE": "Silmeyi onayla",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Evet, Sil ",
+        "NO": "Hayır, Tut"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Güncelleme",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 78782d064..05eb5131e 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Önceki Sohbetler"
     },
     "LABELS": {
-      "TITLE": "Konuşma Etiketleri",
-      "MODAL": {
-        "TITLE": "İçin etiketler",
-        "ACTIVE_LABELS": "Sohbete eklenen etiketler",
-        "INACTIVE_LABELS": "Hesapta bulunan etiketler",
-        "REMOVE": "Etiketi kaldırmak için X simgesine tıklayın",
-        "ADD": "Etiketi eklemek için + simgesine tıklayın",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Etiketleri güncelle",
-        "UPDATE_ERROR": "Etiketler güncellenemedi, tekrar deneyin."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Konuşma Etiketleri",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Hesapta tanımlanmış başka etiket yok.",
-      "NO_AVAILABLE_LABELS": "Bu görüşmeye eklenen etiket yok.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "Detayları göster"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "konuşmalar"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Özel Nitelikler",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 8ee2408c1..f2ec9c24b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 78422565c..0d2144d6e 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Gelen Kutusu Adı",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Web Sitesi Adı",
+        "PLACEHOLDER": "Web sitenizin adını girin"
+      },
       "FB": {
         "HELP": "Not: Oturum açarak, yalnızca Sayfanızın mesajlarına erişebiliriz. Özel mesajlarınıza Chatwoot ile asla erişilemez.",
         "CHOOSE_PAGE": "Sayfa Seçin",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Kanal Avatarı"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Web Sitesi Adı",
-          "PLACEHOLDER": "Web sitenizin adını girin"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Web Sitesi Alan Adı",
           "PLACEHOLDER": "Web sitenizin adresini girin"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Etkin",
         "DISABLED": "Devre dışı"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Etkin",
+        "DISABLED": "Devre dışı"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Silmeyi onayla",
         "MESSAGE": "Silmek istediğinize emin misiniz ?",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Evet, Sil ",
         "NO": "Hayır, Tut"
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Kullanıcılar",
       "INBOX_AGENTS_SUB_TEXT": "Bu gelen kutusuna aracı ekleyin veya aracıları kaldırın",
       "UPDATE": "Güncelleme",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Otomatik atamayı etkinleştir",
       "INBOX_UPDATE_TITLE": "Gelen Kutusu Ayarları",
       "INBOX_UPDATE_SUB_TEXT": "Gelen kutusu ayarlarınızı güncelleyin",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrationApps.json b/app/javascript/dashboard/i18n/locale/tr/integrationApps.json
new file mode 100644
index 000000000..40cab7aa7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Etkin",
+      "DISABLED": "Devre dışı"
+    },
+    "CONFIGURE": "Yapılandır",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Evet, Sil",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "İptal Et",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Sil"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Yarat",
+        "CANCEL": "İptal Et"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Bağlan"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index b27d02dc9..577c5f2aa 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -17,6 +17,24 @@
           "Hareketler"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Düzenle",
+        "TITLE": "Edit webhook",
+        "CANCEL": "İptal Et",
+        "DESC": "Web kancası etkinlikleri size Chatwoot hesabınızda neler olduğu hakkında gerçek zamanlı bilgi sağlar. Bir geri aramayı yapılandırmak için lütfen geçerli bir URL girin.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Web kancası URL'si",
+            "PLACEHOLDER": "Örnek: https://siteadi/api/webkancasi",
+            "ERROR": "Lütfen geçerli bir adres girin"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+        }
+      },
       "ADD": {
         "CANCEL": "İptal Et",
         "TITLE": "Yeni web kancası ekle",
diff --git a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
index 06201307a..d730141c5 100644
--- a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Etiket adı",
         "PLACEHOLDER": "Etiket adı",
-        "ERROR": "Etiket Adı gerekli"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Açıklama",
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 1739e090b..88c03d3f8 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Lütfen geçerli bir tam e-posta adresi",
         "PLACEHOLDER": "Lütfen e-posta adresinizi girin, bu görüşmelerde görüntülenecektir"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Parola",
         "ERROR": "Lütfen 6 veya daha uzun bir şifre girin",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Hazır Yanıtlar",
     "INTEGRATIONS": "Entegrasyonlar",
     "ACCOUNT_SETTINGS": "Hesap ayarları",
+    "APPLICATIONS": "Applications",
     "LABELS": "Etiketler",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
index cd2a73fea..f78cd0d28 100644
--- a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Sil ",
         "NO": "İptal Et"
diff --git a/app/javascript/dashboard/i18n/locale/uk/campaign.json b/app/javascript/dashboard/i18n/locale/uk/campaign.json
index b934debaa..6065777a5 100644
--- a/app/javascript/dashboard/i18n/locale/uk/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/uk/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити?",
+        "YES": "Так, видалити ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Оновити",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index ab9bed67e..daf7fdb44 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "Попередні бесіди"
     },
     "LABELS": {
-      "TITLE": "Мітки бесіди",
-      "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Не вдалося оновити мітки, спробуйте ще раз."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "бесіди"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Custom Attributes",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 7f06b5035..ba23ac674 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 05dfe7da1..a87184bbb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Назва сайту",
+        "PLACEHOLDER": "Введіть назву свого сайту (наприклад: Acme Inc)"
+      },
       "FB": {
         "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
         "CHOOSE_PAGE": "Choose Page",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Channel Avatar"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Назва сайту",
-          "PLACEHOLDER": "Введіть назву свого сайту (наприклад: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Домен сайту",
           "PLACEHOLDER": "Введіть домен вашого сайту (наприклад: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Увімкнено",
         "DISABLED": "Вимкнено"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Увімкнено",
+        "DISABLED": "Вимкнено"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Підтвердження видалення",
         "MESSAGE": "Справді бажаєте видалити ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Так, видалити ",
         "NO": "No, Keep "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Агенти",
       "INBOX_AGENTS_SUB_TEXT": "Додати або вилучити агентів з скриньки Вхідні",
       "UPDATE": "Оновити",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Увімкнути автопризначення",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrationApps.json b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
new file mode 100644
index 000000000..11671710c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Увімкнено",
+      "DISABLED": "Вимкнено"
+    },
+    "CONFIGURE": "Настроїти",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Справді бажаєте видалити?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Так, видалити",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Видалити"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Скасувати"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index 18ecd7bb9..9231c6cf7 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -17,6 +17,24 @@
           "Дії"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Редагувати",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Скасувати",
+        "DESC": "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Будь ласка, введіть дійсний URL для налаштування зворотного виклику.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "URL вебхука",
+            "PLACEHOLDER": "Наприклад: https://example/api/webhook",
+            "ERROR": "Будь ласка, введіть правильний URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+        }
+      },
       "ADD": {
         "CANCEL": "Скасувати",
         "TITLE": "Додати новий вебхук",
diff --git a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
index 155feab8c..754da51f3 100644
--- a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Label Name",
         "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Description",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 4336d72da..933bb4608 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Будь ласка, введіть коректну адресу електронної пошти",
         "PLACEHOLDER": "Введіть адресу електронної пошти, її буде видно в бесідах"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Пароль",
         "ERROR": "Будь ласка, введіть пароль довжиною 6 або більше символів",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Швидкі відповіді",
     "INTEGRATIONS": "Інтеграції",
     "ACCOUNT_SETTINGS": "Налаштування акаунту",
+    "APPLICATIONS": "Applications",
     "LABELS": "Labels",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
index c44ee6a70..5149ec97d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Видалити ",
         "NO": "Скасувати"
diff --git a/app/javascript/dashboard/i18n/locale/vi/campaign.json b/app/javascript/dashboard/i18n/locale/vi/campaign.json
index 93c6acba2..83cd8fe1d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/vi/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "Xoá",
+      "CONFIRM": {
+        "TITLE": "Xác nhận xoá",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Có, xoá ",
+        "NO": "Không, giữ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "Cập nhật",
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index d22a350ed..f97e32755 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -11,26 +11,21 @@
     "OS": "Hệ điều hành",
     "INITIATED_FROM": "Bắt đầu từ",
     "INITIATED_AT": "Bắt đầu lúc",
-    "IP_ADDRESS": "IP Address",
+    "IP_ADDRESS": "Địa chỉ IP",
     "NEW_MESSAGE": "New message",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Không có cuộc trò chuyện trước đó được liên kết với liên hệ này.",
       "TITLE": "Cuộc trò chuyện trước đó"
     },
     "LABELS": {
-      "TITLE": "Nhãn hội thoại",
-      "MODAL": {
-        "TITLE": "Nhãn cho",
-        "ACTIVE_LABELS": "Đã thêm nhãn vào cuộc trò chuyện",
-        "INACTIVE_LABELS": "Các nhãn có sẵn trong tài khoản",
-        "REMOVE": "Click vào X icon xóa nhãn",
-        "ADD": "Click vào + icon thêm nhãn",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "Cập nhật nhãn",
-        "UPDATE_ERROR": "Không thể cập nhật nhãn, hãy thử lại."
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Nhãn hội thoại",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "Không có thêm nhãn nào được xác định trong tài khoản.",
-      "NO_AVAILABLE_LABELS": "Không có nhãn nào được thêm vào cuộc trò chuyện này.",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -124,7 +119,7 @@
         "ERROR": "Select an inbox"
       },
       "MESSAGE": {
-        "LABEL": "Message",
+        "LABEL": "Tin nhắn",
         "PLACEHOLDER": "Write your message here",
         "ERROR": "Message can't be empty"
       },
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "các cuộc hội thoại"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "Thuộc tính tùy chỉnh",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index a96a46667..511a057a7 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 9e87d5f93..8f9c081be 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Tên hộp thư đến",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Tên trang web",
+        "PLACEHOLDER": "Nhập tên trang web của bạn (ví dụ: Acme Inc)"
+      },
       "FB": {
         "HELP": "Tái bút: Bằng cách đăng nhập, chúng tôi chỉ có quyền truy cập vào các tin nhắn trên Trang của bạn. Chatwoot không bao giờ có thể truy cập tin nhắn riêng tư của bạn.",
         "CHOOSE_PAGE": "Chọn trang",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "Hình đại diện kênh"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "Tên trang web",
-          "PLACEHOLDER": "Nhập tên trang web của bạn (ví dụ: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "Domain trang web",
           "PLACEHOLDER": "Nhập tên miền trang web của bạn (ví dụ: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Bật",
         "DISABLED": "Không bật"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Bật",
+        "DISABLED": "Không bật"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "Xác nhận xoá",
         "MESSAGE": "Bạn có muốn xoá? ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "Có, Xoá ",
         "NO": "Không, Giữ "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "Nhà cung cấp",
       "INBOX_AGENTS_SUB_TEXT": "Thêm hoặc xóa tác nhân khỏi hộp thư đến này",
       "UPDATE": "Cập nhật",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Bật tự động chuyển nhượng",
       "INBOX_UPDATE_TITLE": "Cài đặt Hộp thư đến",
       "INBOX_UPDATE_SUB_TEXT": "Cập nhật cài đặt hộp thư đến của bạn",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrationApps.json b/app/javascript/dashboard/i18n/locale/vi/integrationApps.json
new file mode 100644
index 000000000..d7c0ffe9a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Bật",
+      "DISABLED": "Không bật"
+    },
+    "CONFIGURE": "Cấu hình",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Có, Xoá",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Huỷ",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Xoá"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Tạo",
+        "CANCEL": "Huỷ"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Kết nối"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 471040a91..6ffbe1288 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -17,6 +17,24 @@
           "Hành động"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "Chỉnh sửa",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Huỷ",
+        "DESC": "Webhook events cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản Chatwoot của bạn. Vui lòng nhập một URL hợp lệ để định cấu hình một cuộc gọi lại.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Ví dụ: https://example/api/webhook",
+            "ERROR": "Vui lòng nhập một URL hợp lệ"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+        }
+      },
       "ADD": {
         "CANCEL": "Xoá",
         "TITLE": "Thêm mới webhook",
diff --git a/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
index e63625def..5ce6ff50a 100644
--- a/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "Tên nhãn",
         "PLACEHOLDER": "Tên nhãn",
-        "ERROR": "Tên nhãn là bắt buộc"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Mô tả",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index fc22fd2a5..264f77dd9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "Vui lòng nhập một địa chỉ email hợp lệ",
         "PLACEHOLDER": "Vui lòng nhập địa chỉ email của bạn, địa chỉ này sẽ được hiển thị trong các cuộc trò chuyện"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "Mật khẩu",
         "ERROR": "Vui lòng nhập mật khẩu có độ dài từ 6 trở lên",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "Thư mẫu phẩn hồi",
     "INTEGRATIONS": "Tích hợp",
     "ACCOUNT_SETTINGS": "Cài Đặt Tài Khoản",
+    "APPLICATIONS": "Applications",
     "LABELS": "Nhãn",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
index 14d915e4f..7b57fef9f 100644
--- a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "Xoá ",
         "NO": "Huỷ"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
index 4eeda5d60..16ad60a97 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "删除",
+      "CONFIRM": {
+        "TITLE": "确认删除",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "是的，删除 ",
+        "NO": "不，保留 "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "更新",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 36b463c4d..f7a504bea 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "上一次对话"
     },
     "LABELS": {
-      "TITLE": "对话标记",
-      "MODAL": {
-        "TITLE": "标记为",
-        "ACTIVE_LABELS": "添加到对话的标签",
-        "INACTIVE_LABELS": "账户中可用的标签",
-        "REMOVE": "点击 X 图标删除标签",
-        "ADD": "点击 + 图标添加标签",
-        "ADD_BUTTON": "Add Labels",
-        "UPDATE_BUTTON": "更新标签",
-        "UPDATE_ERROR": "无法更新标签，请重试。"
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "对话标记",
+        "ADD_BUTTON": "Add Labels"
       },
-      "NO_LABELS_TO_ADD": "帐户中没有更多标签。",
-      "NO_AVAILABLE_LABELS": "没有标签添加到此对话。",
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "View details"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "Notes"
@@ -168,6 +173,16 @@
       "BUTTON": "View all notes"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "会话"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "自定义属性",
     "BUTTON": "Add custom attribute",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 5017413d1..796426431 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "Conversations Details",
     "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
       "PLACEHOLDER": "None"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index b040d5bfd..e88155d80 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "收件箱名称",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "网站名称",
+        "PLACEHOLDER": "输入您的网站名称 (e.g: Acme Inc)"
+      },
       "FB": {
         "HELP": "注意: 通过登录，我们只能访问您的页面的消息。您的私人消息永远不能被聊天室访问。",
         "CHOOSE_PAGE": "选择页面",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "频道头像"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "网站名称",
-          "PLACEHOLDER": "输入您的网站名称 (e.g: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "网站域名",
           "PLACEHOLDER": "输入您的网站域名(e.g: acme.com)"
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "已启用",
         "DISABLED": "已禁用"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "已启用",
+        "DISABLED": "已禁用"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "确认删除",
         "MESSAGE": "您确定要删除吗？ ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "是，删除 ",
         "NO": "不，保留 "
       },
@@ -243,6 +252,8 @@
       "INBOX_AGENTS": "客服代理们",
       "INBOX_AGENTS_SUB_TEXT": "添加或删除此收件箱中的客服",
       "UPDATE": "更新",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "启用自动分配",
       "INBOX_UPDATE_TITLE": "收件箱设置",
       "INBOX_UPDATE_SUB_TEXT": "更新收件箱设置",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
new file mode 100644
index 000000000..221660a0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "已启用",
+      "DISABLED": "已禁用"
+    },
+    "CONFIGURE": "配置",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "是，删除",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "取消",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "删除"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "创建",
+        "CANCEL": "取消"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "连接"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index 40a7847f8..5cb319e63 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -17,6 +17,24 @@
           "操作"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "编辑",
+        "TITLE": "Edit webhook",
+        "CANCEL": "取消",
+        "DESC": "Webhook 事件为您提供了有关Chatwoot 帐户中发生的事情的实时信息。请输入一个有效的URL来配置回调。",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook 网址",
+            "PLACEHOLDER": "例如：https://example/api/webhook",
+            "ERROR": "请输入一个有效的 URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+        }
+      },
       "ADD": {
         "CANCEL": "取消操作",
         "TITLE": "添加新的 webhook",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
index 556a37a01..5aa58bbf8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "标签名称",
         "PLACEHOLDER": "标签名称",
-        "ERROR": "标签名称是必需的"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "描述信息",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index a6581921a..6bcf28024 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -78,6 +78,11 @@
         "ERROR": "请输入一个有效的电子邮件",
         "PLACEHOLDER": "请输入您的名字，这将会在对话中显示"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "密码",
         "ERROR": "请输入长度6或更长的密码",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "预设回复",
     "INTEGRATIONS": "集成方式",
     "ACCOUNT_SETTINGS": "帐户设置",
+    "APPLICATIONS": "Applications",
     "LABELS": "标签",
     "TEAMS": "Teams"
   },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
index cb7659ae6..1e81cacdb 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
@@ -98,6 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
         "YES": "删除 ",
         "NO": "取消"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/campaign.json b/app/javascript/dashboard/i18n/locale/zh_TW/campaign.json
index 790436830..a89e93463 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/campaign.json
@@ -12,7 +12,7 @@
         "TITLE": {
           "LABEL": "標題",
           "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "ERROR": "標題為必填"
         },
         "MESSAGE": {
           "LABEL": "訊息",
@@ -42,6 +42,19 @@
         "ERROR_MESSAGE": "There was an error. Please try again."
       }
     },
+    "DELETE": {
+      "BUTTON_TEXT": "刪除",
+      "CONFIRM": {
+        "TITLE": "確認刪除",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "是，刪除 ",
+        "NO": "不，保留 "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
     "EDIT": {
       "TITLE": "Edit campaign",
       "UPDATE_BUTTON_TEXT": "更新",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
index 0d1a14808..55a53fe52 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
@@ -1,14 +1,14 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "罐頭回覆",
-    "HEADER_BTN_TXT": "新增罐頭回覆",
-    "LOADING": "取得罐頭回覆",
+    "HEADER": "預設回覆",
+    "HEADER_BTN_TXT": "新增預設回覆",
+    "LOADING": "取得預設回覆",
     "SEARCH_404": "沒有任何項目符合此查詢",
     "SIDEBAR_TXT": "<p><b>預設回覆</b> </p><p> 將預設回覆保存為回覆模板，用來快速發送回覆到對話。 </p><p> 若要建立預設回覆，只需點擊 <b>建立預設回覆</b>。 您也可以通過點擊編輯或刪除按鈕來編輯或刪除現有的預設回覆 </p><p> 在 <b>簡碼</b> 的幫助下使用預設的回覆方式。 客服在聊天時可以通過輸入 <b>'/'</b> 然後是簡碼使用預設回覆 </p>",
     "LIST": {
       "404": "此帳戶中沒有可用的罐頭回覆。",
-      "TITLE": "管理罐頭回覆",
-      "DESC": "罐頭回覆是預定義的回覆模板，可以用來快速發送對工單的回覆。",
+      "TITLE": "管理預設回覆",
+      "DESC": "預設回覆是預定義的回覆模板，可以用來快速發送對工單的回覆。",
       "TABLE_HEADER": [
         "簡碼",
         "内容",
@@ -16,8 +16,8 @@
       ]
     },
     "ADD": {
-      "TITLE": "建立罐頭回覆",
-      "DESC": "罐頭回覆是保存的回覆模板，可以用來快速發送回覆到對話中。",
+      "TITLE": "建立預設回覆",
+      "DESC": "預設回覆是保存的回覆模板，可以用來快速發送回覆到對話中。",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
@@ -33,12 +33,12 @@
         "SUBMIT": "送出"
       },
       "API": {
-        "SUCCESS_MESSAGE": "已成功新增罐頭回覆",
+        "SUCCESS_MESSAGE": "已成功新增預設回覆",
         "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
       }
     },
     "EDIT": {
-      "TITLE": "編輯罐頭回覆",
+      "TITLE": "編輯預設回覆",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
@@ -55,14 +55,14 @@
       },
       "BUTTON_TEXT": "編輯",
       "API": {
-        "SUCCESS_MESSAGE": "罐頭回覆已成功更新",
+        "SUCCESS_MESSAGE": "預設回覆已成功更新",
         "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "刪除",
       "API": {
-        "SUCCESS_MESSAGE": "罐頭回覆已成功刪除",
+        "SUCCESS_MESSAGE": "預設回覆已成功刪除",
         "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index d11179d55..f134d8b36 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -18,19 +18,14 @@
       "TITLE": "上一次對話"
     },
     "LABELS": {
-      "TITLE": "對話標記",
-      "MODAL": {
-        "TITLE": "標記為",
-        "ACTIVE_LABELS": "將標籤新增至對話",
-        "INACTIVE_LABELS": "帳戶中可用的標籤",
-        "REMOVE": "點擊 X 圖示以刪除標籤",
-        "ADD": "點擊 + 圖示以新增標籤",
-        "ADD_BUTTON": "新增標籤",
-        "UPDATE_BUTTON": "更新標籤",
-        "UPDATE_ERROR": "無法更新標籤，請重試。"
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "對話標記",
+        "ADD_BUTTON": "新增標籤"
       },
-      "NO_LABELS_TO_ADD": "帳戶中沒有更多標籤。",
-      "NO_AVAILABLE_LABELS": "此對話沒有被新增任何標籤。",
       "LABEL_SELECT": {
         "TITLE": "新增標籤",
         "PLACEHOLDER": "搜尋標籤",
@@ -120,8 +115,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "收件匣",
+        "ERROR": "選擇一個收件匣"
       },
       "MESSAGE": {
         "LABEL": "訊息",
@@ -139,13 +134,13 @@
     "SEARCH_BUTTON": "搜尋",
     "SEARCH_INPUT_PLACEHOLDER": "搜尋聯絡人",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
+      "LOADING_MESSAGE": "聯絡人載入中...",
+      "404": "找不到符合條件的聯絡人 🔍",
       "TABLE_HEADER": {
         "NAME": "姓名",
         "PHONE_NUMBER": "聯絡人電話",
         "CONVERSATIONS": "對話",
-        "LAST_ACTIVITY": "Last Activity",
+        "LAST_ACTIVITY": "最後活動",
         "COUNTRY": "國家",
         "CITY": "城市",
         "SOCIAL_PROFILES": "Social Profiles",
@@ -155,6 +150,16 @@
       "VIEW_DETAILS": "查看詳細資訊"
     }
   },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "建立",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
   "NOTES": {
     "HEADER": {
       "TITLE": "筆記"
@@ -168,24 +173,34 @@
       "BUTTON": "查看所有筆記"
     }
   },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "筆記",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "對話"
+    }
+  },
   "CUSTOM_ATTRIBUTES": {
     "TITLE": "自訂屬性",
-    "BUTTON": "Add custom attribute",
+    "BUTTON": "新增自訂屬性",
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "建立自訂屬性",
+      "DESC": "為聯絡人新增自訂資訊"
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "新增屬性",
       "CANCEL": "取消",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
+        "LABEL": "自訂屬性名稱",
+        "PLACEHOLDER": "例如：shopify id",
         "ERROR": "Invalid custom attribute name"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "屬性值",
+        "PLACEHOLDER": "例如：11901 "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 3f0f294bc..a95919571 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -6,7 +6,7 @@
     "NO_INBOX_1": "看來你還没有建立任何收件匣。",
     "NO_INBOX_2": " 開始吧",
     "NO_INBOX_AGENT": "看起來你還沒有分配到收件匣。請聯絡你的管理員",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "在對話中搜尋訊息",
     "SEARCH": {
       "TITLE": "搜尋訊息",
       "LOADING_MESSAGE": "Crunching data...",
@@ -26,7 +26,7 @@
     "REPLYING_TO": "你正在回覆到：",
     "REMOVE_SELECTION": "移除選擇項目",
     "DOWNLOAD": "下載",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "UPLOADING_ATTACHMENTS": "正在上傳附件...",
     "NO_RESPONSE": "無回應",
     "HEADER": {
       "RESOLVE_ACTION": "已解決",
@@ -49,7 +49,7 @@
       "SEND": "發送",
       "CREATE": "建立筆記",
       "TWEET": "推特",
-      "TIP_FORMAT_ICON": "Show rich text editor",
+      "TIP_FORMAT_ICON": "顯示文字編輯器",
       "TIP_EMOJI_ICON": "顯示 emoji 選擇器",
       "TIP_ATTACH_ICON": "附件",
       "ENTER_TO_SEND": "按下 Enter 傳送"
@@ -108,8 +108,8 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "DETAILS_TITLE": "對話詳細資訊",
     "ASSIGNEE_LABEL": "指派客服",
+    "SELF_ASSIGN": "Assign to me",
     "TEAM_LABEL": "指派團隊",
     "SELECT": {
       "PLACEHOLDER": "無"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 8a57603b8..5f53d77eb 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -49,7 +49,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "按下 enter 以選擇",
       "ENTER_TO_REMOVE": "按下 enter 以移除",
-      "SELECT_ONE": "Select one"
+      "SELECT_ONE": "選擇其中一項"
     }
   },
   "NOTIFICATIONS_PAGE": {
@@ -62,14 +62,14 @@
         "姓名",
         "聯絡人電話",
         "對話",
-        "Last Contacted"
+        "最後聯絡"
       ]
     },
     "TYPE_LABEL": {
       "conversation_creation": "新對話",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "新訊息",
-      "conversation_mention": "Mention"
+      "conversation_mention": "被提及"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index d8870e9e7..c5c22354a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -28,6 +28,14 @@
       }
     ],
     "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "收件匣名稱",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "網站名稱",
+        "PLACEHOLDER": "輸入您的網站名稱 (e.g: Acme Inc)"
+      },
       "FB": {
         "HELP": "注意: 通過登入，我們只能訪問您的頁面的消息。您的私人消息永遠不能被聊天室訪問。",
         "CHOOSE_PAGE": "選擇頁面",
@@ -48,10 +56,6 @@
         "CHANNEL_AVATAR": {
           "LABEL": "頻道頭像"
         },
-        "CHANNEL_NAME": {
-          "LABEL": "網站名稱",
-          "PLACEHOLDER": "輸入您的網站名稱 (e.g: Acme Inc)"
-        },
         "CHANNEL_DOMAIN": {
           "LABEL": "網站域名",
           "PLACEHOLDER": "輸入您的網站域名(e.g: acme.com)"
@@ -79,7 +83,7 @@
           "IN_A_FEW_MINUTES": "幾分鐘內",
           "IN_A_FEW_HOURS": "幾小時內",
           "IN_A_DAY": "一天內",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "HELP_TEXT": "此回覆時間將會顯示在 live chat 小工具"
         },
         "WIDGET_COLOR": {
           "LABEL": "視窗小元件顏色",
@@ -167,8 +171,8 @@
       "AGENTS": {
         "TITLE": "客服",
         "DESC": "在這裡您可以建立客服來管理您新建立的收件匣。只有這些選定的客服才能訪問您的收件匣。 不屬於此收件匣的客服在登入時將無法看到或回覆此收件匣中的消息。 <br> <b>PS：</b> 作為管理員，如果您需要訪問所有收件匣， 您應該將自己建立到您建立的所有收件匣中。",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "VALIDATION_ERROR": "新增至少一位客服到新的收件匣",
+        "PICK_AGENTS": "為收件匣挑選一些客服"
       },
       "DETAILS": {
         "TITLE": "收件匣詳細資訊",
@@ -208,6 +212,10 @@
       "AUTO_ASSIGNMENT": {
         "ENABLED": "已啟用",
         "DISABLED": "已停用"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "已啟用",
+        "DISABLED": "已停用"
       }
     },
     "DELETE": {
@@ -215,6 +223,7 @@
       "CONFIRM": {
         "TITLE": "確認刪除",
         "MESSAGE": "您確定要刪除吗？ ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
         "YES": "是，刪除 ",
         "NO": "不，保留 "
       },
@@ -229,7 +238,7 @@
       "CONFIGURATION": "組態",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "營業時間"
+      "BUSINESS_HOURS": "服務時間"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -240,14 +249,16 @@
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger 脚本",
       "MESSENGER_SUB_HEAD": "將此按鈕放置在視窗標籤中",
-      "INBOX_AGENTS": "客服代理們",
+      "INBOX_AGENTS": "客服",
       "INBOX_AGENTS_SUB_TEXT": "建立或刪除此收件匣中的客服",
       "UPDATE": "更新",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "啟用自動分配",
       "INBOX_UPDATE_TITLE": "收件匣設定",
       "INBOX_UPDATE_SUB_TEXT": "更新收件匣設定",
       "AUTO_ASSIGNMENT_SUB_TEXT": "啟用或停用此收件匣客服的對話自動分配。",
-      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_VERIFICATION": "使用者身份驗證",
       "HMAC_DESCRIPTION": "Inorder validate the users identity, the SDK allows you to pass an `identity_hash` for each user. You can generate HMAC using 'sha256' with the key shown here."
     },
     "FACEBOOK_REAUTHORIZE": {
@@ -274,21 +285,21 @@
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
+      "TITLE": "設定你的服務時間",
+      "SUBTITLE": "為你的 livechat 小工具設定服務時間",
       "WEEKLY_TITLE": "Set your weekly hours",
       "TIMEZONE_LABEL": "選擇時區",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "UPDATE": "更新服務時間設定",
+      "TOGGLE_AVAILABILITY": "啟用收件匣可用服務時間",
+      "UNAVAILABLE_MESSAGE_LABEL": "非服務時間給訪客的訊息",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "我們現在無法回覆您的訊息。請留言，我們會盡快聯絡您。",
+      "TOGGLE_HELP": "啟用服務時間將會在 live chat 小工具上顯示你的服務時間，就算所有客服都不在線上。若不在服務時間內，訪客將會被提醒及傳送 pre-chat 表單",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "無法使用",
         "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "VALIDATION_ERROR": "開始時間必須在關閉時間之前",
+        "CHOOSE": "選擇"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrationApps.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrationApps.json
new file mode 100644
index 000000000..5d6fdb4f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "已啟用",
+      "DISABLED": "已停用"
+    },
+    "CONFIGURE": "配置",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "是，刪除",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "取消",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "收件匣",
+      "DELETE": {
+        "BUTTON_TEXT": "刪除"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "建立",
+        "CANCEL": "取消"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "連接"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 9eead6e8c..517d35d46 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -17,6 +17,24 @@
           "操作"
         ]
       },
+      "EDIT": {
+        "BUTTON_TEXT": "編輯",
+        "TITLE": "Edit webhook",
+        "CANCEL": "取消",
+        "DESC": "Webhook 事件為您提供了有關 Chatwoot 帳戶中發生的事情的即時資訊。請輸入一個有效的URL來配置回呼。",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook 網址",
+            "PLACEHOLDER": "例如：https://example/api/webhook",
+            "ERROR": "請輸入一個有效的 URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+        }
+      },
       "ADD": {
         "CANCEL": "取消操作",
         "TITLE": "建立新的 webhook",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/labelsMgmt.json
index 3e43f2842..efd8ad9ab 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/labelsMgmt.json
@@ -19,7 +19,9 @@
       "NAME": {
         "LABEL": "標籤名稱",
         "PLACEHOLDER": "標籤名稱",
-        "ERROR": "標籤名稱是必填的"
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "描述資訊",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index b808b432e..2e0555c4b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -41,15 +41,15 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "三個月內"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "六個月內"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "去年"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index d5ea67521..c877cc359 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -3,8 +3,8 @@
     "LINK": "個人資料設定",
     "TITLE": "個人資料設定",
     "BTN_TEXT": "更新個人資料",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
-    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "UPDATE_SUCCESS": "你的個人檔案已經成功更新",
+    "PASSWORD_UPDATE_SUCCESS": "你的密碼已成功變更",
     "AFTER_EMAIL_CHANGED": "您的個人資料已成功更新，請在您的登入憑證更改後重新登入",
     "FORM": {
       "AVATAR": "頭像",
@@ -26,17 +26,17 @@
         "NOTE": "如果要構建基於 API 的整合，則可以使用此 token"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
+        "TITLE": "音效通知",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "ENABLE_AUDIO": "Play audio notification when a new conversation is created or new messages arrives"
+        "ENABLE_AUDIO": "當新的對話被建立或收到新訊息時播放音效通知"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "電子信箱通知",
         "NOTE": "在此更新您的電子信箱通知設定",
         "CONVERSATION_ASSIGNMENT": "當對話分配給我時發送電子信箱通知",
         "CONVERSATION_CREATION": "當對話分配給我時發送電子信箱通知",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "CONVERSATION_MENTION": "當你在對話中被提及時以 Email 通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "當被指派的對話中有新訊息時以 Email 通知"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知設定已成功更新",
@@ -47,8 +47,8 @@
         "NOTE": "在此更新您的電子信箱通知設定",
         "CONVERSATION_ASSIGNMENT": "當對話被分配給我時發送推送通知",
         "CONVERSATION_CREATION": "建立新對話時發送推送通知",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "CONVERSATION_MENTION": "當你在對話中被提及時以推播通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "當被指派的對話中有新訊息時以推播通知",
         "HAS_ENABLED_PUSH": "您已啟用此瀏覽器的推送。",
         "REQUEST_PUSH": "啟用推送通知"
       },
@@ -78,6 +78,11 @@
         "ERROR": "請輸入一個有效的電子信箱",
         "PLACEHOLDER": "請輸入您的名字，這將會在對話中顯示"
       },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
       "PASSWORD": {
         "LABEL": "密碼",
         "ERROR": "請輸入長度6或更長的密碼",
@@ -91,7 +96,7 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "改變",
+    "CHANGE_AVAILABILITY_STATUS": "變更",
     "CHANGE_ACCOUNTS": "切換帳戶",
     "SELECTOR_SUBTITLE": "從以下列表中選擇一個帳戶",
     "PROFILE_SETTINGS": "個人資料設定",
@@ -132,6 +137,7 @@
     "CANNED_RESPONSES": "預設回覆",
     "INTEGRATIONS": "整合方式",
     "ACCOUNT_SETTINGS": "帳戶設定",
+    "APPLICATIONS": "Applications",
     "LABELS": "標籤",
     "TEAMS": "團隊"
   },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
index fa4d03f4a..f8177cc7c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
@@ -6,7 +6,7 @@
     "ACCOUNT_NAME": {
       "LABEL": "帳戶名稱",
       "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "ERROR": "帳號名稱過短"
     },
     "FULL_NAME": {
       "LABEL": "姓名",
@@ -15,8 +15,8 @@
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "PLACEHOLDER": "輸入你的工作 Email。例如： bruce@wayne.enterprises",
+      "ERROR": "Email 無效"
     },
     "PASSWORD": {
       "LABEL": "密碼",
@@ -33,6 +33,6 @@
       "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
     },
     "SUBMIT": "送出",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "已經有帳號了嗎？"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
index cf0a7dfaf..f928c1e48 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "建立新團隊",
     "HEADER": "團隊",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>團隊</b></p> <p>團隊讓你將客服依照他們的職責分組。<br /> 一個使用者可以再多個團隊中。你可以將對話指派給一個團隊以協作。 </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "編輯團隊"
@@ -10,7 +10,7 @@
     "CREATE_FLOW": {
       "CREATE": {
         "TITLE": "建立一個新團隊",
-        "DESC": "Add a title and description to your new team."
+        "DESC": "為你的新團隊新增一個標題跟描述"
       },
       "AGENTS": {
         "BUTTON_TEXT": "將客服加入團隊",
@@ -21,7 +21,7 @@
         {
           "title": "建立",
           "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "body": "為客服建立一個新團隊"
         },
         {
           "title": "建立客服",
@@ -38,24 +38,24 @@
     "EDIT_FLOW": {
       "CREATE": {
         "TITLE": "編輯團隊詳細資訊",
-        "DESC": "Edit title and description to your team.",
+        "DESC": "編輯團隊標題及描述",
         "BUTTON_TEXT": "更新團隊"
       },
       "AGENTS": {
         "BUTTON_TEXT": "更新團隊客服",
         "TITLE": "將客服加入團隊 - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "DESC": "為新建立的團隊新增客服，當對話被指派至團隊時，所有加入的客服都會被通知。"
       },
       "WIZARD": [
         {
           "title": "團隊詳細資訊",
           "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "body": "變更名稱、描述及其他詳細資訊。"
         },
         {
           "title": "編輯客服",
           "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "body": "編輯團隊內的客服"
         },
         {
           "title": "完成",
@@ -74,16 +74,16 @@
       "ADD_AGENTS": "正在將客服加入到你的團隊...",
       "SELECT": "選擇",
       "SELECT_ALL": "選取所有客服",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+      "SELECTED_COUNT": "%{total} 中的 %{selected} 個客服被選取"
     },
     "ADD": {
       "TITLE": "將客服加入團隊 - %{teamName}",
-      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "DESC": "將客服新增到新建立的團隊。這會讓你可以用團隊的形式處理對話，也可以取得同一個對話的新事件通知。",
       "SELECT": "選擇",
       "SELECT_ALL": "選取所有克服",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "SELECTED_COUNT": "%{total} 中的 %{selected} 個客服被選取",
       "BUTTON_TEXT": "新增客服",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "至少選擇一個客服"
     },
     "FINISH": {
       "TITLE": "你的團隊已經準備好了",
@@ -98,7 +98,8 @@
       },
       "CONFIRM": {
         "TITLE": "確定要刪除 - %{teamName} ？",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
+        "MESSAGE": "刪除此團隊將會移除已指派給此團隊的對話指派對象",
         "YES": "刪除 ",
         "NO": "取消"
       }
@@ -109,7 +110,7 @@
       "CREATE": "建立團隊",
       "NAME": {
         "LABEL": "團隊名稱",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "PLACEHOLDER": "例如：業務、客戶支援"
       },
       "DESCRIPTION": {
         "LABEL": "團隊描述",
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 775cf0d3b..bf6107a54 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 31bc0eea3..f7a81c155 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index e15395cc1..045db8e3f 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 0189260aa..d054c55ff 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index ea2dd7987..d60d8c142 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -21,7 +21,7 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Neue Nachrichten anzeigen",
     "CLOSE_MESSAGES_BUTTON": "Schließen",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "von",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "Die Datei überschreitet das Limit von {MAXIMUM_FILE_UPLOAD_SIZE} für Anhänge"
+  "FILE_SIZE_LIMIT": "Die Datei überschreitet das Limit von {MAXIMUM_FILE_UPLOAD_SIZE} für Anhänge",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Ungültiges Feld"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index bb678a457..38c5ddbe8 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}"
+  "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Μη έγκυρο πεδίο"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 2ca5d1e9b..8b9663248 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}"
+  "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Campo no válido"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 4b0ddd988..b9dfc62a1 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -10,7 +10,7 @@
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "ما آنلاین هستیم",
-    "OFFLINE": "We are away at the moment"
+    "OFFLINE": "در حال حاضر دردسترس نیستیم"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "معمولاً در عرض چند دقیقه پاسخ می دهند",
@@ -37,19 +37,24 @@
       "FULL_NAME": {
         "LABEL": "نام کامل",
         "PLACEHOLDER": "لطفا نام کامل خود را وارد کنید",
-        "ERROR": "Full Name is required"
+        "ERROR": "نام کامل مورد نیاز است"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ایمیل",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
+        "ERROR": "آدرس ایمیل اشتباه است"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "پیام",
+        "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
+        "ERROR": "پیام بسیار کوتاه است"
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "فیلد نامتعارف"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index de9bd4131..3247f1665 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 0b7146c3c..4a20b723e 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/he.json b/app/javascript/widget/i18n/locale/he.json
new file mode 100644
index 000000000..e96fd3e45
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -0,0 +1,60 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "הורד",
+      "UPLOADING": "מעלה..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "שלח"
+    }
+  },
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "אנחנו אונליין",
+    "OFFLINE": "אנחנו לא זמינים כרגע"
+  },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "זמן מענה טיפוסי תוך כמה דקות",
+    "IN_A_FEW_HOURS": "מענה ממוצע תוך כמה שעות",
+    "IN_A_DAY": "מענה ממוצע לאחר יום"
+  },
+  "START_CONVERSATION": "התחל שיחה",
+  "UNREAD_VIEW": {
+    "VIEW_MESSAGES_BUTTON": "ראה הודעות חדשות",
+    "CLOSE_MESSAGES_BUTTON": "סגור",
+    "COMPANY_FROM": "מ",
+    "BOT": "בוט"
+  },
+  "BUBBLE": {
+    "LABEL": "דבר איתנו"
+  },
+  "POWERED_BY": "מופעל על ידי Chatwoot",
+  "EMAIL_PLACEHOLDER": "הזן בבקשה את האימייל שלך",
+  "CHAT_PLACEHOLDER": "הקלד הודעה",
+  "TODAY": "היום",
+  "YESTERDAY": "אתמול",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "שם מלא",
+        "PLACEHOLDER": "הכנס שם מלא בבקשה",
+        "ERROR": "שם מלא שדה חובה"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "כתובת מייל",
+        "PLACEHOLDER": "הכנס כתובת מייל בבקשה",
+        "ERROR": "כתובת מייל לא חוקית"
+      },
+      "MESSAGE": {
+        "LABEL": "הודעה",
+        "PLACEHOLDER": "הקלד הודעה בבקשה",
+        "ERROR": "הודעה קצרה מדי"
+      }
+    }
+  },
+  "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 4e22e35e6..44a2b5dcf 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 22f124905..74cfdc7ac 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet"
+  "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index 93e85d860..dcfc318a1 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -10,7 +10,7 @@
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "Kami sedang online",
-    "OFFLINE": "We are away at the moment"
+    "OFFLINE": "Kami sedang tidak tersedia saat ini"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "Biasanya membalas dalam beberapa menit",
@@ -21,7 +21,7 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Lihat pesan baru",
     "CLOSE_MESSAGES_BUTTON": "Tutup",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "dari",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 3416fa1dc..4c09e32e1 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 9a6c16832..72c4e1611 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています"
+  "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index 19e31da12..bb39f72cb 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -10,7 +10,7 @@
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "온라인",
-    "OFFLINE": "We are away at the moment"
+    "OFFLINE": "부재중"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "보통 몇 분 안에 응답",
@@ -30,8 +30,8 @@
   "POWERED_BY": "Chatwoot 작동중",
   "EMAIL_PLACEHOLDER": "이메일을 입력해주세요.",
   "CHAT_PLACEHOLDER": "메시지 입력",
-  "TODAY": "Today",
-  "YESTERDAY": "Yesterday",
+  "TODAY": "오늘",
+  "YESTERDAY": "어제",
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
@@ -41,15 +41,20 @@
       },
       "EMAIL_ADDRESS": {
         "LABEL": "이메일 주소",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "이메일을 입력해주세요.",
+        "ERROR": "잘못된 이메일 주소입니다."
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "메시지",
+        "PLACEHOLDER": "메시지를 입력해 주세요.",
+        "ERROR": "너무 짧은 메시지"
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index a049fc670..ba2a3bdfd 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index 541e859c3..22630b1a3 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index d2934d7c7..fae7eaeb9 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 9454bafc5..e02922553 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 22a2f6bd6..5ce508068 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika"
+  "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index e6cc0dd70..003150e6e 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 404f75f3b..1a5d6fcc7 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -21,7 +21,7 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
     "CLOSE_MESSAGES_BUTTON": "Fechar",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "De",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}"
+  "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Campo inválido"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index f64451399..bb4c86e0d 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 4c91a2783..adbd559a9 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}"
+  "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Неверное поле"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 4e22e35e6..44a2b5dcf 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 2947e8db0..0c6d7654f 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index 0a9527cd7..cf46e6b7e 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 87c601143..aed719778 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index 3088e332d..0b1d12cad 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index 328977c54..3cfbec0a8 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 95bcea754..f8fde56bd 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index 61018995a..de9c86462 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -51,5 +51,10 @@
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index 21e78e4e6..fda7c62ea 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -19,7 +19,7 @@
   },
   "START_CONVERSATION": "開始對話",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "VIEW_MESSAGES_BUTTON": "查看新訊息",
     "CLOSE_MESSAGES_BUTTON": "關閉",
     "COMPANY_FROM": "from",
     "BOT": "機器人"
@@ -47,9 +47,14 @@
       "MESSAGE": {
         "LABEL": "訊息",
         "PLACEHOLDER": "請輸入你的訊息",
-        "ERROR": "Message too short"
+        "ERROR": "訊息過短"
       }
     }
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit"
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  }
 }
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index bf4d9857d..15e4b4da4 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -32,7 +32,8 @@ LANGUAGES_CONFIG = {
   27 => { name: 'Svenska (sv)', iso_639_3_code: 'swe', iso_639_1_code: 'sv', enabled: true },
   28 => { name: 'magyar nyelv (hu)', iso_639_3_code: 'hun', iso_639_1_code: 'hu', enabled: true },
   29 => { name: 'norsk (no)', iso_639_3_code: 'nor', iso_639_1_code: 'no', enabled: true },
-  30 => { name: '中文 (zh-CN)', iso_639_3_code: 'zho', iso_639_1_code: 'zh_CN', enabled: true }
+  30 => { name: '中文 (zh-CN)', iso_639_3_code: 'zho', iso_639_1_code: 'zh_CN', enabled: true },
+  31 => { name: 'język polski (pl)', iso_639_3_code: 'pol', iso_639_1_code: 'pl', enabled: true }
 }.filter { |_key, val| val[:enabled] }.freeze
 
 Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 173f7dfc0..df67dfd57 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -78,4 +78,7 @@ ar:
       description: "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. يمكنك استخدام خاصية الـ Webhook لإيصال الأحداث إلى تطبيقاتك المفضلة مثل Slack أو Github. انقر على \"تهيئة\" لإعداد الـ Webhooks الخاصة بك."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index b1e668cff..ce64fa910 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -78,4 +78,7 @@ ca:
       description: "Els esdeveniments de Webhook us proporcionen informació en temps real sobre el que passa al vostre compte de Chatwoot. Podeu utilitzar els webhooks per comunicar els esdeveniments a les vostres aplicacions preferides com Slack o Github. Feu clic a Configura per configurar els enllaços web."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index c89ae1d28..8a5340eea 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -78,4 +78,7 @@ cs:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2e44e61fc..2a2571850 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -78,4 +78,7 @@ da:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7e3effdb4..54e0f04cb 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -78,4 +78,7 @@ de:
       description: "Webhook-Ereignisse bieten Ihnen Echtzeitinformationen darüber, was in Ihrem Chatwoot-Konto passiert. Sie können die Webhooks verwenden, um die Ereignisse an Ihre Lieblings-Apps wie Slack oder Github zu kommunizieren. Klicken Sie auf Konfigurieren, um Ihre Webhooks einzurichten."
     dialogflow:
       name: "Dialogflow"
-      description: "Schließen Sie Ihren Dialogflow-Bot an Ihren Posteingang an. Lassen Sie die Bots die Abfragen bearbeiten, bevor Sie ihn an den Kundendienst-Agent übergeben."
+      description: "Erstellen Sie Chatbots mit Dialogflow und verbinden Sie diesen mit Ihrem Posteingang. Lassen Sie die Bots Anfragen bearbeiten, bevor Sie an einen Kundendienst-Agent weitergeben werden."
+    fullcontact:
+      name: "Vollständiger Kontakt"
+      description: "Die vollständige Kontakt-Integration hilft die Besucherprofile zu erweitern. Identifizieren Sie die Benutzer, sobald diese ihre E-Mail-Adresse speichern um Ihnen maßgeschneiderten Kundenservice anbieten. Verbinden Sie einen Kontakt mit Ihrem Konto, indem Sie den Kontakt-API-Schlüssel freigeben."
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
new file mode 100644
index 000000000..ac39c33ae
--- /dev/null
+++ b/config/locales/devise.he.yml
@@ -0,0 +1,63 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+he:
+  devise:
+    confirmations:
+      confirmed: "כתובת המייל שלך אושרה בהצלחה."
+      send_instructions: "אתה תקבל הוראות לאישרור המייל לתיבת המייל שלך תוך כמה דקות."
+      send_paranoid_instructions: "אם המייל שלך רשום אצלינו, אתה תקבל מייל עם הוראות לאישרור כתובת המייל שלך תוך כמה דקות."
+    failure:
+      already_authenticated: "אתה כבר רשום."
+      inactive: "החשבון שלך עוד לא הופעל."
+      invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation Instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        two: "%{count} errors prohibited this %{resource} from being saved:"
+        many: "%{count} errors prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 67d75369f..fd8797c3b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -79,3 +79,6 @@ el:
     dialogflow:
       name: "Dialogflow"
       description: "Συνδέστε το Dialogflow bot στα εισερχόμενά σας. Αφήστε τα bots να χειριστούν τα ερωτήματα πριν τα παραδώσουν στον πράκτορα εξυπηρέτησης πελατών."
+    fullcontact:
+      name: "Πλήρης Επαφή"
+      description: "Το FullContact Indegration βοηθά στον εμπλουτισμό προφίλ επισκεπτών. Προσδιορίστε τους χρήστες μόλις μοιραστούν τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους και να τους προσφέρουν προσαρμοσμένη εξυπηρέτηση πελατών. Συνδέστε το FullContact με το λογαριασμό σας, κοινοποιώντας το κλειδί API FullContact."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d767c6564..1a2fd3e22 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -78,4 +78,7 @@ es:
       description: "Los eventos Webhook le proporcionan información en tiempo real sobre lo que está sucediendo en su cuenta de Chatwoot. Puede hacer uso de los webhooks para comunicar los eventos a sus aplicaciones favoritas como Slack o Github. Haga clic en Configurar para configurar sus webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Conecte su bot de Dialogflow a su bandeja de entrada. Deje que los bots manejen las preguntas antes de entregarlo al agente de servicio al cliente."
+      description: "Construya chatboots usando Dialogflow y conéctelos rápidamente a su bandeja de entrada. Permita que los bots gestionen las preguntas and de que pasen a los agentes de servicio al cliente."
+    fullcontact:
+      name: "Nombre completo"
+      description: "La integración con FullContact enriquece los perfiles de los visitantes. Identifique a los usuarios tan pronto compartan la dirección de correo electrónico y ofrezca un servicio al cliente personalizado. Conecte su cuenta de FullContact usando al clave de la API."
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c54f88eee..fe4d296c9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -30,7 +30,7 @@ fa:
   reports:
     period: زمان گزارش از %{since} تا %{until}
     agent_csv:
-      agent_name: Agent name
+      agent_name: اسم اپراتور
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
@@ -78,4 +78,7 @@ fa:
       description: "رویدادهای Webhook اطلاعات واقعی در مورد آنچه در حساب شما اتفاق می افتد را به شما ارائه می دهند. برای برقراری ارتباط رویدادها با برنامه های مورد علاقه خود مانند Slack یا Github می توانید از وب بوک ها استفاده کنید. برای تنظیم webhooks خود روی تنظیمات کلیک کنید."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f4e8acc24..ccaf7f360 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -78,4 +78,7 @@ fi:
       description: "Webhook-tapahtumat antavat sinulle reaaliaikaista tietoa siitä, mitä Chatwoot-tililläsi tapahtuu. Voit käyttää webhookeja ja välittää tapahtumat suosikkiohjelmillesi, kuten Slackiin tai Githubiiin. Klikkaa \"Määrittele\" määrittääksesi webhookisi."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index be61cd964..ce91d0f14 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -78,4 +78,7 @@ fr:
       description: "Les événements Webhook vous fournissent des informations en temps réel sur ce qui se passe dans votre compte. Vous pouvez utiliser les webhooks pour communiquer les événements à vos applications préférées comme Slack ou Github. Cliquez sur Configurer pour configurer vos webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/he.yml b/config/locales/he.yml
new file mode 100644
index 000000000..f9522338a
--- /dev/null
+++ b/config/locales/he.yml
@@ -0,0 +1,84 @@
+#Files in the config/locales directory are used for internationalization
+#and are automatically loaded by Rails. If you want to use locales other
+#than English, add the necessary files in this directory.
+#To use the locales, use `I18n.t`:
+#I18n.t 'hello'
+#In views, this is aliased to just `t`:
+#<%= t('hello') %>
+#To use a different locale, set it with `I18n.locale`:
+#I18n.locale = :es
+#This would use the information in config/locales/es.yml.
+#The following keys must be escaped otherwise they will not be retrieved by
+#the default I18n backend:
+#true, false, on, off, yes, no
+#Instead, surround them with single quotes.
+#en:
+#'true': 'foo'
+#To learn more, please read the Rails Internationalization guide
+#available at https://guides.rubyonrails.org/i18n.html.
+he:
+  hello: "שלום עולם"
+  messages:
+    reset_password_success: יאס! בקשה לאיפוס ססמה נשלחה בהצלחה. בדוק תיבת מייל להוראות.
+    reset_password_failure: אופס! לא מצאנו משתמש עם המייל שצוין.
+  errors:
+    signup:
+      disposable_email: אנחנו לא מאפשרים מיילים חד פעמיים
+      invalid_email: הכנסת מייל לא תקין
+      email_already_exists: "כבר נרשמת לחשבון עם %{email}"
+      failed: הרשמה נכשלה
+  reports:
+    period: Reporting period %{since} to %{until}
+    agent_csv:
+      agent_name: Agent name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+  notifications:
+    notification_title:
+      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
+      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
+      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
+      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+  conversations:
+    messages:
+      deleted: This message was deleted
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+        bot: "Conversation was transferred to bot by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+      assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
+    templates:
+      greeting_message_body: "%{account_name} typically replies in a few hours."
+      ways_to_reach_you_message_body: "Give the team a way to reach you."
+      email_input_box_message_body: "Get notified by email"
+    reply:
+      email_subject: "New messages on this conversation"
+      transcript_subject: "Conversation Transcript"
+  integration_apps:
+    slack:
+      name: "Slack"
+      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+    webhooks:
+      name: "Webhooks"
+      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+    dialogflow:
+      name: "Dialogflow"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index e95095e69..47e62700a 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -78,4 +78,7 @@ hi:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 39fba0317..74e9033b2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -78,4 +78,7 @@ hu:
       description: "A Webhook események valós idejű információt adnak arról, hogy mi történik a fiókodban. Webhookokat használhatsz arra, hogy az eseményeket a kedvenc appjaidban, pl. a Slackben vagy a Githubban használd. Kattints hogy beállíthast a Webhookjaidat."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 17a3dafd0..d8718e188 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -30,10 +30,10 @@ id:
   reports:
     period: Periode pelaporan %{since} hingga %{until}
     agent_csv:
-      agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      agent_name: Nama agen
+      conversations_count: Jumlah percakapan
+      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
+      avg_resolution_time: Rata-rata waktu resolusi (Menit)
   notifications:
     notification_title:
       conversation_creation: "[Percakapan baru] - #%{display_id} telah dibuat di %{inbox_name}"
@@ -47,7 +47,7 @@ id:
       status:
         resolved: "Percakapan ditandai selesai oleh %{user_name}"
         open: "Percakapan telah dibuka kembali oleh %{user_name}"
-        bot: "Conversation was transferred to bot by %{user_name}"
+        bot: "Percakapan ditransfer ke bot oleh %{user_name}"
         auto_resolved: "Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{duration} hari"
       assignee:
         self_assigned: "%{user_name} menetapkan sendiri percakapan ini"
@@ -55,8 +55,8 @@ id:
         removed: "Percakapan batal ditetapkan oleh %{user_name}"
       team:
         assigned: "Ditugaskan ke %{team_name} oleh %{user_name}"
-        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
-        removed: "Unassigned from %{team_name} by %{user_name}"
+        assigned_with_assignee: "Ditugaskan ke %{assignee_name} melalui %{team_name} oleh %{user_name}"
+        removed: "Dibebastugaskan dari %{team_name} oleh %{user_name}"
       labels:
         added: "%{user_name} menambahkan %{labels}"
         removed: "%{user_name} menghapus %{labels}"
@@ -78,4 +78,7 @@ id:
       description: "Webhook event memberi Anda informasi realtime tentang apa yang terjadi di akun Anda. Anda dapat menggunakan webhook untuk mengkomunikasikan acara ke aplikasi favorit Anda seperti Slack atau GitHub. Klik Konfigurasi untuk mengatur webhook Anda."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2f3a35229..71c6e5dd2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -78,4 +78,7 @@ it:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2363623c9..3f78cef21 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -78,4 +78,7 @@ ja:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3855ac9bb..0003ac300 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -64,8 +64,8 @@ ko:
       unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
-      ways_to_reach_you_message_body: "Give the team a way to reach you."
-      email_input_box_message_body: "Get notified by email"
+      ways_to_reach_you_message_body: "저희가 연락드릴 방법을 알려주세요."
+      email_input_box_message_body: "이메일로 연락받기"
     reply:
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
@@ -78,4 +78,7 @@ ko:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index f0468010e..2ab817f9d 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -78,4 +78,7 @@ ml:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 99d2afd98..91970c298 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -78,4 +78,7 @@ ne:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 76c42c075..4130041b0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -78,4 +78,7 @@ nl:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d8a99d271..cf041e5f1 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -78,4 +78,7 @@
       description: "Webhook-hendelser gir deg sanntidsinformasjon om hva som skjer med kontoen din. Du kan bruke webhooks for å sende hendelsene til favorittappene dine, som Slack eller Github. Klikk på Konfigurer for å sette opp webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 38fada5d3..4bca06934 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -78,4 +78,7 @@ pl:
       description: "Webhooki dostarczają informacji o tym, co dzieje się na Twoim koncie do usług zewnętrznych. Możesz wykorzystać webhooki do przekazywania wydarzeń do ulubionych aplikacji, takich jak Slack lub Github. Kliknij na Konfiguruj, aby skonfigurować webhooki."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index dc41ca866..0c84171b9 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -78,4 +78,7 @@ pt:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index a05d1400a..adf67c14d 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -77,5 +77,8 @@ pt_BR:
       name: "Webhooks"
       description: "Webhooks fornecem informações em tempo real sobre o que está acontecendo em sua conta. Você pode usar os webhooks para comunicar eventos com seus aplicativos favoritos como Slack ou Github. Clique em Configurar para configurar seus webhooks."
     dialogflow:
-      name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      name: "Fluxo de diálogo"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    fullcontact:
+      name: "Contato completo"
+      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."
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 17d69bea5..6449fa303 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -78,4 +78,7 @@ ro:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ff3f8693c..8762cc471 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -78,4 +78,7 @@ ru:
       description: "События webhook позволяют получать информацию о происходящем в вашем аккаунте в реальном времени. Вы можете использовать webhook в связке с вашими приложениями, такими как Slack или Github. Нажмите на Настроить для настройки webhook."
     dialogflow:
       name: "Диалог"
-      description: "Подключите бот к диалогам вашего канала. Предоставьте ботам доступ к обработке запросов, прежде чем для предварительного общения с вашими операторами."
+      description: "Создавайте чатботы используя Dialogflow и быстро подключайте их к входящим каналам. Пусть боты обрабатывают запросы, прежде чем передать их агенту по обслуживанию клиентов."
+    fullcontact:
+      name: "Полная карточка контакта"
+      description: "Интеграция с FullContact помогает получить всю информацию о профиле посетителей. Определяйте пользователей как только они поделится своим электронным адресом и предложите им индивидуальное обслуживание клиентов. Подключите ваш FullContact к своей учетной записи, поделившись API ключом FullContact."
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 536a7ee66..2fee5e528 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -78,4 +78,7 @@ sk:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7f79452e4..83a198290 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -78,4 +78,7 @@ sv:
       description: "Webhook-händelser ger dig realtidsinformation om vad som händer i ditt konto. Du kan använda webhooks för att kommunicera händelser till dina favoritappar som Slack eller Github. Klicka på Konfigurera för att konfigurera dina webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 7f9426cfc..96f7f7302 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -78,4 +78,7 @@ ta:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 033ad1621..277f8826c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -78,4 +78,7 @@ th:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1f57cc436..29fcaa07c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -78,4 +78,7 @@ tr:
       description: "Webhook olayları size hesabınızda gerçekleşen gerçek zamanlı bilgileri getirmenizi sağlar. Bu webhookları kullanarak olaylar ile favori uygulamalarınızı haberleştirebilirsiniz(ör: Slack , \n Github). Yapılandıra basarak webhooklarınızı ayarlayabilirsiniz."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index df363f271..c205a8328 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -78,4 +78,7 @@ uk:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 6e05c3011..fdd538e19 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -78,4 +78,7 @@ vi:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 6caff7a98..57c94886e 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -78,4 +78,7 @@ zh_CN:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index cc2f1bdd5..3cda18b9d 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -36,39 +36,39 @@ zh_TW:
       avg_resolution_time: 平均解決時間（分鐘）
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[新對話] - #%{display_id} 已經在 %{inbox_name} 中被建立"
+      conversation_assignment: "[已指派給你] - #%{display_id} 已經被指派給你"
+      assigned_conversation_new_message: "[新訊息] - #%{display_id} %{content}"
+      conversation_mention: "你在對話 %{name} 的 [ID - %{display_id}] 中被提及"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: 訊息已被刪除
     activity:
       status:
         resolved: "被%{user_name}標記的對話已解決。"
         open: "被%{user_name}恢復對話。"
-        bot: "Conversation was transferred to bot by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        bot: "對話已經被 %{user_name} 轉換至機器人模式"
+        auto_resolved: "由於對話已經 %{duration} 天沒有新活動，已經被系統標記為完成"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
+        self_assigned: "%{user_name} 將對話指派給自己"
         assigned: "被%{user_name}分配給%{assignee_name}。"
         removed: "對話被%{user_name}設定成未分配。"
       team:
         assigned: "被%{user_name}分配給%{team_name}。"
         assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
-        removed: "Unassigned from %{team_name} by %{user_name}"
+        removed: "被 %{user_name} 從 %{team_name} 解除指派"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} 新增了 %{labels}"
+        removed: "%{user_name} 移除了 %{labels}"
+      muted: "%{user_name} 已將對話靜音"
+      unmuted: "%{user_name} 將對話解除靜音"
     templates:
-      greeting_message_body: "%{account_name} typically replies in a few hours."
+      greeting_message_body: "%{account_name} 通常在幾小時內回覆"
       ways_to_reach_you_message_body: "給個聯繫方式讓團隊可以聯繫到您。"
       email_input_box_message_body: "透過電子郵件得到通知。"
     reply:
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+      email_subject: "在對話中的新訊息"
+      transcript_subject: "對話紀錄"
   integration_apps:
     slack:
       name: "Slack"
@@ -78,4 +78,7 @@ zh_TW:
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
     dialogflow:
       name: "Dialogflow"
-      description: "Connect your Dialogflow bot to your inbox. Let the bots handle the queries before handing it off to the customer service agent."
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    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."

From a0331b40d42d7dd0c38e2ac3cd4c3e7f49f42c1f Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Tue, 15 Jun 2021 23:20:28 +0530
Subject: [PATCH 67/67] Bump version to 1.17.0

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 55461cba8..258359fd5 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '1.16.2'
+  version: '1.17.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index cb6b4fa42..501cec447 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/javascript --fix",