allow free users to open tickets while viewing the billing page

PostHog · Apr 17, 2024 · 831971c · 831971c
1 parent 7000050
commit 831971c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelSupport.tsx
@@ -214,7 +214,8 @@ export const SidePanelSupport = (): JSX.Element => {
                                 </Section>
                             ) : null}
 
-                            {hasAvailableFeature(AvailableFeature.EMAIL_SUPPORT) ? (
+                            {hasAvailableFeature(AvailableFeature.EMAIL_SUPPORT) ||
+                            window.location.href.includes('/billing') ? (
                                 <>
                                     <Section title="Contact us">
                                         <p>Can't find what you need in the docs?</p>
@@ -309,7 +310,10 @@ export const SidePanelSupport = (): JSX.Element => {
                                 </ul>
                             </Section>
 
-                            {!hasAvailableFeature(AvailableFeature.EMAIL_SUPPORT) ? (
+                            {!(
+                                hasAvailableFeature(AvailableFeature.EMAIL_SUPPORT) ||
+                                window.location.href.includes('/billing')
+                            ) ? (
                                 <Section title="Contact support">
                                     <p>
                                         Due to our large userbase, we're unable to offer email support to organizations

diff --git a/frontend/src/lib/components/Support/SupportForm.tsx b/frontend/src/lib/components/Support/SupportForm.tsx
@@ -19,6 +19,8 @@ import { useEffect, useRef } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { userLogic } from 'scenes/userLogic'
 
+import { AvailableFeature } from '~/types'
+
 import {
     SEVERITY_LEVEL_TO_NAME,
     SUPPORT_TICKET_TEMPLATES,
@@ -56,7 +58,7 @@ export function SupportForm(): JSX.Element | null {
     const { setSendSupportRequestValue } = useActions(supportLogic)
     const { objectStorageAvailable } = useValues(preflightLogic)
     // the support model can be shown when logged out, file upload is not offered to anonymous users
-    const { user } = useValues(userLogic)
+    const { user, hasAvailableFeature } = useValues(userLogic)
     // only allow authentication issues for logged out users
 
     const dropRef = useRef<HTMLDivElement>(null)
@@ -129,6 +131,8 @@ export function SupportForm(): JSX.Element | null {
                     disabledReason={
                         !user
                             ? 'Please login to your account before opening a ticket unrelated to authentication issues.'
+                            : !hasAvailableFeature(AvailableFeature.EMAIL_SUPPORT)
+                            ? 'You can only create billing related issues while viewing the billing page.'
                             : null
                     }
                     fullWidth

diff --git a/frontend/src/lib/components/Support/supportLogic.ts b/frontend/src/lib/components/Support/supportLogic.ts
@@ -341,6 +341,8 @@ export const supportLogic = kea<supportLogicType>([
             let area = target_area ?? getURLPathToTargetArea(window.location.pathname)
             if (!userLogic.values.user) {
                 area = 'login'
+            } else if (window.location.href.includes('/billing')) {
+                area = 'billing'
             }
             kind = kind ?? 'support'
             actions.resetSendSupportRequest({