diff --git a/web/app/components/main-nav/__tests__/index.spec.tsx b/web/app/components/main-nav/__tests__/index.spec.tsx index 6f5982903da..9fec2b83cc4 100644 --- a/web/app/components/main-nav/__tests__/index.spec.tsx +++ b/web/app/components/main-nav/__tests__/index.spec.tsx @@ -678,9 +678,12 @@ describe('MainNav', () => { renderMainNav() fireEvent.click(screen.getByRole('button', { name: 'common.mainNav.help.openMenu' })) - expect(await screen.findByText('common.userProfile.contactUs')).toBeInTheDocument() + const contactUsItem = await screen.findByRole('menuitem', { + name: 'common.userProfile.contactUs billing.upgradeBtn.encourageShort', + }) + expect(screen.queryByRole('button', { name: 'billing.upgradeBtn.encourageShort' })).not.toBeInTheDocument() - fireEvent.click(screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' })) + fireEvent.click(contactUsItem) await waitFor(() => { expect(screen.queryByText('common.userProfile.forum')).not.toBeInTheDocument() diff --git a/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx b/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx index 320c4e3a99d..8a36350cb77 100644 --- a/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx +++ b/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx @@ -142,14 +142,10 @@ describe('SupportMenu', () => { expect(screen.getByText('common.userProfile.contactUs')).toHaveClass('text-text-disabled') expect(screen.getByText('billing.upgradeBtn.encourageShort')).toHaveClass('system-xs-semibold-uppercase', 'text-saas-dify-blue-accessible') expect(screen.queryByText('common.userProfile.emailSupport')).not.toBeInTheDocument() + expect(screen.queryByRole('button', { name: 'billing.upgradeBtn.encourageShort' })).not.toBeInTheDocument() fireEvent.click(screen.getByRole('menuitem', { name: 'common.userProfile.contactUs billing.upgradeBtn.encourageShort' })) - expect(mockSetShowPricingModal).not.toHaveBeenCalled() - expect(onContactUsClick).not.toHaveBeenCalled() - - fireEvent.click(screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' })) - expect(mockSetShowPricingModal).toHaveBeenCalled() expect(openZendeskWindow).not.toHaveBeenCalled() expect(onContactUsClick).toHaveBeenCalled() diff --git a/web/app/components/main-nav/components/support-menu.tsx b/web/app/components/main-nav/components/support-menu.tsx index a9cadde2bf8..7eaf19f21f6 100644 --- a/web/app/components/main-nav/components/support-menu.tsx +++ b/web/app/components/main-nav/components/support-menu.tsx @@ -29,9 +29,11 @@ export default function SupportMenu({ onContactUsClick }: SupportMenuProps) { <> {shouldShowUpgradeContact && ( { - event.preventDefault() + aria-label={`${t('userProfile.contactUs', { ns: 'common' })} ${t('upgradeBtn.encourageShort', { ns: 'billing' })}`} + className="mx-0 h-8 gap-1 px-3 py-1" + onClick={() => { + setShowPricingModal() + onContactUsClick?.() }} > )} trailing={( - + )} />