Skip to content

refactor(clerk-js): Add loading state to <PaymentSources /> component #5879

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 2 commits into from
May 8, 2025
Merged

refactor(clerk-js): Add loading state to <PaymentSources /> component #5879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1db379d
refactor(clerk-js): Add loading state to `<PaymentSources />` component
alexcarpenter May 7, 2025
ef208b6
add changeset
alexcarpenter May 7, 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
5 changes: 5 additions & 0 deletions .changeset/two-keys-act.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add loading state to `<PaymentSources />` component.
81 changes: 47 additions & 34 deletions packages/clerk-js/src/ui/components/PaymentSources/PaymentSources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Fragment, useMemo, useRef } from 'react';
import { RemoveResourceForm } from '../../common';
import { useSubscriberTypeContext } from '../../contexts';
import { localizationKeys } from '../../customizables';
import { ProfileSection, ThreeDotsMenu, useCardState } from '../../elements';
import { FullHeightLoader, ProfileSection, ThreeDotsMenu, useCardState, withCardStateProvider } from '../../elements';
import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useFetch } from '../../hooks';
Expand Down Expand Up @@ -83,25 +83,29 @@ const RemoveScreen = ({
);
};

export const PaymentSources = () => {
export const PaymentSources = withCardStateProvider(() => {
const clerk = useClerk();
const subscriberType = useSubscriberTypeContext();

const resource = subscriberType === 'org' ? clerk?.organization : clerk.user;

const { data, revalidate } = useFetch(
const { data, revalidate, isLoading } = useFetch(
resource?.getPaymentSources,
{},
undefined,
`commerce-payment-sources-${resource?.id}`,
);
const { data: paymentSources } = data || { data: [] };
const { data: paymentSources = [] } = data || {};

const sortedPaymentSources = useMemo(
() => paymentSources.sort((a, b) => (a.isDefault && !b.isDefault ? -1 : 1)),
[paymentSources],
);

if (!resource) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys('userProfile.billingPage.paymentSourcesSection.title')}
Expand All @@ -115,43 +119,52 @@ export const PaymentSources = () => {
})}
>
<Action.Root>
<ProfileSection.ItemList id='paymentSources'>
{sortedPaymentSources.map(paymentSource => (
<Fragment key={paymentSource.id}>
<ProfileSection.Item id='paymentSources'>
<PaymentSourceRow paymentSource={paymentSource} />
<PaymentSourceMenu
paymentSource={paymentSource}
revalidate={revalidate}
<ProfileSection.ItemList
id='paymentSources'
disableAnimation
>
{isLoading ? (
<FullHeightLoader />
) : (
<>
{sortedPaymentSources.map(paymentSource => (
<Fragment key={paymentSource.id}>
<ProfileSection.Item id='paymentSources'>
<PaymentSourceRow paymentSource={paymentSource} />
<PaymentSourceMenu
paymentSource={paymentSource}
revalidate={revalidate}
/>
</ProfileSection.Item>

<Action.Open value={`remove-${paymentSource.id}`}>
<Action.Card variant='destructive'>
<RemoveScreen
paymentSource={paymentSource}
revalidate={revalidate}
/>
</Action.Card>
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys('userProfile.billingPage.paymentSourcesSection.add')}
/>
</ProfileSection.Item>

<Action.Open value={`remove-${paymentSource.id}`}>
<Action.Card variant='destructive'>
<RemoveScreen
paymentSource={paymentSource}
revalidate={revalidate}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidate} />
</Action.Card>
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys('userProfile.billingPage.paymentSourcesSection.add')}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidate} />
</Action.Card>
</Action.Open>
</>
)}
</ProfileSection.ItemList>
</Action.Root>
</ProfileSection.Root>
);
};
});

const PaymentSourceMenu = ({
paymentSource,
Expand Down