thirdweb 5.88.5-nightly-0574eac02c832c382972fd545df79c36e11796e1-20250217000342 → 5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (141) hide show
  1. package/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js +5 -1
  2. package/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -1
  3. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +53 -71
  4. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
  5. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.js +2 -2
  6. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.js.map +1 -1
  7. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js +1 -1
  8. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js.map +1 -1
  9. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js +1 -1
  10. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js.map +1 -1
  11. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +4 -14
  12. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
  13. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +2 -32
  14. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
  15. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js +9 -3
  16. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js.map +1 -1
  17. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js +15 -8
  18. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js.map +1 -1
  19. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.js +39 -0
  20. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.js.map +1 -0
  21. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.js +58 -53
  22. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.js.map +1 -1
  23. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +3 -10
  24. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
  25. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.js +35 -0
  26. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.js.map +1 -0
  27. package/dist/cjs/react/web/ui/ConnectWallet/screens/TokenSelector.js +1 -2
  28. package/dist/cjs/react/web/ui/ConnectWallet/screens/TokenSelector.js.map +1 -1
  29. package/dist/cjs/react/web/ui/ConnectWallet/screens/nativeToken.js +4 -2
  30. package/dist/cjs/react/web/ui/ConnectWallet/screens/nativeToken.js.map +1 -1
  31. package/dist/cjs/react/web/ui/components/token/TokenRow.js +11 -4
  32. package/dist/cjs/react/web/ui/components/token/TokenRow.js.map +1 -1
  33. package/dist/cjs/utils/any-evm/compute-deployment-address.js +4 -1
  34. package/dist/cjs/utils/any-evm/compute-deployment-address.js.map +1 -1
  35. package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js +1 -0
  36. package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
  37. package/dist/cjs/utils/any-evm/get-init-bytecode-with-salt.js +3 -1
  38. package/dist/cjs/utils/any-evm/get-init-bytecode-with-salt.js.map +1 -1
  39. package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js +6 -1
  40. package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -1
  41. package/dist/cjs/version.js +1 -1
  42. package/dist/cjs/wallets/connection/autoConnect.js +3 -4
  43. package/dist/cjs/wallets/connection/autoConnect.js.map +1 -1
  44. package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js +6 -2
  45. package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -1
  46. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +55 -73
  47. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
  48. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.js +1 -1
  49. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.js.map +1 -1
  50. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js +1 -1
  51. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js.map +1 -1
  52. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js +1 -1
  53. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js.map +1 -1
  54. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +4 -14
  55. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
  56. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +4 -34
  57. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
  58. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js +9 -3
  59. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js.map +1 -1
  60. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js +15 -8
  61. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js.map +1 -1
  62. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.js +36 -0
  63. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.js.map +1 -0
  64. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.js +59 -53
  65. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.js.map +1 -1
  66. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +4 -11
  67. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
  68. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.js +32 -0
  69. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.js.map +1 -0
  70. package/dist/esm/react/web/ui/ConnectWallet/screens/TokenSelector.js +1 -2
  71. package/dist/esm/react/web/ui/ConnectWallet/screens/TokenSelector.js.map +1 -1
  72. package/dist/esm/react/web/ui/ConnectWallet/screens/nativeToken.js +4 -2
  73. package/dist/esm/react/web/ui/ConnectWallet/screens/nativeToken.js.map +1 -1
  74. package/dist/esm/react/web/ui/components/token/TokenRow.js +11 -4
  75. package/dist/esm/react/web/ui/components/token/TokenRow.js.map +1 -1
  76. package/dist/esm/utils/any-evm/compute-deployment-address.js +4 -1
  77. package/dist/esm/utils/any-evm/compute-deployment-address.js.map +1 -1
  78. package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js +1 -0
  79. package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
  80. package/dist/esm/utils/any-evm/get-init-bytecode-with-salt.js +4 -2
  81. package/dist/esm/utils/any-evm/get-init-bytecode-with-salt.js.map +1 -1
  82. package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js +6 -1
  83. package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -1
  84. package/dist/esm/version.js +1 -1
  85. package/dist/esm/wallets/connection/autoConnect.js +2 -2
  86. package/dist/esm/wallets/connection/autoConnect.js.map +1 -1
  87. package/dist/types/contract/deployment/zksync/zkDeployDeterministic.d.ts.map +1 -1
  88. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.d.ts.map +1 -1
  89. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.d.ts.map +1 -1
  90. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.d.ts +2 -2
  91. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.d.ts.map +1 -1
  92. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.d.ts.map +1 -1
  93. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.d.ts +2 -2
  94. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.d.ts.map +1 -1
  95. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.d.ts +2 -2
  96. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.d.ts.map +1 -1
  97. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.d.ts +15 -0
  98. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.d.ts.map +1 -0
  99. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.d.ts +2 -16
  100. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.d.ts.map +1 -1
  101. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.d.ts.map +1 -1
  102. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.d.ts +9 -0
  103. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.d.ts.map +1 -0
  104. package/dist/types/react/web/ui/ConnectWallet/screens/TokenSelector.d.ts.map +1 -1
  105. package/dist/types/react/web/ui/ConnectWallet/screens/nativeToken.d.ts +1 -1
  106. package/dist/types/react/web/ui/ConnectWallet/screens/nativeToken.d.ts.map +1 -1
  107. package/dist/types/react/web/ui/components/token/TokenRow.d.ts +2 -2
  108. package/dist/types/react/web/ui/components/token/TokenRow.d.ts.map +1 -1
  109. package/dist/types/utils/any-evm/compute-deployment-address.d.ts.map +1 -1
  110. package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts +3 -0
  111. package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts.map +1 -1
  112. package/dist/types/utils/any-evm/get-init-bytecode-with-salt.d.ts.map +1 -1
  113. package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts +1 -1
  114. package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts.map +1 -1
  115. package/dist/types/version.d.ts +1 -1
  116. package/dist/types/wallets/connection/autoConnect.d.ts +2 -2
  117. package/dist/types/wallets/connection/autoConnect.d.ts.map +1 -1
  118. package/package.json +1 -1
  119. package/src/contract/deployment/deploy-deterministic.test.ts +45 -2
  120. package/src/contract/deployment/zksync/zkDeployDeterministic.ts +10 -2
  121. package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +70 -157
  122. package/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx +1 -1
  123. package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx +1 -0
  124. package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.tsx +1 -1
  125. package/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts +4 -18
  126. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx +20 -161
  127. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx +25 -14
  128. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx +58 -34
  129. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapSummary.tsx +134 -0
  130. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx +134 -128
  131. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx +18 -48
  132. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx +70 -0
  133. package/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx +1 -3
  134. package/src/react/web/ui/ConnectWallet/screens/nativeToken.ts +5 -3
  135. package/src/react/web/ui/components/token/TokenRow.tsx +38 -14
  136. package/src/utils/any-evm/compute-deployment-address.ts +4 -1
  137. package/src/utils/any-evm/compute-published-contract-deploy-info.ts +1 -0
  138. package/src/utils/any-evm/get-init-bytecode-with-salt.ts +5 -2
  139. package/src/utils/any-evm/zksync/computeDeploymentAddress.ts +6 -2
  140. package/src/version.ts +1 -1
  141. package/src/wallets/connection/autoConnect.ts +3 -3
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.WalletRow = WalletRow;
4
+ const jsx_runtime_1 = require("react/jsx-runtime");
5
+ const address_js_1 = require("../../../../../../../utils/address.js");
6
+ const is_ecosystem_wallet_js_1 = require("../../../../../../../wallets/ecosystem/is-ecosystem-wallet.js");
7
+ const index_js_1 = require("../../../../../../../wallets/smart/index.js");
8
+ const index_js_2 = require("../../../../../../core/design-system/index.js");
9
+ const useConnectedWallets_js_1 = require("../../../../../../core/hooks/wallets/useConnectedWallets.js");
10
+ const wallet_js_1 = require("../../../../../../core/utils/wallet.js");
11
+ const useProfiles_js_1 = require("../../../../../hooks/wallets/useProfiles.js");
12
+ const Skeleton_js_1 = require("../../../../components/Skeleton.js");
13
+ const WalletImage_js_1 = require("../../../../components/WalletImage.js");
14
+ const basic_js_1 = require("../../../../components/basic.js");
15
+ const text_js_1 = require("../../../../components/text.js");
16
+ function WalletRow(props) {
17
+ const { client, address } = props;
18
+ const connectedWallets = (0, useConnectedWallets_js_1.useConnectedWallets)();
19
+ const profile = (0, useProfiles_js_1.useProfiles)({ client });
20
+ const wallet = connectedWallets.find((w) => w.getAccount()?.address?.toLowerCase() === address.toLowerCase());
21
+ const email = wallet &&
22
+ (wallet.id === "inApp" ||
23
+ (0, is_ecosystem_wallet_js_1.isEcosystemWallet)(wallet) ||
24
+ (0, index_js_1.isSmartWallet)(wallet))
25
+ ? profile.data?.find((p) => !!p.details.email)?.details.email
26
+ : undefined;
27
+ const walletInfo = (0, wallet_js_1.useWalletInfo)(wallet?.id);
28
+ const ensNameQuery = (0, wallet_js_1.useEnsName)({
29
+ client,
30
+ address,
31
+ });
32
+ const addressOrENS = ensNameQuery.data || (0, address_js_1.shortenAddress)(address);
33
+ return ((0, jsx_runtime_1.jsx)(basic_js_1.Container, { flex: "row", style: { justifyContent: "space-between" }, children: (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", center: "y", gap: "sm", color: "secondaryText", children: [wallet ? ((0, jsx_runtime_1.jsx)(WalletImage_js_1.WalletImage, { id: wallet.id, size: index_js_2.iconSize[props.iconSize || "md"], client: props.client })) : null, (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "4xs", children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: props.textSize || "xs", color: "primaryText", children: addressOrENS || (0, address_js_1.shortenAddress)(props.address) }), profile.isLoading ? ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { width: "100px", height: index_js_2.fontSize.sm })) : email || walletInfo?.data?.name ? ((0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "xs", color: "secondaryText", children: email || walletInfo?.data?.name })) : null] })] }) }));
34
+ }
35
+ //# sourceMappingURL=WalletRow.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"WalletRow.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/WalletRow.tsx"],"names":[],"mappings":";;AAmBA,8BAkDC;;AApED,sEAAuE;AACvE,0GAAkG;AAClG,0EAA4E;AAC5E,4EAGuD;AACvD,wGAAkG;AAClG,sEAGgD;AAChD,gFAA0E;AAC1E,oEAA8D;AAC9D,0EAAoE;AACpE,8DAA4D;AAC5D,4DAAsD;AAEtD,SAAgB,SAAS,CAAC,KAKzB;IACC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,gBAAgB,GAAG,IAAA,4CAAmB,GAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAA,4BAAW,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACxE,CAAC;IACF,MAAM,KAAK,GACT,MAAM;QACN,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO;YACpB,IAAA,0CAAiB,EAAC,MAAM,CAAC;YACzB,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC;QACtB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;QAC7D,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,UAAU,GAAG,IAAA,yBAAa,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAA,sBAAU,EAAC;QAC9B,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,IAAI,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IAClE,OAAO,CACL,uBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,KAAK,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,YAC9D,wBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,EAAC,GAAG,EAAC,IAAI,EAAC,KAAK,EAAC,eAAe,aAC5D,MAAM,CAAC,CAAC,CAAC,CACR,uBAAC,4BAAW,IACV,EAAE,EAAE,MAAM,CAAC,EAAE,EACb,IAAI,EAAE,mBAAQ,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,EACtC,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,CACH,CAAC,CAAC,CAAC,IAAI,EACR,wBAAC,oBAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,GAAG,EAAC,KAAK,aAChC,uBAAC,cAAI,IAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,KAAK,EAAC,aAAa,YACpD,YAAY,IAAI,IAAA,2BAAc,EAAC,KAAK,CAAC,OAAO,CAAC,GACzC,EACN,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CACnB,uBAAC,sBAAQ,IAAC,KAAK,EAAC,OAAO,EAAC,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,CAChD,CAAC,CAAC,CAAC,KAAK,IAAI,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CACpC,uBAAC,cAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAC,eAAe,YAClC,KAAK,IAAI,UAAU,EAAE,IAAI,EAAE,IAAI,GAC3B,CACR,CAAC,CAAC,CAAC,IAAI,IACE,IACF,GACF,CACb,CAAC;AACJ,CAAC"}
@@ -87,7 +87,6 @@ function TokenSelector(props) {
87
87
  } })] }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" }), (filteredList.length > 0 || !input) && ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "xs", px: "lg", scrollY: true, style: {
88
88
  paddingTop: 0,
89
89
  paddingBottom: index_js_1.spacing.lg,
90
- // maxHeight: props.chainSelection ? "300px" : "400px",
91
90
  }, children: [!input && ((0, jsx_runtime_1.jsx)(SelectTokenButton, { onClick: () => {
92
91
  props.onTokenSelect(nativeToken_js_1.NATIVE_TOKEN);
93
92
  }, chain: props.chain, token: nativeToken_js_1.NATIVE_TOKEN, client: props.client })), filteredList.map((token) => {
@@ -110,7 +109,7 @@ function SelectTokenButton(props) {
110
109
  const tokenName = (0, nativeToken_js_1.isNativeToken)(props.token)
111
110
  ? tokenInfoQuery.data?.name
112
111
  : props.token.name;
113
- return ((0, jsx_runtime_1.jsxs)(SelectTokenBtn, { fullWidth: true, variant: "secondary", onClick: props.onClick, children: [(0, jsx_runtime_1.jsx)(TokenIcon_js_1.TokenIcon, { token: props.token, chain: props.chain, size: "lg", client: props.client }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "xxs", children: [tokenName ? ((0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "sm", color: "primaryText", children: tokenName })) : ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { height: index_js_1.fontSize.md, width: "150px" })), account && ((0, jsx_runtime_1.jsx)(TokenBalance, { account: account, chain: props.chain, client: props.client, tokenAddress: (0, nativeToken_js_1.isNativeToken)(props.token) ? undefined : props.token.address }))] })] }));
112
+ return ((0, jsx_runtime_1.jsxs)(SelectTokenBtn, { fullWidth: true, variant: "secondary", onClick: props.onClick, children: [(0, jsx_runtime_1.jsx)(TokenIcon_js_1.TokenIcon, { token: props.token, chain: props.chain, size: "lg", client: props.client }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "4xs", children: [tokenName ? ((0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "sm", color: "primaryText", children: tokenName })) : ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { height: index_js_1.fontSize.md, width: "150px" })), account && ((0, jsx_runtime_1.jsx)(TokenBalance, { account: account, chain: props.chain, client: props.client, tokenAddress: (0, nativeToken_js_1.isNativeToken)(props.token) ? undefined : props.token.address }))] })] }));
114
113
  }
115
114
  function TokenBalance(props) {
116
115
  const tokenBalanceQuery = (0, react_query_1.useQuery)({
@@ -1 +1 @@
1
- {"version":3,"file":"TokenSelector.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TokenSelector.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx"],"names":[],"mappings":"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"}
@@ -10,8 +10,10 @@ exports.NATIVE_TOKEN = { nativeToken: true };
10
10
  * @internal
11
11
  */
12
12
  function isNativeToken(token) {
13
- return ("nativeToken" in token ||
14
- token.address?.toLowerCase() === addresses_js_1.NATIVE_TOKEN_ADDRESS.toLowerCase());
13
+ return ((token &&
14
+ ("nativeToken" in token ||
15
+ token.address?.toLowerCase() === addresses_js_1.NATIVE_TOKEN_ADDRESS.toLowerCase())) ||
16
+ false);
15
17
  }
16
18
  function getTokenAddress(token) {
17
19
  if (isNativeToken(token)) {
@@ -1 +1 @@
1
- {"version":3,"file":"nativeToken.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/nativeToken.ts"],"names":[],"mappings":";;;AAWA,sCAOC;AAED,0CAKC;AAzBD,wEAA6E;AAC7E,gEAA2E;AAK9D,QAAA,YAAY,GAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAE/D;;GAEG;AACH,SAAgB,aAAa,CAC3B,KAAuC;IAEvC,OAAO,CACL,aAAa,IAAI,KAAK;QACtB,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,mCAAoB,CAAC,WAAW,EAAE,CACpE,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,KAA8B;IAC5D,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,mCAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,IAAA,uBAAU,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC"}
1
+ {"version":3,"file":"nativeToken.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/nativeToken.ts"],"names":[],"mappings":";;;AAWA,sCASC;AAED,0CAKC;AA3BD,wEAA6E;AAC7E,gEAA2E;AAK9D,QAAA,YAAY,GAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAE/D;;GAEG;AACH,SAAgB,aAAa,CAC3B,KAAwC;IAExC,OAAO,CACL,CAAC,KAAK;QACJ,CAAC,aAAa,IAAI,KAAK;YACrB,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,mCAAoB,CAAC,WAAW,EAAE,CAAC,CAAC;QACzE,KAAK,CACN,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,KAA8B;IAC5D,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,mCAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,IAAA,uBAAU,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC"}
@@ -8,20 +8,27 @@ const formatNumber_js_1 = require("../../../../../utils/formatNumber.js");
8
8
  const CustomThemeProvider_js_1 = require("../../../../core/design-system/CustomThemeProvider.js");
9
9
  const index_js_1 = require("../../../../core/design-system/index.js");
10
10
  const useChainQuery_js_1 = require("../../../../core/hooks/others/useChainQuery.js");
11
+ const PayTokenIcon_js_1 = require("../../ConnectWallet/screens/Buy/PayTokenIcon.js");
11
12
  const Skeleton_js_1 = require("../Skeleton.js");
12
- const TokenIcon_js_1 = require("../TokenIcon.js");
13
13
  const basic_js_1 = require("../basic.js");
14
14
  const buttons_js_1 = require("../buttons.js");
15
15
  const text_js_1 = require("../text.js");
16
16
  const TokenSymbol_js_1 = require("./TokenSymbol.js");
17
17
  function TokenRow(props) {
18
18
  const { name } = (0, useChainQuery_js_1.useChainName)(props.chain);
19
+ if (!props.token || !props.chain) {
20
+ return ((0, jsx_runtime_1.jsxs)(buttons_js_1.Button, { variant: "secondary", fullWidth: true, style: {
21
+ fontSize: index_js_1.fontSize.sm,
22
+ justifyContent: "space-between",
23
+ paddingTop: index_js_1.spacing.md,
24
+ paddingBottom: index_js_1.spacing.md,
25
+ ...props.style,
26
+ }, gap: "xxs", onClick: props.onSelectToken, children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "sm", color: "primaryText", children: "Select payment token" }), (0, jsx_runtime_1.jsx)(basic_js_1.Container, { color: "primaryText", children: (0, jsx_runtime_1.jsx)(react_icons_1.ChevronDownIcon, { width: index_js_1.iconSize.sm, height: index_js_1.iconSize.sm }) })] }));
27
+ }
19
28
  return ((0, jsx_runtime_1.jsxs)(TokenButton, { variant: "secondary", fullWidth: true, style: {
20
29
  fontSize: index_js_1.fontSize.sm,
21
30
  ...props.style,
22
- }, gap: "xxs", onClick: props.onSelectToken, disabled: props.freezeChainAndToken, children: [(0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", center: "y", gap: "sm", children: [(0, jsx_runtime_1.jsx)(TokenIcon_js_1.TokenIcon, { token: props.token, chain: props.chain, size: "md", client: props.client }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", style: {
23
- gap: "4px",
24
- }, children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { flex: "column", gap: "3xs", children: props.isLoading ? ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { width: "120px", height: index_js_1.fontSize.md, color: "borderColor" })) : props.value ? ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xxs", center: "y", color: "primaryText", children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "md", color: props.value ? "primaryText" : "secondaryText", children: (0, formatNumber_js_1.formatNumber)(Number(props.value), 6) || "" }), (0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.token, chain: props.chain, size: "sm" })] })) : ((0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.token, chain: props.chain, size: "sm" })) }), name ? ((0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "xs", color: "secondaryText", children: name })) : ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { width: "90px", height: index_js_1.fontSize.xs }))] })] }), (0, jsx_runtime_1.jsx)(basic_js_1.Container, { color: "primaryText", children: (0, jsx_runtime_1.jsx)(react_icons_1.ChevronDownIcon, { width: index_js_1.iconSize.sm, height: index_js_1.iconSize.sm }) })] }));
31
+ }, gap: "xxs", onClick: props.onSelectToken, disabled: props.freezeChainAndToken, children: [(0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", center: "y", gap: "sm", children: [(0, jsx_runtime_1.jsx)(PayTokenIcon_js_1.PayTokenIcon, { token: props.token, chain: props.chain, size: "md", client: props.client }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "4xs", children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { flex: "column", gap: "4xs", children: props.isLoading ? ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { width: "120px", height: index_js_1.fontSize.md, color: "borderColor" })) : props.value ? ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xxs", center: "y", color: "primaryText", children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "md", color: props.value ? "primaryText" : "secondaryText", children: (0, formatNumber_js_1.formatNumber)(Number(props.value), 6) || "" }), (0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.token, chain: props.chain, color: "secondaryText", size: "sm" })] })) : ((0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.token, chain: props.chain, size: "sm" })) }), name ? ((0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "xs", color: "secondaryText", children: name })) : ((0, jsx_runtime_1.jsx)(Skeleton_js_1.Skeleton, { width: "90px", height: index_js_1.fontSize.xs }))] })] }), !props.freezeChainAndToken && ((0, jsx_runtime_1.jsx)(basic_js_1.Container, { color: "primaryText", children: (0, jsx_runtime_1.jsx)(react_icons_1.ChevronDownIcon, { width: index_js_1.iconSize.sm, height: index_js_1.iconSize.sm }) }))] }));
25
32
  }
26
33
  const TokenButton = /* @__PURE__ */ (0, styled_1.default)(buttons_js_1.Button)(() => {
27
34
  const theme = (0, CustomThemeProvider_js_1.useCustomTheme)();
@@ -1 +1 @@
1
- {"version":3,"file":"TokenRow.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/components/token/TokenRow.tsx"],"names":[],"mappings":";;AAoBA,4BA+EC;;AAnGD,4CAAqC;AACrC,uDAAwD;AAGxD,0EAAoE;AACpE,kGAAuF;AACvF,sEAIiD;AACjD,qFAA8E;AAE9E,gDAA0C;AAC1C,kDAA4C;AAC5C,0CAAwC;AACxC,8CAAuC;AACvC,wCAAkC;AAClC,qDAA+C;AAE/C,SAAgB,QAAQ,CAAC,KASxB;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,+BAAY,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,CACL,wBAAC,WAAW,IACV,OAAO,EAAC,WAAW,EACnB,SAAS,QACT,KAAK,EAAE;YACL,QAAQ,EAAE,mBAAQ,CAAC,EAAE;YACrB,GAAG,KAAK,CAAC,KAAK;SACf,EACD,GAAG,EAAC,KAAK,EACT,OAAO,EAAE,KAAK,CAAC,aAAa,EAC5B,QAAQ,EAAE,KAAK,CAAC,mBAAmB,aAEnC,wBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,EAAC,GAAG,EAAC,IAAI,aACvC,uBAAC,wBAAS,IACR,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,IAAI,EAAC,IAAI,EACT,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,EAEF,wBAAC,oBAAS,IACR,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE;4BACL,GAAG,EAAE,KAAK;yBACX,aAGD,uBAAC,oBAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,GAAG,EAAC,KAAK,YAC/B,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,uBAAC,sBAAQ,IACP,KAAK,EAAC,OAAO,EACb,MAAM,EAAE,mBAAQ,CAAC,EAAE,EACnB,KAAK,EAAC,aAAa,GACnB,CACH,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,wBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,GAAG,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,EAAC,KAAK,EAAC,aAAa,aAC5D,uBAAC,cAAI,IACH,IAAI,EAAC,IAAI,EACT,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,YAEnD,IAAA,8BAAY,EAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GACtC,EACP,uBAAC,4BAAW,IACV,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,IAAI,EAAC,IAAI,GACT,IACQ,CACb,CAAC,CAAC,CAAC,CACF,uBAAC,4BAAW,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAC,IAAI,GAAG,CAClE,GACS,EAGX,IAAI,CAAC,CAAC,CAAC,CACN,uBAAC,cAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAC,eAAe,YAClC,IAAI,GACA,CACR,CAAC,CAAC,CAAC,CACF,uBAAC,sBAAQ,IAAC,KAAK,EAAC,MAAM,EAAC,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,CAC/C,IACS,IACF,EACZ,uBAAC,oBAAS,IAAC,KAAK,EAAC,aAAa,YAC5B,uBAAC,6BAAe,IAAC,KAAK,EAAE,mBAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,GAClD,IACA,CACf,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,eAAe,CAAC,IAAA,gBAAM,EAAC,mBAAM,CAAC,CAAC,GAAG,EAAE;IACtD,MAAM,KAAK,GAAG,IAAA,uCAAc,GAAE,CAAC;IAC/B,OAAO;QACL,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU;QACnC,MAAM,EAAE,aAAa,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;QAC/C,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE,kBAAO,CAAC,EAAE;KACpB,CAAC;AACJ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"TokenRow.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/components/token/TokenRow.tsx"],"names":[],"mappings":";;AAoBA,4BAuGC;;AA3HD,4CAAqC;AACrC,uDAAwD;AAGxD,0EAAoE;AACpE,kGAAuF;AACvF,sEAIiD;AACjD,qFAA8E;AAC9E,qFAA+E;AAE/E,gDAA0C;AAC1C,0CAAwC;AACxC,8CAAuC;AACvC,wCAAkC;AAClC,qDAA+C;AAE/C,SAAgB,QAAQ,CAAC,KASxB;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,+BAAY,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE3C,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACjC,OAAO,CACL,wBAAC,mBAAM,IACL,OAAO,EAAC,WAAW,EACnB,SAAS,QACT,KAAK,EAAE;gBACL,QAAQ,EAAE,mBAAQ,CAAC,EAAE;gBACrB,cAAc,EAAE,eAAe;gBAC/B,UAAU,EAAE,kBAAO,CAAC,EAAE;gBACtB,aAAa,EAAE,kBAAO,CAAC,EAAE;gBACzB,GAAG,KAAK,CAAC,KAAK;aACf,EACD,GAAG,EAAC,KAAK,EACT,OAAO,EAAE,KAAK,CAAC,aAAa,aAE5B,uBAAC,cAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAC,aAAa,qCAE5B,EACP,uBAAC,oBAAS,IAAC,KAAK,EAAC,aAAa,YAC5B,uBAAC,6BAAe,IAAC,KAAK,EAAE,mBAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,GAClD,IACL,CACV,CAAC;IACJ,CAAC;IAED,OAAO,CACL,wBAAC,WAAW,IACV,OAAO,EAAC,WAAW,EACnB,SAAS,QACT,KAAK,EAAE;YACL,QAAQ,EAAE,mBAAQ,CAAC,EAAE;YACrB,GAAG,KAAK,CAAC,KAAK;SACf,EACD,GAAG,EAAC,KAAK,EACT,OAAO,EAAE,KAAK,CAAC,aAAa,EAC5B,QAAQ,EAAE,KAAK,CAAC,mBAAmB,aAEnC,wBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,EAAC,GAAG,EAAC,IAAI,aACvC,uBAAC,8BAAY,IACX,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,IAAI,EAAC,IAAI,EACT,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,EAEF,wBAAC,oBAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,GAAG,EAAC,KAAK,aAEhC,uBAAC,oBAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,GAAG,EAAC,KAAK,YAC/B,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,uBAAC,sBAAQ,IACP,KAAK,EAAC,OAAO,EACb,MAAM,EAAE,mBAAQ,CAAC,EAAE,EACnB,KAAK,EAAC,aAAa,GACnB,CACH,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,wBAAC,oBAAS,IAAC,IAAI,EAAC,KAAK,EAAC,GAAG,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,EAAC,KAAK,EAAC,aAAa,aAC5D,uBAAC,cAAI,IACH,IAAI,EAAC,IAAI,EACT,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,YAEnD,IAAA,8BAAY,EAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GACtC,EACP,uBAAC,4BAAW,IACV,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,KAAK,EAAC,eAAe,EACrB,IAAI,EAAC,IAAI,GACT,IACQ,CACb,CAAC,CAAC,CAAC,CACF,uBAAC,4BAAW,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAC,IAAI,GAAG,CAClE,GACS,EAGX,IAAI,CAAC,CAAC,CAAC,CACN,uBAAC,cAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAC,eAAe,YAClC,IAAI,GACA,CACR,CAAC,CAAC,CAAC,CACF,uBAAC,sBAAQ,IAAC,KAAK,EAAC,MAAM,EAAC,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,CAC/C,IACS,IACF,EACX,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAC7B,uBAAC,oBAAS,IAAC,KAAK,EAAC,aAAa,YAC5B,uBAAC,6BAAe,IAAC,KAAK,EAAE,mBAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAQ,CAAC,EAAE,GAAI,GAClD,CACb,IACW,CACf,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,eAAe,CAAC,IAAA,gBAAM,EAAC,mBAAM,CAAC,CAAC,GAAG,EAAE;IACtD,MAAM,KAAK,GAAG,IAAA,uCAAc,GAAE,CAAC;IAC/B,OAAO;QACL,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU;QACnC,MAAM,EAAE,aAAa,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;QAC/C,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE,kBAAO,CAAC,EAAE;KACpB,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -4,6 +4,7 @@ exports.computeDeploymentAddress = computeDeploymentAddress;
4
4
  const viem_1 = require("viem");
5
5
  const address_js_1 = require("../address.js");
6
6
  const prefix_js_1 = require("../bytecode/prefix.js");
7
+ const hex_js_1 = require("../encoding/hex.js");
7
8
  const keccak256_js_1 = require("../hashing/keccak256.js");
8
9
  const get_salt_hash_js_1 = require("./get-salt-hash.js");
9
10
  const keccak_id_js_1 = require("./keccak-id.js");
@@ -26,7 +27,9 @@ const keccak_id_js_1 = require("./keccak-id.js");
26
27
  function computeDeploymentAddress(options) {
27
28
  const bytecode = (0, prefix_js_1.ensureBytecodePrefix)(options.bytecode);
28
29
  const saltHash = options.salt
29
- ? (0, keccak_id_js_1.keccakId)(options.salt)
30
+ ? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
31
+ ? options.salt
32
+ : (0, keccak_id_js_1.keccakId)(options.salt)
30
33
  : (0, get_salt_hash_js_1.getSaltHash)(bytecode);
31
34
  // 1. create init bytecode hash with contract's bytecode and encoded args
32
35
  const initBytecode = (0, viem_1.encodePacked)(["bytes", "bytes"], [bytecode, options.encodedArgs]);
@@ -1 +1 @@
1
- {"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":";;AA8BA,4DAgCC;AA9DD,+BAA8C;AAC9C,8CAA2C;AAC3C,qDAA6D;AAC7D,0DAAoD;AACpD,yDAAiD;AACjD,iDAA0C;AAS1C;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,yEAAyE;IACzE,MAAM,YAAY,GAAG,IAAA,mBAAY,EAC/B,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAChC,CAAC;IAEF,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,IAAA,mBAAY,EACnC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC3C;QACE,MAAM;QACN,IAAA,uBAAU,EAAC,OAAO,CAAC,qBAAqB,CAAC;QACzC,QAAQ;QACR,IAAA,wBAAS,EAAC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;KACnD,CACF,CAAC;IAEF,iCAAiC;IACjC,MAAM,gBAAgB,GAAG,IAAA,wBAAS,EAChC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAC5C,CAAC;IAEF,uFAAuF;IACvF,OAAO,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;AAC3C,CAAC"}
1
+ {"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":";;AA+BA,4DAkCC;AAjED,+BAA8C;AAC9C,8CAA2C;AAC3C,qDAA6D;AAC7D,+CAA2C;AAC3C,0DAAoD;AACpD,yDAAiD;AACjD,iDAA0C;AAS1C;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,yEAAyE;IACzE,MAAM,YAAY,GAAG,IAAA,mBAAY,EAC/B,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAChC,CAAC;IAEF,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,IAAA,mBAAY,EACnC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC3C;QACE,MAAM;QACN,IAAA,uBAAU,EAAC,OAAO,CAAC,qBAAqB,CAAC;QACzC,QAAQ;QACR,IAAA,wBAAS,EAAC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;KACnD,CACF,CAAC;IAEF,iCAAiC;IACjC,MAAM,gBAAgB,GAAG,IAAA,wBAAS,EAChC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAC5C,CAAC;IAEF,uFAAuF;IACvF,OAAO,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;AAC3C,CAAC"}
@@ -65,6 +65,7 @@ async function computeDeploymentInfoFromBytecode(args) {
65
65
  initBytecodeWithsalt,
66
66
  encodedArgs,
67
67
  create2FactoryAddress,
68
+ salt,
68
69
  };
69
70
  }
70
71
  //# sourceMappingURL=compute-published-contract-deploy-info.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;AAkBA,kFAuBC;AAKD,8EAmBC;AAED,8EAgCC;AAhGD,yEAAwF;AACxF,6FAAmG;AACnG,0EAAoE;AACpE,kFAA4E;AAC5E,qDAA6D;AAE7D,6DAG8B;AAC9B,qFAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,IAAA,sDAAiC,EAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,IAAA,kDAA4B,EAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,IAAA,4CAAmB,EACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,IAAA,oDAAuB,EAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wDAAuB,EAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;AAkBA,kFAuBC;AAKD,8EAmBC;AAED,8EAiCC;AAjGD,yEAAwF;AACxF,6FAAmG;AACnG,0EAAoE;AACpE,kFAA4E;AAC5E,qDAA6D;AAE7D,6DAG8B;AAC9B,qFAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,IAAA,sDAAiC,EAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,IAAA,kDAA4B,EAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,IAAA,4CAAmB,EACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,IAAA,oDAAuB,EAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wDAAuB,EAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;QACrB,IAAI;KACL,CAAC;AACJ,CAAC"}
@@ -24,7 +24,9 @@ const keccak_id_js_1 = require("./keccak-id.js");
24
24
  function getInitBytecodeWithSalt(options) {
25
25
  const bytecode = (0, prefix_js_1.ensureBytecodePrefix)(options.bytecode);
26
26
  const saltHash = options.salt
27
- ? (0, keccak_id_js_1.keccakId)(options.salt)
27
+ ? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
28
+ ? options.salt
29
+ : (0, keccak_id_js_1.keccakId)(options.salt)
28
30
  : (0, get_salt_hash_js_1.getSaltHash)(bytecode);
29
31
  const encodedArgs = typeof options.encodedArgs === "string"
30
32
  ? options.encodedArgs
@@ -1 +1 @@
1
- {"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":";;AA2BA,0DAiBC;AA5CD,sCAA0C;AAC1C,qDAA6D;AAC7D,+CAA+D;AAC/D,yDAAiD;AACjD,iDAA0C;AAQ1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,uBAAuB,CACrC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,WAAW,GACf,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,WAAW;QACrB,CAAC,CAAC,IAAA,wBAAe,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,IAAA,oBAAY,EACjB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAClC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":";;AA2BA,0DAoBC;AA/CD,sCAA0C;AAC1C,qDAA6D;AAC7D,+CAAsE;AACtE,yDAAiD;AACjD,iDAA0C;AAQ1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,uBAAuB,CACrC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,WAAW,GACf,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,WAAW;QACrB,CAAC,CAAC,IAAA,wBAAe,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,IAAA,oBAAY,EACjB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAClC,CAAC;AACJ,CAAC"}
@@ -1,10 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.computeDeploymentAddress = computeDeploymentAddress;
4
+ const hex_js_1 = require("../../encoding/hex.js");
4
5
  const keccak_id_js_1 = require("../keccak-id.js");
5
6
  const create2Address_js_1 = require("./create2Address.js");
6
7
  function computeDeploymentAddress(options) {
7
- const saltHash = options.salt ? (0, keccak_id_js_1.keccakId)(options.salt) : (0, keccak_id_js_1.keccakId)("thirdweb");
8
+ const saltHash = options.salt
9
+ ? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
10
+ ? options.salt
11
+ : (0, keccak_id_js_1.keccakId)(options.salt)
12
+ : (0, keccak_id_js_1.keccakId)("thirdweb");
8
13
  return (0, create2Address_js_1.create2Address)({
9
14
  sender: options.create2FactoryAddress,
10
15
  bytecodeHash: options.bytecodeHash,
@@ -1 +1 @@
1
- {"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":";;AAYA,4DAWC;AArBD,kDAA2C;AAC3C,2DAAqD;AASrD,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAQ,EAAC,UAAU,CAAC,CAAC;IAE9E,OAAO,IAAA,kCAAc,EAAC;QACpB,MAAM,EAAE,OAAO,CAAC,qBAAqB;QACrC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,OAAO,CAAC,WAAW;KAC3B,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":";;AAYA,4DAeC;AA1BD,kDAAwD;AACxD,kDAA2C;AAC3C,2DAAqD;AASrD,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,uBAAQ,EAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,IAAA,kCAAc,EAAC;QACpB,MAAM,EAAE,OAAO,CAAC,qBAAqB;QACrC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,OAAO,CAAC,WAAW;KAC3B,CAAC,CAAC;AACL,CAAC"}
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.version = void 0;
4
- exports.version = "5.88.5-nightly-0574eac02c832c382972fd545df79c36e11796e1-20250217000342";
4
+ exports.version = "5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338";
5
5
  //# sourceMappingURL=version.js.map
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.autoConnect = void 0;
3
+ exports.autoConnect = autoConnect;
4
4
  const webStorage_js_1 = require("../../utils/storage/webStorage.js");
5
5
  const create_wallet_js_1 = require("../create-wallet.js");
6
6
  const defaultWallets_js_1 = require("../defaultWallets.js");
@@ -29,7 +29,7 @@ const autoConnectCore_js_1 = require("./autoConnectCore.js");
29
29
  * @returns {boolean} a promise resolving to true or false depending on whether the auto connect function connected to a wallet or not
30
30
  * @walletConnection
31
31
  */
32
- const autoConnect = async (props) => {
32
+ async function autoConnect(props) {
33
33
  const wallets = props.wallets || (0, defaultWallets_js_1.getDefaultWallets)(props);
34
34
  const manager = (0, index_js_1.createConnectionManager)(webStorage_js_1.webLocalStorage);
35
35
  const result = await (0, autoConnectCore_js_1.autoConnectCore)({
@@ -50,6 +50,5 @@ const autoConnect = async (props) => {
50
50
  manager,
51
51
  });
52
52
  return result;
53
- };
54
- exports.autoConnect = autoConnect;
53
+ }
55
54
  //# sourceMappingURL=autoConnect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"autoConnect.js","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnect.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AACpE,0DAAmD;AACnD,4DAAyD;AACzD,2DAAuE;AAEvE,kDAA8D;AAC9D,6DAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACI,MAAM,WAAW,GAAG,KAAK,EAC9B,KAEC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,IAAA,qCAAiB,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,IAAA,kCAAuB,EAAC,+BAAe,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAe,EAAC;QACnC,OAAO,EAAE,+BAAe;QACxB,KAAK,EAAE;YACL,GAAG,KAAK;YACR,OAAO;SACR;QACD,cAAc,EAAE,+BAAY;QAC5B,mBAAmB,EAAE,GAAG,EAAE;YACxB,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7D,gFAAgF;YAChF,MAAM,gBAAgB,GAAG,IAAA,0CAA2B,GAAE;iBACnD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,+BAAY,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEzC,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QACD,OAAO;KACR,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3BW,QAAA,WAAW,eA2BtB"}
1
+ {"version":3,"file":"autoConnect.js","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnect.ts"],"names":[],"mappings":";;AA+BA,kCA2BC;AA1DD,qEAAoE;AACpE,0DAAmD;AACnD,4DAAyD;AACzD,2DAAuE;AAEvE,kDAA8D;AAC9D,6DAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACI,KAAK,UAAU,WAAW,CAC/B,KAEC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,IAAA,qCAAiB,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,IAAA,kCAAuB,EAAC,+BAAe,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAe,EAAC;QACnC,OAAO,EAAE,+BAAe;QACxB,KAAK,EAAE;YACL,GAAG,KAAK;YACR,OAAO;SACR;QACD,cAAc,EAAE,+BAAY;QAC5B,mBAAmB,EAAE,GAAG,EAAE;YACxB,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7D,gFAAgF;YAChF,MAAM,gBAAgB,GAAG,IAAA,0CAA2B,GAAE;iBACnD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,+BAAY,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEzC,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QACD,OAAO;KACR,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -10,7 +10,7 @@ import { computeDeploymentAddress } from "../../../utils/any-evm/zksync/computeD
10
10
  import { KNOWN_CODES_STORAGE, singletonFactoryAbi, } from "../../../utils/any-evm/zksync/constants.js";
11
11
  import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
12
12
  import { ensureBytecodePrefix } from "../../../utils/bytecode/prefix.js";
13
- import { uint8ArrayToHex } from "../../../utils/encoding/hex.js";
13
+ import { isHex, uint8ArrayToHex, } from "../../../utils/encoding/hex.js";
14
14
  import { getContract } from "../../contract.js";
15
15
  import { zkDeployContract } from "./zkDeployContract.js";
16
16
  import { zkDeployCreate2Factory } from "./zkDeployCreate2Factory.js";
@@ -68,7 +68,11 @@ export async function zkDeployContractDeterministic(options) {
68
68
  client: options.client,
69
69
  abi: parseAbi(singletonFactoryAbi),
70
70
  });
71
- const salt = options?.salt ? keccakId(options.salt) : keccakId("thirdweb");
71
+ const salt = options?.salt
72
+ ? isHex(options.salt) && options.salt.length === 66
73
+ ? options.salt
74
+ : keccakId(options.salt)
75
+ : keccakId("thirdweb");
72
76
  await sendAndConfirmTransaction({
73
77
  account: options.account,
74
78
  transaction: prepareContractCall({
@@ -1 +1 @@
1
- {"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAY,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAKC;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,CAC/C,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACpB,MAAM,WAAW,GAAG,mBAAmB,CACrC,cAAc,CAAC,MAAM,EACrB,uBAAuB,CAAC,cAAgC,EAAE,OAAO,CAAC,MAAM,CAAC,CAC1E,CAAC;IACF,MAAM,qBAAqB,GAAG,MAAM,sBAAsB,CAAC;QACzD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;QAChD,YAAY;QACZ,WAAW;QACX,qBAAqB;QACrB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CACvC,WAAW,CAAC;QACV,OAAO,EAAE,gBAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,iCAAiC;QACjC,MAAM,yBAAyB,GAAG,WAAW,CAAC;YAC5C,OAAO,EAAE,mBAAmB;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,QAAQ,EAAE,yBAAyB;YACnC,MAAM,EAAE,iEAAiE;YACzE,MAAM,EAAE,CAAC,YAAY,CAAC;SACvB,CAAC,CAAC;QACH,yCAAyC;QACzC,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAClB,MAAM,gBAAgB,CAAC;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,QAAQ;gBACR,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;QAED,8BAA8B;QAC9B,MAAM,OAAO,GAAG,WAAW,CAAC;YAC1B,OAAO,EAAE,qBAAqB;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,QAAQ,CAAC,mBAAmB,CAAC;SACnC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAE3E,MAAM,yBAAyB,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,mBAAmB,CAAC;gBAC/B,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,CAAC;aAC1C,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"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"}
@@ -3,18 +3,16 @@ import { useQueryClient } from "@tanstack/react-query";
3
3
  import { useCallback, useMemo, useState } from "react";
4
4
  import { NATIVE_TOKEN_ADDRESS } from "../../../../../../constants/addresses.js";
5
5
  import { formatNumber } from "../../../../../../utils/formatNumber.js";
6
- import { useCustomTheme } from "../../../../../core/design-system/CustomThemeProvider.js";
7
- import { fontSize, radius, spacing, } from "../../../../../core/design-system/index.js";
6
+ import { fontSize, spacing, } from "../../../../../core/design-system/index.js";
8
7
  import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
9
8
  import { invalidateWalletBalance } from "../../../../../core/providers/invalidateWalletBalance.js";
10
9
  import { ErrorState } from "../../../../wallets/shared/ErrorState.js";
11
10
  import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
12
11
  import { ChainName } from "../../../components/ChainName.js";
13
12
  import { Spacer } from "../../../components/Spacer.js";
14
- import { Container, ModalHeader } from "../../../components/basic.js";
13
+ import { Container, Line, ModalHeader } from "../../../components/basic.js";
15
14
  import { Button } from "../../../components/buttons.js";
16
15
  import { Input } from "../../../components/formElements.js";
17
- import { Text } from "../../../components/text.js";
18
16
  import { TokenSymbol } from "../../../components/token/TokenSymbol.js";
19
17
  import { ConnectButton } from "../../ConnectButton.js";
20
18
  import { ChainButton, NetworkSelectorContent } from "../../NetworkSelector.js";
@@ -200,46 +198,26 @@ function BuyScreenContent(props) {
200
198
  }
201
199
  : undefined, connectLocale: connectLocale, client: client, modalTitle: props.title }));
202
200
  }
203
- if (screen.id === "select-from-token" &&
204
- supportedSourcesQuery.data &&
205
- sourceSupportedTokens) {
206
- const chains = supportedSourcesQuery.data.map((x) => x.chain);
207
- const goBack = () => setScreen(screen.backScreen);
208
- // if token selection is disabled - only show network selector screen
209
- if (payOptions.buyWithCrypto !== false &&
210
- payOptions.buyWithCrypto?.prefillSource?.allowEdits?.token === false) {
211
- return (_jsx(ChainSelectionScreen, { chains: chains, client: props.client, connectLocale: props.connectLocale, setChain: setFromChain, goBack: goBack }));
212
- }
213
- return (_jsx(TokenSelectorScreen, { onBack: goBack, onConnect: () => {
214
- setScreen({
215
- id: "connect-payer-wallet",
216
- backScreen: screen,
217
- });
218
- }, modalTitle: "Available tokens", connectLocale: props.connectLocale, client: props.client, sourceTokens: sourceSupportedTokens, sourceSupportedTokens: sourceSupportedTokens, toChain: toChain, toToken: toToken, tokenAmount: tokenAmount, fromChain: fromChain, fromToken: fromToken, mode: payOptions.mode, hiddenWallets: props.hiddenWallets, onSelect: (w, token, chain) => {
219
- const account = w.getAccount();
220
- if (account) {
221
- setPayer({
222
- account,
223
- chain,
224
- wallet: w,
225
- });
226
- setFromToken(token);
227
- setFromChain(chain);
228
- }
229
- goBack();
230
- } }));
231
- }
232
201
  return (_jsx(Container, { animate: "fadein", children: _jsxs("div", { children: [screen.id === "main" && (_jsx(MainScreen, { title: props.title, payerAccount: payer?.account, client: client, onSelectBuyToken: () => setScreen({ id: "select-to-token", backScreen: screen }), payOptions: payOptions, setTokenAmount: setTokenAmount, setToChain: setToChain, setToToken: setToToken, setFromChain: setFromChain, setFromToken: setFromToken, toChain: toChain, toToken: toToken, tokenAmount: tokenAmount, connectOptions: props.connectOptions, setScreen: setScreen, supportedDestinations: supportedDestinations, onBack: props.onBack, theme: props.theme, hasEditedAmount: hasEditedAmount, setHasEditedAmount: setHasEditedAmount, enabledPaymentMethods: enabledPaymentMethods })), (screen.id === "select-payment-method" ||
233
202
  screen.id === "buy-with-crypto" ||
234
- screen.id === "buy-with-fiat") &&
235
- payer && (_jsxs(TokenSelectedLayout, { isBuyWithFiatEnabled: enabledPaymentMethods.buyWithFiatEnabled, isBuyWithCryptoEnabled: enabledPaymentMethods.buyWithCryptoEnabled, mode: screen.id === "buy-with-fiat" ? "buy" : "swap", onModeChange: (mode) => {
236
- setScreen({
237
- id: mode === "swap" ? "buy-with-crypto" : "buy-with-fiat",
238
- });
239
- }, disabled: ("prefillBuy" in payOptions &&
203
+ screen.id === "buy-with-fiat" ||
204
+ screen.id === "select-from-token") &&
205
+ payer && (_jsxs(TokenSelectedLayout, { disabled: ("prefillBuy" in payOptions &&
240
206
  payOptions.prefillBuy?.allowEdits?.amount === false) ||
241
207
  payOptions.mode !== "fund_wallet", title: props.title, selectedChain: toChain, selectedToken: toToken, tokenAmount: tokenAmount, setTokenAmount: setTokenAmount, client: client, onBack: () => {
242
- setScreen({ id: "main" });
208
+ if (screen.id === "buy-with-crypto" ||
209
+ screen.id === "buy-with-fiat") {
210
+ setScreen({
211
+ id: "select-from-token",
212
+ backScreen: { id: "main" },
213
+ });
214
+ }
215
+ else if (screen.id === "select-from-token") {
216
+ setScreen(screen.backScreen);
217
+ }
218
+ else {
219
+ setScreen({ id: "main" });
220
+ }
243
221
  }, children: [screen.id === "buy-with-crypto" && activeAccount && (_jsx(SwapScreenContent, { setScreen: setScreen, tokenAmount: deferredTokenAmount, toChain: toChain, toToken: toToken, fromChain: fromChain, fromToken: fromToken, showFromTokenSelector: () => {
244
222
  setScreen({
245
223
  id: "select-from-token",
@@ -257,7 +235,30 @@ function BuyScreenContent(props) {
257
235
  id: "select-currency",
258
236
  backScreen: screen,
259
237
  });
260
- }, payer: payer, setTokenAmount: setTokenAmount, setHasEditedAmount: setHasEditedAmount }))] }))] }) }));
238
+ }, payer: payer, setTokenAmount: setTokenAmount, setHasEditedAmount: setHasEditedAmount })), screen.id === "select-from-token" &&
239
+ supportedSourcesQuery.data &&
240
+ sourceSupportedTokens && (_jsx(TokenSelectorScreen, { client: props.client, sourceTokens: sourceSupportedTokens, sourceSupportedTokens: sourceSupportedTokens, toChain: toChain, toToken: toToken, tokenAmount: tokenAmount, mode: payOptions.mode, hiddenWallets: props.hiddenWallets, onConnect: () => {
241
+ setScreen({
242
+ id: "connect-payer-wallet",
243
+ backScreen: screen,
244
+ });
245
+ }, onPayWithFiat: () => {
246
+ setScreen({
247
+ id: "buy-with-fiat",
248
+ });
249
+ }, onSelectToken: (w, token, chain) => {
250
+ const account = w.getAccount();
251
+ if (account) {
252
+ setPayer({
253
+ account,
254
+ chain,
255
+ wallet: w,
256
+ });
257
+ setFromToken(token);
258
+ setFromChain(chain);
259
+ }
260
+ setScreen({ id: "buy-with-crypto" });
261
+ } }))] }))] }) }));
261
262
  }
262
263
  function SelectedTokenInfo(props) {
263
264
  const getWidth = () => {
@@ -324,7 +325,10 @@ function MainScreen(props) {
324
325
  props.setScreen({ id: "buy-with-fiat" });
325
326
  }
326
327
  else {
327
- props.setScreen({ id: "buy-with-crypto" });
328
+ props.setScreen({
329
+ id: "select-from-token",
330
+ backScreen: { id: "main" },
331
+ });
328
332
  }
329
333
  } }));
330
334
  }
@@ -339,7 +343,10 @@ function MainScreen(props) {
339
343
  props.setScreen({ id: "buy-with-fiat" });
340
344
  }
341
345
  else {
342
- props.setScreen({ id: "buy-with-crypto" });
346
+ props.setScreen({
347
+ id: "select-from-token",
348
+ backScreen: { id: "main" },
349
+ });
343
350
  }
344
351
  } }));
345
352
  }
@@ -362,44 +369,19 @@ function MainScreen(props) {
362
369
  props.setScreen({ id: "buy-with-fiat" });
363
370
  }
364
371
  else {
365
- props.setScreen({ id: "buy-with-crypto" });
372
+ props.setScreen({
373
+ id: "select-from-token",
374
+ backScreen: { id: "main" },
375
+ });
366
376
  }
367
377
  }, children: "Continue" })) })] }));
368
378
  }
369
379
  }
370
380
  }
371
381
  function TokenSelectedLayout(props) {
372
- const theme = useCustomTheme();
373
382
  return (_jsxs(Container, { children: [_jsx(Container, { p: "lg", children: _jsx(ModalHeader, { title: props.title, onBack: props.onBack }) }), _jsxs(Container, { px: "lg", style: {
374
383
  paddingBottom: spacing.lg,
375
- }, children: [_jsx(Spacer, { y: "xs" }), _jsx(SelectedTokenInfo, { selectedToken: props.selectedToken, selectedChain: props.selectedChain, tokenAmount: props.tokenAmount, setTokenAmount: props.setTokenAmount, client: props.client, disabled: props.disabled }), _jsx(Spacer, { y: "lg" }), _jsxs(Container, { flex: "row", gap: "md", center: "y", children: [_jsx(Text, { size: "sm", children: " Pay with " }), props.isBuyWithFiatEnabled && props.isBuyWithCryptoEnabled && (_jsxs(Container, { flex: "row", style: {
376
- flex: 1,
377
- justifyContent: "center",
378
- borderRadius: radius.xl,
379
- border: `1px solid ${theme.colors.borderColor}`,
380
- alignItems: "stretch",
381
- }, children: [_jsx(Button, { variant: "ghost", style: {
382
- flex: 1,
383
- background: props.mode === "swap"
384
- ? theme.colors.tertiaryBg
385
- : "transparent",
386
- borderRadius: radius.xl,
387
- borderTopRightRadius: 0,
388
- borderBottomRightRadius: 0,
389
- padding: spacing.xs,
390
- }, onClick: () => props.onModeChange("swap"), children: _jsx(Text, { size: "sm", color: props.mode === "swap" ? "primaryText" : "secondaryText", children: "Crypto" }) }), _jsx("div", { style: {
391
- width: "1px",
392
- background: theme.colors.borderColor,
393
- } }), _jsx(Button, { variant: "ghost", style: {
394
- flex: 1,
395
- background: props.mode === "buy"
396
- ? theme.colors.tertiaryBg
397
- : "transparent",
398
- borderRadius: radius.xl,
399
- borderTopLeftRadius: 0,
400
- borderBottomLeftRadius: 0,
401
- padding: spacing.xs,
402
- }, onClick: () => props.onModeChange("buy"), children: _jsx(Text, { size: "sm", color: props.mode === "buy" ? "primaryText" : "secondaryText", children: "Card" }) })] }))] }), _jsx(Spacer, { y: "lg" }), props.children] })] }));
384
+ }, children: [_jsx(Spacer, { y: "xs" }), _jsx(SelectedTokenInfo, { selectedToken: props.selectedToken, selectedChain: props.selectedChain, tokenAmount: props.tokenAmount, setTokenAmount: props.setTokenAmount, client: props.client, disabled: props.disabled }), _jsx(Spacer, { y: "sm" }), _jsx(Line, {}), _jsx(Spacer, { y: "sm" }), props.children] })] }));
403
385
  }
404
386
  function createSupportedTokens(data, payOptions, supportedTokensOverrides) {
405
387
  const tokens = {};