chore(clerk-js): Rename payment source to method internally#6952

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
panteliselef merged 2 commits into from
Oct 9, 2025
Merged

chore(clerk-js): Rename payment source to method internally #6952

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
1b0eeb0
chore: Rename payment source to method internally
panteliselef Oct 9, 2025
34a99d1
changeset
panteliselef Oct 9, 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
2 changes: 2 additions & 0 deletions .changeset/wet-cameras-sneeze.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 2 additions & 3 deletions packages/clerk-js/src/core/modules/billing/payment-source-methods.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
method: 'GET',
search: convertPageToOffsetSearchParams(rest),
}).then(res => {
const { data: paymentSources, total_count } =
res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
return {
total_count,
data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
};
});
};
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
pathRoot: '',
reload: vi.fn(),
},
paymentSource: undefined,
paymentMethod: undefined,
confirm: vi.fn(),
reload: vi.fn(),
pathRoot: '/checkout',
Expand Down
54 changes: 27 additions & 27 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
const { checkout } = useCheckout();
const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
const { data: paymentSources } = usePaymentMethods();
const { data: paymentMethods } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);

const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
>
{__BUILD_DISABLE_RHC__ ? null : (
<>
{paymentSources.length > 0 && showPaymentMethods && (
{paymentMethods.length > 0 && showPaymentMethods && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
)}

{paymentMethodSource === 'existing' && (
<ExistingPaymentSourceForm
paymentSources={paymentSources}
<ExistingPaymentMethodForm
paymentMethods={paymentMethods}
totalDueNow={totals.totalDueNow}
/>
)}

{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
</Col>
);
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
const { isLoading } = useCardState();
const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
const { addPaymentMethodAndPay } = useCheckoutMutations();
const submitLabel = useSubmitLabel();
const { checkout } = useCheckout();

return (
<AddPaymentSource.Root
<AddPaymentMethod.Root
onSuccess={addPaymentMethodAndPay}
checkout={checkout}
>
<DevOnly>
<PayWithTestPaymentSource />
<PayWithTestPaymentMethod />
</DevOnly>

<AddPaymentSource.FormButton text={submitLabel} />
</AddPaymentSource.Root>
<AddPaymentMethod.FormButton text={submitLabel} />
</AddPaymentMethod.Root>
);
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
({
totalDueNow,
paymentSources,
paymentMethods,
}: {
totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
}) => {
const submitLabel = useSubmitLabel();
const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
const { payWithExistingPaymentMethod } = useCheckoutMutations();
const card = useCardState();
const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
paymentMethod || paymentSources.find(p => p.isDefault),
paymentMethod || paymentMethods.find(p => p.isDefault),
);

const options = useMemo(() => {
return paymentSources.map(source => {
return paymentMethods.map(method => {
const label =
source.paymentType !== 'card'
? `${capitalize(source.paymentType)}`
: `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
? `${capitalize(method.paymentType)}`
: `${capitalize(method.cardType)} ⋯ ${method.last4}`;

return {
value: source.id,
value: method.id,
label,
};
});
}, [paymentSources]);
}, [paymentMethods]);

const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
options={options}
value={selectedPaymentMethod?.id || null}
onChange={option => {
const paymentSource = paymentSources.find(source => source.id === option.value);
setSelectedPaymentMethod(paymentSource);
const paymentMethod = paymentMethods.find(source => source.id === option.value);
setSelectedPaymentMethod(paymentMethod);
}}
portal
>
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
backgroundColor: t.colors.$colorBackground,
})}
>
{selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
{selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
</SelectButton>
<SelectOptionList
sx={t => ({
Expand Down
30 changes: 15 additions & 15 deletions packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
freeTrialDays: 7,
freeTrialEnabled: true,
},
paymentSource: undefined,
paymentMethod: undefined,
confirm: vi.fn(),
freeTrialEndsAt,
} as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
freeTrialDays: 7,
freeTrialEnabled: true,
},
paymentSource: undefined,
paymentMethod: undefined,
confirm: vi.fn(),
freeTrialEndsAt: new Date('2025-08-19'),
} as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
});

await waitFor(() => {
const visaPaymentSource = getByText('visa');
expect(visaPaymentSource).toBeVisible();
const visaPaymentMethod = getByText('visa');
expect(visaPaymentMethod).toBeVisible();

const last4Digits = getByText('⋯ 4242');
expect(last4Digits).toBeVisible();

// Verify the default badge is shown for the first payment source
// Verify the default badge is shown for the first payment method
const defaultBadge = getByText('Default');
expect(defaultBadge).toBeVisible();

// Verify the hidden input contains the correct payment source id
// Verify the hidden input contains the correct payment method id
const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
freeTrialDays: 7,
freeTrialEnabled: true,
},
paymentSource: undefined,
paymentMethod: undefined,
confirm: vi.fn(),
freeTrialEndsAt: null,
} as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
});

await waitFor(() => {
const visaPaymentSource = getByText('visa');
expect(visaPaymentSource).toBeVisible();
const visaPaymentMethod = getByText('visa');
expect(visaPaymentMethod).toBeVisible();

const last4Digits = getByText('⋯ 4242');
expect(last4Digits).toBeVisible();

// Verify the default badge is shown for the first payment source
// Verify the default badge is shown for the first payment method
const defaultBadge = getByText('Default');
expect(defaultBadge).toBeVisible();

// Verify the hidden input contains the correct payment source id
// Verify the hidden input contains the correct payment method id
const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
freeTrialDays: 7,
freeTrialEnabled: true,
},
paymentSource: undefined,
paymentMethod: undefined,
confirm: vi.fn(),
freeTrialEndsAt: null,
} as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
const addPaymentMethodButton = queryByText('Add payment method');
expect(addPaymentMethodButton).toBeNull();

const visaPaymentSource = queryByText('visa');
expect(visaPaymentSource).toBeNull();
const visaPaymentMethod = queryByText('visa');
expect(visaPaymentMethod).toBeNull();

expect(
getByText(
'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
),
).toBeInTheDocument();

// Verify the hidden input contains the correct payment source id
// Verify the hidden input contains the correct payment method id
const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
)}
/>
<Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
<PaymentSources />
<PaymentMethods />
</Protect>
</TabPanel>
<TabPanel sx={{ width: '100%' }}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore(clerk-js): Rename payment source to method internally#6952

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

panteliselef
merged 2 commits into

from

Oct 9, 2025
 Merged


chore(clerk-js): Rename payment source to method internally
#6952
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
1b0eeb0

chore: Rename payment source to method internally


panteliselef Oct 9, 2025
34a99d1

changeset


panteliselef Oct 9, 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


2 changes: 2 additions & 0 deletions
.changeset/wet-cameras-sneeze.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

5 changes: 2 additions & 3 deletions
packages/clerk-js/src/core/modules/billing/payment-source-methods.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,11 +46,10 @@ export const getPaymentMethods = async (params: GetPaymentMethodsParams) => {
 method: 'GET',
 search: convertPageToOffsetSearchParams(rest),
 }).then(res => {
 const { data: paymentSources, total_count } =
 res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 const { data, total_count } = res?.response as unknown as ClerkPaginatedResponse<BillingPaymentMethodJSON>;
 return {
 total_count,
 data: paymentSources.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 data: data.map(paymentMethod => new BillingPaymentMethod(paymentMethod)),
 };
 });
};

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/modules/checkout/__tests__/manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ const createMockCheckoutResource = (overrides: Partial<BillingCheckoutResource>
 pathRoot: '',
 reload: vi.fn(),
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 reload: vi.fn(),
 pathRoot: '/checkout',
Expand Down

54 changes: 27 additions & 27 deletions
packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ import { DevOnly } from '../../common/DevOnly';
import { useCheckoutContext, usePaymentMethods } from '../../contexts';
import { Box, Button, Col, descriptors, Flex, Form, localizationKeys, Spinner, Text } from '../../customizables';
import { ChevronUpDown, InformationCircle } from '../../icons';
import * as AddPaymentSource from '../PaymentSources/AddPaymentSource';
import { PaymentSourceRow } from '../PaymentSources/PaymentSourceRow';
import * as AddPaymentMethod from '../PaymentMethods/AddPaymentMethod';
import { PaymentMethodRow } from '../PaymentMethods/PaymentMethodRow';
import { SubscriptionBadge } from '../Subscriptions/badge';

type PaymentMethodSource = 'existing' | 'new';
Expand DownExpand Up@@ -213,10 +213,10 @@ const CheckoutFormElements = () => {
const CheckoutFormElementsInternal = () => {
 const { checkout } = useCheckout();
 const { id, totals, isImmediatePlanChange, freeTrialEndsAt } = checkout;
 const { data: paymentSources } = usePaymentMethods();
 const { data: paymentMethods } = usePaymentMethods();

 const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
paymentMethods.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
 );

 const showPaymentMethods = isImmediatePlanChange && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt);
Expand All@@ -233,7 +233,7 @@ const CheckoutFormElementsInternal = () => {
 >
 {__BUILD_DISABLE_RHC__ ? null : (
 <>
 {paymentSources.length > 0 && showPaymentMethods && (
 {paymentMethods.length > 0 && showPaymentMethods && (
 <SegmentedControl.Root
 aria-label='Payment method source'
 value={paymentMethodSource}
Expand All@@ -255,18 +255,18 @@ const CheckoutFormElementsInternal = () => {
 )}

 {paymentMethodSource === 'existing' && (
 <ExistingPaymentSourceForm
paymentSources={paymentSources}
 <ExistingPaymentMethodForm
paymentMethods={paymentMethods}
 totalDueNow={totals.totalDueNow}
 />
 )}

 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
 {__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentMethodForCheckout />}
 </Col>
 );
};

export const PayWithTestPaymentSource = () => {
export const PayWithTestPaymentMethod = () => {
 const { isLoading } = useCardState();
 const { payWithTestCard } = useCheckoutMutations();

Expand DownExpand Up@@ -344,32 +344,32 @@ const useSubmitLabel = () => {
 return localizationKeys('commerce.subscribe');
};

const AddPaymentSourceForCheckout = withCardStateProvider(() => {
const AddPaymentMethodForCheckout = withCardStateProvider(() => {
 const { addPaymentMethodAndPay } = useCheckoutMutations();
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();

 return (
 <AddPaymentSource.Root
 <AddPaymentMethod.Root
 onSuccess={addPaymentMethodAndPay}
 checkout={checkout}
 >
 <DevOnly>
 <PayWithTestPaymentSource />
 <PayWithTestPaymentMethod />
 </DevOnly>

 <AddPaymentSource.FormButton text={submitLabel} />
 </AddPaymentSource.Root>
 <AddPaymentMethod.FormButton text={submitLabel} />
 </AddPaymentMethod.Root>
 );
});

const ExistingPaymentSourceForm = withCardStateProvider(
const ExistingPaymentMethodForm = withCardStateProvider(
 ({
 totalDueNow,
paymentSources,
paymentMethods,
 }: {
 totalDueNow: BillingMoneyAmount;
paymentSources: BillingPaymentMethodResource[];
paymentMethods: BillingPaymentMethodResource[];
 }) => {
 const submitLabel = useSubmitLabel();
 const { checkout } = useCheckout();
Expand All@@ -378,22 +378,22 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 const { payWithExistingPaymentMethod } = useCheckoutMutations();
 const card = useCardState();
 const [selectedPaymentMethod, setSelectedPaymentMethod] = useState<BillingPaymentMethodResource | undefined>(
 paymentMethod || paymentSources.find(p => p.isDefault),
 paymentMethod || paymentMethods.find(p => p.isDefault),
 );

 const options = useMemo(() => {
 return paymentSources.map(source => {
 return paymentMethods.map(method => {
 const label =
source.paymentType !== 'card'
 ? `${capitalize(source.paymentType)}`
 : `${capitalize(source.cardType)} ⋯ ${source.last4}`;
method.paymentType !== 'card'
 ? `${capitalize(method.paymentType)}`
 : `${capitalize(method.cardType)} ⋯ ${method.last4}`;

 return {
 value: source.id,
 value: method.id,
 label,
 };
 });
 }, [paymentSources]);
 }, [paymentMethods]);

 const showPaymentMethods = isImmediatePlanChange && (totalDueNow.amount > 0 || !!freeTrialEndsAt);

Expand All@@ -412,8 +412,8 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 options={options}
 value={selectedPaymentMethod?.id || null}
 onChange={option => {
 const paymentSource = paymentSources.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentSource);
 const paymentMethod = paymentMethods.find(source => source.id === option.value);
 setSelectedPaymentMethod(paymentMethod);
 }}
 portal
 >
Expand All@@ -430,7 +430,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
 backgroundColor: t.colors.$colorBackground,
 })}
 >
 {selectedPaymentMethod && <PaymentSourceRow paymentSource={selectedPaymentMethod} />}
 {selectedPaymentMethod && <PaymentMethodRow paymentMethod={selectedPaymentMethod} />}
 </SelectButton>
 <SelectOptionList
 sx={t => ({
Expand Down

30 changes: 15 additions & 15 deletions
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt,
 } as any);
Expand DownExpand Up@@ -747,7 +747,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: new Date('2025-08-19'),
 } as any);
Expand DownExpand Up@@ -780,17 +780,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -886,7 +886,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -919,17 +919,17 @@ describe('Checkout', () => {
 });

 await waitFor(() => {
 const visaPaymentSource = getByText('visa');
 expect(visaPaymentSource).toBeVisible();
 const visaPaymentMethod = getByText('visa');
 expect(visaPaymentMethod).toBeVisible();

 const last4Digits = getByText('⋯ 4242');
 expect(last4Digits).toBeVisible();

 // Verify the default badge is shown for the first payment source
 // Verify the default badge is shown for the first payment method
 const defaultBadge = getByText('Default');
 expect(defaultBadge).toBeVisible();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand DownExpand Up@@ -1025,7 +1025,7 @@ describe('Checkout', () => {
 freeTrialDays: 7,
 freeTrialEnabled: true,
 },
paymentSource: undefined,
paymentMethod: undefined,
 confirm: vi.fn(),
 freeTrialEndsAt: null,
 } as any);
Expand DownExpand Up@@ -1055,16 +1055,16 @@ describe('Checkout', () => {
 const addPaymentMethodButton = queryByText('Add payment method');
 expect(addPaymentMethodButton).toBeNull();

 const visaPaymentSource = queryByText('visa');
 expect(visaPaymentSource).toBeNull();
 const visaPaymentMethod = queryByText('visa');
 expect(visaPaymentMethod).toBeNull();

 expect(
 getByText(
 'You will keep your current subscription and its features until the end of the billing cycle, then you will be switched to this subscription.',
 ),
 ).toBeInTheDocument();

 // Verify the hidden input contains the correct payment source id
 // Verify the hidden input contains the correct payment method id
 const hiddenInput = baseElement.querySelector('input[name="payment_method_id"]');
 expect(hiddenInput).toHaveAttribute('value', 'pm_test_visa');

Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationBillingPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { SubscriberTypeContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { useTabState } from '../../hooks/useTabState';
import { PaymentAttemptsList } from '../PaymentAttempts';
import { PaymentSources } from '../PaymentSources';
import { PaymentMethods } from '../PaymentMethods';
import { StatementsList } from '../Statements';
import { SubscriptionsList } from '../Subscriptions';

Expand DownExpand Up@@ -68,7 +68,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
 )}
 />
 <Protect condition={has => has({ permission: 'org:sys_billing:manage' })}>
 <PaymentSources />
 <PaymentMethods />
 </Protect>
 </TabPanel>
 <TabPanel sx={{ width: '100%' }}>
Expand Down
Loading