thirdweb 5.95.0-nightly-4c1f384a635054a8cfaaa487e3ba7ada63b221ec-20250415110008 → 5.95.0-nightly-e7b01108037ebef07fba95f888be1905c8fab5df-20250417000348

package/src/insight/index.ts

@@ -1,3 +1,8 @@
-export { getOwnedNFTs, type OwnedNFT } from "./get-nfts.js";
-export { getOwnedTokens, type OwnedToken } from "./get-tokens.js";
+export {
+  getContractNFTs,
+  getOwnedNFTs,
+  getNFT,
+} from "./get-nfts.js";
+export { getOwnedTokens } from "./get-tokens.js";
 export { getTransactions, type Transaction } from "./get-transactions.js";
+export { getContractEvents, type ContractEvent } from "./get-events.js";

package/src/pay/buyWithCrypto/getHistory.ts

@@ -79,8 +79,10 @@ export async function getBuyWithCryptoHistory(
 
     // Assuming the response directly matches the SwapResponse interface
     if (!response.ok) {
-      response.body?.cancel();
-      throw new Error(`HTTP error! status: ${response.status}`);
+      const error = await response.text().catch(() => null);
+      throw new Error(
+        `HTTP error! status: ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+      );
     }
 
     const data: BuyWithCryptoHistoryData = (await response.json()).result;

package/src/pay/buyWithCrypto/getStatus.ts

@@ -142,8 +142,10 @@ export async function getBuyWithCryptoStatus(
 
     // Assuming the response directly matches the BuyWithCryptoStatus interface
     if (!response.ok) {
-      response.body?.cancel();
-      throw new Error(`HTTP error! status: ${response.status}`);
+      const error = await response.text().catch(() => null);
+      throw new Error(
+        `HTTP error! status: ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+      );
     }
 
     const data: BuyWithCryptoStatus = (await response.json()).result;

package/src/pay/buyWithFiat/getHistory.ts

@@ -78,8 +78,10 @@ export async function getBuyWithFiatHistory(
 
     // Assuming the response directly matches the BuyWithFiatStatus response interface
     if (!response.ok) {
-      response.body?.cancel();
-      throw new Error(`HTTP error! status: ${response.status}`);
+      const error = await response.text().catch(() => null);
+      throw new Error(
+        `HTTP error! status: ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+      );
     }
 
     const data: BuyWithFiatHistoryData = (await response.json()).result;

package/src/pay/buyWithFiat/getStatus.ts

@@ -188,8 +188,10 @@ export async function getBuyWithFiatStatus(
     const response = await getClientFetch(params.client)(url);
 
     if (!response.ok) {
-      response.body?.cancel();
-      throw new Error(`HTTP error! status: ${response.status}`);
+      const error = await response.text().catch(() => null);
+      throw new Error(
+        `HTTP error! status: ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+      );
     }
 
     return (await response.json()).result;

package/src/pay/getBuyHistory.ts

@@ -93,8 +93,10 @@ export async function getBuyHistory(
 
     // Assuming the response directly matches the SwapResponse interface
     if (!response.ok) {
-      response.body?.cancel();
-      throw new Error(`HTTP error! status: ${response.status}`);
+      const error = await response.text().catch(() => null);
+      throw new Error(
+        `HTTP error! status: ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+      );
     }
 
     const data: BuyHistoryData = (await response.json()).result;

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

@@ -68,7 +68,11 @@ export function SwapConfirmationScreen(props: {
 
   const uiErrorMessage = useMemo(() => {
     if (step === "approval" && status === "error" && error) {
-      if (error.toLowerCase().includes("user rejected")) {
+      if (
+        error.toLowerCase().includes("user rejected") ||
+        error.toLowerCase().includes("user closed modal") ||
+        error.toLowerCase().includes("user denied")
+      ) {
         return {
           title: "Failed to Approve",
           message: "Your wallet rejected the approval request.",
@@ -82,7 +86,11 @@ export function SwapConfirmationScreen(props: {
     }
 
     if (step === "swap" && status === "error" && error) {
-      if (error.toLowerCase().includes("user rejected")) {
+      if (
+        error.toLowerCase().includes("user rejected") ||
+        error.toLowerCase().includes("user closed modal") ||
+        error.toLowerCase().includes("user denied")
+      ) {
         return {
           title: "Failed to Confirm",
           message: "Your wallet rejected the confirmation request.",

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

@@ -112,7 +112,11 @@ export function TransferConfirmationScreen(
 
   const uiErrorMessage = useMemo(() => {
     if (step === "approve" && status.id === "error" && status.error) {
-      if (status.error.toLowerCase().includes("user rejected")) {
+      if (
+        status.error.toLowerCase().includes("user rejected") ||
+        status.error.toLowerCase().includes("user closed modal") ||
+        status.error.toLowerCase().includes("user denied")
+      ) {
         return {
           title: "Failed to Approve",
           message: "Your wallet rejected the approval request.",

package/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx

@@ -145,7 +145,11 @@ export function SendFundsForm(props: {
       return locale.transactionFailed;
     }
 
-    if (message.includes("user rejected")) {
+    if (
+      message.includes("user rejected") ||
+      message.includes("user closed modal") ||
+      message.includes("user denied")
+    ) {
       return locale.transactionRejected;
     }
 

package/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx

@@ -130,53 +130,12 @@ export function ViewNFTsContent(props: {
       });
 
       return result
-        .filter((nft) => !!nft.name && !!nft.image_url)
+        .filter((nft) => !!nft.metadata.name && !!nft.metadata.image)
         .map((nft) => {
-          let parsedNft: NFT;
-          const metadata = {
-            name: nft.name,
-            description: nft.description,
-            image: nft.image_url,
-            animation_url: nft.video_url,
-            external_url: nft.external_url,
-            background_color: nft.background_color,
-            uri: nft.metadata_url ?? "",
-            image_url: nft.image_url,
-            attributes: Array.isArray(nft.extra_metadata?.attributes)
-              ? nft.extra_metadata?.attributes?.reduce(
-                  (acc, attr) => {
-                    acc[attr.trait_type] = attr.value;
-                    return acc;
-                  },
-                  {} as Record<string, unknown>,
-                )
-              : {},
-          };
-
-          if (nft.contract?.type === "erc1155") {
-            parsedNft = {
-              id: BigInt(nft.token_id),
-              type: "ERC1155",
-              owner: activeAccount.address,
-              tokenURI: nft.metadata_url ?? "",
-              supply: BigInt(nft.balance), // TODO: this is wrong
-              metadata,
-            };
-          } else {
-            parsedNft = {
-              id: BigInt(nft.token_id),
-              type: "ERC721",
-              owner: activeAccount.address,
-              tokenURI: nft.metadata_url ?? "",
-              metadata,
-            };
-          }
-
           return {
-            chain: getCachedChain(nft.chain_id),
-            address: nft.token_address as Address,
-            quantityOwned: BigInt(nft.balance),
-            ...parsedNft,
+            chain: getCachedChain(nft.chainId),
+            address: nft.tokenAddress as Address,
+            ...nft,
           };
         });
     },
@@ -197,29 +156,45 @@ export function ViewNFTsContent(props: {
 
   return (
     <>
-      <Container
-        style={{
-          display: "grid",
-          gridTemplateColumns: "1fr 1fr",
-          gap: "12px",
-        }}
-      >
-        {nftQuery.error ? (
-          <Text>Error loading NFTs</Text>
-        ) : nftQuery.isLoading || !filteredNFTs ? (
-          <Skeleton height="150px" width="150px" />
-        ) : (
-          filteredNFTs.map((nft) => (
-            <NftCard
-              key={`${nft.chain.id}:${nft.address}:${nft.id}`}
-              {...nft}
-              client={props.client}
-              chain={nft.chain}
-              theme={props.theme}
-            />
-          ))
-        )}
-      </Container>
+      {nftQuery.error ? (
+        <Container center="both" py="lg">
+          <Text size="sm" color="secondaryText" center>
+            Error loading NFTs
+          </Text>
+        </Container>
+      ) : nftQuery.data?.length === 0 && !nftQuery.isLoading ? (
+        <Container center="both" py="lg">
+          <Text size="sm" color="secondaryText" center>
+            No NFTs found on this chain
+          </Text>
+        </Container>
+      ) : (
+        <Container
+          style={{
+            display: "grid",
+            gridTemplateColumns: "1fr 1fr",
+            gap: "12px",
+          }}
+        >
+          {nftQuery.isLoading || !filteredNFTs ? (
+            <>
+              <Skeleton height="150px" width="150px" />
+              <Skeleton height="150px" width="150px" />
+              <Skeleton height="150px" width="150px" />
+            </>
+          ) : (
+            filteredNFTs.map((nft) => (
+              <NftCard
+                key={`${nft.chain.id}:${nft.address}:${nft.id}`}
+                {...nft}
+                client={props.client}
+                chain={nft.chain}
+                theme={props.theme}
+              />
+            ))
+          )}
+        </Container>
+      )}
       <Spacer y="lg" />
     </>
   );

package/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx

@@ -2,7 +2,6 @@ import { useQuery } from "@tanstack/react-query";
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getOwnedTokens } from "../../../../../insight/get-tokens.js";
-import { toTokens } from "../../../../../utils/units.js";
 import { fontSize } from "../../../../core/design-system/index.js";
 import { useWalletBalance } from "../../../../core/hooks/others/useWalletBalance.js";
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
@@ -94,8 +93,7 @@ export function ViewTokensContent(props: {
       return result.filter(
         (token) =>
           !defaultTokens[activeChain.id]?.some(
-            (t) =>
-              t.address.toLowerCase() === token.token_address.toLowerCase(),
+            (t) => t.address.toLowerCase() === token.tokenAddress.toLowerCase(),
           ),
       );
     },
@@ -139,22 +137,14 @@ export function ViewTokensContent(props: {
         return (
           <TokenInfo
             token={{
-              address: token.token_address,
+              address: token.tokenAddress,
               name: token.name ?? "",
               symbol: token.symbol ?? "",
             }}
-            key={token.token_address}
+            key={token.tokenAddress}
             chain={activeChain}
             client={props.client}
-            balanceData={{
-              symbol: token.symbol ?? "",
-              name: token.name ?? "",
-              decimals: token.decimals ?? 18,
-              displayValue: toTokens(
-                BigInt(token.balance),
-                token.decimals ?? 18,
-              ),
-            }}
+            balanceData={token}
           />
         );
       })}

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

@@ -6,12 +6,13 @@ import { NATIVE_TOKEN_ADDRESS } from "../../../../constants/addresses.js";
 import { iconSize } from "../../../core/design-system/index.js";
 import { useChainIconUrl } from "../../../core/hooks/others/useChainQuery.js";
 import { genericTokenIcon } from "../../../core/utils/walletIcon.js";
+import { CoinsIcon } from "../ConnectWallet/icons/CoinsIcon.js";
 import {
   type NativeToken,
   isNativeToken,
 } from "../ConnectWallet/screens/nativeToken.js";
 import { Img } from "./Img.js";
-
+import { Container } from "./basic.js";
 /**
  * @internal
  */
@@ -38,13 +39,21 @@ export function TokenIcon(props: {
     return props.token.icon;
   }, [props.token, chainIconQuery.url]);
 
-  return (
+  return tokenImage ? (
     <Img
-      src={tokenImage || ""}
+      src={tokenImage}
       width={iconSize[props.size]}
       height={iconSize[props.size]}
       fallbackImage={genericTokenIcon}
       client={props.client}
     />
+  ) : (
+    <Container
+      center="both"
+      style={{ width: iconSize[props.size], height: iconSize[props.size] }}
+      color="secondaryText"
+    >
+      <CoinsIcon size={iconSize[props.size]} />
+    </Container>
   );
 }

package/src/react/web/ui/prebuilt/NFT/utils.test.ts

@@ -12,40 +12,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getNFTInfo", () => {
       contract: DOODLES_CONTRACT,
       tokenId: 0n,
     });
-    expect(nft).toStrictEqual({
-      id: 0n,
-      metadata: {
-        attributes: [
-          {
-            trait_type: "face",
-            value: "mustache",
-          },
-          {
-            trait_type: "hair",
-            value: "purple long",
-          },
-          {
-            trait_type: "body",
-            value: "blue and yellow jacket",
-          },
-          {
-            trait_type: "background",
-            value: "green",
-          },
-          {
-            trait_type: "head",
-            value: "tan",
-          },
-        ],
-        description:
-          "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-        image: "ipfs://QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
-        name: "Doodle #0",
-      },
-      owner: null,
-      tokenURI: "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/0",
-      type: "ERC721",
-    });
+    expect(nft.metadata.name).toBe("Doodle #0");
   });
 
   it("should work with ERC1155", async () => {
@@ -53,36 +20,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getNFTInfo", () => {
       contract: DROP1155_CONTRACT,
       tokenId: 0n,
     });
-    expect(nft).toStrictEqual({
-      id: 0n,
-      metadata: {
-        animation_url:
-          "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/1.mp4",
-        attributes: [
-          {
-            trait_type: "Revenue Share",
-            value: "40%",
-          },
-          {
-            trait_type: "Max Supply",
-            value: "50",
-          },
-          {
-            trait_type: "Max Per Wallet",
-            value: "1",
-          },
-        ],
-        background_color: "",
-        description: "",
-        external_url: "https://auraexchange.org",
-        image: "ipfs://QmeGCqV1mSHTZrvuFzW1XZdCRRGXB6AmSotTqHoxA2xfDo/0.png",
-        name: "Aura OG",
-      },
-      owner: null,
-      supply: 33n,
-      tokenURI: "ipfs://QmNgevzVNwJWJdErFY2B7KsuKdJz3gVuBraNKaSxPktLh5/0",
-      type: "ERC1155",
-    });
+    expect(nft.metadata.name).toBe("Aura OG");
   });
 
   it("should throw error if failed to load nft info", async () => {

package/src/react/web/ui/prebuilt/NFT/utils.ts

@@ -11,8 +11,13 @@ export async function getNFTInfo(options: NFTProviderProps): Promise<NFT> {
   return withCache(
     async () => {
       const nft = await Promise.allSettled([
-        getNFT721(options),
-        getNFT1155(options),
+        getNFT721({
+          ...options,
+          useIndexer: false, // TODO (insight): switch this call to only call insight once
+        }),
+        getNFT1155({
+          ...options,
+        }),
       ]).then(([possibleNFT721, possibleNFT1155]) => {
         // getNFT extension always return an NFT object
         // so we need to check if the tokenURI exists

package/src/rpc/fetch-rpc.ts

@@ -72,9 +72,9 @@ export async function fetchRpc(
   });
 
   if (!response.ok) {
-    response.body?.cancel();
+    const error = await response.text().catch(() => null);
     throw new Error(
-      `RPC request failed with status ${response.status} - ${response.statusText}`,
+      `RPC request failed with status ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
     );
   }
 
@@ -116,8 +116,10 @@ export async function fetchSingleRpc(
   });
 
   if (!response.ok) {
-    response.body?.cancel();
-    throw new Error(`RPC request failed with status ${response.status}`);
+    const error = await response.text().catch(() => null);
+    throw new Error(
+      `RPC request failed with status ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
+    );
   }
   if (response.headers.get("Content-Type")?.startsWith("application/json")) {
     return await response.json();

package/src/social/profiles.ts

@@ -32,15 +32,11 @@ export async function getSocialProfiles(args: {
     `${getThirdwebBaseUrl("social")}/v1/profiles/${address}`,
   );
 
-  if (response.status !== 200) {
-    try {
-      const errorBody = await response.json();
-      throw new Error(`Failed to fetch profile: ${errorBody.message}`);
-    } catch {
-      throw new Error(
-        `Failed to fetch profile: ${response.status}\n${await response.text()}`,
-      );
-    }
+  if (!response.ok) {
+    const errorBody = await response.text().catch(() => "Unknown error");
+    throw new Error(
+      `Failed to fetch profile: ${response.status} ${response.statusText} - ${errorBody}`,
+    );
   }
 
   return (await response.json()).data as SocialProfile[];

package/src/storage/download.ts

@@ -99,8 +99,10 @@ export async function download(options: DownloadOptions) {
   });
 
   if (!res.ok) {
-    res.body?.cancel();
-    throw new Error(`Failed to download file: ${res.statusText}`);
+    const error = await res.text();
+    throw new Error(
+      `Failed to download file: ${res.status} ${res.statusText} ${error || ""}`,
+    );
   }
   return res;
 }

package/src/storage/unpin.ts

@@ -41,12 +41,14 @@ export async function unpin(options: UnpinOptions) {
   );
 
   if (!res.ok) {
-    res.body?.cancel();
     if (res.status === 401) {
       throw new Error(
         "Unauthorized - You don't have permission to use this service.",
       );
     }
-    throw new Error(`Failed to unpin file - ${res.status} - ${res.statusText}`);
+    const error = await res.text();
+    throw new Error(
+      `Failed to unpin file - ${res.status} - ${res.statusText} ${error || ""}`,
+    );
   }
 }

package/src/storage/upload/web-node.ts

@@ -29,7 +29,6 @@ export async function uploadBatch<const TFiles extends UploadableFile[]>(
   );
 
   if (!res.ok) {
-    res.body?.cancel();
     if (res.status === 401) {
       throw new Error(
         "Unauthorized - You don't have permission to use this service.",

package/src/transaction/actions/gasless/providers/biconomy.ts

@@ -139,7 +139,6 @@ export async function relayBiconomyTransaction(
     },
   );
   if (!response.ok) {
-    response.body?.cancel();
     throw new Error(`Failed to send transaction: ${await response.text()}`);
   }
   const json = await response.json();

package/src/transaction/actions/gasless/providers/openzeppelin.ts

@@ -157,7 +157,6 @@ export async function relayOpenZeppelinTransaction(
   });
 
   if (!response.ok) {
-    response.body?.cancel();
     throw new Error(`Failed to send transaction: ${await response.text()}`);
   }
   const json = await response.json();

package/src/utils/nft/parseNft.test.ts

@@ -21,6 +21,8 @@ describe("parseNft", () => {
       tokenId: 0n,
       tokenUri: "ipfs://",
       type: "ERC721",
+      tokenAddress: "0x1234567890123456789012345678901234567890",
+      chainId: 1,
     };
     const result = parseNFT(base, option);
     const expectedResult: NFT = {
@@ -29,6 +31,8 @@ describe("parseNft", () => {
       id: option.tokenId,
       tokenURI: option.tokenUri,
       type: option.type,
+      tokenAddress: option.tokenAddress,
+      chainId: option.chainId,
     };
     expect(result).toMatchObject(expectedResult);
   });
@@ -39,6 +43,8 @@ describe("parseNft", () => {
       tokenUri: "ipfs://",
       type: "ERC1155",
       supply: 10n,
+      tokenAddress: "0x1234567890123456789012345678901234567890",
+      chainId: 1,
     };
     const expectedResult: NFT = {
       metadata: base,
@@ -47,6 +53,8 @@ describe("parseNft", () => {
       tokenURI: option.tokenUri,
       type: option.type,
       supply: option.supply,
+      tokenAddress: option.tokenAddress,
+      chainId: option.chainId,
     };
     const result = parseNFT(base, option);
     expect(result).toMatchObject(expectedResult);

package/src/utils/nft/parseNft.ts

@@ -41,6 +41,8 @@ export type NFT =
       id: bigint;
       tokenURI: string;
       type: "ERC721";
+      tokenAddress: string;
+      chainId: number;
     }
   | {
       metadata: NFTMetadata;
@@ -49,6 +51,8 @@ export type NFT =
       tokenURI: string;
       type: "ERC1155";
       supply: bigint;
+      tokenAddress: string;
+      chainId: number;
     };
 
 /**
@@ -60,6 +64,8 @@ export type ParseNFTOptions =
       tokenUri: string;
       type: "ERC721";
       owner?: string | null;
+      tokenAddress: string;
+      chainId: number;
     }
   | {
       tokenId: bigint;
@@ -67,6 +73,8 @@ export type ParseNFTOptions =
       type: "ERC1155";
       owner?: string | null;
       supply: bigint;
+      tokenAddress: string;
+      chainId: number;
     };
 
 /**
@@ -85,6 +93,8 @@ export function parseNFT(base: NFTMetadata, options: ParseNFTOptions): NFT {
         id: options.tokenId,
         tokenURI: options.tokenUri,
         type: options.type,
+        tokenAddress: options.tokenAddress,
+        chainId: options.chainId,
       };
     case "ERC1155":
       return {
@@ -94,6 +104,8 @@ export function parseNFT(base: NFTMetadata, options: ParseNFTOptions): NFT {
         tokenURI: options.tokenUri,
         type: options.type,
         supply: options.supply,
+        tokenAddress: options.tokenAddress,
+        chainId: options.chainId,
       };
     default:
       throw new Error("Invalid NFT type");

package/src/utils/signatures/resolve-signature.ts

@@ -17,7 +17,6 @@ async function resolveFunctionSignature(
     `${SIGNATURE_API}/signatures/?format=json&hex_signature=${hexSig}`,
   );
   if (!res.ok) {
-    res.body?.cancel();
     return null;
   }
   const data = await res.json();
@@ -39,7 +38,6 @@ async function resolveEventSignature(
     `${SIGNATURE_API}/event-signatures/?format=json&hex_signature=${hexSig}`,
   );
   if (!res.ok) {
-    res.body?.cancel();
     return null;
   }
   const data = await res.json();

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.95.0-nightly-4c1f384a635054a8cfaaa487e3ba7ada63b221ec-20250415110008";
+export const version = "5.95.0-nightly-e7b01108037ebef07fba95f888be1905c8fab5df-20250417000348";