Skip to content

Commit

Permalink
changed text font weight and color to match figma
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewlee348 committed Nov 29, 2024
1 parent 8aa5748 commit 9b663cb
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 62 deletions.
10 changes: 5 additions & 5 deletions src/components/PendingTxn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ export default function PendingTxn({
}) {
return (
<Box flexDirection="column" width="full" gap="5" paddingTop="7">
<Text variant="normal" fontWeight="bold" color="text100">
<Text variant="normal" fontWeight="bold" color="text80">
Pending transactions
</Text>
<Box background="backgroundSecondary" borderRadius="sm" alignItems="center" padding="4" gap="5">
<Spinner size="lg" />

<Box flexDirection="column" gap="1">
<Box flexDirection="row" alignItems="center" gap="1">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text80">
Sending {amount} {symbol} on
</Text>

<NetworkTag chainId={chainId} paddingTop="0" paddingBottom="1" />

<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text80">
to
</Text>
<Text variant="normal" fontWeight="semibold" color="text80" style={{ fontFamily: 'monospace' }}>
<Text variant="normal" fontWeight="medium" color="text80" style={{ fontFamily: 'monospace' }}>
{to}
</Text>
</Box>

<Text variant="normal" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
Your external wallet will prompt you to confirm the transaction
</Text>
</Box>
Expand Down
6 changes: 3 additions & 3 deletions src/components/SelectProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ export default function SelectProvider({
Attention
</Text>
{walletConnectDappsConnected ? (
<Text variant="normal" color="text80">
<Text variant="normal" fontWeight="medium" color="text80">
If you connect your external wallet using WalletConnect, you'll lose all Dapps connections
you already made using WalletConnect.
</Text>
) : (
<Text variant="normal" color="text80">
<Text variant="normal" fontWeight="medium" color="text80">
If you connect your external wallet using WalletConnect, you won't be able to connect to any
other Dapps during this session. <br /> <br />
If you need to connect Dapps, please consider using a different external wallet instead.
Expand All @@ -92,7 +92,7 @@ export default function SelectProvider({
<Text variant="large" fontWeight="bold" color="text80">
Connect external wallet
</Text>
<Text variant="normal" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
You need an external wallet to relay transactions
</Text>
<Box flexDirection="column" gap="3">
Expand Down
2 changes: 1 addition & 1 deletion src/components/network/NetworkItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function NetworkItem({ network }: { network: NetworkConfig }) {
</Text>

{(hasPreviousEdit || isUserAddition) && (
<Text variant="normal" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
{isUserAddition ? `(Chain Id "${network.chainId}", added by you)` : '(edited)'}
</Text>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/recovery/RecoveryHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function RecoveryHeader({ handleNetworkModal }: { handleNetworkMo
label={
<Box flexDirection="row" alignItems="center" gap="2">
<Image src={externalArrowIcon} height="5" />
<Text variant="medium" lineHeight="5" color="text50">
<Text variant="normal" fontWeight="bold" color="text50">
Docs
</Text>
</Box>
Expand All @@ -44,7 +44,7 @@ export default function RecoveryHeader({ handleNetworkModal }: { handleNetworkMo
label={
<Box flexDirection="row" alignItems="center" gap="2">
<Image src={networkIcon} height="5" />
<Text variant="medium" lineHeight="5" color="text50">
<Text variant="normal" fontWeight="bold" color="text50">
Networks
</Text>
</Box>
Expand Down
9 changes: 7 additions & 2 deletions src/components/recovery/WalletList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function WalletList({

return (
<Box flexDirection="column" gap={`${gapWidth}`}>
<Text variant="normal" color="text100">
<Text variant="normal" fontWeight="medium" color="text80">
Wallets found
</Text>
{possibleWallets.map(wallet => {
Expand All @@ -40,7 +40,12 @@ export default function WalletList({
paddingX="4"
style={{ width: `${WALLET_WIDTH - ROUND_CHECKBOX_SIZE * 4 - gapWidth * 4}px` }}
>
<Text variant="normal" color="text100" style={{ fontFamily: 'monospace' }}>
<Text
variant="normal"
fontWeight="medium"
color="text100"
style={{ fontFamily: 'monospace' }}
>
{wallet}
</Text>
</Box>
Expand Down
8 changes: 4 additions & 4 deletions src/components/signing/ConnectDapp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export default function ConnectDapp({ onClose }: { onClose: () => void }) {

<Box flexDirection="column" gap="3">
<Card flexDirection="row" justifyContent="space-between" alignItems="center">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Origin
</Text>
<Box flexDirection="row" alignItems="center" gap="2">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{connectOptions?.origin?.split('//')[1]}
</Text>
<IconButton
Expand All @@ -76,10 +76,10 @@ export default function ConnectDapp({ onClose }: { onClose: () => void }) {
</Box>
</Card>
<Card flexDirection="row" justifyContent="space-between">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Network
</Text>
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{getNetworkTitle(Number(connectOptions?.networkId))}
</Text>
</Card>
Expand Down
2 changes: 1 addition & 1 deletion src/components/signing/ConnectionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function ConnectionList({ sessionList }: { sessionList: SessionTy
<Box alignItems="center" gap="4">
<ExternalIcon background="text80" src={session.peer.metadata.icons[0]} />

<Text variant="medium" color="text100">
<Text variant="normal" fontWeight="bold" color="text100">
{!!!session.peer.metadata.name ? session.peer.metadata.url : session.peer.metadata.name}
</Text>
</Box>
Expand Down
12 changes: 6 additions & 6 deletions src/components/signing/SignClientTransactionConfirm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ export default function SignClientTransactionConfirm({

<Box flexDirection="column" gap="3">
<Card flexDirection="row" justifyContent="space-between" alignItems="center">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Origin
</Text>
<Box flexDirection="row" alignItems="center" gap="2">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{details?.origin?.split('//')[1]}
</Text>
<IconButton
Expand All @@ -71,21 +71,21 @@ export default function SignClientTransactionConfirm({
</Box>
</Card>
<Card flexDirection="row" justifyContent="space-between">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Network
</Text>
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{getNetworkTitle(Number(details.chainId))}
</Text>
</Card>
<Card flexDirection="column" gap="4">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Signee
</Text>
<Card>
<Text
variant="normal"
fontWeight="semibold"
fontWeight="medium"
color="text100"
style={{ fontFamily: 'monospace' }}
>
Expand Down
8 changes: 4 additions & 4 deletions src/components/signing/SignClientTransactionRelay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ export default function SignClientTransactionRelay({

<Box flexDirection="column" gap="3">
<Card flexDirection="row" justifyContent="space-between" alignItems="center">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Origin
</Text>
<Box flexDirection="row" alignItems="center" gap="2">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{details?.origin?.split('//')[1]}
</Text>
<IconButton
Expand All @@ -66,10 +66,10 @@ export default function SignClientTransactionRelay({
</Box>
</Card>
<Card flexDirection="row" justifyContent="space-between">
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
Network
</Text>
<Text variant="normal" fontWeight="semibold" color="text100">
<Text variant="normal" fontWeight="medium" color="text100">
{getNetworkTitle(Number(details.chainId))}
</Text>
</Card>
Expand Down
4 changes: 2 additions & 2 deletions src/components/wallet/ConfirmSignOut.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { Box, Button, Text } from '@0xsequence/design-system'
export default function ConfirmSignOut({ handleSignOut }: { handleSignOut: (signOut?: boolean) => void }) {
return (
<Box flexDirection="column" padding="6" gap="6">
<Text variant="large" color="text100" marginRight="8">
<Text variant="large" fontWeight="bold" color="text100" marginRight="8">
Are you sure you want to sign out?
</Text>
<Text variant="normal" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
This will disconnect all Dapps, tokens, and relay wallet connections, and you’ll need to reconnect
them manually.
</Text>
Expand Down
4 changes: 2 additions & 2 deletions src/components/wallet/DappList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ export default function DappList() {
{provider?.info.name === 'WalletConnect' ? (
<Box flexDirection="column" alignItems="center" gap="4">
<Image src={WarningIcon} color="text50" width="8" height="8" />
<Text textAlign="center" variant="normal" fontWeight="medium" color="text50" padding="4">
<Text textAlign="center" variant="normal" color="text50" padding="4">
To connect to Dapps, switch from WalletConnect to a different wallet as your External Wallet
connection method.
</Text>
</Box>
) : (
<Text textAlign="center" variant="normal" fontWeight="medium" color="text50" padding="4">
<Text textAlign="center" variant="normal" color="text50" padding="4">
Connect a Dapp with WalletConnect to sign actions
</Text>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/wallet/ExternalWallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function ExternalWallet() {
</Text>

<Box gap="1">
<Text variant="normal" color="text50" width="full">
<Text variant="normal" fontWeight="medium" color="text50" width="full">
{selectedExternalWalletAddress}
</Text>

Expand All @@ -112,7 +112,7 @@ export default function ExternalWallet() {
<ButtonWithIcon icon={<CloseIcon color="text100" />} onClick={() => handleDisconnect()} />
</Box>
) : (
<Text textAlign="center" variant="normal" fontWeight="medium" color="text50" padding="4">
<Text textAlign="center" variant="normal" color="text50" padding="4">
Connect an external wallet to relay transactions
</Text>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/wallet/WalletDropdownMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default function SettingsDropdownMenu() {
label={
<Box flexDirection="row" alignItems="center" gap="2">
<GradientAvatar address={walletAddress} size="sm" />
<Text variant="normal" fontWeight="bold" color="text100">
<Text variant="normal" fontWeight="medium" fontWeight="bold" color="text100">
{truncateMiddle(walletAddress!, 4, 4)}
</Text>
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function CollectibleBalanceItem({
</Box>

<Box>
<Text variant="normal" fontWeight="bold" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
{collectibleInfo.collectibleInfoParams.contractType === 'ERC1155'
? Number(
ethers.formatUnits(
Expand Down
4 changes: 2 additions & 2 deletions src/components/wallet/collectibles/CollectibleList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function CollectibleList({
<Box alignItems="center" gap="2">
<Image src={CollectionIcon} width="5" height="5" />

<Text variant="normal" fontWeight="bold" color="text100">
<Text variant="normal" fontWeight="medium" fontWeight="bold" color="text100">
Collectibles
</Text>
</Box>
Expand Down Expand Up @@ -87,7 +87,7 @@ export default function CollectibleList({
</>
) : (
<Card flexDirection="column">
<Text textAlign="center" variant="normal" fontWeight="medium" color="text50" padding="4">
<Text textAlign="center" variant="normal" color="text50" padding="4">
Import ERC721 or ERC1155 Collectibles
</Text>
</Card>
Expand Down
3 changes: 1 addition & 2 deletions src/components/wallet/collectibles/ImportCollectible.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ export default function ImportCollectible({ onClose }: { onClose: () => void })

<Text
variant="normal"
fontWeight="medium"
color="text50"
underline={!!tokenDirectory}
cursor={tokenDirectory ? 'pointer' : 'default'}
Expand Down Expand Up @@ -230,7 +229,7 @@ export default function ImportCollectible({ onClose }: { onClose: () => void })
<Text variant="medium" fontWeight="bold" color="text80">
{collectibleInfoResponse.name ?? ''}
</Text>
<Text variant="small" fontWeight="medium" color="text80">
<Text variant="small" color="text80">
Your Balance:
</Text>
<Text variant="medium" fontWeight="bold" color="text80">
Expand Down
2 changes: 1 addition & 1 deletion src/components/wallet/collectibles/SendCollectible.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default function SendCollectible({
label={
<Box flexDirection="row" alignItems="center" gap="2">
<FilledCheckBox checked={sendToExternalWallet} size="md" />
<Text variant="small" fontWeight="medium" color="text80">
<Text variant="small" color="text80">
Send to connected external wallet address
</Text>
</Box>
Expand Down
3 changes: 1 addition & 2 deletions src/components/wallet/tokens/ImportToken.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ export default function ImportToken({ onClose }: { onClose: () => void }) {
</Text>
<Text
variant="normal"
fontWeight="medium"
color="text50"
underline={!!tokenDirectory}
cursor={tokenDirectory ? 'pointer' : 'default'}
Expand Down Expand Up @@ -161,7 +160,7 @@ export default function ImportToken({ onClose }: { onClose: () => void }) {
<Text variant="medium" fontWeight="bold" color="text80">
{tokenInfo.symbol ?? ''}
</Text>
<Text variant="small" fontWeight="medium" color="text80">
<Text variant="small" color="text80">
Your Balance:
</Text>
<Text variant="medium" fontWeight="bold" color="text80">
Expand Down
2 changes: 1 addition & 1 deletion src/components/wallet/tokens/SendToken.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default function SendToken({
label={
<Box flexDirection="row" alignItems="center" gap="2">
<FilledCheckBox checked={sendToExternalWallet} size="md" />
<Text variant="small" fontWeight="medium" color="text80">
<Text variant="small" color="text80">
Send to connected external wallet address
</Text>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion src/components/wallet/tokens/TokenBalanceItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function TokenBalanceItem({
</Box>

<Box>
<Text variant="normal" fontWeight="bold" color="text50">
<Text variant="normal" fontWeight="medium" color="text50">
{truncatedBalance}
</Text>
</Box>
Expand Down
4 changes: 2 additions & 2 deletions src/components/wallet/tokens/TokenList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default function TokenList({ onSendClick }: { onSendClick: (tokenBalance:
>
<FilledCheckbox checked={filterZeroBalances} size="md" />

<Text variant="small" fontWeight="medium" color="text80">
<Text variant="small" color="text80">
Filter zero balances
</Text>
</Box>
Expand Down Expand Up @@ -116,7 +116,7 @@ export default function TokenList({ onSendClick }: { onSendClick: (tokenBalance:
</>
) : (
<Card flexDirection="column">
<Text textAlign="center" variant="normal" fontWeight="medium" color="text50" padding="4">
<Text textAlign="center" variant="normal" color="text50" padding="4">
Import ERC 20 token address
</Text>
</Card>
Expand Down
Loading

0 comments on commit 9b663cb

Please sign in to comment.