PostHog · liyiy · Nov 6, 2023 · Nov 7, 2023 · Nov 7, 2023 · Nov 7, 2023
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--stickiness-edit--webkit.png
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-line-edit.png
diff --git a/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png b/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png
diff --git a/frontend/__snapshots__/scenes-other-billing-v2--billing-v-2.png b/frontend/__snapshots__/scenes-other-billing-v2--billing-v-2.png
diff --git a/frontend/src/toolbar/flags/featureFlagsLogic.ts b/frontend/src/toolbar/flags/featureFlagsLogic.ts
@@ -66,7 +66,6 @@ export const featureFlagsLogic = kea<featureFlagsLogicType>([
             (userFlags, localOverrides) => {
                 return userFlags.map((flag) => {
                     const hasVariants = (flag.feature_flag.filters?.multivariate?.variants?.length || 0) > 0
-
                     const currentValue =
                         flag.feature_flag.key in localOverrides ? localOverrides[flag.feature_flag.key] : flag.value
 

diff --git a/posthog/api/feature_flag.py b/posthog/api/feature_flag.py
@@ -39,7 +39,6 @@
 from posthog.models.cohort import Cohort
 from posthog.models.cohort.util import get_dependent_cohorts
 from posthog.models.feature_flag import (
-    FeatureFlagMatcher,
     FeatureFlagDashboards,
     can_user_edit_feature_flag,
     get_all_feature_flags,
@@ -460,7 +459,7 @@ def my_flags(self, request: request.Request, **kwargs):
             raise exceptions.NotAuthenticated()
 
         feature_flags = (
-            FeatureFlag.objects.filter(team=self.team, active=True, deleted=False)
+            FeatureFlag.objects.filter(team=self.team, deleted=False)
             .prefetch_related("experiment_set")
             .prefetch_related("features")
             .prefetch_related("analytics_dashboards")
@@ -476,7 +475,8 @@ def my_flags(self, request: request.Request, **kwargs):
         if not feature_flag_list:
             return Response(flags)
 
-        matches, _, _, _ = FeatureFlagMatcher(feature_flag_list, request.user.distinct_id, groups).get_matches()
+        matches, _, _, _ = get_all_feature_flags(self.team_id, request.user.distinct_id, groups)
+
         for feature_flag in feature_flags:
             flags.append(
                 {