Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 55 additions & 11 deletions static/gsApp/components/gsBanner.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {Component, Fragment} from 'react';
import React, {Component, Fragment, useEffect} from 'react';
import {ThemeProvider, useTheme} from '@emotion/react';
import * as Sentry from '@sentry/react';
import Cookies from 'js-cookie';
Expand All @@ -25,6 +25,7 @@ import {ConfigStore} from 'sentry/stores/configStore';
import {GuideStore} from 'sentry/stores/guideStore';
import {DataCategory} from 'sentry/types/core';
import type {Organization} from 'sentry/types/organization';
import {showIntercom} from 'sentry/utils/intercom';
import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
import {promptIsDismissed} from 'sentry/utils/promptIsDismissed';
import {useInvertedTheme} from 'sentry/utils/theme/useInvertedTheme';
Expand Down Expand Up @@ -96,10 +97,43 @@ function objectFromBilledCategories(callback: (c: BilledDataCategoryInfo) => any
const ALERTS_OFF = objectFromBilledCategories(() => false);

type SuspensionModalProps = ModalRenderProps & {
organization: Organization;
subscription: Subscription;
};

function SuspensionModal({Header, Body, Footer, subscription}: SuspensionModalProps) {
function SuspensionModal({
Header,
Body,
Footer,
organization,
subscription,
}: SuspensionModalProps) {
const hasIntercom = organization.features.includes('intercom-support');

useEffect(() => {
if (hasIntercom) {
trackGetsentryAnalytics('intercom_link.viewed', {
organization,
source: 'account-suspension',
});
}
}, [hasIntercom, organization]);

async function handleIntercomClick() {
trackGetsentryAnalytics('intercom_link.clicked', {
organization,
source: 'account-suspension',
});
try {
await showIntercom(organization.slug);
} catch {
const supportEmail = ConfigStore.get('supportEmail');
if (supportEmail) {
window.location.href = `mailto:${supportEmail}?subject=${window.encodeURIComponent('Account Suspension')}`;
}
}
}

return (
<Fragment>
<Header>{'Action Required'}</Header>
Expand All @@ -120,13 +154,17 @@ function SuspensionModal({Header, Body, Footer, subscription}: SuspensionModalPr
</p>
</Body>
<Footer>
<ZendeskLink
subject="Account Suspension"
Component={props => <LinkButton {...props} href={props.href ?? ''} />}
source="account-suspension"
>
{t('Contact Support')}
</ZendeskLink>
{hasIntercom ? (
<Button onClick={handleIntercomClick}>{t('Contact Support')}</Button>
) : (
<ZendeskLink
subject="Account Suspension"
Component={props => <LinkButton {...props} href={props.href ?? ''} />}
source="account-suspension"
>
{t('Contact Support')}
</ZendeskLink>
)}
</Footer>
</Fragment>
);
Expand Down Expand Up @@ -482,13 +520,19 @@ class GSBanner extends Component<Props, State> {
}

tryTriggerSuspendedModal() {
const {subscription} = this.props;
const {organization, subscription} = this.props;

if (!subscription.isSuspended) {
return;
}

openModal(props => <SuspensionModal {...props} subscription={subscription} />);
openModal(props => (
<SuspensionModal
{...props}
organization={organization}
subscription={subscription}
/>
));
}

tryTriggerNoticeModal() {
Expand Down
36 changes: 35 additions & 1 deletion static/gsApp/views/amCheckout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {t, tct} from 'sentry/locale';
import {ConfigStore} from 'sentry/stores/configStore';
import type {DataCategory} from 'sentry/types/core';
import type {Organization} from 'sentry/types/organization';
import {showIntercom} from 'sentry/utils/intercom';
import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
import type {ReactRouter3Navigate} from 'sentry/utils/useNavigate';
import {withApi} from 'sentry/utils/withApi';
Expand Down Expand Up @@ -564,6 +565,8 @@ function AMCheckout(props: Props) {
loadStripe(ConfigStore.get('getsentry.stripePublishKey')!);
}, []);

const hasIntercom = organization.features.includes('intercom-support');

useEffect(() => {
trackGetsentryAnalytics('am_checkout.viewed', {
organization,
Expand All @@ -573,6 +576,15 @@ function AMCheckout(props: Props) {
Sentry.getReplay()?.start();
}, [organization, subscription]);

useEffect(() => {
if (hasIntercom) {
trackGetsentryAnalytics('intercom_link.viewed', {
organization,
source: 'checkout',
});
}
}, [hasIntercom, organization]);

useEffect(() => {
if (subscription.canSelfServe) {
if (!hasFetchedBillingConfig.current) {
Expand Down Expand Up @@ -750,7 +762,29 @@ function AMCheckout(props: Props) {
help: (
<ExternalLink href="https://www.sentry.help/en/collections/18842102-account-billing" />
),
contact: hasZendesk() ? (
contact: hasIntercom ? (
<Button
size="zero"
variant="link"
onClick={async () => {
trackGetsentryAnalytics('intercom_link.clicked', {
organization,
source: 'checkout',
});
try {
await showIntercom(organization.slug);
} catch {
// Fall back to mailto
const supportEmail = ConfigStore.get('supportEmail');
if (supportEmail) {
window.location.href = `mailto:${supportEmail}?subject=${window.encodeURIComponent('Billing Question')}`;
}
}
}}
>
<Text variant="accent">{t('ask Support')}</Text>
</Button>
) : hasZendesk() ? (
<Button size="zero" variant="link" onClick={activateZendesk}>
<Text variant="accent">{t('ask Support')}</Text>
</Button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import {useEffect} from 'react';
import styled from '@emotion/styled';
import moment from 'moment-timezone';

import {Button} from '@sentry/scraps/button';
import {ExternalLink} from '@sentry/scraps/link';

import {Panel} from 'sentry/components/panels/panel';
import {IconBusiness} from 'sentry/icons';
import {t, tct} from 'sentry/locale';
import {ConfigStore} from 'sentry/stores/configStore';
import {showIntercom} from 'sentry/utils/intercom';
import {useOrganization} from 'sentry/utils/useOrganization';

import ZendeskLink from 'getsentry/components/zendeskLink';
import {ANNUAL} from 'getsentry/constants';
import {CohortId, type PlanMigration, type Subscription} from 'getsentry/types';
import {trackGetsentryAnalytics} from 'getsentry/utils/trackGetsentryAnalytics';
import {PanelBodyWithTable} from 'getsentry/views/subscriptionPage/styles';

import {PlanMigrationTable} from './planMigrationTable';
Expand Down Expand Up @@ -39,10 +45,46 @@ function getMigrationDate(migration: PlanMigration, subscription: Subscription)
}

export function PlanMigrationActive({subscription, migration}: Props) {
const organization = useOrganization();
const hasIntercom = organization.features.includes('intercom-support');
const shouldRender = Boolean(migration?.cohort?.nextPlan);

useEffect(() => {
if (shouldRender && hasIntercom) {
trackGetsentryAnalytics('intercom_link.viewed', {
organization,
source: 'billing',
});
}
}, [shouldRender, hasIntercom, organization]);

if (!migration?.cohort?.nextPlan) {
return null;
}

async function handleIntercomClick() {
trackGetsentryAnalytics('intercom_link.clicked', {
organization,
source: 'billing',
});
try {
await showIntercom(organization.slug);
} catch {
const supportEmail = ConfigStore.get('supportEmail');
if (supportEmail) {
window.location.href = `mailto:${supportEmail}?subject=${window.encodeURIComponent('Legacy Plan Migration Question')}`;
}
}
}

const supportLink = hasIntercom ? (
<Button size="zero" variant="link" onClick={handleIntercomClick}>
{null}
</Button>
) : (
<ZendeskLink subject="Legacy Plan Migration Question" source="billing" />
);

const isAM3Migration = migration.cohort.cohortId >= CohortId.EIGHTH;

return (
Expand Down Expand Up @@ -90,17 +132,12 @@ export function PlanMigrationActive({subscription, migration}: Props) {

<MoreInfo>
{tct(
'For more details please see our [faqLink:FAQ] or contact [zendeskLink:Support].',
'For more details please see our [faqLink:FAQ] or contact [supportLink:Support].',
{
faqLink: (
<ExternalLink href="https://www.sentry.help/en/articles/13964853-how-is-my-legacy-plan-changing-september-12-2024" />
),
zendeskLink: (
<ZendeskLink
subject="Legacy Plan Migration Question"
source="billing"
/>
),
supportLink,
}
)}
</MoreInfo>
Expand Down
48 changes: 46 additions & 2 deletions static/gsApp/views/subscriptionPage/trial/trialEnded.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,67 @@
import {useEffect} from 'react';

import {Alert} from '@sentry/scraps/alert';
import {Button} from '@sentry/scraps/button';

import {tct} from 'sentry/locale';
import {ConfigStore} from 'sentry/stores/configStore';
import {showIntercom} from 'sentry/utils/intercom';
import {useOrganization} from 'sentry/utils/useOrganization';

import ZendeskLink from 'getsentry/components/zendeskLink';
import type {Subscription} from 'getsentry/types';
import {trackGetsentryAnalytics} from 'getsentry/utils/trackGetsentryAnalytics';

type Props = {
subscription: Subscription;
};

export function TrialEnded({subscription}: Props) {
const organization = useOrganization();
const hasIntercom = organization.features.includes('intercom-support');
const canRequestTrial =
subscription.canSelfServe && subscription.planDetails?.trialPlan;
const shouldRender = !(
subscription.isTrial ||
subscription.canTrial ||
!canRequestTrial
);

useEffect(() => {
if (shouldRender && hasIntercom) {
trackGetsentryAnalytics('intercom_link.viewed', {
organization,
source: 'trial',
});
}
}, [shouldRender, hasIntercom, organization]);

if (subscription.isTrial || subscription.canTrial || !canRequestTrial) {
if (!shouldRender) {
return null;
}

const supportLink = <ZendeskLink subject="Request Another Trial" source="trial" />;
async function handleIntercomClick() {
trackGetsentryAnalytics('intercom_link.clicked', {
organization,
source: 'trial',
});
try {
await showIntercom(organization.slug);
} catch {
const supportEmail = ConfigStore.get('supportEmail');
if (supportEmail) {
window.location.href = `mailto:${supportEmail}?subject=${window.encodeURIComponent('Request Another Trial')}`;
}
}
}
Comment thread
souredoutlook marked this conversation as resolved.

const supportLink = hasIntercom ? (
<Button size="zero" variant="link" onClick={handleIntercomClick}>
{null}
</Button>
) : (
<ZendeskLink subject="Request Another Trial" source="trial" />
);

return (
<Alert variant="info" showIcon={false}>
Expand Down
Loading