Merge branch 'main' into greg/cnct-2213-siteembed-component

Author: gregfromstl

apps/dashboard/src/@/constants/auth.ts

@@ -1,14 +1,16 @@
-const LOGGED_IN_ONLY_PATHS = [
-  // anything that _starts_ with /dashboard is logged in only
-  "/dashboard",
-  // team pages are logged in only
-  "/team",
-  // anything that _starts_ with /cli is logged in only
-  "/cli",
-  // publish page
-  "/contracts/publish",
-];
-
 export function isLoginRequired(pathname: string) {
-  return LOGGED_IN_ONLY_PATHS.some((path) => pathname.startsWith(path));
+  // remove '/' in front and then split by '/'
+  const paths = pathname.slice(1).split("/");
+
+  // /dashboard, /team, /cli
+  if (paths[0] === "dashboard" || paths[0] === "team" || paths[0] === "cli") {
+    return true;
+  }
+
+  // /contracts/publish
+  if (paths[0] === "contracts" && paths[1] === "publish") {
+    return true;
+  }
+
+  return false;
 }

apps/dashboard/src/components/engine/engine-instances-table.tsx

@@ -430,34 +430,22 @@ function DeleteSubscriptionModalContent(props: {
 
       <form onSubmit={form.handleSubmit(onSubmit)}>
         {/* Reason */}
-        <FormControl isRequired>
+        <FormControl>
           <FormLabel className="!text-base">
             Please share your feedback to help us improve Engine.
           </FormLabel>
           <RadioGroup>
             <div className="flex flex-col gap-2">
-              <Radio
-                value="USING_SELF_HOSTED"
-                {...form.register("reason", { required: true })}
-              >
+              <Radio value="USING_SELF_HOSTED" {...form.register("reason")}>
                 <span className="text-sm"> Migrating to self-hosted </span>
               </Radio>
-              <Radio
-                value="TOO_EXPENSIVE"
-                {...form.register("reason", { required: true })}
-              >
+              <Radio value="TOO_EXPENSIVE" {...form.register("reason")}>
                 <span className="text-sm"> Too expensive </span>
               </Radio>
-              <Radio
-                value="MISSING_FEATURES"
-                {...form.register("reason", { required: true })}
-              >
+              <Radio value="MISSING_FEATURES" {...form.register("reason")}>
                 <span className="text-sm"> Missing features </span>
               </Radio>
-              <Radio
-                value="OTHER"
-                {...form.register("reason", { required: true })}
-              >
+              <Radio value="OTHER" {...form.register("reason")}>
                 <span className="text-sm"> Other </span>
               </Radio>
             </div>

packages/thirdweb/.size-limit.json

@@ -19,7 +19,7 @@
   {
     "name": "thirdweb/chains (tree-shaking)",
     "path": "./dist/esm/exports/chains.js",
-    "limit": "500 B",
+    "limit": "600 B",
     "import": "{ ethereum }"
   },
   {

packages/thirdweb/CHANGELOG.md

@@ -1,5 +1,11 @@
 # thirdweb
 
+## 5.65.1
+
+### Patch Changes
+
+- [#5277](https://github.com/thirdweb-dev/js/pull/5277) [`58fb28d`](https://github.com/thirdweb-dev/js/commit/58fb28de297e5a81be18a185d495425e29913a0b) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Respect bundlerUrl in waitForUserReceipt
+
 ## 5.65.0
 
 ### Minor Changes

packages/thirdweb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.65.0",
+  "version": "5.65.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"

packages/thirdweb/src/utils/any-evm/zksync/isZkSyncChain.ts

@@ -16,10 +16,20 @@ export async function isZkSyncChain(chain: Chain) {
     chain.id === 4654 ||
     chain.id === 333271 ||
     chain.id === 37111 ||
-    chain.id === 978658
+    chain.id === 978658 ||
+    chain.id === 531050104 ||
+    chain.id === 4457845
   ) {
     return true;
   }
 
-  return false;
+  // fallback to checking the stack on rpc
+  try {
+    const { getChainMetadata } = await import("../../../chains/utils.js");
+    const chainMetadata = await getChainMetadata(chain);
+    return chainMetadata.stackType === "zksync_stack";
+  } catch {
+    // If the network check fails, assume it's not a ZkSync chain
+    return false;
+  }
 }

packages/thirdweb/src/wallets/smart/index.ts

@@ -624,7 +624,7 @@ async function _sendUserOp(args: {
   });
   // wait for tx receipt rather than return the userOp hash
   const receipt = await waitForUserOpReceipt({
-    ...options,
+    ...bundlerOptions,
     userOpHash,
   });
 

packages/thirdweb/src/wallets/utils/getWalletBalance.test.ts

@@ -3,7 +3,6 @@ import { ANVIL_CHAIN } from "~test/chains.js";
 import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
-import { defineChain } from "../../chains/utils.js";
 import { getContract } from "../../contract/contract.js";
 import { mintTo } from "../../extensions/erc20/write/mintTo.js";
 import { deployERC20Contract } from "../../extensions/prebuilts/deploy-erc20.js";
@@ -57,12 +56,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("getWalletBalance", () => {
     expect(result.displayValue).toBe(amount.toString());
   });
 
-  it("should work for un-named token", async () => {
+  it("should work for native currency", async () => {
     const result = await getWalletBalance({
       address: TEST_ACCOUNT_A.address,
       client: TEST_CLIENT,
-      chain: defineChain(97),
-      tokenAddress: "0xd66c6B4F0be8CE5b39D52E0Fd1344c389929B378",
+      chain: ANVIL_CHAIN,
     });
     expect(result).toBeDefined();
     expect(result.decimals).toBe(18);