Merge branch 'main' into yash/ref-constructor-params

Author: kumaryash90

apps/dashboard/src/@/constants/thirdweb.server.ts

@@ -12,11 +12,9 @@ import {
   THIRDWEB_STORAGE_DOMAIN,
 } from "constants/urls";
 import { createThirdwebClient } from "thirdweb";
-import { getChainMetadata } from "thirdweb/chains";
 import { populateEip712Transaction } from "thirdweb/transaction";
 import {
   getTransactionDecorator,
-  isZkSyncChain,
   setThirdwebDomains,
   setTransactionDecorator,
 } from "thirdweb/utils";
@@ -39,43 +37,32 @@ export function getThirdwebClient(jwt?: string) {
 
   if (!getTransactionDecorator()) {
     setTransactionDecorator(async ({ account, transaction }) => {
-      // use paymaster for zk chains on testnets
-      const chainMeta = await getChainMetadata(transaction.chain);
-      if (chainMeta.testnet) {
-        const isZkChain = await isZkSyncChain(transaction.chain);
-        if (isZkChain) {
-          const serializedTx = await populateEip712Transaction({
-            transaction,
-            account,
-          });
-          const pmData = await getZkPaymasterData({
-            options: {
-              client: transaction.client,
-              chain: transaction.chain,
+      // special override for sophon testnet (zk chain)
+      // sophon only allows transactions through their paymaster
+      // so always use eip712 tx + paymaster
+      if (transaction.chain.id === 531050104) {
+        const serializedTx = await populateEip712Transaction({
+          transaction,
+          account,
+        });
+        const pmData = await getZkPaymasterData({
+          options: {
+            client: transaction.client,
+            chain: transaction.chain,
+          },
+          transaction: serializedTx,
+        });
+        return {
+          account,
+          transaction: {
+            ...transaction,
+            eip712: {
+              ...transaction.eip712,
+              paymaster: pmData.paymaster,
+              paymasterInput: pmData.paymasterInput,
             },
-            transaction: serializedTx,
-          }).catch((e) => {
-            console.warn(
-              "No zk paymaster data available on chain ",
-              transaction.chain.id,
-              e,
-            );
-            return undefined;
-          });
-          return {
-            account,
-            transaction: {
-              ...transaction,
-              eip712: pmData
-                ? {
-                    ...transaction.eip712,
-                    paymaster: pmData.paymaster,
-                    paymasterInput: pmData.paymasterInput,
-                  }
-                : transaction.eip712,
-            },
-          };
-        }
+          },
+        };
       }
       return { account, transaction };
     });

apps/dashboard/src/app/login/page.tsx

@@ -7,10 +7,32 @@ import { useTheme } from "next-themes";
 import { useSearchParams } from "next/navigation";
 import { Suspense, useEffect, useState } from "react";
 import { ConnectEmbed } from "thirdweb/react";
+import { createWallet, inAppWallet } from "thirdweb/wallets";
 import { ThirdwebMiniLogo } from "../components/ThirdwebMiniLogo";
 import { getSDKTheme } from "../components/sdk-component-theme";
 import { doLogin, doLogout, getLoginPayload, isLoggedIn } from "./auth-actions";
 
+const wallets = [
+  inAppWallet({
+    auth: {
+      options: [
+        "google",
+        "apple",
+        "facebook",
+        "github",
+        "email",
+        "phone",
+        "passkey",
+      ],
+    },
+  }),
+  createWallet("io.metamask"),
+  createWallet("com.coinbase.wallet"),
+  createWallet("io.rabby"),
+  createWallet("me.rainbow"),
+  createWallet("io.zerion.wallet"),
+];
+
 export default function LoginPage() {
   return (
     <div className="relative grid h-screen place-items-center bg-muted/30">
@@ -74,6 +96,7 @@ function CustomConnectEmmbed() {
           return isLoggedInResult;
         },
       }}
+      wallets={wallets}
       client={client}
       modalSize={isLG ? "wide" : "compact"}
       theme={getSDKTheme(theme === "light" ? "light" : "dark")}