Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/slow-foxes-lay.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Refactor billing statement page and payment attempt page data loading
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
{ "path": "./dist/clerk.js", "maxSize": "618KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand All@@ -23,7 +23,7 @@
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.45KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.5KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
Expand Down
22 changes: 22 additions & 0 deletions packages/clerk-js/src/core/modules/commerce/CommerceBilling.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,18 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getStatement = async (params: { id: string; orgId?: string }): Promise<CommerceStatementResource> => {
const statement = (
await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/statements/${params.id}`
: `/me/commerce/statements/${params.id}`,
method: 'GET',
})
)?.response as unknown as CommerceStatementJSON;
return new CommerceStatement(statement);
};

getPaymentAttempts = async (
params: GetPaymentAttemptsParams,
): Promise<ClerkPaginatedResponse<CommercePaymentResource>> => {
Expand All@@ -122,6 +134,16 @@ export class CommerceBilling implements CommerceBillingNamespace {
});
};

getPaymentAttempt = async (params: { id: string; orgId?: string }): Promise<CommercePaymentResource> => {
const paymentAttempt = (await BaseResource._fetch({
path: params.orgId
? `/organizations/${params.orgId}/commerce/payment_attempts/${params.id}`
: `/me/commerce/payment_attempts/${params.id}`,
method: 'GET',
})) as unknown as CommercePaymentJSON;
return new CommercePayment(paymentAttempt);
};

startCheckout = async (params: CreateCheckoutParams) => {
const { orgId, ...rest } = params;
const json = (
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

import { usePaymentAttemptsContext, useStatements } from '../../contexts';
import { useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Badge,
Box,
Expand All@@ -16,18 +19,39 @@ import {
Span,
Spinner,
Text,
useLocalizations,
} from '../../customizables';
import { useClipboard } from '../../hooks';
import { Check, Copy } from '../../icons';
import { useRouter } from '../../router';

export const PaymentAttemptPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getPaymentAttemptById } = usePaymentAttemptsContext();
Comment thread
aeliox marked this conversation as resolved.
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: paymentAttempt,
isLoading,
error,
} = useSWR(
params.paymentAttemptId
? {
type: 'payment-attempt',
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getPaymentAttempt({
id: params.paymentAttemptId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

const paymentAttempt = params.paymentAttemptId ? getPaymentAttemptById(params.paymentAttemptId) : null;
const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
Expand DownExpand Up@@ -61,10 +85,15 @@ export const PaymentAttemptPage = () => {
</Header.BackLink>
</Header.Root>
{!paymentAttempt ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.paymentHistorySection.notFound`))}
</Alert>
</Box>
) : (
<Box
elementDescriptor={descriptors.paymentAttemptRoot}
Expand Down
8 changes: 6 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type { LocalizationKey } from '../../customizables';
import { Badge, Box, Button, descriptors, Heading, Icon, Span, Text } from '../../customizables';
import { useClipboard } from '../../hooks';
Expand DownExpand Up@@ -279,7 +281,7 @@ function SectionContentDetailsListItem({
icon?: React.ReactNode;
label: string | LocalizationKey;
labelIcon?: React.ComponentType;
value: string | LocalizationKey;
value: string | LocalizationKey | React.ReactElement;
valueTruncated?: boolean;
valueCopyable?: boolean;
}) {
Expand DownExpand Up@@ -348,12 +350,14 @@ function SectionContentDetailsListItem({
{valueTruncated ? truncateWithEndVisible(value) : value}
</Text>
</>
) : React.isValidElement(value) ? (
value
) : (
<Text
elementDescriptor={descriptors.statementSectionContentDetailsListItemValue}
colorScheme='secondary'
variant='caption'
localizationKey={value}
localizationKey={value as LocalizationKey}
/>
)}
</Span>
Expand Down
80 changes: 66 additions & 14 deletions packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
import { useClerk, useOrganization } from '@clerk/shared/react';
import useSWR from 'swr';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { formatDate } from '@/ui/utils/formatDate';

import { useStatements, useStatementsContext, useSubscriberTypeLocalizationRoot } from '../../contexts';
import { Box, descriptors, localizationKeys, Spinner, Text, useLocalizations } from '../../customizables';
import { Plus, RotateLeftRight } from '../../icons';
import { useSubscriberTypeContext, useSubscriberTypeLocalizationRoot } from '../../contexts/components';
import {
Box,
descriptors,
Icon,
localizationKeys,
SimpleButton,
Span,
Spinner,
useLocalizations,
} from '../../customizables';
import { ArrowRightIcon, Plus, RotateLeftRight } from '../../icons';
import { useRouter } from '../../router';
import { Statement } from './Statement';

export const StatementPage = () => {
const { params, navigate } = useRouter();
const { isLoading } = useStatements();
const { getStatementById } = useStatementsContext();
const subscriberType = useSubscriberTypeContext();
const { organization } = useOrganization();
const localizationRoot = useSubscriberTypeLocalizationRoot();
const { t } = useLocalizations();
const statement = params.statementId ? getStatementById(params.statementId) : null;
const { t, translateError } = useLocalizations();
const clerk = useClerk();

const {
data: statement,
isLoading,
error,
} = useSWR(
params.statementId
? {
type: 'statement',
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}
: null,
() =>
clerk.billing.getStatement({
id: params.statementId,
orgId: subscriberType === 'organization' ? organization?.id : undefined,
}),
);

if (isLoading) {
return (
Expand DownExpand Up@@ -48,10 +80,15 @@ export const StatementPage = () => {
</Header.BackLink>
</Header.Root>
{!statement ? (
<Text
localizationKey={localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`)}
sx={{ textAlign: 'center' }}
/>
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Alert
variant='danger'
colorScheme='danger'
>
{translateError(error.errors[0]) ||
t(localizationKeys(`${localizationRoot}.billingPage.statementsSection.notFound`))}
</Alert>
</Box>
) : (
<Statement.Root>
<Statement.Header
Expand DownExpand Up@@ -91,9 +128,24 @@ export const StatementPage = () => {
)
}
labelIcon={item.chargeType === 'recurring' ? RotateLeftRight : Plus}
value={item.id}
valueTruncated
valueCopyable
value={
<SimpleButton
onClick={() => void navigate(`../../payment-attempt/${item.id}`)}
variant='link'
colorScheme='primary'
textVariant='buttonSmall'
sx={t => ({
gap: t.space.$1,
})}
>
<Span localizationKey={localizationKeys('commerce.viewPayment')} />
<Icon
icon={ArrowRightIcon}
size='sm'
aria-hidden
/>
</SimpleButton>
}
/>
{item.subscriptionItem.credit && item.subscriptionItem.credit.amount.amount > 0 ? (
<Statement.SectionContentDetailsListItem
Expand Down
17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/PaymentAttempts.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/clerk-js/src/ui/contexts/components/Statements.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/contexts/components/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ export * from './GoogleOneTap';
export * from './Waitlist';
export * from './PricingTable';
export * from './Checkout';
export * from './Statements';
export * from './PaymentAttempts';
export * from './Plans';
export * from './ApiKeys';
export * from './OAuthConsent';
1 change: 1 addition & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const arSA: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const beBY: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bgBG: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/bn-IN.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const bnIN: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const caES: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ export const csCZ: LocalizationResource = {
totalDue: 'Celkem k zaplacení',
totalDueToday: 'Celkem k zaplacení dnes',
viewFeatures: 'Zobrazit funkce',
viewPayment: undefined,
year: 'Rok',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const daDK: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,7 @@ export const deDE: LocalizationResource = {
totalDue: undefined,
totalDueToday: 'Heute fällig',
viewFeatures: 'Funktionen anzeigen',
viewPayment: undefined,
year: 'Jahr',
},
createOrganization: {
Expand Down
1 change: 1 addition & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ export const elGR: LocalizationResource = {
totalDue: undefined,
totalDueToday: undefined,
viewFeatures: undefined,
viewPayment: undefined,
year: undefined,
},
createOrganization: {
Expand Down
Loading
Loading