update survey banner warning

PostHog · Oct 19, 2023 · 9532df5 · 9532df5
1 parent 5ff7549
commit 9532df5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/frontend/src/scenes/surveys/Surveys.tsx b/frontend/src/scenes/surveys/Surveys.tsx
@@ -60,7 +60,8 @@ export function Surveys(): JSX.Element {
 
     const { user } = useValues(userLogic)
     const { currentTeam } = useValues(teamLogic)
-    const surveysPopupDisabled = currentTeam && !currentTeam?.surveys_opt_in
+    const surveysPopupDisabled =
+        currentTeam && !currentTeam?.surveys_opt_in && surveys.some((s) => s.start_date && !s.end_date)
 
     const [tab, setSurveyTab] = useState(SurveysTabs.Active)
     const shouldShowEmptyState = !surveysLoading && surveys.length === 0
@@ -139,7 +140,8 @@ export function Surveys(): JSX.Element {
                         }}
                         className="mb-2"
                     >
-                        Survey popovers are currently disabled for this project.
+                        Survey popovers are currently disabled for this project but there are active surveys running.
+                        Re-enable them in the settings.
                     </LemonBanner>
                 ) : null}
             </div>

diff --git a/frontend/src/scenes/surveys/surveyLogic.tsx b/frontend/src/scenes/surveys/surveyLogic.tsx
@@ -424,8 +424,8 @@ export const surveyLogic = kea<surveyLogicType>([
         stopSurveySuccess: ({ survey }) => {
             actions.loadSurveys()
             if (values.currentTeam?.surveys_opt_in === true) {
-                const allActiveSurveys = values.surveys.filter((s) => s.start_date && !s.end_date)
-                if (allActiveSurveys.length === 0) {
+                const hasActiveSurveys = values.surveys.some((s) => s.start_date && !s.end_date)
+                if (!hasActiveSurveys) {
                     actions.setSurveysOptIn(false)
                 }
             }