thirdweb 5.111.9 → 5.111.11-nightly-eb1a9c3c3e670290e28ad86e14ddae4c7cf7455d-20251112000353

package/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts

@@ -11,54 +11,50 @@ import { sendTransaction } from "../../../transaction/actions/send-transaction.j
 import { installPublishedExtension } from "./installPublishedExtension.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("install extension", () => {
-  // TODO: Fix this test
-  it.skip.sequential(
-    "should install extension to a dynamic contract",
-    async () => {
-      await deployCloneFactory({
-        account: TEST_ACCOUNT_A,
-        chain: ANVIL_CHAIN,
-        client: TEST_CLIENT,
-      });
+  it.sequential("should install extension to a dynamic contract", async () => {
+    await deployCloneFactory({
+      account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+    });
 
-      const deployed = await deployPublishedContract({
-        account: TEST_ACCOUNT_A,
-        chain: ANVIL_CHAIN,
-        client: TEST_CLIENT,
-        contractId: "EvolvingNFT",
-        contractParams: {
-          contractURI: "",
-          defaultAdmin: TEST_ACCOUNT_A.address,
-          name: "Evolving nft",
-          royaltyBps: 0n,
-          royaltyRecipient: TEST_ACCOUNT_A.address,
-          saleRecipient: TEST_ACCOUNT_A.address,
-          symbol: "ENFT",
-          trustedForwarders: [],
-        },
-      });
+    const deployed = await deployPublishedContract({
+      account: TEST_ACCOUNT_A,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+      contractId: "EvolvingNFT",
+      contractParams: {
+        contractURI: "",
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        name: "Evolving nft",
+        royaltyBps: 0n,
+        royaltyRecipient: TEST_ACCOUNT_A.address,
+        saleRecipient: TEST_ACCOUNT_A.address,
+        symbol: "ENFT",
+        trustedForwarders: [],
+      },
+    });
 
-      const contract = getContract({
-        address: deployed,
-        chain: ANVIL_CHAIN,
-        client: TEST_CLIENT,
-      });
+    const contract = getContract({
+      address: deployed,
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+    });
 
-      const transaction = installPublishedExtension({
-        account: TEST_ACCOUNT_A,
-        contract,
-        extensionName: "DirectListingsLogic",
-      });
+    const transaction = installPublishedExtension({
+      account: TEST_ACCOUNT_A,
+      contract,
+      extensionName: "DirectListingsLogic",
+    });
 
-      await sendTransaction({ account: TEST_ACCOUNT_A, transaction });
+    await sendTransaction({ account: TEST_ACCOUNT_A, transaction });
 
-      const extensions = await readContract({
-        contract,
-        method: resolveMethod("getAllExtensions"),
-        params: [],
-      });
+    const extensions = await readContract({
+      contract,
+      method: resolveMethod("getAllExtensions"),
+      params: [],
+    });
 
-      expect(extensions.length).toEqual(4);
-    },
-  );
+    expect(extensions.length).toEqual(4);
+  });
 });

package/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts

@@ -11,8 +11,7 @@ import { deployPublishedContract } from "../../prebuilts/deploy-published.js";
 import { uninstallExtension } from "./uninstallExtension.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("uninstall extension", () => {
-  // TODO: Fix this test
-  it.skip.sequential(
+  it.sequential(
     "should uninstall extension from a dynamic contract",
     async () => {
       await deployCloneFactory({

package/src/extensions/modules/common/installPublishedModule.ts

@@ -1,6 +1,7 @@
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import { getOrDeployInfraForPublishedContract } from "../../../contract/deployment/utils/bootstrap.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
+import { deployPublishedContract } from "../../prebuilts/deploy-published.js";
 import { installModule } from "../__generated__/IModularCore/write/installModule.js";
 
 /**
@@ -49,17 +50,35 @@ export function installPublishedModule(options: InstallPublishedModuleOptions) {
 
   return installModule({
     asyncParams: async () => {
-      const deployedModule = await getOrDeployInfraForPublishedContract({
-        account,
-        chain: contract.chain,
-        client: contract.client,
-        constructorParams,
-        contractId: moduleName,
-        publisher,
-      });
+      let implementationAddress: string;
+
+      if (moduleName.toLowerCase().includes("stylus")) {
+        // TODO: switch to deterministic / create2 when available
+
+        implementationAddress = await deployPublishedContract({
+          account,
+          chain: contract.chain,
+          client: contract.client,
+          contractParams: constructorParams,
+          contractId: moduleName,
+          publisher,
+        });
+      } else {
+        const deployedModule = await getOrDeployInfraForPublishedContract({
+          account,
+          chain: contract.chain,
+          client: contract.client,
+          constructorParams,
+          contractId: moduleName,
+          publisher,
+        });
+
+        implementationAddress = deployedModule.implementationContract
+          .address as string;
+      }
       return {
         data: moduleData || "0x",
-        moduleContract: deployedModule.implementationContract.address as string,
+        moduleContract: implementationAddress,
       };
     },
     contract,

package/src/extensions/prebuilts/deploy-published.ts

@@ -215,7 +215,7 @@ export async function deployContractfromDeployMetadata(
       if (
         deployMetadata.routerType === "dynamic" &&
         deployMetadata.defaultExtensions &&
-        !isZkSyncChain(chain)
+        !(await isZkSyncChain(chain))
       ) {
         for (const e of deployMetadata.defaultExtensions) {
           await getOrDeployInfraForPublishedContract({

package/src/react/web/ui/Bridge/TransactionPayment.tsx

@@ -219,7 +219,7 @@ export function TransactionPayment({
         }}
       >
         {/* USD Value */}
-        <Text color="primaryText" size="xl" weight={600}>
+        <Text color="primaryText" size="xl" weight={500}>
           {costToDisplay}
         </Text>
 

package/src/react/web/ui/Bridge/common/TokenAndChain.tsx

@@ -82,7 +82,7 @@ export function TokenAndChain({
             textOverflow: "ellipsis",
             whiteSpace: "nowrap",
           }}
-          weight={600}
+          weight={500}
           trackingTight
         >
           {token.name}

package/src/react/web/ui/Bridge/common/TokenBalanceRow.tsx

@@ -68,18 +68,9 @@ export function TokenBalanceRow({
             overflow: "hidden",
           }}
         >
-          <FiatValue
-            currency={currency}
-            chain={chain}
-            client={client}
+          <Text
             color="primaryText"
             size="sm"
-            token={token}
-            tokenAmount={amount}
-          />
-          <Text
-            color="secondaryText"
-            size="xs"
             style={{
               overflow: "hidden",
               textOverflow: "ellipsis",
@@ -91,6 +82,16 @@ export function TokenBalanceRow({
               minimumFractionDigits: 0,
             })} ${token.symbol}`}
           </Text>
+
+          <FiatValue
+            currency={currency}
+            chain={chain}
+            client={client}
+            color="secondaryText"
+            size="sm"
+            token={token}
+            tokenAmount={amount}
+          />
         </Container>
       </Container>
     </StyledButton>

package/src/react/web/ui/Bridge/common/selected-token-button.tsx

@@ -100,13 +100,23 @@ export function SelectedTokenButton(props: {
               }}
             >
               <Img
-                src={props.chain?.icon}
+                src={props.chain?.icon || ""}
                 client={props.client}
                 width={iconSize.sm}
                 height={iconSize.sm}
                 style={{
                   borderRadius: radius.full,
                 }}
+                fallback={
+                  <Container
+                    style={{
+                      background: `linear-gradient(45deg, white, ${theme.colors.accentText})`,
+                      borderRadius: radius.full,
+                      width: `${iconSize.sm}px`,
+                      height: `${iconSize.sm}px`,
+                    }}
+                  />
+                }
               />
             </Container>
           )}

package/src/react/web/ui/Bridge/payment-details/PaymentOverview.tsx

@@ -63,7 +63,7 @@ export function PaymentOverview(props: {
             <WalletRow
               address={sender}
               client={props.client}
-              iconSize="md"
+              iconSize="lg"
               textSize="sm"
             />
           </Container>
@@ -91,13 +91,14 @@ export function PaymentOverview(props: {
             py="sm"
             style={{ justifyContent: "space-between" }}
           >
+            {/* left */}
             <Container center="y" flex="row" gap="sm">
               {getFiatCurrencyIcon({
                 currency: props.paymentMethod.currency,
                 size: "lg",
               })}
               <Container center="y" flex="column" gap="3xs">
-                <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
+                <Text color="primaryText" size="sm" weight={500}>
                   {props.paymentMethod.currency}
                 </Text>
                 <Text color="secondaryText" size="xs">
@@ -106,7 +107,8 @@ export function PaymentOverview(props: {
                 </Text>
               </Container>
             </Container>
-            <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
+            {/* right */}
+            <Text color="primaryText" size="sm">
               {props.fromAmount}
             </Text>
           </Container>
@@ -136,11 +138,12 @@ export function PaymentOverview(props: {
             <WalletRow
               address={props.receiver}
               client={props.client}
-              iconSize="md"
+              iconSize="lg"
               textSize="sm"
             />
           </Container>
         )}
+
         {props.modeInfo.mode === "direct_payment" && (
           <Container
             center="y"
@@ -150,7 +153,7 @@ export function PaymentOverview(props: {
             style={{ justifyContent: "space-between" }}
           >
             <Container center="y" flex="column" gap="3xs" style={{ flex: 1 }}>
-              <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
+              <Text color="primaryText" size="sm" weight={500}>
                 {props.metadata.title || "Payment"}
               </Text>
               {props.metadata.description && (
@@ -173,7 +176,6 @@ export function PaymentOverview(props: {
                 size="sm"
                 token={props.toToken}
                 tokenAmount={props.modeInfo.paymentInfo.amount}
-                weight={600}
               />
               <Text color="secondaryText" size="xs">
                 {props.modeInfo.paymentInfo.amount} {props.toToken.symbol}
@@ -285,7 +287,7 @@ const TransactionOverViewCompact = (props: {
       style={{ justifyContent: "space-between" }}
     >
       <Container center="y" flex="column" gap="3xs" style={{ flex: 1 }}>
-        <Text color="primaryText" size="sm" style={{ fontWeight: 600 }}>
+        <Text color="primaryText" size="sm" weight={500}>
           {props.metadata.title || "Transaction"}
         </Text>
         {props.metadata.description && (

package/src/react/web/ui/Bridge/payment-selection/TokenSelection.tsx

@@ -89,7 +89,7 @@ function PaymentMethodTokenRow({
             <Text
               color="primaryText"
               size="sm"
-              style={{ fontWeight: 600, textWrap: "nowrap" }}
+              style={{ fontWeight: 500, textWrap: "nowrap" }}
             >
               {formatCurrencyAmount(
                 currency || "USD",