Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): If Web3 wallet already claimed preview error on <UserProfile /> #4389

Merged
merged 4 commits into from
Oct 24, 2024
Merged

fix(ui): If Web3 wallet already claimed preview error on <UserProfile /> #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1882a1c
fix(ui): If Web3 wallet already claimed preview error on <UserProfile />
EmmanouelaPothitou Oct 23, 2024
ceca9c8
Create two-wasps-dance.md
EmmanouelaPothitou Oct 23, 2024
cd6e494
Update .changeset/two-wasps-dance.md
nikosdouvlis Oct 24, 2024
db0cd4a
Merge branch 'main' into emmanouela/user-845-if-web3-wallet-already-c…
EmmanouelaPothitou Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/two-wasps-dance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/clerk-js": patch
---

Show an error on `<UserProfile />` if the Web3 wallet is already claimed.
76 changes: 45 additions & 31 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useUser } from '@clerk/shared/react';
import type { Web3Provider, Web3Strategy } from '@clerk/types';

import { generateWeb3Signature, getWeb3Identifier } from '../../../utils/web3';
import { descriptors, Image, localizationKeys } from '../../customizables';
import { descriptors, Image, localizationKeys, Text } from '../../customizables';
import { ProfileSection, useCardState, withCardStateProvider } from '../../elements';
import { useEnabledThirdPartyProviders } from '../../hooks';
import { getFieldError, handleError } from '../../utils';
Expand All @@ -20,6 +20,7 @@ export const AddWeb3WalletActionMenu = withCardStateProvider(() => {

const connect = async (strategy: Web3Strategy) => {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
card.setError(undefined);

try {
card.setLoading(strategy);
Expand Down Expand Up @@ -51,37 +52,50 @@ export const AddWeb3WalletActionMenu = withCardStateProvider(() => {
}

return (
<ProfileSection.ActionMenu
id='web3Wallets'
triggerLocalizationKey={localizationKeys('userProfile.start.web3WalletsSection.primaryButton')}
>
{unconnectedStrategies.map(strategy => (
<ProfileSection.ActionMenuItem
key={strategy}
id={strategyToDisplayData[strategy].id}
onClick={() => connect(strategy)}
isLoading={card.loadingMetadata === strategy}
isDisabled={card.isLoading}
localizationKey={localizationKeys('userProfile.web3WalletPage.web3WalletButtonsBlockButton', {
provider: strategyToDisplayData[strategy].name,
})}
<>
<ProfileSection.ActionMenu
id='web3Wallets'
triggerLocalizationKey={localizationKeys('userProfile.start.web3WalletsSection.primaryButton')}
>
{unconnectedStrategies.map(strategy => (
<ProfileSection.ActionMenuItem
key={strategy}
id={strategyToDisplayData[strategy].id}
onClick={() => connect(strategy)}
isLoading={card.loadingMetadata === strategy}
isDisabled={card.isLoading}
localizationKey={localizationKeys('userProfile.web3WalletPage.web3WalletButtonsBlockButton', {
provider: strategyToDisplayData[strategy].name,
})}
sx={t => ({
justifyContent: 'start',
gap: t.space.$2,
})}
leftIcon={
<Image
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(strategyToDisplayData[strategy].id)}
isLoading={card.loadingMetadata === strategy}
isDisabled={card.isLoading}
src={strategyToDisplayData[strategy].iconUrl}
alt={`Connect ${strategyToDisplayData[strategy].name}`}
sx={theme => ({ width: theme.sizes.$5 })}
/>
}
/>
))}
</ProfileSection.ActionMenu>
{card.error && (
<Text
colorScheme='danger'
sx={t => ({
justifyContent: 'start',
gap: t.space.$2,
padding: t.sizes.$1x5,
paddingLeft: t.sizes.$8x5,
})}
leftIcon={
<Image
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(strategyToDisplayData[strategy].id)}
isLoading={card.loadingMetadata === strategy}
isDisabled={card.isLoading}
src={strategyToDisplayData[strategy].iconUrl}
alt={`Connect ${strategyToDisplayData[strategy].name}`}
sx={theme => ({ width: theme.sizes.$5 })}
/>
}
/>
))}
</ProfileSection.ActionMenu>
>
{card.error}
</Text>
)}
</>
);
});
Loading