fix(send): stop Send dashboard self-closing when opened from accounts dashboard (#945)

ProfileView auto-closed itself whenever it loaded inside Thunderbird
without ?showDashboard=true. The accounts.tb.pro Send link does not append
that flag, so clicking it briefly showed the dashboard and then ran
window.close() + a fallback redirect, appearing to "fail to load".

Invert the condition: a genuine web-app tab inside Thunderbird now renders
the dashboard, and only the post-login extension popup (which always carries
?isExtension=true and relies on the auto-close) falls through to closing.

Also implement the 5s timeout that queryAddonLoginState already documented but
never had, so its promise can no longer hang forever and block the
/send/profile router guard when the token-bridge does not respond.

Adds ProfileView tests covering the regression and the popup auto-close path.

Closes #944

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: aaspinwall

packages/send/frontend/src/apps/send/components/ProfileView.test.ts

@@ -0,0 +1,104 @@
+import { mount } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import ProfileView from './ProfileView.vue';
+
+const { isThunderbirdHost, environmentType, push } = vi.hoisted(() => {
+  return { isThunderbirdHost: vi.fn(), environmentType: vi.fn(), push: vi.fn() };
+});
+
+// Run debounced callbacks synchronously so we can assert without timers.
+vi.mock('@vueuse/core', () => ({
+  useDebounceFn: (fn: (...args: unknown[]) => unknown) => fn,
+}));
+
+vi.mock('@send-frontend/stores', () => ({
+  useConfigStore: () => ({
+    get isThunderbirdHost() {
+      return isThunderbirdHost();
+    },
+  }),
+}));
+
+vi.mock('@send-frontend/composables/useIsExtension', () => ({
+  useIsExtension: () => ({
+    environmentType: { value: environmentType() },
+  }),
+}));
+
+vi.mock('vue-router', () => ({
+  useRouter: () => ({ push }),
+}));
+
+const stubs = {
+  UserDashboard: true,
+  LoadingComponent: true,
+};
+
+function setSearch(search: string) {
+  Object.defineProperty(window, 'location', {
+    value: { search },
+    writable: true,
+  });
+}
+
+describe('ProfileView.vue', () => {
+  beforeEach(() => {
+    window.close = vi.fn();
+    setSearch('');
+    isThunderbirdHost.mockReturnValue(false);
+    environmentType.mockReturnValue('WEB APP OUTSIDE THUNDERBIRD');
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('shows the dashboard for the web app outside Thunderbird', () => {
+    environmentType.mockReturnValue('WEB APP OUTSIDE THUNDERBIRD');
+    isThunderbirdHost.mockReturnValue(false);
+
+    const wrapper = mount(ProfileView, { global: { stubs } });
+
+    expect(wrapper.findComponent({ name: 'UserDashboard' }).exists()).toBe(true);
+    expect(window.close).not.toHaveBeenCalled();
+  });
+
+  it('shows the dashboard when ?showDashboard=true is present inside Thunderbird', () => {
+    environmentType.mockReturnValue('WEB APP INSIDE THUNDERBIRD');
+    isThunderbirdHost.mockReturnValue(true);
+    setSearch('?showDashboard=true');
+
+    const wrapper = mount(ProfileView, { global: { stubs } });
+
+    expect(wrapper.findComponent({ name: 'UserDashboard' }).exists()).toBe(true);
+    expect(window.close).not.toHaveBeenCalled();
+  });
+
+  it('shows the dashboard for a genuine web-app tab inside Thunderbird (e.g. opened from accounts dashboard)', () => {
+    // Regression test for bugzilla #2051092: the accounts.tb.pro Send link
+    // navigates here without ?showDashboard=true and the page used to
+    // self-close instead of rendering the dashboard.
+    environmentType.mockReturnValue('WEB APP INSIDE THUNDERBIRD');
+    isThunderbirdHost.mockReturnValue(true);
+    setSearch('');
+
+    const wrapper = mount(ProfileView, { global: { stubs } });
+
+    expect(wrapper.findComponent({ name: 'UserDashboard' }).exists()).toBe(true);
+    expect(window.close).not.toHaveBeenCalled();
+  });
+
+  it('auto-closes the post-login extension popup (isExtension=true)', () => {
+    environmentType.mockReturnValue('WEB APP INSIDE THUNDERBIRD');
+    isThunderbirdHost.mockReturnValue(true);
+    setSearch('?isExtension=true');
+
+    const wrapper = mount(ProfileView, { global: { stubs } });
+
+    expect(wrapper.findComponent({ name: 'UserDashboard' }).exists()).toBe(
+      false
+    );
+    expect(window.close).toHaveBeenCalled();
+    expect(push).toHaveBeenCalledWith('/close');
+  });
+});

packages/send/frontend/src/apps/send/components/ProfileView.vue

@@ -11,11 +11,24 @@ const { isThunderbirdHost } = useConfigStore();
 const { environmentType } = useIsExtension();
 const router = useRouter();
 
+// The post-login extension popup arrives at /send/profile?isExtension=true and
+// relies on the auto-close below to dismiss itself. A genuine user tab (e.g.
+// opened from the accounts.tb.pro dashboard) does not carry this flag.
+const isExtensionLoginPopup = computed(
+  () =>
+    new URLSearchParams(window.location.search).get('isExtension') === 'true'
+);
+
 const shouldShowDashboard = computed(() => {
   if (environmentType.value === 'WEB APP OUTSIDE THUNDERBIRD') return true;
 
   const urlParams = new URLSearchParams(window.location.search);
-  return urlParams.get('showDashboard') === 'true';
+  if (urlParams.get('showDashboard') === 'true') return true;
+
+  // A real web-app tab inside Thunderbird should render the dashboard rather
+  // than self-close. Only the post-login extension popup (isExtension=true)
+  // should fall through to the auto-close path.
+  return !isExtensionLoginPopup.value;
 });
 
 const close = useDebounceFn(() => {

packages/send/frontend/src/composables/useSendConfig.ts

@@ -157,7 +157,16 @@ export function useSendConfig() {
     isLoggedIn: boolean;
     username: string | null;
   }> => {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+      // Guards against the token-bridge content script being absent or
+      // unresponsive (e.g. the page is open outside of Thunderbird, or the
+      // add-on isn't installed). Without this the promise — and any router
+      // guard awaiting it — would hang forever.
+      const timeout = setTimeout(() => {
+        cleanup();
+        reject(new Error('Timed out waiting for addon login state'));
+      }, 5000);
+
       const messageHandler = (event: MessageEvent) => {
         if (event.data?.type === LOGIN_STATE_RESPONSE) {
           cleanup();
@@ -169,6 +178,7 @@ export function useSendConfig() {
       };
 
       const cleanup = () => {
+        clearTimeout(timeout);
         window.removeEventListener('message', messageHandler);
       };