Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix(billing): loading/disabled feedback on billing actions

Carl-Gerhard Lindesvärd1515903113c2
diff --git a/apps/start/src/components/organization/billing-plan-picker.tsx b/apps/start/src/components/organization/billing-plan-picker.tsx
index 80ac819ba..e4987dcd1 100644
--- a/apps/start/src/components/organization/billing-plan-picker.tsx
+++ b/apps/start/src/components/organization/billing-plan-picker.tsx
@@ -31,6 +31,31 @@ const getPrice = (product: IPolarProduct) => {
: 0;
};
+const PolarLogo = ({ className }: { className?: string }) => (
+ <svg
+ className={className}
+ fill="none"
+ height="300"
+ viewBox="0 0 300 300"
+ width="300"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <g clip-path="url(#clip0_1_4)">
+ <path
+ clip-rule="evenodd"
+ d="M66.4284 274.26C134.876 320.593 227.925 302.666 274.258 234.219C320.593 165.771 302.666 72.7222 234.218 26.3885C165.77 -19.9451 72.721 -2.0181 26.3873 66.4297C-19.9465 134.877 -2.01938 227.927 66.4284 274.26ZM47.9555 116.67C30.8375 169.263 36.5445 221.893 59.2454 256.373C18.0412 217.361 7.27564 150.307 36.9437 92.318C55.9152 55.2362 87.5665 29.3937 122.5 18.3483C90.5911 36.7105 62.5549 71.8144 47.9555 116.67ZM175.347 283.137C211.377 272.606 244.211 246.385 263.685 208.322C293.101 150.825 282.768 84.4172 242.427 45.2673C264.22 79.7626 269.473 131.542 252.631 183.287C237.615 229.421 208.385 265.239 175.347 283.137ZM183.627 266.229C207.945 245.418 228.016 210.604 236.936 168.79C251.033 102.693 232.551 41.1978 195.112 20.6768C214.97 47.3945 225.022 99.2902 218.824 157.333C214.085 201.724 200.814 240.593 183.627 266.229ZM63.7178 131.844C49.5155 198.43 68.377 260.345 106.374 280.405C85.9962 254.009 75.5969 201.514 81.8758 142.711C86.5375 99.0536 99.4504 60.737 116.225 35.0969C92.2678 55.983 72.5384 90.4892 63.7178 131.844ZM199.834 149.561C200.908 217.473 179.59 272.878 152.222 273.309C124.853 273.742 101.797 219.039 100.724 151.127C99.6511 83.2138 120.968 27.8094 148.337 27.377C175.705 26.9446 198.762 81.648 199.834 149.561Z"
+ fill="currentColor"
+ fill-rule="evenodd"
+ />
+ </g>
+ <defs>
+ <clipPath id="clip0_1_4">
+ <rect fill="white" height="300" width="300" />
+ </clipPath>
+ </defs>
+ </svg>
+);
+
export default function BillingPlanPicker({
organization,
currentProduct,
@@ -78,6 +103,7 @@ export default function BillingPlanPicker({
if (data?.url) {
window.location.href = data.url;
} else {
+ setPendingProductId(null);
queryClient.invalidateQueries(
trpc.organization.get.queryOptions({
organizationId: organization.id,
@@ -117,7 +143,7 @@ export default function BillingPlanPicker({
};
const handleCheckout = () => {
- if (!selectedProduct) {
+ if (!selectedProduct || checkoutMutation.isPending) {
return;
}
startCheckout(selectedProduct);
@@ -189,9 +215,18 @@ export default function BillingPlanPicker({
return 'Pay with Polar';
})();
+ // A checkout click charges the card via Polar, so the button must lock
+ // while the request is in flight — otherwise each extra click is another
+ // charge attempt.
+ const isCheckingOut = checkoutMutation.isPending;
+
return (
<button
- className="group mt-4 w-full overflow-hidden rounded-lg transition-all hover:translate-y-[-1px]"
+ className={cn(
+ 'group mt-4 w-full overflow-hidden rounded-lg transition-all',
+ isCheckingOut ? 'cursor-wait opacity-70' : 'hover:translate-y-[-1px]'
+ )}
+ disabled={isCheckingOut}
onClick={handleCheckout}
type="button"
>
@@ -211,28 +246,11 @@ export default function BillingPlanPicker({
<span>{number.currency(getPrice(selectedProduct))}</span>
</div>
<div className="center-center row gap-4 bg-primary p-4 text-primary-foreground transition-colors group-hover:bg-primary/90">
- <svg
- className="size-6"
- fill="none"
- height="300"
- viewBox="0 0 300 300"
- width="300"
- xmlns="http://www.w3.org/2000/svg"
- >
- <g clip-path="url(#clip0_1_4)">
- <path
- clip-rule="evenodd"
- d="M66.4284 274.26C134.876 320.593 227.925 302.666 274.258 234.219C320.593 165.771 302.666 72.7222 234.218 26.3885C165.77 -19.9451 72.721 -2.0181 26.3873 66.4297C-19.9465 134.877 -2.01938 227.927 66.4284 274.26ZM47.9555 116.67C30.8375 169.263 36.5445 221.893 59.2454 256.373C18.0412 217.361 7.27564 150.307 36.9437 92.318C55.9152 55.2362 87.5665 29.3937 122.5 18.3483C90.5911 36.7105 62.5549 71.8144 47.9555 116.67ZM175.347 283.137C211.377 272.606 244.211 246.385 263.685 208.322C293.101 150.825 282.768 84.4172 242.427 45.2673C264.22 79.7626 269.473 131.542 252.631 183.287C237.615 229.421 208.385 265.239 175.347 283.137ZM183.627 266.229C207.945 245.418 228.016 210.604 236.936 168.79C251.033 102.693 232.551 41.1978 195.112 20.6768C214.97 47.3945 225.022 99.2902 218.824 157.333C214.085 201.724 200.814 240.593 183.627 266.229ZM63.7178 131.844C49.5155 198.43 68.377 260.345 106.374 280.405C85.9962 254.009 75.5969 201.514 81.8758 142.711C86.5375 99.0536 99.4504 60.737 116.225 35.0969C92.2678 55.983 72.5384 90.4892 63.7178 131.844ZM199.834 149.561C200.908 217.473 179.59 272.878 152.222 273.309C124.853 273.742 101.797 219.039 100.724 151.127C99.6511 83.2138 120.968 27.8094 148.337 27.377C175.705 26.9446 198.762 81.648 199.834 149.561Z"
- fill="currentColor"
- fill-rule="evenodd"
- />
- </g>
- <defs>
- <clipPath id="clip0_1_4">
- <rect fill="white" height="300" width="300" />
- </clipPath>
- </defs>
- </svg>
+ {isCheckingOut ? (
+ <Loader2Icon className="size-6 animate-spin" />
+ ) : (
+ <PolarLogo className="size-6" />
+ )}
<span className="font-semibold">{payLabel}</span>
</div>
</button>
@@ -316,10 +334,7 @@ export default function BillingPlanPicker({
'text-muted-foreground line-through',
isProductDisabled && '!cursor-not-allowed opacity-50'
)}
- disabled={
- isProductDisabled ||
- (directCheckout && checkoutMutation.isPending)
- }
+ disabled={isProductDisabled || checkoutMutation.isPending}
key={product.id}
onClick={() =>
directCheckout
diff --git a/apps/start/src/components/organization/billing-prompt.tsx b/apps/start/src/components/organization/billing-prompt.tsx
index 33392a3f4..61196eb86 100644
--- a/apps/start/src/components/organization/billing-prompt.tsx
+++ b/apps/start/src/components/organization/billing-prompt.tsx
@@ -116,6 +116,9 @@ export default function BillingPrompt({
});
}
},
+ onError(error) {
+ toast.error(error.message);
+ },
})
);
const portal = useMutation(
diff --git a/apps/start/src/components/organization/billing.tsx b/apps/start/src/components/organization/billing.tsx
index d956a18b7..a522b8bb8 100644
--- a/apps/start/src/components/organization/billing.tsx
+++ b/apps/start/src/components/organization/billing.tsx
@@ -228,6 +228,7 @@ export default function Billing({ organization }: Props) {
/>
<div className="row mt-4 justify-between">
<Button
+ loading={portalMutation.isPending}
onClick={() =>
portalMutation.mutate({ organizationId: organization.id })
}
diff --git a/apps/start/src/components/organization/cancel-subscription-flow.tsx b/apps/start/src/components/organization/cancel-subscription-flow.tsx
index eb45b0d75..f6598e680 100644
--- a/apps/start/src/components/organization/cancel-subscription-flow.tsx
+++ b/apps/start/src/components/organization/cancel-subscription-flow.tsx
@@ -259,6 +259,7 @@ export default function CancelSubscriptionFlow({
<ButtonContainer className="shrink-0 gap-2 [&>*]:flex-1">
<Button
disabled={isPending}
+ loading={cancelMutation.isPending}
onClick={() => {
op.track('cancel_pause_declined', {
organizationId: organization.id,
@@ -275,6 +276,7 @@ export default function CancelSubscriptionFlow({
{discountAvailable ? 'No thanks' : 'No thanks, cancel'}
</Button>
<Button
+ disabled={isPending}
loading={pauseMutation.isPending}
onClick={() => {
op.track('cancel_pause_accepted', {
@@ -325,6 +327,7 @@ export default function CancelSubscriptionFlow({
Cancel subscription
</Button>
<Button
+ disabled={isPending}
loading={discountMutation.isPending}
onClick={() => {
op.track('cancel_discount_accepted', {