Skip to content

fix(clerk-js): Incremental improvements for account funds #5705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2025
Merged

fix(clerk-js): Incremental improvements for account funds #5705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
247f219
fix(clerk-js): Incremental improvements for account funds
panteliselef Apr 24, 2025
1bf7a4f
fix auto imports
panteliselef Apr 24, 2025
a2e5343
Merge branch 'main' into elef/com-523-iterate-on-account-funds
panteliselef Apr 24, 2025
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
9 changes: 9 additions & 0 deletions .changeset/silver-symbols-worry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': patch
---

Incremental improvements for account funds in checkout.

- Fixes CLS issues when rendering account funds
- Renames "accounts funds" to "payment sources" for consistency
- Auto opes the "Add a new payment source" drawer only if no payments sources exist
17 changes: 10 additions & 7 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ const CheckoutFormElements = ({
const { __experimental_commerce } = useClerk();
const { organization } = useOrganization();
const { subscriberType } = useCheckoutContext();
const [openAccountFundsDropDown, setOpenAccountFundsDropDown] = useState(true);
const [openAddNewSourceDropDown, setOpenAddNewSourceDropDown] = useState(true);
const [isSubmitting, setIsSubmitting] = useState(false);
const [submitError, setSubmitError] = useState<ClerkRuntimeError | ClerkAPIError | string | undefined>();

const { data } = useFetch(
__experimental_commerce?.getPaymentSources,
Expand All @@ -106,6 +102,12 @@ const CheckoutFormElements = ({
undefined,
'commerce-payment-sources',
);

const [openAccountFundsDropDown, setOpenAccountFundsDropDown] = useState(true);
const [openAddNewSourceDropDown, setOpenAddNewSourceDropDown] = useState((data?.data.length || 0) === 0);
const [isSubmitting, setIsSubmitting] = useState(false);
const [submitError, setSubmitError] = useState<ClerkRuntimeError | ClerkAPIError | string | undefined>();

const { data: paymentSources } = data || { data: [] };

const confirmCheckout = async ({ paymentSourceId }: { paymentSourceId: string }) => {
Expand Down Expand Up @@ -160,7 +162,7 @@ const CheckoutFormElements = ({
onOpenChange={setOpenAccountFundsDropDown}
>
{/* TODO(@Commerce): needs localization */}
<Disclosure.Trigger text='Account Funds' />
<Disclosure.Trigger text='Payment Sources' />
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In follow up ticket we will be handling localization for Checkout.

<Disclosure.Content>
<Col gap={3}>
<PaymentSourceMethods
Expand All @@ -181,8 +183,9 @@ const CheckoutFormElements = ({
open={openAddNewSourceDropDown}
onOpenChange={setOpenAddNewSourceDropDown}
>
{/* TODO(@Commerce): needs localization */}
<Disclosure.Trigger text='Add a New Payment Source' />
<Disclosure.Trigger
text={localizationKeys('userProfile.__experimental_billingPage.paymentSourcesSection.add')}
/>
<Disclosure.Content>
<__experimental_PaymentSourcesContext.Provider value={{ componentName: 'PaymentSources', subscriberType }}>
<AddPaymentSource
Expand Down
17 changes: 15 additions & 2 deletions packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useOrganization } from '@clerk/shared/react';
import type {
__experimental_CommercePlanResource,
__experimental_CommerceSubscriptionPlanPeriod,
Expand All @@ -7,13 +7,15 @@ import type {
import { useState } from 'react';

import { usePlansContext, usePricingTableContext } from '../../contexts';
import { useFetch } from '../../hooks/useFetch';
import { PricingTableDefault } from './PricingTableDefault';
import { PricingTableMatrix } from './PricingTableMatrix';

const PricingTable = (props: __experimental_PricingTableProps) => {
const clerk = useClerk();
const { mode = 'mounted' } = usePricingTableContext();
const { mode = 'mounted', subscriberType } = usePricingTableContext();
const isCompact = mode === 'modal';
const { organization } = useOrganization();

const { plans, handleSelectPlan } = usePlansContext();

Expand All @@ -27,6 +29,17 @@ const PricingTable = (props: __experimental_PricingTableProps) => {
handleSelectPlan({ mode, plan, planPeriod });
};

const { __experimental_commerce } = useClerk();

useFetch(
__experimental_commerce?.getPaymentSources,
{
...(subscriberType === 'org' ? { orgId: organization?.id } : {}),
},
undefined,
'commerce-payment-sources',
);

Comment on lines +34 to +42
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically prefetching from pricing table in order to avoid the layout shift.

return (
<>
{mode !== 'modal' && props.layout === 'matrix' ? (
Expand Down