From 9b58e8940a11cb145af902ab793d3b265898c709 Mon Sep 17 00:00:00 2001
From: Muhsin <12408980+muhsin-k@users.noreply.github.com>
Date: Sun, 12 Jul 2026 15:37:36 +0400
Subject: [PATCH] chore: improve the error message

---
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  1 +
 .../inbox/channels/WhatsappManualSetup.vue    | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 06de925f5..77fb40565 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -384,6 +384,7 @@
           "ERRORS": {
             "IDS_REQUIRED": "Enter the Phone Number ID and WhatsApp Business Account ID.",
             "REQUIRED": "Enter the WABA ID, Phone Number ID, and permanent access token.",
+            "INVALID_TOKEN": "This access token is invalid or expired. Generate a new permanent token and try again.",
             "GENERIC": "We could not complete the WhatsApp setup. Check your details and try again."
           }
         },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue
index a70714520..ff376cfff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue
@@ -133,9 +133,14 @@ const statusRows = computed(() => [
   },
 ]);
 
-const apiErrorMessage = error =>
-  error.response?.data?.message ||
-  t('INBOX_MGMT.ADD.WHATSAPP.MANUAL_SETUP.ERRORS.GENERIC');
+const apiErrorMessage = error => {
+  const message = error.response?.data?.message || '';
+  if (/invalid oauth access token|cannot parse access token/i.test(message)) {
+    return t('INBOX_MGMT.ADD.WHATSAPP.MANUAL_SETUP.ERRORS.INVALID_TOKEN');
+  }
+
+  return message || t('INBOX_MGMT.ADD.WHATSAPP.MANUAL_SETUP.ERRORS.GENERIC');
+};
 
 const setStep = step => {
   errorMessage.value = '';
@@ -315,7 +320,7 @@ onBeforeUnmount(() => {
       </div>
 
       <div
-        v-if="errorMessage"
+        v-if="errorMessage && currentStep !== 3"
         class="mt-6 rounded-lg border border-n-ruby-5 bg-n-ruby-3 px-4 py-3 text-sm text-n-ruby-11"
       >
         {{ errorMessage }}
@@ -592,6 +597,9 @@ onBeforeUnmount(() => {
                   'INBOX_MGMT.ADD.WHATSAPP.MANUAL_SETUP.DETAILS.TOKEN_PLACEHOLDER'
                 )
               "
+              :message="errorMessage"
+              message-type="error"
+              @update:model-value="errorMessage = ''"
             />
             <Button
               :label="
@@ -609,7 +617,10 @@ onBeforeUnmount(() => {
               @click="showAccessToken = !showAccessToken"
             />
           </div>
-          <p class="mt-3 flex items-start gap-2 text-sm text-n-amber-11">
+          <p
+            v-if="!errorMessage"
+            class="mt-3 flex items-start gap-2 text-sm text-n-amber-11"
+          >
             <Icon icon="i-lucide-triangle-alert" class="mt-0.5 shrink-0" />
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.MANUAL_SETUP.TOKEN.WARNING') }}
           </p>