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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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/strong-chefs-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Allow user set primary web3 wallet in `<UserProfile />` when more than one web3 wallets presented
22 changes: 20 additions & 2 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useUser } from '@clerk/shared/react';
import { useReverification, useUser } from '@clerk/shared/react';
import { Fragment, useState } from 'react';

import { Badge, Box, Flex, Image, localizationKeys, Text } from '../../customizables';
Expand All@@ -7,7 +7,9 @@ import { Action } from '../../elements/Action';
import { useActionContext } from '../../elements/Action/ActionRoot';
import { useEnabledThirdPartyProviders } from '../../hooks';
import type { PropsOfComponent } from '../../styledSystem';
import { handleError } from '../../utils';
import { RemoveWeb3WalletForm } from './RemoveResourceForm';
import { sortIdentificationBasedOnVerification } from './utils';
import { AddWeb3WalletActionMenu } from './Web3Form';

type RemoveWeb3WalletScreenProps = { walletId: string };
Expand DownExpand Up@@ -44,6 +46,7 @@ export const Web3Section = withCardStateProvider(
return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.web3WalletsSection.title')}
centered={false}
id='web3Wallets'
>
<Card.Alert>{card.error}</Card.Alert>
Expand All@@ -52,7 +55,7 @@ export const Web3Section = withCardStateProvider(
onChange={setActionValue}
>
<ProfileSection.ItemList id='web3Wallets'>
{user?.web3Wallets.map(wallet => {
{sortIdentificationBasedOnVerification(user?.web3Wallets, user?.primaryWeb3WalletId).map(wallet => {
const strategy = wallet.verification.strategy as keyof typeof strategyToDisplayData;
const walletId = wallet.id;
return (
Expand DownExpand Up@@ -109,12 +112,27 @@ export const Web3Section = withCardStateProvider(
);

const Web3WalletMenu = ({ walletId }: { walletId: string }) => {
const card = useCardState();
const { open } = useActionContext();
const { user } = useUser();
const isPrimary = user?.primaryWeb3WalletId === walletId;
const [setPrimary] = useReverification(() => {
return user?.update({ primaryWeb3WalletId: walletId });
});
Comment on lines +119 to +121

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯


const actions = (
[
!isPrimary
? {
label: localizationKeys('userProfile.start.web3WalletsSection.detailsAction__nonPrimary'),
onClick: () => {
setPrimary().catch(e => handleError(e, [], card.setError));
},
}
: null,
{
label: localizationKeys('userProfile.start.web3WalletsSection.destructiveAction'),
isDestructive: true,
onClick: () => open(`remove-${walletId}`),
},
] satisfies (PropsOfComponent<typeof ThreeDotsMenu>['actions'][0] | null)[]
Expand Down
15 changes: 10 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import type { Attributes, EmailAddressResource, PhoneNumberResource, UserResource } from '@clerk/types';
import type {
Attributes,
EmailAddressResource,
PhoneNumberResource,
UserResource,
Web3WalletResource,
} from '@clerk/types';

type IDable = { id: string };

Expand DownExpand Up@@ -38,10 +44,9 @@ export function getSecondFactorsAvailableToAdd(attributes: Attributes, user: Use
return sfs;
}

export function sortIdentificationBasedOnVerification<T extends Array<EmailAddressResource | PhoneNumberResource>>(
array: T | null | undefined,
primaryId: string | null | undefined,
): T {
export function sortIdentificationBasedOnVerification<
T extends Array<EmailAddressResource | PhoneNumberResource | Web3WalletResource>,
>(array: T | null | undefined, primaryId: string | null | undefined): T {
if (!array) {
return [] as unknown as T;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ar-SA.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ export const arSA: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -311,6 +312,11 @@ export const arSA: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -908,6 +914,7 @@ export const arSA: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'حذف المحفظة',
detailsAction__nonPrimary: undefined,
primaryButton: 'محافظ Web3',
title: 'محافظ Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/be-BY.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ export const beBY: LocalizationResource = {
actionText: 'Паспрабуйце іншы метад для верыфікацыі.',
blockButton__backupCode: 'Увядзіце код з рэзервовага кода',
blockButton__emailCode: 'Увядзіце код, адправлены на электронную пошту',
blockButton__passkey: undefined,
blockButton__password: 'Увядзіце пароль',
blockButton__phoneCode: 'Увядзіце код, адправлены на тэлефон',
blockButton__totp: 'Выкарыстайце TOTP',
Expand All@@ -317,6 +318,11 @@ export const beBY: LocalizationResource = {
subtitle: 'Калі ласка, выберыце іншы метад або звярніцеся ў службу падтрымкі.',
title: 'Няма даступных метадаў верыфікацыі',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Вярнуцца да ўводу пароля',
subtitle: 'Калі вы памятаеце свой пароль, вы можаце ўвесці яго для завершэння верыфікацыі.',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const beBY: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Выдаліць кашалёк',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 кашалькі',
title: 'Web3 кашалькі',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/bg-BG.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const bgBG: LocalizationResource = {
actionText: "Don't have one of these?",
blockButton__backupCode: 'Use backup code',
blockButton__emailCode: 'Send code to email',
blockButton__passkey: undefined,
blockButton__password: 'Login with password',
blockButton__phoneCode: 'Send code to phone',
blockButton__totp: 'Use authenticator app',
Expand All@@ -313,6 +314,11 @@ export const bgBG: LocalizationResource = {
subtitle: 'Something went wrong.',
title: 'Authentication failed',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue using "{{applicationName}}"',
Expand DownExpand Up@@ -913,6 +919,7 @@ export const bgBG: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Премахни портфейл',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 портфейли',
title: 'Web3 портфейли',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/ca-ES.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const caES: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const caES: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -920,6 +926,7 @@ export const caES: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Elimina cartera',
detailsAction__nonPrimary: undefined,
primaryButton: 'Carteres Web3',
title: 'Carteres Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/cs-CZ.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -312,6 +313,11 @@ export const csCZ: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -911,6 +917,7 @@ export const csCZ: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Odstranit peněženku',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3 peněženky',
title: 'Web3 peněženky',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/da-DK.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const daDK: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const daDK: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -913,6 +919,7 @@ export const daDK: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Fjern tegnebog',
detailsAction__nonPrimary: undefined,
primaryButton: 'Tilføj Web3 tegnebøger',
title: 'Web3 tegnebøger',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/de-DE.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,6 +290,7 @@ export const deDE: LocalizationResource = {
actionText: 'Verwenden Sie eine alternative Verifizierungsmethode',
blockButton__backupCode: 'Mit Backup-Code verifizieren',
blockButton__emailCode: 'Mit E-Mail-Code verifizieren',
blockButton__passkey: undefined,
blockButton__password: 'Mit Passwort verifizieren',
blockButton__phoneCode: 'Mit SMS-Code verifizieren',
blockButton__totp: 'Mit TOTP verifizieren',
Expand All@@ -316,6 +317,11 @@ export const deDE: LocalizationResource = {
subtitle: 'Bitte kontaktieren Sie den Support, um Hilfe zu erhalten.',
title: 'Keine verfügbaren Methoden',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Passwort zurücksetzen',
subtitle: 'Geben Sie Ihr Passwort ein, um fortzufahren.',
Expand DownExpand Up@@ -928,6 +934,7 @@ export const deDE: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Wallet entfernen',
detailsAction__nonPrimary: undefined,
primaryButton: 'Web3-Wallets',
title: 'Web3-Wallets',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/el-GR.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const elGR: LocalizationResource = {
actionText: undefined,
blockButton__backupCode: undefined,
blockButton__emailCode: undefined,
blockButton__passkey: undefined,
blockButton__password: undefined,
blockButton__phoneCode: undefined,
blockButton__totp: undefined,
Expand All@@ -313,6 +314,11 @@ export const elGR: LocalizationResource = {
subtitle: undefined,
title: undefined,
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: undefined,
subtitle: undefined,
Expand DownExpand Up@@ -924,6 +930,7 @@ export const elGR: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Αφαίρεση πορτοφολιού',
detailsAction__nonPrimary: undefined,
primaryButton: 'Πορτοφόλια Web3',
title: 'Πορτοφόλια Web3',
},
Expand Down
7 changes: 7 additions & 0 deletions packages/localizations/src/en-GB.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,7 @@ export const enGB: LocalizationResource = {
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: undefined,
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand DownExpand Up@@ -314,6 +315,11 @@ export const enGB: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: undefined,
subtitle: undefined,
title: undefined,
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -923,6 +929,7 @@ export const enGB: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: undefined,
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
15 changes: 8 additions & 7 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,8 +274,8 @@ export const enUS: LocalizationResource = {
actionLink: 'Get help',
actionText: 'Don’t have any of these?',
blockButton__backupCode: 'Use a backup code',
blockButton__passkey: 'Use your passkey',
blockButton__emailCode: 'Email code to {{identifier}}',
blockButton__passkey: 'Use your passkey',
blockButton__password: 'Continue with your password',
blockButton__phoneCode: 'Send SMS code to {{identifier}}',
blockButton__totp: 'Use your authenticator app',
Expand All@@ -292,12 +292,6 @@ export const enUS: LocalizationResource = {
subtitle: 'Enter the backup code you received when setting up two-step authentication',
title: 'Enter a backup code',
},
passkey: {
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
blockButton__passkey: 'Use your passkey',
},
emailCode: {
formTitle: 'Verification code',
resendButton: "Didn't receive a code? Resend",
Expand All@@ -309,6 +303,12 @@ export const enUS: LocalizationResource = {
subtitle: 'An error occurred',
title: 'Cannot verify your account',
},
passkey: {
blockButton__passkey: 'Use your passkey',
subtitle:
'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
title: 'Use your passkey',
},
password: {
actionLink: 'Use another method',
subtitle: 'Enter your password to continue',
Expand DownExpand Up@@ -918,6 +918,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
detailsAction__nonPrimary: 'Set as primary',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
Expand Down
Loading