thirdweb 5.49.0 → 5.50.0-nightly-ff3abfa79e4f5f8806676d97c11ff24ffd62266f-20240901000406

package/src/extensions/erc1155/drops/write/updateMetadata.ts

@@ -109,12 +109,13 @@ export async function getUpdateMetadataParams(
  * const transaction = updateMetadata({
  *  contract,
  *  targetTokenId: 0n,
+ *  client: thirdwebClient,
  *  newMetadata: {
  *    name: "this is the new nft name",
  *    description: "...",
  *    image: "new image uri"
  *    // ...
- *  }
+ *  },
  * });
  *
  * await sendTransaction({ transaction, account });

package/src/extensions/erc721/drops/write/updateMetadata.test.ts

@@ -0,0 +1,56 @@
+import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "~test/chains.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
+
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
+import { getContract } from "../../../../contract/contract.js";
+import { deployERC721Contract } from "../../../../extensions/prebuilts/deploy-erc721.js";
+import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
+import { getNFTs } from "../../read/getNFTs.js";
+import { lazyMint } from "../../write/lazyMint.js";
+import { updateMetadata } from "./updateMetadata.js";
+
+const account = TEST_ACCOUNT_A;
+const client = TEST_CLIENT;
+const chain = ANVIL_CHAIN;
+
+describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
+  it("should update metadata", async () => {
+    const address = await deployERC721Contract({
+      client,
+      chain,
+      account,
+      type: "DropERC721",
+      params: {
+        name: "NFT Drop",
+        contractURI: TEST_CONTRACT_URI,
+      },
+    });
+    const contract = getContract({
+      address,
+      client,
+      chain,
+    });
+    const lazyMintTx = lazyMint({
+      contract,
+      nfts: [{ name: "token 0" }, { name: "token 1" }, { name: "token 2" }],
+    });
+    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
+
+    const updateTx = updateMetadata({
+      contract,
+      targetTokenId: 1n,
+      newMetadata: { name: "token 1 - updated" },
+      client,
+    });
+    await sendAndConfirmTransaction({ transaction: updateTx, account });
+
+    const nfts = await getNFTs({ contract });
+
+    expect(nfts.length).toBe(3);
+    expect(nfts[0]?.metadata.name).toBe("token 0");
+    expect(nfts[1]?.metadata.name).toBe("token 1 - updated");
+    expect(nfts[2]?.metadata.name).toBe("token 2");
+  });
+});

package/src/extensions/erc721/drops/write/updateMetadata.ts

@@ -106,6 +106,7 @@ export async function getUpdateMetadataParams(
  * const transaction = updateMetadata({
  *  contract,
  *  targetTokenId: 0n,
+ *  client: thirdwebClient,
  *  newMetadata: {
  *    name: "this is the new nft name",
  *    description: "...",

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -265,7 +265,7 @@ function BuyScreenContent(props: BuyScreenContentProps) {
             : props.connectOptions?.showAllWallets
         }
         walletConnect={props.connectOptions?.walletConnect}
-        wallets={props.connectOptions?.wallets}
+        wallets={props.connectOptions?.wallets?.filter((w) => w.id !== "inApp")}
       />
     );
   }

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

@@ -38,7 +38,7 @@ export function WalletSwitcherConnectionScreen(
     getDefaultWallets({
       appMetadata: props.appMetadata,
       chains: props.chains,
-    });
+    }).filter((w) => w.id !== "inApp");
 
   const screenSetup = useSetupScreen({
     size: "compact",

package/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx

@@ -4,7 +4,8 @@ import { useCallback } from "react";
 import type { Chain } from "../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../client/client.js";
 import { getContract } from "../../../../../../contract/contract.js";
-import { getApprovalForTransaction } from "../../../../../../extensions/erc20/write/getApprovalForTransaction.js";
+import { isERC721 } from "../../../../../../extensions/erc721/read/isERC721.js";
+import { isERC1155 } from "../../../../../../extensions/erc1155/read/isERC1155.js";
 import {
   type CreateListingParams,
   createListing,
@@ -74,12 +75,13 @@ export function CreateDirectListingButton(
   });
   const account = useActiveAccount();
   const defaultPayModalMetadata = payModal ? payModal.metadata : undefined;
+  const nftContract = getContract({
+    address: assetContractAddress,
+    chain,
+    client,
+  });
   const { data: payMetadata } = useReadContract(getPayMetadata, {
-    contract: getContract({
-      address: assetContractAddress,
-      chain,
-      client,
-    }),
+    contract: nftContract,
     tokenId,
     queryOptions: {
       enabled: !defaultPayModalMetadata,
@@ -91,19 +93,78 @@ export function CreateDirectListingButton(
     if (!account) {
       throw new Error("No account detected");
     }
+    const [is721, is1155] = await Promise.all([
+      isERC721({ contract: nftContract }),
+      isERC1155({ contract: nftContract }),
+    ]);
+    if (!is1155 && !is721) {
+      throw new Error("Asset must either be ERC721 or ERC1155");
+    }
+    // Check for token approval
+    if (is1155) {
+      const [{ isApprovedForAll }, { setApprovalForAll }] = await Promise.all([
+        import(
+          "../../../../../../extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.js"
+        ),
+        import(
+          "../../../../../../extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.js"
+        ),
+      ]);
+      const isApproved = await isApprovedForAll({
+        contract: nftContract,
+        operator: marketplaceContract.address,
+        owner: account.address,
+      });
+      if (!isApproved) {
+        const transaction = setApprovalForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          approved: true,
+        });
+        await mutateAsync(transaction);
+      }
+    } else {
+      const [{ isApprovedForAll }, { setApprovalForAll }, { getApproved }] =
+        await Promise.all([
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.js"
+          ),
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.js"
+          ),
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/read/getApproved.js"
+          ),
+        ]);
+      const [isApproved, tokenApproved] = await Promise.all([
+        isApprovedForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          owner: account.address,
+        }),
+        getApproved({ contract: nftContract, tokenId: props.tokenId }),
+      ]);
+
+      if (
+        !isApproved &&
+        tokenApproved.toLowerCase() !==
+          marketplaceContract.address.toLowerCase()
+      ) {
+        const transaction = setApprovalForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          approved: true,
+        });
+        await mutateAsync(transaction);
+      }
+    }
     const listingTx = createListing({
       contract: marketplaceContract,
       ...props,
     });
-    const approveTx = await getApprovalForTransaction({
-      transaction: listingTx,
-      account,
-    });
-    if (approveTx) {
-      await mutateAsync(approveTx);
-    }
+
     return listingTx;
-  }, [marketplaceContract, props, account, mutateAsync]);
+  }, [marketplaceContract, props, account, mutateAsync, nftContract]);
 
   return (
     <TransactionButton
@@ -128,14 +189,10 @@ async function getPayMetadata(
   }>,
 ): Promise<{ name?: string; image?: string }> {
   const [
-    { isERC721 },
-    { isERC1155 },
     { getContractMetadata },
     { getNFT: getERC721 },
     { getNFT: getERC1155 },
   ] = await Promise.all([
-    import("../../../../../../extensions/erc721/read/isERC721.js"),
-    import("../../../../../../extensions/erc1155/read/isERC1155.js"),
     import("../../../../../../extensions/common/read/getContractMetadata.js"),
     import("../../../../../../extensions/erc721/read/getNFT.js"),
     import("../../../../../../extensions/erc1155/read/getNFT.js"),

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.49.0";
+export const version = "5.50.0-nightly-ff3abfa79e4f5f8806676d97c11ff24ffd62266f-20240901000406";