diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--dark.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--dark.png index e86df67429be0..e59c4ade41418 100644 Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--dark.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-edit--dark.png differ diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx index b971755535e1c..6ebcb0a16f554 100644 --- a/frontend/src/lib/constants.tsx +++ b/frontend/src/lib/constants.tsx @@ -206,7 +206,6 @@ export const FEATURE_FLAGS = { WEB_ANALYTICS_REPLAY: 'web-analytics-replay', // owner: @robbie-c BATCH_EXPORTS_POSTHOG_HTTP: 'posthog-http-batch-exports', EXPERIMENT_MAKE_DECISION: 'experiment-make-decision', // owner: @jurajmajerik #team-feature-success - PURCHASE_CREDITS: 'purchase-credits', // owner: @zach DATA_MODELING: 'data-modeling', // owner: @EDsCODE #team-data-warehouse WEB_ANALYTICS_CONVERSION_GOALS: 'web-analytics-conversion-goals', // owner: @robbie-c WEB_ANALYTICS_LAST_CLICK: 'web-analytics-last-click', // owner: @robbie-c diff --git a/frontend/src/scenes/billing/Billing.stories.tsx b/frontend/src/scenes/billing/Billing.stories.tsx index 5fb26b3c4565c..455f76c3d080a 100644 --- a/frontend/src/scenes/billing/Billing.stories.tsx +++ b/frontend/src/scenes/billing/Billing.stories.tsx @@ -1,7 +1,6 @@ import { Meta } from '@storybook/react' -import { FEATURE_FLAGS } from 'lib/constants' -import { mswDecorator, setFeatureFlags, useStorybookMocks } from '~/mocks/browser' +import { mswDecorator, useStorybookMocks } from '~/mocks/browser' import { billingJson } from '~/mocks/fixtures/_billing' import billingJsonWith100PercentDiscount from '~/mocks/fixtures/_billing_with_100_percent_discount.json' import billingJsonWithCredits from '~/mocks/fixtures/_billing_with_credits.json' @@ -72,7 +71,6 @@ export const BillingWithCredits = (): JSX.Element => { } export const BillingWithCreditCTA = (): JSX.Element => { - setFeatureFlags([FEATURE_FLAGS.PURCHASE_CREDITS]) useStorybookMocks({ get: { '/api/billing/': { diff --git a/frontend/src/scenes/billing/CreditCTAHero.tsx b/frontend/src/scenes/billing/CreditCTAHero.tsx index e2bf348d40cc9..0f076245c0a48 100644 --- a/frontend/src/scenes/billing/CreditCTAHero.tsx +++ b/frontend/src/scenes/billing/CreditCTAHero.tsx @@ -2,8 +2,6 @@ import { IconX } from '@posthog/icons' import { LemonButton, LemonDivider } from '@posthog/lemon-ui' import { useActions, useValues } from 'kea' import { BurningMoneyHog } from 'lib/components/hedgehogs' -import { FEATURE_FLAGS } from 'lib/constants' -import { featureFlagLogic } from 'lib/logic/featureFlagLogic' import useResizeObserver from 'use-resize-observer' import { billingLogic } from './billingLogic' @@ -15,14 +13,10 @@ export const CreditCTAHero = (): JSX.Element | null => { const { creditOverview, isPurchaseCreditsModalOpen, isCreditCTAHeroDismissed, computedDiscount } = useValues(billingLogic) const { showPurchaseCreditsModal, toggleCreditCTAHeroDismissed } = useActions(billingLogic) - const { featureFlags } = useValues(featureFlagLogic) if (!creditOverview.eligible || creditOverview.status === 'paid') { return null } - if (!featureFlags[FEATURE_FLAGS.PURCHASE_CREDITS]) { - return null - } if (isCreditCTAHeroDismissed) { return ( diff --git a/frontend/src/scenes/billing/PurchaseCreditsModal.tsx b/frontend/src/scenes/billing/PurchaseCreditsModal.tsx index 4907e2920d00d..5c2d36dc79a8f 100644 --- a/frontend/src/scenes/billing/PurchaseCreditsModal.tsx +++ b/frontend/src/scenes/billing/PurchaseCreditsModal.tsx @@ -101,14 +101,14 @@ export const PurchaseCreditsModal = (): JSX.Element | null => { { type: BillingGaugeItemKind.FreeTier, text: - creditInputValue >= 6000 && creditInputValue < 20000 ? ( + creditInputValue >= 3000 && creditInputValue < 20000 ? ( <> 10% off ) : ( '10% off' ), - value: 6000, + value: 3000, prefix: '$', top: true, }, diff --git a/frontend/src/scenes/billing/billingLogic.tsx b/frontend/src/scenes/billing/billingLogic.tsx index eecb06c09059d..686c121d3793a 100644 --- a/frontend/src/scenes/billing/billingLogic.tsx +++ b/frontend/src/scenes/billing/billingLogic.tsx @@ -4,7 +4,6 @@ import { FieldNamePath, forms } from 'kea-forms' import { loaders } from 'kea-loaders' import { router, urlToAction } from 'kea-router' import api, { getJSONOrNull } from 'lib/api' -import { FEATURE_FLAGS } from 'lib/constants' import { dayjs } from 'lib/dayjs' import { LemonBannerAction } from 'lib/lemon-ui/LemonBanner/LemonBanner' import { lemonBannerLogic } from 'lib/lemon-ui/LemonBanner/lemonBannerLogic' @@ -345,11 +344,7 @@ export const billingLogic = kea([ ) } - if ( - response.eligible && - response.status === 'none' && - values.featureFlags[FEATURE_FLAGS.PURCHASE_CREDITS] - ) { + if (response.eligible && response.status === 'none') { actions.reportCreditsCTAShown(response) } return response @@ -503,9 +498,9 @@ export const billingLogic = kea([ errors: ({ creditInput, collectionMethod }) => ({ creditInput: !creditInput ? 'Please enter the amount of credits you want to purchase' - : // This value is used because 6667 - 10% = 6000 - +creditInput < 6667 - ? 'Please enter a credit amount greater than $6,666' + : // This value is used because 3333 - 10% = 3000 + +creditInput < 3333 + ? 'Please enter a credit amount of at least $3,333' : undefined, collectionMethod: !collectionMethod ? 'Please select a collection method' : undefined, }), @@ -650,7 +645,7 @@ export const billingLogic = kea([ discount = 0.25 } else if (spend >= 20000) { discount = 0.2 - } else if (spend >= 6000) { + } else if (spend >= 3000) { discount = 0.1 } actions.setComputedDiscount(discount)