thirdweb 5.80.1-nightly-ce3e850fdbf34911e20919ecc2674e4a63f08fa3-20241226000321 → 5.80.1-nightly-a7b6cb3211e8b5232e77965cb8dd8ff96b369424-20241228000338

package/src/react/web/ui/ConnectWallet/NetworkSelector.tsx

@@ -27,32 +27,35 @@ import {
   radius,
   spacing,
 } from "../../../core/design-system/index.js";
-import {
-  useChainIconUrl,
-  useChainName,
-  useChainsQuery,
-} from "../../../core/hooks/others/useChainQuery.js";
+import { useChainsQuery } from "../../../core/hooks/others/useChainQuery.js";
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useSwitchActiveWalletChain } from "../../../core/hooks/wallets/useSwitchActiveWalletChain.js";
 import { SetRootElementContext } from "../../../core/providers/RootElementContext.js";
-import { ChainIcon } from "../components/ChainIcon.js";
+import { ChainActiveDot } from "../components/ChainActiveDot.js";
 import { Modal } from "../components/Modal.js";
 import { Skeleton } from "../components/Skeleton.js";
 import { Spacer } from "../components/Spacer.js";
 import { Spinner } from "../components/Spinner.js";
 import { Container, Line, ModalHeader } from "../components/basic.js";
 import { Button } from "../components/buttons.js";
+import { fallbackChainIcon } from "../components/fallbackChainIcon.js";
 import { Input } from "../components/formElements.js";
 import { ModalTitle } from "../components/modalElements.js";
 import { Text } from "../components/text.js";
 import { StyledButton, StyledP, StyledUl } from "../design-system/elements.js";
 import { useDebouncedValue } from "../hooks/useDebouncedValue.js";
 import { useShowMore } from "../hooks/useShowMore.js";
+import { ChainIcon } from "../prebuilt/Chain/icon.js";
+import { ChainName } from "../prebuilt/Chain/name.js";
+import { ChainProvider } from "../prebuilt/Chain/provider.js";
 import type { LocaleId } from "../types.js";
 import { getConnectLocale } from "./locale/getConnectLocale.js";
 import type { ConnectLocale } from "./locale/types.js";
 
-type NetworkSelectorChainProps = {
+/**
+ * @internal
+ */
+export type NetworkSelectorChainProps = {
   /**
    * `Chain` object to be displayed
    */
@@ -548,7 +551,10 @@ type NetworkListProps = {
   connectLocale: ConnectLocale;
 };
 
-const NetworkList = /* @__PURE__ */ memo(function NetworkList(
+/**
+ * @internal Exported for tests
+ */
+export const NetworkList = /* @__PURE__ */ memo(function NetworkList(
   props: NetworkListProps,
 ) {
   // show 10 items first, when reaching the last item, show 10 more
@@ -626,6 +632,9 @@ const NetworkList = /* @__PURE__ */ memo(function NetworkList(
   );
 } as React.FC<NetworkListProps>);
 
+/**
+ * @internal
+ */
 export const ChainButton = /* @__PURE__ */ memo(function ChainButton(props: {
   chain: Chain;
   onClick: () => void;
@@ -636,72 +645,95 @@ export const ChainButton = /* @__PURE__ */ memo(function ChainButton(props: {
 }) {
   const locale = props.connectLocale;
   const { chain, confirming, switchingFailed } = props;
-
   const activeChain = useActiveWalletChain();
 
-  const chainNameQuery = useChainName(chain);
-  const chainIconQuery = useChainIconUrl(chain);
-
-  let chainName: React.ReactNode;
-  if (chainNameQuery.name) {
-    chainName = <span>{chainNameQuery.name} </span>;
-  } else {
-    chainName = <Skeleton width="150px" height="20px" />;
-  }
-
   return (
-    <NetworkButton
-      data-active={activeChain?.id === chain.id}
-      onClick={props.onClick}
-    >
-      {!chainIconQuery.isLoading ? (
-        <ChainIcon
-          chainIconUrl={chainIconQuery.url}
-          size={iconSize.lg}
-          active={activeChain?.id === chain.id}
-          loading="lazy"
-          client={props.client}
-        />
-      ) : (
-        <Skeleton width={`${iconSize.lg}px`} height={`${iconSize.lg}px`} />
-      )}
-
-      {confirming || switchingFailed ? (
-        <div
+    <ChainProvider chain={chain}>
+      <NetworkButton
+        data-active={activeChain?.id === chain.id}
+        onClick={props.onClick}
+      >
+        <Container
           style={{
+            position: "relative",
             display: "flex",
-            flexDirection: "column",
-            gap: spacing.xs,
+            flexShrink: 0,
+            alignItems: "center",
           }}
         >
-          {chainName}
-          <Container animate="fadein" flex="row" gap="xxs" center="y">
-            {confirming && (
-              <>
-                <Text size="xs" color="accentText">
-                  {locale.confirmInWallet}
-                </Text>
-                <Spinner size="xs" color="accentText" />
-              </>
-            )}
-
-            {switchingFailed && (
-              <Container animate="fadein">
-                <Text size="xs" color="danger">
-                  {locale.networkSelector.failedToSwitch}
-                </Text>
-              </Container>
-            )}
-          </Container>
-        </div>
-      ) : (
-        chainName
-      )}
-    </NetworkButton>
+          <ChainIcon
+            client={props.client}
+            loadingComponent={
+              <Skeleton
+                width={`${iconSize.lg}px`}
+                height={`${iconSize.lg}px`}
+              />
+            }
+            fallbackComponent={
+              <img
+                src={fallbackChainIcon}
+                alt=""
+                style={{
+                  width: `${iconSize.lg}px`,
+                  height: `${iconSize.lg}px`,
+                }}
+              />
+            }
+            style={{
+              width: `${iconSize.lg}px`,
+              height: `${iconSize.lg}px`,
+            }}
+            loading="lazy"
+          />
+          {activeChain?.id === chain.id && (
+            <ChainActiveDot className="tw-chain-active-dot-button-network-selector" />
+          )}
+        </Container>
+        {confirming || switchingFailed ? (
+          <div
+            style={{
+              display: "flex",
+              flexDirection: "column",
+              gap: spacing.xs,
+            }}
+          >
+            <ChainName
+              loadingComponent={<Skeleton width="150px" height="20px" />}
+            />
+            <Container animate="fadein" flex="row" gap="xxs" center="y">
+              {confirming && (
+                <>
+                  <Text size="xs" color="accentText">
+                    {locale.confirmInWallet}
+                  </Text>
+                  <Spinner size="xs" color="accentText" />
+                </>
+              )}
+
+              {switchingFailed && (
+                <Container animate="fadein">
+                  <Text size="xs" color="danger">
+                    {locale.networkSelector.failedToSwitch}
+                  </Text>
+                </Container>
+              )}
+            </Container>
+          </div>
+        ) : (
+          <ChainName
+            loadingComponent={<Skeleton width="150px" height="20px" />}
+            className="tw-chain-icon-none-confirming"
+          />
+        )}
+      </NetworkButton>
+    </ChainProvider>
   );
 });
 
-const TabButton = /* @__PURE__ */ (() =>
+/**
+ * @internal Exported for tests
+ */
+export const TabButton = /* @__PURE__ */ (() =>
   styled.button((_) => {
     const theme = useCustomTheme();
     return {
@@ -722,7 +754,10 @@ const TabButton = /* @__PURE__ */ (() =>
     };
   }))();
 
-const SectionLabel = /* @__PURE__ */ StyledP(() => {
+/**
+ * @internal Exported for tests
+ */
+export const SectionLabel = /* @__PURE__ */ StyledP(() => {
   const theme = useCustomTheme();
   return {
     fontSize: fontSize.sm,
@@ -743,7 +778,10 @@ const NetworkListUl = /* @__PURE__ */ StyledUl({
   boxSizing: "border-box",
 });
 
-const NetworkButton = /* @__PURE__ */ StyledButton((_) => {
+/**
+ * @internal Exported for tests
+ */
+export const NetworkButton = /* @__PURE__ */ StyledButton((_) => {
   const theme = useCustomTheme();
   return {
     all: "unset",
@@ -769,16 +807,19 @@ const NetworkButton = /* @__PURE__ */ StyledButton((_) => {
   };
 });
 
-const StyledMagnifyingGlassIcon = /* @__PURE__ */ styled(MagnifyingGlassIcon)(
-  (_) => {
-    const theme = useCustomTheme();
-    return {
-      color: theme.colors.secondaryText,
-      position: "absolute",
-      left: spacing.sm,
-    };
-  },
-);
+/**
+ * @internal Exported for tests
+ */
+export const StyledMagnifyingGlassIcon = /* @__PURE__ */ styled(
+  MagnifyingGlassIcon,
+)((_) => {
+  const theme = useCustomTheme();
+  return {
+    color: theme.colors.secondaryText,
+    position: "absolute",
+    left: spacing.sm,
+  };
+});
 
 /**
  * Options for the `useNetworkSwitcherModal` hook's returned `open` function

package/src/react/web/ui/components/ChainActiveDot.tsx

@@ -0,0 +1,17 @@
+import { StyledDiv } from "../design-system/elements.js";
+
+/**
+ * The greet dot that is placed at the corner of the chain icon -
+ * indicating that the chain is currently active (connected to)
+ * @internal
+ */
+export const ChainActiveDot = /* @__PURE__ */ StyledDiv({
+  width: "28%",
+  height: "28%",
+  borderRadius: "50%",
+  position: "absolute",
+  bottom: 0,
+  right: 0,
+  backgroundColor: "#00d395",
+  boxShadow: "0 0 0 2px var(--bg)",
+});

package/src/react/web/ui/components/ChainIcon.test.tsx

@@ -0,0 +1,60 @@
+import { describe, expect, it } from "vitest";
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
+import { render } from "~test/react-render.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { ChainIcon, getSrcChainIcon } from "./ChainIcon.js";
+import { fallbackChainIcon } from "./fallbackChainIcon.js";
+
+const client = TEST_CLIENT;
+
+describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon-legacy", () => {
+  it("getSrcChainIcon should return fallbackChainIcon if chainIconUrl does not exist", () => {
+    expect(getSrcChainIcon({ client })).toBe(fallbackChainIcon);
+  });
+
+  it("getSrcChainIcon should return the resolved url", () => {
+    const resolvedUrl = getSrcChainIcon({
+      client,
+      chainIconUrl: TEST_CONTRACT_URI,
+    });
+    expect(resolvedUrl.startsWith("https://")).toBe(true);
+  });
+
+  it("getSrcChainIcon should return the fallbackChainIcon if fails to resolve", () => {
+    expect(getSrcChainIcon({ client, chainIconUrl: "test" })).toBe(
+      fallbackChainIcon,
+    );
+  });
+
+  it("should render an image", () => {
+    const { container } = render(
+      <ChainIcon
+        chainIconUrl="ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png"
+        client={client}
+        size="lg"
+      />,
+    );
+
+    const image = container.querySelector("img");
+    expect(image).toBeTruthy();
+
+    expect(
+      image?.src.includes("QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9"),
+    ).toBe(true);
+  });
+
+  it("should render ChainActiveDot if the `active` prop is set to true", () => {
+    const { container } = render(
+      <ChainIcon
+        chainIconUrl="ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/ethereum/512.png"
+        client={client}
+        size="lg"
+        active
+      />,
+    );
+    const activeDot = container.querySelector(
+      ".tw-chain-active-dot-legacy-chain-icon",
+    );
+    expect(activeDot).toBeTruthy();
+  });
+});

package/src/react/web/ui/components/ChainIcon.tsx

@@ -1,13 +1,12 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { resolveScheme } from "../../../../utils/ipfs.js";
-import { StyledDiv } from "../design-system/elements.js";
+import { ChainActiveDot } from "./ChainActiveDot.js";
 import { Img } from "./Img.js";
 import { Container } from "./basic.js";
-
-const fallbackChainIcon =
-  "data:image/svg+xml;charset=UTF-8,%3csvg width='15' height='14' viewBox='0 0 15 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M7 8.04238e-07C5.1435 8.04238e-07 3.36301 0.737501 2.05025 2.05025C0.7375 3.36301 0 5.1435 0 7C0 7.225 -1.52737e-07 7.445 0.0349998 7.665C0.16385 9.0151 0.68213 10.2988 1.52686 11.3598C2.37158 12.4209 3.50637 13.2137 4.79326 13.642C6.0801 14.0702 7.4637 14.1153 8.7758 13.7719C10.0879 13.4285 11.2719 12.7113 12.184 11.7075C13.0961 10.7038 13.6969 9.4567 13.9135 8.1178C14.1301 6.7789 13.9531 5.406 13.4039 4.16587C12.8548 2.92574 11.9573 1.87184 10.8204 1.13228C9.6835 0.392721 8.3563 -0.000649196 7 8.04238e-07ZM7 1C8.581 1.00137 10.0975 1.62668 11.22 2.74V3.24C9.2438 2.55991 7.0956 2.56872 5.125 3.265C4.96758 3.1116 4.76997 3.00586 4.555 2.96H4.43C4.37 2.75 4.315 2.54 4.27 2.325C4.225 2.11 4.2 1.92 4.175 1.715C5.043 1.24658 6.0137 1.00091 7 1ZM5.5 3.935C7.3158 3.32693 9.2838 3.34984 11.085 4C10.8414 5.2703 10.3094 6.4677 9.53 7.5C9.312 7.4077 9.0707 7.3855 8.8395 7.4366C8.6083 7.4877 8.3988 7.6094 8.24 7.785C8.065 7.685 7.89 7.585 7.74 7.47C6.7307 6.7966 5.8877 5.9023 5.275 4.855C5.374 4.73221 5.4461 4.58996 5.4866 4.43749C5.5271 4.28502 5.5351 4.12575 5.51 3.97L5.5 3.935ZM3.5 2.135C3.5 2.24 3.53 2.35 3.55 2.455C3.595 2.675 3.655 2.89 3.715 3.105C3.52353 3.21838 3.36943 3.38531 3.2717 3.58522C3.17397 3.78513 3.13688 4.00927 3.165 4.23C2.37575 4.7454 1.67078 5.3795 1.075 6.11C1.19455 5.3189 1.47112 4.55966 1.88843 3.87701C2.30575 3.19437 2.85539 2.60208 3.505 2.135H3.5ZM3.5 9.99C3.30481 10.0555 3.13037 10.1714 2.9943 10.3259C2.85822 10.4804 2.76533 10.6681 2.725 10.87H2.405C1.59754 9.9069 1.1146 8.7136 1.025 7.46L1.08 7.365C1.70611 6.3942 2.52463 5.562 3.485 4.92C3.62899 5.0704 3.81094 5.179 4.01162 5.2345C4.2123 5.2899 4.42423 5.2901 4.625 5.235C5.2938 6.3652 6.208 7.3306 7.3 8.06C7.505 8.195 7.715 8.32 7.925 8.44C7.9082 8.6312 7.9391 8.8237 8.015 9C7.1 9.7266 6.0445 10.256 4.915 10.555C4.78401 10.3103 4.57028 10.1201 4.31199 10.0184C4.05369 9.9167 3.76766 9.9102 3.505 10L3.5 9.99ZM7 12.99C5.9831 12.9903 4.98307 12.7304 4.095 12.235L4.235 12.205C4.43397 12.1397 4.61176 12.0222 4.74984 11.8648C4.88792 11.7074 4.98122 11.5158 5.02 11.31C6.2985 10.984 7.4921 10.3872 8.52 9.56C8.7642 9.7027 9.0525 9.75 9.3295 9.6927C9.6064 9.6355 9.8524 9.4778 10.02 9.25C10.7254 9.4334 11.4511 9.5275 12.18 9.53H12.445C11.9626 10.5673 11.1938 11.4451 10.2291 12.0599C9.2643 12.6747 8.144 13.0009 7 13V12.99ZM10.255 8.54C10.2545 8.3304 10.1975 8.1249 10.09 7.945C10.9221 6.8581 11.5012 5.5991 11.785 4.26C12.035 4.37667 12.2817 4.50667 12.525 4.65C13.0749 5.9495 13.1493 7.4012 12.735 8.75C11.9049 8.8142 11.0698 8.7484 10.26 8.555L10.255 8.54Z' fill='%23646D7A'/%3e%3c/svg%3e";
+import { fallbackChainIcon } from "./fallbackChainIcon.js";
 
 /**
+ * This component (file) will eventually be replaced with the ChainIcon prebuilt version.
  * @internal
  */
 export const ChainIcon: React.FC<{
@@ -18,21 +17,6 @@ export const ChainIcon: React.FC<{
   loading?: "lazy" | "eager";
   client: ThirdwebClient;
 }> = (props) => {
-  const getSrc = () => {
-    const url = props.chainIconUrl;
-    if (!url) {
-      return fallbackChainIcon;
-    }
-    try {
-      return resolveScheme({
-        uri: url,
-        client: props.client,
-      });
-    } catch {
-      return fallbackChainIcon;
-    }
-  };
-
   return (
     <Container
       style={{
@@ -43,24 +27,36 @@ export const ChainIcon: React.FC<{
       }}
     >
       <Img
-        src={getSrc()}
+        src={getSrcChainIcon(props)}
         width={props.size}
         height={props.size}
         fallbackImage={fallbackChainIcon}
         client={props.client}
       />
-      {props.active && <ActiveDot />}
+      {props.active && (
+        <ChainActiveDot className="tw-chain-active-dot-legacy-chain-icon" />
+      )}
     </Container>
   );
 };
 
-const ActiveDot = /* @__PURE__ */ StyledDiv({
-  width: "28%",
-  height: "28%",
-  borderRadius: "50%",
-  position: "absolute",
-  bottom: 0,
-  right: 0,
-  backgroundColor: "#00d395",
-  boxShadow: "0 0 0 2px var(--bg)",
-});
+/**
+ * @internal
+ */
+export const getSrcChainIcon = (props: {
+  client: ThirdwebClient;
+  chainIconUrl?: string;
+}) => {
+  const url = props.chainIconUrl;
+  if (!url) {
+    return fallbackChainIcon;
+  }
+  try {
+    return resolveScheme({
+      uri: url,
+      client: props.client,
+    });
+  } catch {
+    return fallbackChainIcon;
+  }
+};

package/src/react/web/ui/components/fallbackChainIcon.ts

@@ -0,0 +1,6 @@
+/**
+ * The dummy image to be used in case the chain icon does not exist
+ * @internal
+ */
+export const fallbackChainIcon =
+  "data:image/svg+xml;charset=UTF-8,%3csvg width='15' height='14' viewBox='0 0 15 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M7 8.04238e-07C5.1435 8.04238e-07 3.36301 0.737501 2.05025 2.05025C0.7375 3.36301 0 5.1435 0 7C0 7.225 -1.52737e-07 7.445 0.0349998 7.665C0.16385 9.0151 0.68213 10.2988 1.52686 11.3598C2.37158 12.4209 3.50637 13.2137 4.79326 13.642C6.0801 14.0702 7.4637 14.1153 8.7758 13.7719C10.0879 13.4285 11.2719 12.7113 12.184 11.7075C13.0961 10.7038 13.6969 9.4567 13.9135 8.1178C14.1301 6.7789 13.9531 5.406 13.4039 4.16587C12.8548 2.92574 11.9573 1.87184 10.8204 1.13228C9.6835 0.392721 8.3563 -0.000649196 7 8.04238e-07ZM7 1C8.581 1.00137 10.0975 1.62668 11.22 2.74V3.24C9.2438 2.55991 7.0956 2.56872 5.125 3.265C4.96758 3.1116 4.76997 3.00586 4.555 2.96H4.43C4.37 2.75 4.315 2.54 4.27 2.325C4.225 2.11 4.2 1.92 4.175 1.715C5.043 1.24658 6.0137 1.00091 7 1ZM5.5 3.935C7.3158 3.32693 9.2838 3.34984 11.085 4C10.8414 5.2703 10.3094 6.4677 9.53 7.5C9.312 7.4077 9.0707 7.3855 8.8395 7.4366C8.6083 7.4877 8.3988 7.6094 8.24 7.785C8.065 7.685 7.89 7.585 7.74 7.47C6.7307 6.7966 5.8877 5.9023 5.275 4.855C5.374 4.73221 5.4461 4.58996 5.4866 4.43749C5.5271 4.28502 5.5351 4.12575 5.51 3.97L5.5 3.935ZM3.5 2.135C3.5 2.24 3.53 2.35 3.55 2.455C3.595 2.675 3.655 2.89 3.715 3.105C3.52353 3.21838 3.36943 3.38531 3.2717 3.58522C3.17397 3.78513 3.13688 4.00927 3.165 4.23C2.37575 4.7454 1.67078 5.3795 1.075 6.11C1.19455 5.3189 1.47112 4.55966 1.88843 3.87701C2.30575 3.19437 2.85539 2.60208 3.505 2.135H3.5ZM3.5 9.99C3.30481 10.0555 3.13037 10.1714 2.9943 10.3259C2.85822 10.4804 2.76533 10.6681 2.725 10.87H2.405C1.59754 9.9069 1.1146 8.7136 1.025 7.46L1.08 7.365C1.70611 6.3942 2.52463 5.562 3.485 4.92C3.62899 5.0704 3.81094 5.179 4.01162 5.2345C4.2123 5.2899 4.42423 5.2901 4.625 5.235C5.2938 6.3652 6.208 7.3306 7.3 8.06C7.505 8.195 7.715 8.32 7.925 8.44C7.9082 8.6312 7.9391 8.8237 8.015 9C7.1 9.7266 6.0445 10.256 4.915 10.555C4.78401 10.3103 4.57028 10.1201 4.31199 10.0184C4.05369 9.9167 3.76766 9.9102 3.505 10L3.5 9.99ZM7 12.99C5.9831 12.9903 4.98307 12.7304 4.095 12.235L4.235 12.205C4.43397 12.1397 4.61176 12.0222 4.74984 11.8648C4.88792 11.7074 4.98122 11.5158 5.02 11.31C6.2985 10.984 7.4921 10.3872 8.52 9.56C8.7642 9.7027 9.0525 9.75 9.3295 9.6927C9.6064 9.6355 9.8524 9.4778 10.02 9.25C10.7254 9.4334 11.4511 9.5275 12.18 9.53H12.445C11.9626 10.5673 11.1938 11.4451 10.2291 12.0599C9.2643 12.6747 8.144 13.0009 7 13V12.99ZM10.255 8.54C10.2545 8.3304 10.1975 8.1249 10.09 7.945C10.9221 6.8581 11.5012 5.5991 11.785 4.26C12.035 4.37667 12.2817 4.50667 12.525 4.65C13.0749 5.9495 13.1493 7.4012 12.735 8.75C11.9049 8.8142 11.0698 8.7484 10.26 8.555L10.255 8.54Z' fill='%23646D7A'/%3e%3c/svg%3e";

package/src/react/web/ui/prebuilt/Chain/icon.test.tsx

@@ -0,0 +1,150 @@
+import { describe, expect, it } from "vitest";
+import { render, waitFor } from "~test/react-render.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { ethereum } from "../../../../../chains/chain-definitions/ethereum.js";
+import { defineChain } from "../../../../../chains/utils.js";
+import { getFunctionId } from "../../../../../utils/function-id.js";
+import { ChainIcon, fetchChainIcon, getQueryKeys } from "./icon.js";
+import { ChainProvider } from "./provider.js";
+
+const client = TEST_CLIENT;
+
+describe.runIf(process.env.TW_SECRET_KEY)("ChainIcon", () => {
+  it("fetchChainIcon should respect iconResolver as a string", async () => {
+    expect(
+      await fetchChainIcon({ chain: ethereum, client, iconResolver: "test" }),
+    ).toBe("test");
+  });
+
+  it("fetchChainIcon should respect iconResolver as a non-async function", async () => {
+    expect(
+      await fetchChainIcon({
+        chain: ethereum,
+        client,
+        iconResolver: () => "test",
+      }),
+    ).toBe("test");
+  });
+
+  it("fetchChainIcon should respect iconResolver as an async function", async () => {
+    expect(
+      await fetchChainIcon({
+        chain: ethereum,
+        client,
+        iconResolver: async () => "test",
+      }),
+    ).toBe("test");
+  });
+
+  it("fetchChainIcon should return a resolved url from the backend server, NOT ipfs uri", async () => {
+    const resolvedUrl = await fetchChainIcon({ chain: ethereum, client });
+    expect(
+      resolvedUrl.includes("QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9"),
+    ).toBe(true);
+    expect(resolvedUrl.startsWith("https://")).toBe(true);
+  });
+
+  it("fetchChainIcon should return a resolved url from the chain object, NOT the ipfs uri", async () => {
+    const mockEthereum = defineChain({
+      id: 1,
+      name: "Ethereum",
+      nativeCurrency: {
+        name: "Ether",
+        symbol: "ETH",
+        decimals: 18,
+      },
+      blockExplorers: [
+        {
+          name: "Etherscan",
+          url: "https://etherscan.io",
+        },
+      ],
+      icon: {
+        url: "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
+        format: "png",
+        width: 100,
+        height: 100,
+      },
+    });
+    const resolvedUrl = await fetchChainIcon({ chain: mockEthereum, client });
+    expect(
+      resolvedUrl.endsWith(
+        ".ipfscdn.io/ipfs/QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
+      ),
+    ).toBe(true);
+    expect(resolvedUrl.startsWith("https://")).toBe(true);
+  });
+
+  it("fetchChainIcon should throw error if failed to resolve chain icon", async () => {
+    await expect(() =>
+      fetchChainIcon({ chain: defineChain(-1), client }),
+    ).rejects.toThrowError("Failed to resolve icon for chain");
+  });
+
+  it("getQueryKeys should work without resolver", () => {
+    expect(getQueryKeys({ chainId: 1 })).toStrictEqual([
+      "_internal_chain_icon_",
+      1,
+      {
+        resolver: undefined,
+      },
+    ]);
+  });
+
+  it("getQueryKeys should work with resolver being a string", () => {
+    expect(getQueryKeys({ chainId: 1, iconResolver: "tw" })).toStrictEqual([
+      "_internal_chain_icon_",
+      1,
+      {
+        resolver: "tw",
+      },
+    ]);
+  });
+
+  it("getQueryKeys should work with resolver being a non-async fn that returns a string", () => {
+    const fn = () => "tw";
+    const fnId = getFunctionId(fn);
+    expect(getQueryKeys({ chainId: 1, iconResolver: fn })).toStrictEqual([
+      "_internal_chain_icon_",
+      1,
+      {
+        resolver: fnId,
+      },
+    ]);
+  });
+
+  it("getQueryKeys should work with resolver being an async fn that returns a string", () => {
+    const fn = async () => {
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+      return "tw";
+    };
+    const fnId = getFunctionId(fn);
+    expect(
+      getQueryKeys({
+        chainId: 1,
+        iconResolver: fn,
+      }),
+    ).toStrictEqual([
+      "_internal_chain_icon_",
+      1,
+      {
+        resolver: fnId,
+      },
+    ]);
+  });
+
+  it("should render an image", async () => {
+    const { container } = render(
+      <ChainProvider chain={ethereum}>
+        <ChainIcon client={client} />
+      </ChainProvider>,
+    );
+    await waitFor(() => {
+      const image = container.querySelector("img");
+      expect(image).toBeTruthy();
+      expect(
+        image?.src.includes("QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9"),
+      ).toBe(true);
+    });
+  });
+});