diff --git a/package.json b/package.json index 64d07dffef2..b08bcd43664 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "@dlc-link/dlc-tools": "1.1.1", "@fungible-systems/zone-file": "2.0.0", "@hirosystems/token-metadata-api-client": "1.2.0", - "@leather-wallet/tokens": "0.0.10", + "@leather-wallet/tokens": "0.0.13", "@ledgerhq/hw-transport-webusb": "6.27.19", "@noble/hashes": "1.3.2", "@noble/secp256k1": "2.0.0", diff --git a/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx b/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx index 08c681f7c0d..3d093e70813 100644 --- a/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx +++ b/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx @@ -43,9 +43,9 @@ export function BitcoinContractEntryPointLayout(props: BitcoinContractEntryPoint - {caption} + {caption} - {isLoading ? '' : {usdBalance}} + {isLoading ? '' : {usdBalance}} diff --git a/src/app/components/bitcoin-fees-list/components/fees-list-item.tsx b/src/app/components/bitcoin-fees-list/components/fees-list-item.tsx index 8d58a7dabd0..2545382af11 100644 --- a/src/app/components/bitcoin-fees-list/components/fees-list-item.tsx +++ b/src/app/components/bitcoin-fees-list/components/fees-list-item.tsx @@ -41,7 +41,7 @@ export function FeesListItem({ {`${feeFiatValue} | ${feeRate} sats/vB | ${feeAmount}`} diff --git a/src/app/components/disclaimer.tsx b/src/app/components/disclaimer.tsx index fbd8a9e72d5..0ef74549f06 100644 --- a/src/app/components/disclaimer.tsx +++ b/src/app/components/disclaimer.tsx @@ -10,7 +10,7 @@ interface DisclaimerProps extends BoxProps { export function Disclaimer({ disclaimerText, learnMoreUrl, ...props }: DisclaimerProps) { return ( - + {disclaimerText} {learnMoreUrl ? ( openInNewTab(learnMoreUrl)}> diff --git a/src/app/components/inscription-preview-card/components/inscription-metadata.tsx b/src/app/components/inscription-preview-card/components/inscription-metadata.tsx index b31368f81de..869bfe31f7b 100644 --- a/src/app/components/inscription-preview-card/components/inscription-metadata.tsx +++ b/src/app/components/inscription-preview-card/components/inscription-metadata.tsx @@ -20,9 +20,9 @@ export function InscriptionMetadata({ {icon && icon} {title} - {subtitle} + {subtitle} {action ? ( - action()} textStyle="caption.02" variant="text"> + action()} textStyle="caption.01" variant="text"> {actionLabel} ) : null} diff --git a/src/app/components/no-fees-warning-row.tsx b/src/app/components/no-fees-warning-row.tsx index 3ed6cfedf31..420bf92a6d5 100644 --- a/src/app/components/no-fees-warning-row.tsx +++ b/src/app/components/no-fees-warning-row.tsx @@ -9,8 +9,8 @@ interface NoFeesWarningRowProps { export function NoFeesWarningRow({ chainId }: NoFeesWarningRowProps) { return ( - No fees are incurred - + No fees are incurred + {whenStacksChainId(chainId)({ [ChainID.Testnet]: 'Testnet', [ChainID.Mainnet]: 'Mainnet', diff --git a/src/app/features/bitcoin-choose-fee/components/choose-fee-subtitle.tsx b/src/app/features/bitcoin-choose-fee/components/choose-fee-subtitle.tsx index dbec55fd8d9..95961f5c709 100644 --- a/src/app/features/bitcoin-choose-fee/components/choose-fee-subtitle.tsx +++ b/src/app/features/bitcoin-choose-fee/components/choose-fee-subtitle.tsx @@ -10,7 +10,7 @@ export function ChooseFeeSubtitle({ isSendingMax }: { isSendingMax: boolean }) { ); return ( - + {subtitle} ); diff --git a/src/app/features/collectibles/components/taproot-balance-displayer.tsx b/src/app/features/collectibles/components/taproot-balance-displayer.tsx index e82e23a3986..e94fe3f89b1 100644 --- a/src/app/features/collectibles/components/taproot-balance-displayer.tsx +++ b/src/app/features/collectibles/components/taproot-balance-displayer.tsx @@ -19,7 +19,7 @@ export function TaprootBalanceDisplayer({ onSelectRetrieveBalance }: TaprootBala if (balance.amount.isLessThanOrEqualTo(0)) return null; return ( - onSelectRetrieveBalance()} textStyle="caption.02" variant="text"> + onSelectRetrieveBalance()} textStyle="caption.01" variant="text"> {formatMoney(balance)} diff --git a/src/app/features/hiro-messages/components/in-app-message-item.tsx b/src/app/features/hiro-messages/components/in-app-message-item.tsx index 9fca95bb6f5..b68c1faaa95 100644 --- a/src/app/features/hiro-messages/components/in-app-message-item.tsx +++ b/src/app/features/hiro-messages/components/in-app-message-item.tsx @@ -41,7 +41,7 @@ export function HiroMessageItem(props: HiroMessageItemProps) { )} - + Leather Wallet will now be provided by Leather Wallet LLC [a subsidiary of Nassau Machines Inc]. Please review and accept Leather Wallet{' '} diff --git a/src/app/features/message-signer/hash-drawer.tsx b/src/app/features/message-signer/hash-drawer.tsx index 42a3d09b096..9b77917d01c 100644 --- a/src/app/features/message-signer/hash-drawer.tsx +++ b/src/app/features/message-signer/hash-drawer.tsx @@ -48,7 +48,7 @@ export function HashDrawer(props: HashDrawerProps) { color="ink.text-subdued" lineHeight="1.6" wordBreak="break-all" - textStyle="caption.02" + textStyle="caption.01" > {displayHash} diff --git a/src/app/features/psbt-signer/components/psbt-inputs-and-outputs/components/psbt-input-output-item.layout.tsx b/src/app/features/psbt-signer/components/psbt-inputs-and-outputs/components/psbt-input-output-item.layout.tsx index 3dd279b4295..37469fc99f5 100644 --- a/src/app/features/psbt-signer/components/psbt-inputs-and-outputs/components/psbt-input-output-item.layout.tsx +++ b/src/app/features/psbt-signer/components/psbt-inputs-and-outputs/components/psbt-input-output-item.layout.tsx @@ -59,7 +59,7 @@ export function PsbtInputOutputItemLayout({ variant="text" > - {txId} + {txId} ) : null} diff --git a/src/app/features/psbt-signer/components/psbt-request-fee.tsx b/src/app/features/psbt-signer/components/psbt-request-fee.tsx index fc00033b5a6..ba81fc77ec2 100644 --- a/src/app/features/psbt-signer/components/psbt-request-fee.tsx +++ b/src/app/features/psbt-signer/components/psbt-request-fee.tsx @@ -17,7 +17,7 @@ export function PsbtRequestFee(props: { fee: Money }) { Transaction fee {formatMoney(fee)} - + {i18nFormatCurrency(calculateBitcoinFiatValue(fee))} diff --git a/src/app/features/stacks-message-signer/components/structured-data-box.tsx b/src/app/features/stacks-message-signer/components/structured-data-box.tsx index d2f7e83b2ed..2cced680a90 100644 --- a/src/app/features/stacks-message-signer/components/structured-data-box.tsx +++ b/src/app/features/stacks-message-signer/components/structured-data-box.tsx @@ -49,7 +49,7 @@ export function StructuredDataBox(props: { {domainName} - + {domainVersion} {domainChainName} diff --git a/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx b/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx index 642e425afb9..a8669b172d1 100644 --- a/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx +++ b/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx @@ -45,7 +45,7 @@ export function GetAddressesLayout(props: GetAddressesLayoutProps) { alignSelf="bottom" bg="ink.background-secondary" > - + By connecting you give permission to {requester} to see all addresses linked to this account diff --git a/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/components/recipient-address-displayer.tsx b/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/components/recipient-address-displayer.tsx index ed568d29f4a..4510ac690f3 100644 --- a/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/components/recipient-address-displayer.tsx +++ b/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/components/recipient-address-displayer.tsx @@ -23,7 +23,7 @@ export function RecipientAddressDisplayer({ address }: RecipientAddressDisplayer return ( {address} diff --git a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx index 9d5ee8e67d3..c08ccc6c6de 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx @@ -94,7 +94,7 @@ export function BtcSendForm() { {currentNetwork.chain.bitcoin.bitcoinNetwork === 'testnet' && ( {'This is a Bitcoin testnet transaction. Funds have no value. '} - + Get testnet BTC here ↗ diff --git a/src/app/pages/swap/components/swap-amount-field.tsx b/src/app/pages/swap/components/swap-amount-field.tsx index 6c4336c1c8f..dbd0a5e5425 100644 --- a/src/app/pages/swap/components/swap-amount-field.tsx +++ b/src/app/pages/swap/components/swap-amount-field.tsx @@ -79,7 +79,7 @@ export function SwapAmountField({ amountAsFiat, isDisabled, name }: SwapAmountFi }} /> {amountAsFiat ? ( - + {amountAsFiat} ) : null} diff --git a/src/app/pages/swap/components/swap-assets-pair/swap-asset-item.layout.tsx b/src/app/pages/swap/components/swap-assets-pair/swap-asset-item.layout.tsx index 44d54f375bc..5a9beb435ba 100644 --- a/src/app/pages/swap/components/swap-assets-pair/swap-asset-item.layout.tsx +++ b/src/app/pages/swap/components/swap-assets-pair/swap-asset-item.layout.tsx @@ -16,7 +16,7 @@ export function SwapAssetItemLayout({ caption, icon, symbol, value }: SwapAssetI spacing="space.03" width="100%" > - + {caption} diff --git a/src/app/pages/swap/components/swap-selected-asset.layout.tsx b/src/app/pages/swap/components/swap-selected-asset.layout.tsx index b8cc6083ced..c5ddb5c9eae 100644 --- a/src/app/pages/swap/components/swap-selected-asset.layout.tsx +++ b/src/app/pages/swap/components/swap-selected-asset.layout.tsx @@ -77,7 +77,7 @@ export function SwapSelectedAssetLayout({ {showError ? error : caption} @@ -88,7 +88,7 @@ export function SwapSelectedAssetLayout({ onClick={onClickHandler ? onClickHandler : noop} variant={onClickHandler ? 'underlined' : 'text'} > - {value} + {value} ) : null} diff --git a/src/app/ui/components/callout/callout.tsx b/src/app/ui/components/callout/callout.tsx index 7ba98707b97..80d5311c75a 100644 --- a/src/app/ui/components/callout/callout.tsx +++ b/src/app/ui/components/callout/callout.tsx @@ -60,7 +60,7 @@ export function Callout(props: CalloutProps & CalloutVariants) { {title} )} - {children && {children}} + {children && {children}} diff --git a/src/app/ui/components/typography/caption.tsx b/src/app/ui/components/typography/caption.tsx index f51c0a3501f..86953e043c0 100644 --- a/src/app/ui/components/typography/caption.tsx +++ b/src/app/ui/components/typography/caption.tsx @@ -8,7 +8,7 @@ export const Caption = forwardRef>( _disabled={{ color: 'ink.non-interactive' }} color="ink.text-subdued" ref={ref} - textStyle="caption.02" + textStyle="caption.01" {...props} > {children} diff --git a/theme/typography.ts b/theme/typography.ts index 60189901e4f..6f378cd773f 100644 --- a/theme/typography.ts +++ b/theme/typography.ts @@ -1,5 +1,5 @@ -import { textStyles as leatherTextStyles } from '@leather-wallet/tokens'; +import { getWebTextVariants } from '@leather-wallet/tokens'; import { defineTextStyles } from '@pandacss/dev'; // ts-unused-exports:disable-next-line -export const textStyles = defineTextStyles({ ...leatherTextStyles }); +export const textStyles = defineTextStyles({ ...getWebTextVariants() }); diff --git a/yarn.lock b/yarn.lock index 9e894c435aa..98ed1c729f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2594,10 +2594,10 @@ "@trivago/prettier-plugin-sort-imports" "^4.2.0" prettier "^3.0.3" -"@leather-wallet/tokens@0.0.10": - version "0.0.10" - resolved "https://registry.yarnpkg.com/@leather-wallet/tokens/-/tokens-0.0.10.tgz#8d944d6f63847a71d9739974163554496c92b79c" - integrity sha512-DhFBpPclCaDM5+o/H5+luPfTrnLuQ8aW9PGBRSc+yiIhSL1wNv/fuTljF/R4uHQQblG4EQQ2fjRyh5XKBEfKaQ== +"@leather-wallet/tokens@0.0.13": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@leather-wallet/tokens/-/tokens-0.0.13.tgz#0162f59d888afcb15dd71fbbe7ab54b5b54b6386" + integrity sha512-ScXDDa0pyB86XqUHTWGoZPsrCpdWG/vEvhD5YyfSIBKnNnPdf/zP16/Wv88edPBXQfcR98YUOgIm+Uvjq75Fqw== "@ledgerhq/devices@^8.0.7", "@ledgerhq/devices@^8.2.0": version "8.2.0"