Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(teams): invite and upgrade reactive updates (#4981)
dev-rb51503326f5be
diff --git a/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx b/apps/web/src/components/app/app-sidebar/sidebar-promo.tsxindex 2f78c94872..439e5afedc 100644--- a/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx+++ b/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx@@ -9,12 +9,13 @@ export const PROMO_HINT_DURATION_MS = 8000;type SidebarPromoCardAction = {label: string;onClick: () => void;+ disabled?: boolean;};type SidebarPromoCardProps = {label: string;description: string;- onDismiss: () => void;+ onDismiss?: () => void;onClick?: () => void;primaryAction?: SidebarPromoCardAction;secondaryAction?: SidebarPromoCardAction;@@ -29,17 +30,21 @@ export const SidebarPromoCard = (props: SidebarPromoCardProps) => {<h3 class="flex-1 min-w-0 text-xs font-medium text-ink leading-tight m-0">{props.label}</h3>- <Button- variant="ghost"- class="shrink-0 size-5 rounded-sm p-0 [&_svg]:size-3"- label="Dismiss"- onClick={(e) => {- e.stopPropagation();- props.onDismiss();- }}- >- <XIcon />- </Button>+ <Show when={props.onDismiss}>+ {(onDismiss) => (+ <Button+ variant="ghost"+ class="shrink-0 size-5 rounded-sm p-0 [&_svg]:size-3"+ label="Dismiss"+ onClick={(e) => {+ e.stopPropagation();+ onDismiss()();+ }}+ >+ <XIcon />+ </Button>+ )}+ </Show></header><Dynamiccomponent={props.onClick ? 'button' : 'div'}@@ -65,6 +70,7 @@ export const SidebarPromoCard = (props: SidebarPromoCardProps) => {<Buttonvariant="ghost"size="sm"+ disabled={action().disabled}onClick={(e) => {e.stopPropagation();action().onClick();@@ -79,6 +85,7 @@ export const SidebarPromoCard = (props: SidebarPromoCardProps) => {<Buttonvariant="cta"size="sm"+ disabled={action().disabled}onClick={(e) => {e.stopPropagation();action().onClick();diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsxindex 178929cc7f..2296f6e202 100644--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx@@ -61,6 +61,7 @@ import { clearPressedKeys } from '@core/hotkey/state';import { type HotkeyToken, TOKENS } from '@core/hotkey/tokens';import type { ValidHotkey } from '@core/hotkey/types';import { activateClosestDOMScope } from '@core/hotkey/utils';+import { tryMacroId, useDisplayName } from '@core/user';import LogoIcon from '@icon/macro-logo.svg';import { AnimatedActivityIcon } from '@icon/wide-activity';import { AnimatedCallIcon } from '@icon/wide-call';@@ -82,8 +83,14 @@ import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';import SignOutIcon from '@phosphor/sign-out.svg';import UsersThreeIcon from '@phosphor/users-three.svg';import { useEmailLinksQuery } from '@queries/email/link';+import {+ useJoinTeamMutation,+ useRejectInvitationMutation,+ useUserInvitesQuery,+} from '@queries/team/invitations';import { useCurrentTeamQuery } from '@queries/team/teams';import { authServiceClient } from '@service-auth/client';+import type { TeamInviteDetails } from '@service-auth/generated/schemas/teamInviteDetails';import { createElementSize } from '@solid-primitives/resize-observer';import { debounce } from '@solid-primitives/scheduled';import { makePersisted } from '@solid-primitives/storage';@@ -983,10 +990,39 @@ const buildSidebarLinks = (): SidebarItem[] => {return links;};+const TeamInviteSidebarPromo = (props: { invite: TeamInviteDetails }) => {+ const [inviterName] = useDisplayName(tryMacroId(props.invite.invited_by));+ const joinTeamMutation = useJoinTeamMutation();+ const rejectInvitationMutation = useRejectInvitationMutation();+ const mutationPending = () =>+ joinTeamMutation.isPending || rejectInvitationMutation.isPending;++ return (+ <SidebarPromoCard+ label="Team invitation"+ description={`${inviterName() || 'A teammate'} invited you to join a team as ${props.invite.team_role}.`}+ primaryAction={{+ label: 'Accept',+ disabled: mutationPending(),+ onClick: () =>+ joinTeamMutation.mutate({ teamInviteId: props.invite.id }),+ }}+ secondaryAction={{+ label: 'Decline',+ disabled: mutationPending(),+ onClick: () =>+ rejectInvitationMutation.mutate({ teamInviteId: props.invite.id }),+ }}+ />+ );+};+export const AppSidebar = (props: AppSidebarProps) => {const { openSettings, selectTab, settingsOpen } = useSettingsState();const isTabAvailable = useSettingsTabAvailable();const currentTeamQuery = useCurrentTeamQuery();+ const userInvitesQuery = useUserInvitesQuery();+ const firstTeamInvite = () => userInvitesQuery.data?.invites.at(0);const [sectionVisibility, setSectionVisibility] = makePersisted(createSignal<SidebarSectionVisibility>(DEFAULT_SECTION_VISIBILITY),{ name: 'sidebar-section-visibility' }@@ -1430,10 +1466,15 @@ export const AppSidebar = (props: AppSidebarProps) => {<InCallPanel isSlim={() => false} /></div></Show>+ <Show keyed when={isExpandedView() ? firstTeamInvite() : undefined}>+ {(invite) => <TeamInviteSidebarPromo invite={invite} />}+ </Show><Showwhen={!hasPaidAccess() &&isExpandedView() &&+ !userInvitesQuery.isLoading &&+ !firstTeamInvite() &&!premiumCardDismissed() &&newPricingFF().enabled}@@ -1462,6 +1503,8 @@ export const AppSidebar = (props: AppSidebarProps) => {when={!hasPaidAccess() &&isExpandedView() &&+ !userInvitesQuery.isLoading &&+ !firstTeamInvite() &&premiumHintVisible() &&premiumCardDismissed() &&newPricingFF().enableddiff --git a/apps/web/src/features/paywall/use-checkout-completion-listener.ts b/apps/web/src/features/paywall/use-checkout-completion-listener.tsnew file mode 100644index 0000000000..35ed80b6af--- /dev/null+++ b/apps/web/src/features/paywall/use-checkout-completion-listener.ts@@ -0,0 +1,70 @@+import { useAnalytics } from '@app/lib/analytics/analytics-context';+import { toast } from '@core/component/Toast/Toast';+import { useUserInfoQuery } from '@queries/auth/user-info';+import { useSearchParams } from '@solidjs/router';+import { createSignal, onCleanup, onMount } from 'solid-js';++const CHECKOUT_REFRESH_ATTEMPTS = 10;+const CHECKOUT_REFRESH_INTERVAL_MS = 1_000;++/**+ * Handles Stripe checkout return parameters and refreshes user information+ * until the asynchronously updated license becomes available.+ */+export function useCheckoutCompletionListener() {+ const analytics = useAnalytics();+ const [searchParams] = useSearchParams();+ const userInfoQuery = useUserInfoQuery();+ const subscriptionSuccess = searchParams.subscriptionSuccess;+ const [refreshPending, setRefreshPending] = createSignal(+ subscriptionSuccess === 'true'+ );+ let cancelled = false;++ onCleanup(() => {+ cancelled = true;+ });++ onMount(() => {+ if (subscriptionSuccess === 'true') {+ toast.success('Your plan has been activated!');+ analytics.track('subscription_success', { type: searchParams.type });++ void (async () => {+ try {+ for (+ let attempt = 0;+ attempt < CHECKOUT_REFRESH_ATTEMPTS;+ attempt+++ ) {+ const result = await userInfoQuery.refetch();+ const licenseStatus = result.data?.licenseStatus;+ if (+ cancelled ||+ licenseStatus === 'active' ||+ licenseStatus === 'trialing'+ ) {+ break;+ }++ if (attempt < CHECKOUT_REFRESH_ATTEMPTS - 1) {+ await new Promise((resolve) =>+ setTimeout(resolve, CHECKOUT_REFRESH_INTERVAL_MS)+ );+ }+ }+ } catch (error) {+ console.error('Failed to refresh user info after checkout', error);+ } finally {+ if (!cancelled) setRefreshPending(false);+ }+ })();+ }++ if (searchParams.subscriptionCancel === 'true') {+ analytics.track('subscription_cancel', { tier: searchParams.tier });+ }+ });++ return refreshPending;+}diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsxindex 8b25549b46..08b401d421 100644--- a/apps/web/src/routes/Root.tsx+++ b/apps/web/src/routes/Root.tsx@@ -11,6 +11,7 @@ import { GlobalShareInboxConflictDialog } from '@app/features/inbox/ShareInboxCoimport { SearchProvider } from '@app/features/next-soup/search-context';import { usePendingNotificationNavigationEffect } from '@app/features/notifications/PendingNotificationNavigationEffect';import { InteractiveOnboardingModal } from '@app/features/onboarding/InteractiveOnboardingModal';+import { useCheckoutCompletionListener } from '@app/features/paywall/use-checkout-completion-listener';import { TeamInviteAcceptance } from '@app/features/team-invitations/TeamInviteAcceptance';import {AnalyticsContextProvider,@@ -34,7 +35,6 @@ import { ReactiveFavicon } from '@components/app/ReactiveFavicon';import { LAYOUT_ROUTE } from '@components/app/split-layout/SplitLayoutRoute';import { clearLocalAuthSession } from '@core/auth/logout';import { ChatAttachmentsInit } from '@core/component/AI/signal/globalAttachments';-import { toast } from '@core/component/Toast/Toast';import { ToastRegion } from '@core/component/Toast/ToastRegion';import { ChannelsContextProvider } from '@core/context/channels';import { QuickAccessProvider } from '@core/context/quickAccess';@@ -236,26 +236,15 @@ function OfflineFallbackRoute() {}function BasePathComponent() {- const analytics = useAnalytics();-const [searchParams] = useSearchParams();+ const userInfoQuery = useUserInfoQuery();+ const checkoutRefreshPending = useCheckoutCompletionListener();- const subscriptionSuccess = searchParams.subscriptionSuccess;- const type = searchParams.type;- if (subscriptionSuccess === 'true') {- toast.success('Your plan has been activated!');- analytics.track('subscription_success', { type });- // Invalidate user info to refresh trial status and subscription data- invalidateUserInfo();- }-- if (searchParams.subscriptionCancel === 'true') {- analytics.track('subscription_cancel', { tier: searchParams.tier });- }-- if (searchParams.upgrade === 'true') {- sessionStorage.setItem('showUpgradeModal', 'true');- }+ onMount(() => {+ if (searchParams.upgrade === 'true') {+ sessionStorage.setItem('showUpgradeModal', 'true');+ }+ });// check session storage for redirect urlconst redirectUrl = sessionStorage.getItem('redirectUrl');@@ -266,15 +255,15 @@ function BasePathComponent() {return;}- const userInfoQuery = useUserInfoQuery();-// Preserve existing query parameters when redirectingconst queryString = getCurrentQueryString();const redirectPath = `${DEFAULT_ROUTE}${queryString}`;return (<Switch>- <Match when={userInfoQuery.isLoading}>{null}</Match>+ <Match when={userInfoQuery.isLoading || checkoutRefreshPending()}>+ {null}+ </Match><Matchwhen={hasLoginCookie() &&