diff --git a/.changeset/smooth-signs-type.md b/.changeset/smooth-signs-type.md new file mode 100644 index 00000000000..fa80dc759d9 --- /dev/null +++ b/.changeset/smooth-signs-type.md @@ -0,0 +1,7 @@ +--- +'@clerk/localizations': patch +'@clerk/clerk-js': patch +'@clerk/types': patch +--- + +Update SubscriptionsList UI to be rendered within ProfileSections within UserProfile and OrganizationProfile. diff --git a/integration/tests/pricing-table.test.ts b/integration/tests/pricing-table.test.ts index 365a0d44611..67e6bc41d8b 100644 --- a/integration/tests/pricing-table.test.ts +++ b/integration/tests/pricing-table.test.ts @@ -113,7 +113,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl await u.po.userProfile.waitForMounted(); await u.po.userProfile.switchToBillingTab(); - await u.po.page.getByRole('button', { name: 'View all plans' }).click(); + await u.po.page.getByRole('button', { name: 'Switch plans' }).click(); await u.po.pricingTable.waitForMounted(); await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible(); }); diff --git a/packages/clerk-js/bundlewatch.config.json b/packages/clerk-js/bundlewatch.config.json index 0c6154cc81d..cbafeb4b68a 100644 --- a/packages/clerk-js/bundlewatch.config.json +++ b/packages/clerk-js/bundlewatch.config.json @@ -23,8 +23,8 @@ { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" }, { "path": "./dist/checkout*.js", "maxSize": "5.79KB" }, { "path": "./dist/paymentSources*.js", "maxSize": "9.06KB" }, - { "path": "./dist/up-billing-page*.js", "maxSize": "2.4KB" }, - { "path": "./dist/op-billing-page*.js", "maxSize": "2.4KB" }, + { "path": "./dist/up-billing-page*.js", "maxSize": "2.5KB" }, + { "path": "./dist/op-billing-page*.js", "maxSize": "2.5KB" }, { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" } ] } diff --git a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx index 917c1b61ca1..5c9711d090b 100644 --- a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx +++ b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx @@ -14,7 +14,7 @@ import { useCheckoutContext } from '../../contexts'; import { Box, Button, Col, descriptors, Form, localizationKeys, Text } from '../../customizables'; import { Alert, Drawer, LineItems, SegmentedControl, Select, SelectButton, SelectOptionList } from '../../elements'; import { useFetch } from '../../hooks'; -import { ArrowUpDown } from '../../icons'; +import { ChevronUpDown } from '../../icons'; import { animations } from '../../styledSystem'; import { handleError } from '../../utils'; import { AddPaymentSource, PaymentSourceRow } from '../PaymentSources'; @@ -309,7 +309,7 @@ const ExistingPaymentSourceForm = ({ value={selectedPaymentSource?.id} /> ({ justifyContent: 'space-between', backgroundColor: t.colors.$colorBackground, diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx index 9508903eb71..3e5d8a0d5f0 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx @@ -6,11 +6,12 @@ import { SubscriberTypeContext, useSubscriptions, } from '../../contexts'; -import { Button, Col, descriptors, Flex, localizationKeys } from '../../customizables'; +import { Col, descriptors, Flex, localizationKeys } from '../../customizables'; import { Alert, Card, Header, + ProfileSection, Tab, TabPanel, TabPanels, @@ -20,6 +21,7 @@ import { withCardStateProvider, } from '../../elements'; import { useTabState } from '../../hooks/useTabState'; +import { ArrowsUpDown } from '../../icons'; import { useRouter } from '../../router'; import { InvoicesList } from '../Invoices'; import { PaymentSources } from '../PaymentSources'; @@ -53,7 +55,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => { > @@ -68,56 +70,70 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => { 0 - ? localizationKeys('userProfile.billingPage.start.headerTitle__subscriptions') - : localizationKeys('userProfile.billingPage.start.headerTitle__plans') + ? localizationKeys('organizationProfile.billingPage.start.headerTitle__subscriptions') + : localizationKeys('organizationProfile.billingPage.start.headerTitle__plans') } /> - + - - {subscriptions.data.length > 0 ? ( - <> + {subscriptions.data.length > 0 ? ( + + ({ + borderTop: 'none', + paddingTop: t.space.$1, + })} + > !has({ permission: 'org:sys_billing:manage' })}> -