diff --git a/frontend/src/scenes/billing/BillingProductAddon.tsx b/frontend/src/scenes/billing/BillingProductAddon.tsx index 4f60ca0bbe3c4..3f54118475591 100644 --- a/frontend/src/scenes/billing/BillingProductAddon.tsx +++ b/frontend/src/scenes/billing/BillingProductAddon.tsx @@ -49,6 +49,7 @@ export const BillingProductAddon = ({ addon }: { addon: BillingProductV2AddonTyp initiateProductUpgrade, setTrialModalOpen, activateTrial, + cancelTrial, } = useActions(billingProductLogic({ product: addon })) const { openSupportForm } = useActions(supportLogic) @@ -190,8 +191,7 @@ export const BillingProductAddon = ({ addon }: { addon: BillingProductV2AddonTyp You're on a trial for this add-on - {/* Comment out until we can make sure a customer can't activate a trial multiple times */} - {/* Cancel trial - */} + ) : addon.included_with_main_product ? ( }> @@ -275,14 +275,18 @@ export const BillingProductAddon = ({ addon }: { addon: BillingProductV2AddonTyp )} - {!addon.inclusion_only && !addon.trial && isProrated && !addon.contact_support && ( -

- Pay ~${prorationAmount} today (prorated) and -
- {formatFlatRate(Number(upgradePlan?.unit_amount_usd), upgradePlan?.unit)} every month - thereafter. -

- )} + {!addon.inclusion_only && + !addon.trial && + isProrated && + !addon.contact_support && + !billing?.trial && ( +

+ Pay ~${prorationAmount} today (prorated) and +
+ {formatFlatRate(Number(upgradePlan?.unit_amount_usd), upgradePlan?.unit)} every month + thereafter. +

+ )} {!!addon.trial && !!trialExperiment && !billing?.trial && (

You'll have {addon.trial.length} days to try it out. Then you'll be charged{' '} diff --git a/frontend/src/scenes/billing/billingProductLogic.ts b/frontend/src/scenes/billing/billingProductLogic.ts index 0b90a88813764..3d6a3bed351fa 100644 --- a/frontend/src/scenes/billing/billingProductLogic.ts +++ b/frontend/src/scenes/billing/billingProductLogic.ts @@ -394,6 +394,7 @@ export const billingProductLogic = kea([ lemonToast.error('There was an error cancelling your trial. Please try again or contact support.') } finally { actions.loadBilling() + window.location.reload() actions.setTrialLoading(false) } },