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

package/src/react/web/ui/components/token/TokenRow.tsx

@@ -10,17 +10,17 @@ import {
   spacing,
 } from "../../../../core/design-system/index.js";
 import { useChainName } from "../../../../core/hooks/others/useChainQuery.js";
+import { PayTokenIcon } from "../../ConnectWallet/screens/Buy/PayTokenIcon.js";
 import type { ERC20OrNativeToken } from "../../ConnectWallet/screens/nativeToken.js";
 import { Skeleton } from "../Skeleton.js";
-import { TokenIcon } from "../TokenIcon.js";
 import { Container } from "../basic.js";
 import { Button } from "../buttons.js";
 import { Text } from "../text.js";
 import { TokenSymbol } from "./TokenSymbol.js";
 
 export function TokenRow(props: {
-  token: ERC20OrNativeToken;
-  chain: Chain;
+  token: ERC20OrNativeToken | undefined;
+  chain: Chain | undefined;
   client: ThirdwebClient;
   onSelectToken: () => void;
   freezeChainAndToken?: boolean;
@@ -29,6 +29,32 @@ export function TokenRow(props: {
   style?: React.CSSProperties;
 }) {
   const { name } = useChainName(props.chain);
+
+  if (!props.token || !props.chain) {
+    return (
+      <Button
+        variant="secondary"
+        fullWidth
+        style={{
+          fontSize: fontSize.sm,
+          justifyContent: "space-between",
+          paddingTop: spacing.md,
+          paddingBottom: spacing.md,
+          ...props.style,
+        }}
+        gap="xxs"
+        onClick={props.onSelectToken}
+      >
+        <Text size="sm" color="primaryText">
+          Select payment token
+        </Text>
+        <Container color="primaryText">
+          <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+        </Container>
+      </Button>
+    );
+  }
+
   return (
     <TokenButton
       variant="secondary"
@@ -42,21 +68,16 @@ export function TokenRow(props: {
       disabled={props.freezeChainAndToken}
     >
       <Container flex="row" center="y" gap="sm">
-        <TokenIcon
+        <PayTokenIcon
           token={props.token}
           chain={props.chain}
           size="md"
           client={props.client}
         />
 
-        <Container
-          flex="column"
-          style={{
-            gap: "4px",
-          }}
-        >
+        <Container flex="column" gap="4xs">
           {/* Token Symbol */}
-          <Container flex="column" gap="3xs">
+          <Container flex="column" gap="4xs">
             {props.isLoading ? (
               <Skeleton
                 width="120px"
@@ -74,6 +95,7 @@ export function TokenRow(props: {
                 <TokenSymbol
                   token={props.token}
                   chain={props.chain}
+                  color="secondaryText"
                   size="sm"
                 />
               </Container>
@@ -92,9 +114,11 @@ export function TokenRow(props: {
           )}
         </Container>
       </Container>
-      <Container color="primaryText">
-        <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
-      </Container>
+      {!props.freezeChainAndToken && (
+        <Container color="primaryText">
+          <ChevronDownIcon width={iconSize.sm} height={iconSize.sm} />
+        </Container>
+      )}
     </TokenButton>
   );
 }

package/src/utils/any-evm/compute-deployment-address.ts

@@ -1,6 +1,7 @@
 import { type Hex, encodePacked } from "viem";
 import { getAddress } from "../address.js";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
+import { isHex } from "../encoding/hex.js";
 import { keccak256 } from "../hashing/keccak256.js";
 import { getSaltHash } from "./get-salt-hash.js";
 import { keccakId } from "./keccak-id.js";
@@ -33,7 +34,9 @@ export function computeDeploymentAddress(
 ) {
   const bytecode = ensureBytecodePrefix(options.bytecode);
   const saltHash = options.salt
-    ? keccakId(options.salt)
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
     : getSaltHash(bytecode);
 
   // 1. create init bytecode hash with contract's bytecode and encoded args

package/src/utils/any-evm/compute-published-contract-deploy-info.ts

@@ -96,5 +96,6 @@ export async function computeDeploymentInfoFromBytecode(args: {
     initBytecodeWithsalt,
     encodedArgs,
     create2FactoryAddress,
+    salt,
   };
 }

package/src/utils/any-evm/get-init-bytecode-with-salt.ts

@@ -1,6 +1,6 @@
 import { encodePacked } from "viem/utils";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
-import { type Hex, uint8ArrayToHex } from "../encoding/hex.js";
+import { type Hex, isHex, uint8ArrayToHex } from "../encoding/hex.js";
 import { getSaltHash } from "./get-salt-hash.js";
 import { keccakId } from "./keccak-id.js";
 
@@ -29,8 +29,11 @@ export function getInitBytecodeWithSalt(
   options: GetInitiBytecodeWithSaltOptions,
 ): Hex {
   const bytecode = ensureBytecodePrefix(options.bytecode);
+
   const saltHash = options.salt
-    ? keccakId(options.salt)
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
     : getSaltHash(bytecode);
 
   const encodedArgs =

package/src/utils/any-evm/zksync/computeDeploymentAddress.ts

@@ -1,5 +1,5 @@
 import type { Address } from "../../address.js";
-import type { Hex } from "../../encoding/hex.js";
+import { type Hex, isHex } from "../../encoding/hex.js";
 import { keccakId } from "../keccak-id.js";
 import { create2Address } from "./create2Address.js";
 
@@ -13,7 +13,11 @@ type ComputeDeploymentAddressOptions = {
 export function computeDeploymentAddress(
   options: ComputeDeploymentAddressOptions,
 ) {
-  const saltHash = options.salt ? keccakId(options.salt) : keccakId("thirdweb");
+  const saltHash = options.salt
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
+    : keccakId("thirdweb");
 
   return create2Address({
     sender: options.create2FactoryAddress,

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.88.5-nightly-0574eac02c832c382972fd545df79c36e11796e1-20250217000342";
+export const version = "5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338";

package/src/wallets/connection/autoConnect.ts

@@ -29,11 +29,11 @@ import type { AutoConnectProps } from "./types.js";
  * @returns {boolean} a promise resolving to true or false depending on whether the auto connect function connected to a wallet or not
  * @walletConnection
  */
-export const autoConnect = async (
+export async function autoConnect(
   props: AutoConnectProps & {
     wallets?: Wallet[];
   },
-) => {
+): Promise<boolean> {
   const wallets = props.wallets || getDefaultWallets(props);
   const manager = createConnectionManager(webLocalStorage);
   const result = await autoConnectCore({
@@ -56,4 +56,4 @@ export const autoConnect = async (
     manager,
   });
   return result;
-};
+}