From 7a3544ba99c535c4f06528e9ec7a1392538f69c2 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Tue, 4 Nov 2025 16:04:28 -0300
Subject: [PATCH] chore: remove zapi feature flag (#132)

---
 app/javascript/dashboard/featureFlags.js        |  1 -
 .../settings/inbox/channels/BaileysWhatsapp.vue |  8 +-------
 .../settings/inbox/channels/CloudWhatsapp.vue   | 11 +----------
 .../settings/inbox/channels/Twilio.vue          | 11 +----------
 .../settings/inbox/channels/Whatsapp.vue        | 17 ++++-------------
 config/features.yml                             |  3 ---
 .../incoming_message_baileys_service_spec.rb    |  2 +-
 7 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 34214ae47..87227e74b 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -41,7 +41,6 @@ export const FEATURE_FLAGS = {
   CAPTAIN_V2: 'captain_integration_v2',
   SAML: 'saml',
   QUOTED_EMAIL_REPLY: 'quoted_email_reply',
-  CHANNEL_ZAPI: 'channel_zapi',
 };
 
 export const PREMIUM_FEATURES = [
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
index 8bd8fe836..c0fb4cac5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
@@ -12,13 +12,10 @@ import { isValidURL } from '../../../../../helper/URLHelper';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import Switch from 'dashboard/components-next/switch/Switch.vue';
 import PromoBanner from 'dashboard/components-next/banner/PromoBanner.vue';
-import { usePolicy } from 'dashboard/composables/usePolicy';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 const router = useRouter();
 const store = useStore();
 const { t } = useI18n();
-const { isFeatureFlagEnabled } = usePolicy();
 
 const inboxName = ref('');
 const phoneNumber = ref('');
@@ -99,10 +96,7 @@ const switchToZapi = () => {
 
 <template>
   <form class="flex flex-wrap mx-0" @submit.prevent="createChannel()">
-    <div
-      v-if="isFeatureFlagEnabled(FEATURE_FLAGS.CHANNEL_ZAPI)"
-      class="w-full mb-6"
-    >
+    <div class="w-full mb-6">
       <PromoBanner
         :title="$t('INBOX_MGMT.ADD.WHATSAPP.ZAPI_PROMO.SWITCH_BANNER.TITLE')"
         :description="
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
index 44c558acd..86692e819 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
@@ -8,7 +8,6 @@ import { isPhoneE164OrEmpty, isNumber } from 'shared/helpers/Validators';
 
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import PromoBanner from 'dashboard/components-next/banner/PromoBanner.vue';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 export default {
   components: {
@@ -30,15 +29,7 @@ export default {
   computed: {
     ...mapGetters({
       uiFlags: 'inboxes/getUIFlags',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
-      accountId: 'getCurrentAccountId',
     }),
-    isZapiEnabled() {
-      return this.isFeatureEnabledonAccount(
-        this.accountId,
-        FEATURE_FLAGS.CHANNEL_ZAPI
-      );
-    },
   },
   validations: {
     inboxName: { required },
@@ -98,7 +89,7 @@ export default {
 
 <template>
   <form class="flex flex-wrap flex-col mx-0" @submit.prevent="createChannel()">
-    <div v-if="isZapiEnabled" class="mb-6">
+    <div class="mb-6">
       <PromoBanner
         :title="$t('INBOX_MGMT.ADD.WHATSAPP.ZAPI_PROMO.SWITCH_BANNER.TITLE')"
         :description="
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
index fd4e7e6f7..fb5e640b0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
@@ -9,7 +9,6 @@ import NextButton from 'dashboard/components-next/button/Button.vue';
 import PromoBanner from 'dashboard/components-next/banner/PromoBanner.vue';
 import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 export default {
   components: {
@@ -41,8 +40,6 @@ export default {
   computed: {
     ...mapGetters({
       uiFlags: 'inboxes/getUIFlags',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
-      accountId: 'getCurrentAccountId',
     }),
     authTokeni18nKey() {
       return this.useAPIKey ? 'API_KEY_SECRET' : 'AUTH_TOKEN';
@@ -50,12 +47,6 @@ export default {
     isWhatsApp() {
       return this.type === 'whatsapp';
     },
-    isZapiEnabled() {
-      return this.isFeatureEnabledonAccount(
-        this.accountId,
-        FEATURE_FLAGS.CHANNEL_ZAPI
-      );
-    },
   },
   validations() {
     let validations = {
@@ -139,7 +130,7 @@ export default {
 
 <template>
   <form class="flex flex-wrap flex-col mx-0" @submit.prevent="createChannel()">
-    <div v-if="isWhatsApp && isZapiEnabled" class="mb-6">
+    <div v-if="isWhatsApp" class="mb-6">
       <PromoBanner
         :title="$t('INBOX_MGMT.ADD.WHATSAPP.ZAPI_PROMO.SWITCH_BANNER.TITLE')"
         :description="
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index 673ff66f8..d9a88069d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -10,13 +10,10 @@ import ChannelSelector from 'dashboard/components/ChannelSelector.vue';
 import BaileysWhatsapp from './BaileysWhatsapp.vue';
 import ZapiWhatsapp from './ZapiWhatsapp.vue';
 import PromoBanner from 'dashboard/components-next/banner/PromoBanner.vue';
-import { usePolicy } from 'dashboard/composables/usePolicy';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const { isFeatureFlagEnabled } = usePolicy();
 
 const PROVIDER_TYPES = {
   WHATSAPP: 'whatsapp',
@@ -62,16 +59,13 @@ const availableProviders = computed(() => {
       description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS_DESC'),
       icon: 'i-woot-baileys',
     },
-  ];
-
-  if (isFeatureFlagEnabled(FEATURE_FLAGS.CHANNEL_ZAPI)) {
-    providers.push({
+    {
       key: PROVIDER_TYPES.ZAPI,
       title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI'),
       description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI_DESC'),
       icon: 'i-woot-zapi',
-    });
-  }
+    },
+  ];
 
   return providers;
 });
@@ -119,10 +113,7 @@ const handleManualLinkClick = () => {
         />
       </div>
 
-      <div
-        v-if="isFeatureFlagEnabled(FEATURE_FLAGS.CHANNEL_ZAPI)"
-        class="mt-6 relative overflow-visible"
-      >
+      <div class="mt-6 relative overflow-visible">
         <img
           src="~dashboard/assets/images/curved-arrow.svg"
           alt=""
diff --git a/config/features.yml b/config/features.yml
index 988a0ecce..feac71d68 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -222,6 +222,3 @@
   chatwoot_internal: true
 - name: quoted_email_reply
   display_name: Quoted Email Reply
-- name: channel_zapi
-  display_name: Z-API Channel
-  enabled: false
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 9130f9dcc..db3b4f409 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -722,7 +722,7 @@ describe Whatsapp::IncomingMessageBaileysService do
       end
 
       context 'when processing multiple messages' do
-        it 'creates separate contacts and conversations for each message' do # rubocop:disable RSpec/ExampleLength
+        it 'creates separate contacts and conversations for each message' do
           raw_message1 = {
             key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
             pushName: 'John Doe',