Merge branch 'develop' into feat/v5-ui-redesign

app/javascript/dashboard/components/widgets/ChannelItem.vue

@@ -23,6 +23,10 @@ const hasInstagramConfigured = computed(() => {
   return window.chatwootConfig?.instagramAppId;
 });
 
+const hasTiktokConfigured = computed(() => {
+  return window.chatwootConfig?.tiktokAppId;
+});
+
 const isActive = computed(() => {
   const { key } = props.channel;
   if (Object.keys(props.enabledFeatures).length === 0) {
@@ -44,6 +48,10 @@ const isActive = computed(() => {
     );
   }
 
+  if (key === 'tiktok') {
+    return props.enabledFeatures.channel_tiktok && hasTiktokConfigured.value;
+  }
+
   if (key === 'voice') {
     return props.enabledFeatures.channel_voice;
   }
@@ -57,6 +65,7 @@ const isActive = computed(() => {
     'telegram',
     'line',
     'instagram',
+    'tiktok',
     'voice',
   ].includes(key);
 });

app/javascript/dashboard/components/widgets/conversation/MessagesView.vue

@@ -121,6 +121,7 @@ const {
   isAnInstagramChannel,
   is360DialogWhatsAppChannel,
   isAnEmailChannel,
+  isATiktokChannel,
 } = useInbox();
 
 const inboxHasFeature = feature => {
@@ -213,6 +214,9 @@ const replyWindowLink = computed(() => {
   if (isAWhatsAppCloudChannel.value) {
     return REPLY_POLICY.WHATSAPP_CLOUD;
   }
+  if (isATiktokChannel.value) {
+    return REPLY_POLICY.TIKTOK;
+  }
   if (!isAPIInbox.value) {
     return REPLY_POLICY.TWILIO_WHATSAPP;
   }
@@ -227,6 +231,9 @@ const replyWindowLinkText = computed(() => {
   ) {
     return t('CONVERSATION.24_HOURS_WINDOW');
   }
+  if (isATiktokChannel.value) {
+    return t('CONVERSATION.48_HOURS_WINDOW');
+  }
   if (!isAPIInbox.value) {
     return t('CONVERSATION.TWILIO_WHATSAPP_24_HOURS_WINDOW');
   }

app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue

@@ -234,6 +234,9 @@ export default {
       if (this.isAnInstagramChannel) {
         return MESSAGE_MAX_LENGTH.INSTAGRAM;
       }
+      if (this.isATiktokChannel) {
+        return MESSAGE_MAX_LENGTH.TIKTOK;
+      }
       if (this.isATwilioWhatsAppChannel) {
         return MESSAGE_MAX_LENGTH.TWILIO_WHATSAPP;
       }