Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat: add loading indicator and ChargeBreakdown in NewOrgForm (#45236)

Ignacio Dobronich7dcf677a9546
diff --git a/apps/studio/components/interfaces/Billing/ChargeBreakdown.tsx b/apps/studio/components/interfaces/Billing/ChargeBreakdown.tsx
index 38ce73ec9b6..6de12139b2c 100644
--- a/apps/studio/components/interfaces/Billing/ChargeBreakdown.tsx
+++ b/apps/studio/components/interfaces/Billing/ChargeBreakdown.tsx
@@ -4,6 +4,7 @@ import { formatCurrency } from '@/lib/helpers'
export interface ChargeBreakdownProps {
subtotal: number
+ subtotalLabel?: string
total: number
tax?: { amount: number; percentage: number }
taxStatus?: 'calculated' | 'failed' | 'not_applicable'
@@ -12,6 +13,7 @@ export interface ChargeBreakdownProps {
export const ChargeBreakdown = ({
subtotal,
+ subtotalLabel = 'Subtotal',
total,
tax,
taxStatus,
@@ -23,7 +25,7 @@ export const ChargeBreakdown = ({
>
{total !== subtotal && (
<div className="flex items-center justify-between gap-2 border-b border-muted text-sm">
- <div className="py-2">Subtotal</div>
+ <div className="py-2">{subtotalLabel}</div>
<div className="py-2 text-right tabular-nums" translate="no">
{formatCurrency(subtotal)}
</div>
diff --git a/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx b/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
index 40621505922..8bbf7267711 100644
--- a/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
+++ b/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
@@ -14,7 +14,6 @@ import { SubmitHandler, useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
- cn,
Form,
FormControl,
FormField,
@@ -27,9 +26,11 @@ import {
Switch,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import { z } from 'zod'
import { UpgradeExistingOrganizationCallout } from './UpgradeExistingOrganizationCallout'
+import { ChargeBreakdown } from '@/components/interfaces/Billing/ChargeBreakdown'
import { getStripeElementsAppearanceOptions } from '@/components/interfaces/Billing/Payment/Payment.utils'
import { PaymentConfirmation } from '@/components/interfaces/Billing/Payment/PaymentConfirmation'
import {
@@ -49,7 +50,6 @@ import { useConfirmPendingSubscriptionCreateMutation } from '@/data/subscription
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { PRICING_TIER_LABELS_ORG, STRIPE_PUBLIC_KEY } from '@/lib/constants'
-import { formatCurrency } from '@/lib/helpers'
import { useProfile } from '@/lib/profile'
const ORG_KIND_TYPES = {
@@ -407,7 +407,7 @@ export const NewOrgForm = ({
htmlType="submit"
type="primary"
loading={newOrgLoading}
- disabled={newOrgLoading}
+ disabled={newOrgLoading || creationPreviewIsFetching}
>
Create organization
</Button>
@@ -605,49 +605,31 @@ export const NewOrgForm = ({
/>
</Elements>
- {creationPreviewInitialized && !!billingAddress && (
- <div
- className={cn(
- 'text-foreground-light text-sm transition-opacity mt-4',
- creationPreviewIsFetching && 'opacity-50'
- )}
- >
- {creationPreview.total !== creationPreview.plan_price && (
- <div className="flex items-center justify-between gap-2 border-b border-muted text-sm">
- <div className="py-2">Plan price</div>
- <div className="py-2 text-right tabular-nums" translate="no">
- {formatCurrency(creationPreview.plan_price)}
- </div>
- </div>
- )}
-
- {creationPreview.tax_status === 'calculated' &&
- creationPreview.tax &&
- creationPreview.tax.tax_amount > 0 && (
- <div className="flex items-center justify-between gap-2 border-b border-muted text-sm">
- <div className="py-2">
- Tax ({creationPreview.tax.tax_rate_percentage}%)
- </div>
- <div className="py-2 text-right tabular-nums" translate="no">
- {formatCurrency(creationPreview.tax.tax_amount)}
- </div>
- </div>
- )}
-
- {creationPreview.tax_status === 'failed' && (
- <div className="flex items-center justify-between gap-2 border-b border-muted text-sm">
- <div className="py-2 text-foreground-lighter">
- Tax could not be estimated and may be applied separately
- </div>
- </div>
- )}
+ {!!billingAddress && !creationPreviewInitialized && (
+ <div className="space-y-2 mt-4">
+ <ShimmeringLoader />
+ <ShimmeringLoader className="w-3/4" />
+ <ShimmeringLoader className="w-1/2" />
+ </div>
+ )}
- <div className="flex items-center justify-between gap-2 text-foreground text-base">
- <div className="py-2">Total due today</div>
- <div className="py-2 text-right tabular-nums" translate="no">
- {formatCurrency(creationPreview.total)}
- </div>
- </div>
+ {creationPreviewInitialized && !!billingAddress && (
+ <div className="mt-4">
+ <ChargeBreakdown
+ subtotal={creationPreview.plan_price}
+ subtotalLabel="Plan price"
+ total={creationPreview.total}
+ tax={
+ creationPreview.tax
+ ? {
+ amount: creationPreview.tax.tax_amount,
+ percentage: creationPreview.tax.tax_rate_percentage,
+ }
+ : undefined
+ }
+ taxStatus={creationPreview.tax_status}
+ isFetching={creationPreviewIsFetching}
+ />
</div>
)}
</Panel.Content>