diff --git a/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png b/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png index f796da82a307b..2c0a0f6dfeca2 100644 Binary files a/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png and b/frontend/__snapshots__/scenes-app-experiments--complete-funnel-experiment.png differ diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx index 3606c033962d1..2039a84f6d816 100644 --- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx +++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx @@ -125,7 +125,7 @@ export const sidePanelLogic = kea([ }), afterMount(({ values }) => { - if (values.shouldShowWelcomeAnnouncement) { + if (!values.sidePanelOpen && values.shouldShowWelcomeAnnouncement) { sidePanelStateLogic.findMounted()?.actions.openSidePanel(SidePanelTab.Welcome) } }), diff --git a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts b/frontend/src/lib/components/ActivationSidebar/activationLogic.ts index 9d11bceabbcf3..449b93f710f53 100644 --- a/frontend/src/lib/components/ActivationSidebar/activationLogic.ts +++ b/frontend/src/lib/components/ActivationSidebar/activationLogic.ts @@ -12,8 +12,9 @@ import { teamLogic } from 'scenes/teamLogic' import { urls } from 'scenes/urls' import { navigationLogic } from '~/layout/navigation/navigationLogic' +import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic' import { dashboardsModel } from '~/models/dashboardsModel' -import { EventDefinitionType, ProductKey, TeamBasicType } from '~/types' +import { EventDefinitionType, ProductKey, SidePanelTab, TeamBasicType } from '~/types' import type { activationLogicType } from './activationLogicType' @@ -67,6 +68,8 @@ export const activationLogic = kea([ ['loadPluginsSuccess', 'loadPluginsFailure'], navigationLogic, ['toggleActivationSideBar', 'showActivationSideBar', 'hideActivationSideBar'], + sidePanelStateLogic, + ['openSidePanel'], eventUsageLogic, ['reportActivationSideBarShown'], savedInsightsLogic, @@ -373,6 +376,7 @@ export const activationLogic = kea([ '*': (_, params) => { if (params?.onboarding_completed && !values.hasCompletedAllTasks) { actions.toggleActivationSideBar() + actions.openSidePanel(SidePanelTab.Activation) } else { actions.hideActivationSideBar() } diff --git a/frontend/src/scenes/billing/PlanComparison.tsx b/frontend/src/scenes/billing/PlanComparison.tsx index 6c54369d984ca..6eaf2676c9248 100644 --- a/frontend/src/scenes/billing/PlanComparison.tsx +++ b/frontend/src/scenes/billing/PlanComparison.tsx @@ -1,7 +1,9 @@ import './PlanComparison.scss' import { LemonButton, LemonModal, LemonTag, Link } from '@posthog/lemon-ui' +import clsx from 'clsx' import { useActions, useValues } from 'kea' +import { useFeatureFlag } from 'lib/hooks/useFeatureFlag' import { IconCheckmark, IconClose, IconWarning } from 'lib/lemon-ui/icons' import { Tooltip } from 'lib/lemon-ui/Tooltip' import { eventUsageLogic } from 'lib/utils/eventUsageLogic' @@ -27,11 +29,11 @@ export function PlanIcon({
{!feature ? ( <> - + ) : feature.limit ? ( <> - + {feature.limit && `${convertLargeNumberToWords(feature.limit, null)} ${feature.unit && feature.unit}${ timeDenominator ? `/${timeDenominator}` : '' @@ -40,7 +42,7 @@ export function PlanIcon({ ) : ( <> - + {feature.note} )} @@ -64,7 +66,10 @@ const getProductTiers = ( tiers?.map((tier, i) => (
@@ -80,7 +85,7 @@ const getProductTiers = ( ) : product?.free_allocation ? (
@@ -108,6 +113,7 @@ export const PlanComparison = ({ const { reportBillingUpgradeClicked } = useActions(eventUsageLogic) const { redirectPath, billing } = useValues(billingLogic) const { width, ref: planComparisonRef } = useResizeObserver() + const is3000 = useFeatureFlag('POSTHOG_3000', 'test') const upgradeButtons = plans?.map((plan) => { return ( @@ -115,6 +121,7 @@ export const PlanComparison = ({ {product.name}

)} -

Priced per {product.unit}

+

Priced per {product.unit}

{plans?.map((plan) => ( {getProductTiers(plan, product)} @@ -241,9 +248,12 @@ export const PlanComparison = ({ } > {feature.name} @@ -293,21 +303,21 @@ export const PlanComparison = ({ ?.features?.map((feature, i) => ( plan.included_if == 'has_subscription' - )?.features?.length || 0) - - 1 + (includedProduct.plans.find( + (plan) => plan.included_if == 'has_subscription' + )?.features?.length || 0) - + 1 ? 'PlanTable__th__last-feature' : '' - }`} + )} > {feature.name} diff --git a/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx b/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx index 5dfdd792335a7..e4f4562192cb0 100644 --- a/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx +++ b/frontend/src/scenes/experiments/ExperimentImplementationDetails.tsx @@ -135,7 +135,7 @@ export function ExperimentImplementationDetails({ experiment }: ExperimentImplem Implement your experiment in code - + See the docs for more implementation information.