From 01363042ce1b54798bc4f8c5311662836d799842 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Thu, 6 Nov 2025 20:44:59 -0800
Subject: [PATCH] fix: Handle login when there are no accounts (#12816)

---
 app/javascript/dashboard/App.vue              | 13 -------
 .../dashboard/i18n/locale/en/settings.json    |  6 +++
 .../routes/dashboard/dashboard.routes.js      |  6 +++
 .../routes/dashboard/noAccounts/Index.vue     | 39 +++++++++++++++++++
 app/javascript/dashboard/routes/index.js      | 13 ++++++-
 5 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 0fcb8c9fe..a63cb1a90 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -1,6 +1,5 @@
 <script>
 import { mapGetters } from 'vuex';
-import AddAccountModal from './components/app/AddAccountModal.vue';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
@@ -25,7 +24,6 @@ export default {
   name: 'App',
 
   components: {
-    AddAccountModal,
     LoadingState,
     NetworkNotification,
     UpdateBanner,
@@ -51,7 +49,6 @@ export default {
   },
   data() {
     return {
-      showAddAccountModal: false,
       latestChatwootVersion: null,
       reconnectService: null,
     };
@@ -64,21 +61,12 @@ export default {
       authUIFlags: 'getAuthUIFlags',
       accountUIFlags: 'accounts/getUIFlags',
     }),
-    hasAccounts() {
-      const { accounts = [] } = this.currentUser || {};
-      return accounts.length > 0;
-    },
     hideOnOnboardingView() {
       return !isOnOnboardingView(this.$route);
     },
   },
 
   watch: {
-    currentUser() {
-      if (!this.hasAccounts) {
-        this.showAddAccountModal = true;
-      }
-    },
     currentAccountId: {
       immediate: true,
       handler() {
@@ -156,7 +144,6 @@ export default {
         <component :is="Component" />
       </transition>
     </router-view>
-    <AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
     <WootSnackbarBox />
     <NetworkNotification />
   </div>
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 072ebf013..50cf38b58 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -251,6 +251,12 @@
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    },
+    "NO_ACCOUNTS": {
+      "TITLE": "No account found",
+      "MESSAGE_CLOUD": "You are not part of any accounts right now. If you think this is a mistake, please reach out to our support team.",
+      "MESSAGE_SELF_HOSTED": "You are not part of any accounts right now. Please reach out to your administrator.",
+      "LOGOUT": "Log out"
     }
   },
   "COMPONENTS": {
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index a36d00a42..5d27d6e49 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -10,6 +10,7 @@ import campaignsRoutes from './campaigns/campaigns.routes';
 import { routes as captainRoutes } from './captain/captain.routes';
 import AppContainer from './Dashboard.vue';
 import Suspended from './suspended/Index.vue';
+import NoAccounts from './noAccounts/Index.vue';
 
 export default {
   routes: [
@@ -36,5 +37,10 @@ export default {
       },
       component: Suspended,
     },
+    {
+      path: frontendURL('no-accounts'),
+      name: 'no_accounts',
+      component: NoAccounts,
+    },
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue b/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue
new file mode 100644
index 000000000..2df89e58f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/noAccounts/Index.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useMapGetter } from 'dashboard/composables/store';
+import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import Auth from 'dashboard/api/auth';
+
+const { t } = useI18n();
+const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
+
+const message = computed(() => {
+  if (isOnChatwootCloud.value) {
+    return t('APP_GLOBAL.NO_ACCOUNTS.MESSAGE_CLOUD');
+  }
+  return t('APP_GLOBAL.NO_ACCOUNTS.MESSAGE_SELF_HOSTED');
+});
+
+const handleLogout = () => {
+  Auth.logout();
+};
+</script>
+
+<template>
+  <div
+    class="flex flex-col flex-1 items-center justify-center w-full h-full gap-6 bg-n-slate-2"
+  >
+    <EmptyState
+      :title="$t('APP_GLOBAL.NO_ACCOUNTS.TITLE')"
+      :message="message"
+    />
+    <NextButton
+      variant="smooth"
+      color-scheme="secondary"
+      :label="$t('APP_GLOBAL.NO_ACCOUNTS.LOGOUT')"
+      @click="handleLogout"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index e69d0b5ad..27465eb39 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -18,8 +18,17 @@ export const validateAuthenticateRoutePermission = (to, next) => {
     return '';
   }
 
-  if (!to.name) {
-    return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+  const { accounts = [], account_id: accountId } = user;
+
+  if (!accounts.length) {
+    if (to.name === 'no_accounts') {
+      return next();
+    }
+    return next(frontendURL('no-accounts'));
+  }
+
+  if (to.name === 'no_accounts' || !to.name) {
+    return next(frontendURL(`accounts/${accountId}/dashboard`));
   }
 
   const nextRoute = validateLoggedInRoutes(to, store.getters.getCurrentUser);