thirdweb 5.105.12 → 5.105.13

package/src/react/web/ui/Bridge/payment-selection/PaymentSelection.tsx

@@ -5,6 +5,7 @@ import { trackPayEvent } from "../../../../../analytics/track/pay.js";
 import type { Token } from "../../../../../bridge/types/Token.js";
 import { defineChain } from "../../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import type { SupportedFiatCurrency } from "../../../../../pay/convert/type.js";
 import type { Address } from "../../../../../utils/address.js";
 import { toUnits } from "../../../../../utils/units.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
@@ -82,6 +83,12 @@ export interface PaymentSelectionProps {
    * Fee payer
    */
   feePayer?: "sender" | "receiver";
+
+  /**
+   * The currency to use for the payment.
+   * @default "USD"
+   */
+  currency?: SupportedFiatCurrency;
 }
 
 type Step =
@@ -103,6 +110,7 @@ export function PaymentSelection({
   includeDestinationToken,
   paymentMethods = ["crypto", "card"],
   feePayer,
+  currency,
 }: PaymentSelectionProps) {
   const connectedWallets = useConnectedWallets();
   const activeWallet = useActiveWallet();
@@ -290,6 +298,7 @@ export function PaymentSelection({
             toAmount={destinationAmount}
             toChainId={destinationToken.chainId}
             toTokenAddress={destinationToken.address}
+            currency={currency}
           />
         )}
       </Container>

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx

@@ -2,12 +2,13 @@ import { useQuery } from "@tanstack/react-query";
 import type { Chain } from "../../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import { convertCryptoToFiat } from "../../../../../../../pay/convert/cryptoToFiat.js";
-import { formatNumber } from "../../../../../../../utils/formatNumber.js";
+import type { SupportedFiatCurrency } from "../../../../../../../pay/convert/type.js";
 import { fontSize } from "../../../../../../core/design-system/index.js";
 import { Skeleton } from "../../../../components/Skeleton.js";
 import type { TextProps } from "../../../../components/text.js";
 import { Text } from "../../../../components/text.js";
 import { useDebouncedValue } from "../../../../hooks/useDebouncedValue.js";
+import { formatCurrencyAmount } from "../../formatTokenBalance.js";
 import type { ERC20OrNativeToken } from "../../nativeToken.js";
 import { getTokenAddress } from "../../nativeToken.js";
 
@@ -17,6 +18,7 @@ export function FiatValue(
     token: ERC20OrNativeToken;
     chain: Chain;
     client: ThirdwebClient;
+    currency?: SupportedFiatCurrency;
   } & TextProps,
 ) {
   const deferredTokenAmount = useDebouncedValue(props.tokenAmount, 500);
@@ -27,7 +29,7 @@ export function FiatValue(
         client: props.client,
         fromAmount: Number(deferredTokenAmount),
         fromTokenAddress: getTokenAddress(props.token),
-        to: "USD",
+        to: props.currency || "USD",
       }),
     queryKey: [
       "cryptoToFiat",
@@ -43,13 +45,10 @@ export function FiatValue(
 
   return cryptoToFiatQuery.data?.result ? (
     <Text {...props}>
-      $
-      {Number(
-        formatNumber(cryptoToFiatQuery.data.result, 2).toFixed(2),
-      ).toLocaleString(undefined, {
-        maximumFractionDigits: 2,
-        minimumFractionDigits: 2,
-      })}
+      {formatCurrencyAmount(
+        props.currency || "USD",
+        cryptoToFiatQuery.data.result,
+      )}
     </Text>
   ) : null;
 }

package/src/react/web/ui/ConnectWallet/screens/formatTokenBalance.ts

@@ -1,6 +1,5 @@
 import { formatNumber } from "../../../../../utils/formatNumber.js";
 import { toTokens } from "../../../../../utils/units.js";
-import { getCurrencyMeta } from "./Buy/fiat/currencies.js";
 
 /**
  * @internal
@@ -34,11 +33,17 @@ export function formatTokenAmount(
   ).toString();
 }
 
-export function formatCurrencyAmount(
-  currency: string,
-  amount: number,
-  decimals = 2,
-) {
-  const symbol = getCurrencyMeta(currency).symbol;
-  return `${symbol}${formatNumber(amount, decimals).toFixed(decimals)}`;
+export function formatCurrencyAmount(currency: string, amount: number) {
+  return formatMoney(amount, "en-US", currency);
+}
+
+function formatMoney(
+  value: number,
+  locale: string,
+  currencyCode: string,
+): string {
+  return new Intl.NumberFormat(locale, {
+    style: "currency",
+    currency: currencyCode,
+  }).format(value);
 }

package/src/stories/Bridge/fixtures.ts

@@ -26,7 +26,9 @@ export const ETH: Token = {
   iconUri:
     "https://coin-images.coingecko.com/coins/images/279/large/ethereum.png",
   name: "Ethereum",
-  priceUsd: 1000,
+  prices: {
+    USD: 1000,
+  },
   symbol: "ETH",
 };
 
@@ -37,7 +39,9 @@ export const USDC: Token = {
   iconUri:
     "https://coin-images.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
   name: "USD Coin",
-  priceUsd: 1,
+  prices: {
+    USD: 1,
+  },
   symbol: "USDC",
 };
 
@@ -48,7 +52,9 @@ export const UNI: Token = {
   iconUri:
     "https://coin-images.coingecko.com/coins/images/12504/large/uniswap-uni.png",
   name: "Uniswap",
-  priceUsd: 1000,
+  prices: {
+    USD: 1000,
+  },
   symbol: "UNI",
 };
 
@@ -93,7 +99,9 @@ export const simpleOnrampQuote: BridgePrepareResult = JSON.parse(
       iconUri:
         "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
       name: "USD Coin (PoS)",
-      priceUsd: 1.0,
+      prices: {
+        USD: 1.0,
+      },
       symbol: "USDC",
     },
     id: "onramp-simple-123",
@@ -122,7 +130,9 @@ export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
       chainId: 1,
       decimals: 18,
       name: "Ethereum",
-      priceUsd: 2500.0,
+      prices: {
+        USD: 2500.0,
+      },
       symbol: "ETH",
     },
     id: "onramp-swaps-456",
@@ -143,7 +153,9 @@ export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
           chainId: 137,
           decimals: 18,
           name: "Wrapped Ether",
-          priceUsd: 2500.0,
+          prices: {
+            USD: 2500.0,
+          },
           symbol: "WETH",
         },
         estimatedExecutionTimeMs: 30000, // 110 USDC
@@ -155,7 +167,9 @@ export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
           name: "USD Coin (PoS)",
-          priceUsd: 1.0,
+          prices: {
+            USD: 1.0,
+          },
           symbol: "USDC",
         },
         transactions: [
@@ -186,7 +200,9 @@ export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
           chainId: 1,
           decimals: 18,
           name: "Ethereum",
-          priceUsd: 2500.0,
+          prices: {
+            USD: 2500.0,
+          },
           symbol: "ETH",
         },
         estimatedExecutionTimeMs: 180000, // 0.044 WETH
@@ -196,7 +212,9 @@ export const onrampWithSwapsQuote: BridgePrepareResult = JSON.parse(
           chainId: 137,
           decimals: 18,
           name: "Wrapped Ether",
-          priceUsd: 2500.0,
+          prices: {
+            USD: 2500.0,
+          },
           symbol: "WETH",
         },
         transactions: [
@@ -251,7 +269,9 @@ export const simpleBuyQuote: BridgePrepareResult = JSON.parse(
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
           name: "USD Coin",
-          priceUsd: 1.0,
+          prices: {
+            USD: 1.0,
+          },
           symbol: "USDC",
         },
         estimatedExecutionTimeMs: 60000,
@@ -263,7 +283,9 @@ export const simpleBuyQuote: BridgePrepareResult = JSON.parse(
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
           name: "Ethereum",
-          priceUsd: 2500.0,
+          prices: {
+            USD: 2500.0,
+          },
           symbol: "ETH",
         },
         transactions: [
@@ -309,7 +331,9 @@ export const longTextBuyQuote: BridgePrepareResult = JSON.parse(
           iconUri:
             "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
           name: "USD Coin (USDC.e on Etherlink)",
-          priceUsd: 1.0,
+          prices: {
+            USD: 1.0,
+          },
           symbol: "USDC.e",
         },
         estimatedExecutionTimeMs: 60000,

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.105.12";
+export const version = "5.105.13";

package/src/wallets/__generated__/wallet/ag.jup/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "ag.jup",
+  name: "Jupiter",
+  homepage: "https://jup.ag/mobile",
+  image_id: "7601bec3-144f-4c9d-30a1-2d4a372ede00",
   app: {
+    browser: null,
+    ios: "https://apps.apple.com/us/app/jupiter-solana-swap-wallet/id6484069059",
     android:
       "https://play.google.com/store/apps/details?id=ag.jup.jupiter.android",
-    browser: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome: null,
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/jupiter-solana-swap-wallet/id6484069059",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://jup.ag/mobile",
-  id: "ag.jup",
-  image_id: "7601bec3-144f-4c9d-30a1-2d4a372ede00",
+  rdns: null,
   mobile: {
     native: "jupiter://",
     universal: null,
   },
-  name: "Jupiter",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/ai.hacken/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "ai.hacken",
+  name: "hAI by Hacken",
+  homepage: "https://hacken.ai",
+  image_id: "d2ff6baf-5051-4bf2-edec-32450b451000",
   app: {
+    browser: "https://hacken.ai",
+    ios: "https://apps.apple.com/us/app/hai-by-hacken/id1501384789",
     android:
       "https://play.google.com/store/apps/details?id=com.hackenai.hackenaiapp&hl=en_US",
-    browser: "https://hacken.ai",
+    mac: null,
+    windows: null,
+    linux: null,
     chrome: null,
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/hai-by-hacken/id1501384789",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://hacken.ai",
-  id: "ai.hacken",
-  image_id: "d2ff6baf-5051-4bf2-edec-32450b451000",
+  rdns: null,
   mobile: {
     native: "hai://",
     universal: "https://hacken.ai",
   },
-  name: "hAI by Hacken",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/ai.pundi/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "ai.pundi",
+  name: "Pundi Wallet",
+  homepage: "https://pundi.ai/",
+  image_id: "f095abd7-575e-4851-cf9c-79c2c4e4cc00",
   app: {
+    browser: null,
+    ios: "https://apps.apple.com/us/app/f-x-wallet-by-function-x-labs/id1504798360",
     android:
       "https://play.google.com/store/apps/details?id=com.pundix.functionx",
-    browser: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome: null,
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/f-x-wallet-by-function-x-labs/id1504798360",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://pundi.ai/",
-  id: "ai.pundi",
-  image_id: "f095abd7-575e-4851-cf9c-79c2c4e4cc00",
+  rdns: null,
   mobile: {
     native: "fxwallet://",
     universal: "https://fx.wallet/wc",
   },
-  name: "Pundi Wallet",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/ai.purewallet/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "ai.purewallet",
+  name: "PureWallet app",
+  homepage: "https://purewallet.ai",
+  image_id: "4e97b9d6-60eb-42cd-6256-5cd7205e3f00",
   app: {
+    browser: null,
+    ios: "https://apps.apple.com/us/app/purewallet/id6738949168?platform=iphone",
     android:
       "https://play.google.com/store/apps/details?id=com.nslab.purewalletp&pli=1",
-    browser: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome: null,
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/purewallet/id6738949168?platform=iphone",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://purewallet.ai",
-  id: "ai.purewallet",
-  image_id: "4e97b9d6-60eb-42cd-6256-5cd7205e3f00",
+  rdns: null,
   mobile: {
     native: "purewalletp://",
     universal: null,
   },
-  name: "PureWallet app",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/ai.spotonchain.platform/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "ai.spotonchain.platform",
+  name: "Spot On Chain App",
+  homepage: "https://platform.spotonchain.ai",
+  image_id: "1bcb5ed6-f6c9-4b0d-f891-b70c48b93d00",
   app: {
+    browser: null,
+    ios: "https://apps.apple.com/us/app/spot-on-chain/id6449733489",
     android:
       "https://play.google.com/store/apps/details?id=network.spotonchain",
-    browser: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome: null,
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/spot-on-chain/id6449733489",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://platform.spotonchain.ai",
-  id: "ai.spotonchain.platform",
-  image_id: "1bcb5ed6-f6c9-4b0d-f891-b70c48b93d00",
+  rdns: null,
   mobile: {
     native: "spotonchain://",
     universal: "https://spotonchain.ai/",
   },
-  name: "Spot On Chain App",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/app.ammer/index.ts

@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "app.ammer",
+  name: "Ammer Wallet",
+  homepage: "https://ammer.app/",
+  image_id: "7d38dd8e-92ee-44bf-1ca4-818531de1900",
   app: {
-    android: null,
     browser: null,
-    chrome: null,
-    edge: null,
-    firefox: null,
     ios: "https://apps.apple.com/us/app/ammer-wallet/id1599698329",
-    linux: null,
+    android: null,
     mac: null,
-    opera: null,
-    safari: null,
     windows: null,
+    linux: null,
+    chrome: null,
+    firefox: null,
+    safari: null,
+    edge: null,
+    opera: null,
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
-  homepage: "https://ammer.app/",
-  id: "app.ammer",
-  image_id: "7d38dd8e-92ee-44bf-1ca4-818531de1900",
+  rdns: null,
   mobile: {
     native: "ammerwallet://",
     universal: null,
   },
-  name: "Ammer Wallet",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/app.backpack/index.ts

@@ -2,32 +2,32 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "app.backpack",
+  name: "Backpack",
+  homepage: "https://backpack.app",
+  image_id: "71ca9daf-a31e-4d2a-fd01-f5dc2dc66900",
   app: {
+    browser: null,
+    ios: "https://apps.apple.com/us/app/backpack-wallet-exchange/id6445964121",
     android:
       "https://play.google.com/store/apps/details?id=app.backpack.mobile",
-    browser: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome:
       "https://chrome.google.com/webstore/detail/backpack/aflkmfhebedbjioipglgcbcmnbpgliof",
-    edge: null,
     firefox: null,
-    ios: "https://apps.apple.com/us/app/backpack-wallet-exchange/id6445964121",
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
-  },
-  desktop: {
-    native: null,
-    universal: null,
+    edge: null,
+    opera: null,
   },
-  homepage: "https://backpack.app",
-  id: "app.backpack",
-  image_id: "71ca9daf-a31e-4d2a-fd01-f5dc2dc66900",
+  rdns: "app.backpack",
   mobile: {
     native: "backpack://",
     universal: "https://backpack.app/ul/v1",
   },
-  name: "Backpack",
-  rdns: "app.backpack",
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/app.beewallet/index.ts

@@ -2,30 +2,30 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "app.beewallet",
+  name: "Bee Wallet",
+  homepage: "https://www.beewallet.app",
+  image_id: "f90bc33f-f085-40cf-7538-fae5ae84f900",
   app: {
-    android: null,
     browser: null,
-    chrome: null,
-    edge: null,
-    firefox: null,
     ios: "https://apps.apple.com/lt/app/bee-for-uniswap-pancakeswap/id1617257467",
-    linux: null,
+    android: null,
     mac: null,
-    opera: null,
-    safari: null,
     windows: null,
+    linux: null,
+    chrome: null,
+    firefox: null,
+    safari: null,
+    edge: null,
+    opera: null,
   },
-  desktop: {
-    native: null,
-    universal: null,
-  },
-  homepage: "https://www.beewallet.app",
-  id: "app.beewallet",
-  image_id: "f90bc33f-f085-40cf-7538-fae5ae84f900",
+  rdns: null,
   mobile: {
     native: "beewallet.app://",
     universal: "https://beewallet.app/wc",
   },
-  name: "Bee Wallet",
-  rdns: null,
+  desktop: {
+    native: null,
+    universal: null,
+  },
 } as const;

package/src/wallets/__generated__/wallet/app.berasig/index.ts

@@ -2,31 +2,31 @@
 // Do not modify this file manually.
 
 export const wallet = {
+  id: "app.berasig",
+  name: "BeraSig",
+  homepage: "https://www.berasig.com/",
+  image_id: "4b9e9716-c86d-4f1e-4bcc-12af74af7400",
   app: {
-    android: null,
     browser: null,
+    ios: null,
+    android: null,
+    mac: null,
+    windows: null,
+    linux: null,
     chrome:
       "https://chromewebstore.google.com/detail/berasig/ckedkkegjbflcfblcjklibnedmfjppbj",
-    edge: null,
     firefox: null,
-    ios: null,
-    linux: null,
-    mac: null,
-    opera: null,
     safari: null,
-    windows: null,
+    edge: null,
+    opera: null,
   },
-  desktop: {
+  rdns: "app.berasig",
+  mobile: {
     native: null,
     universal: null,
   },
-  homepage: "https://www.berasig.com/",
-  id: "app.berasig",
-  image_id: "4b9e9716-c86d-4f1e-4bcc-12af74af7400",
-  mobile: {
+  desktop: {
     native: null,
     universal: null,
   },
-  name: "BeraSig",
-  rdns: "app.berasig",
 } as const;