diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
index 5f02901bfcd..39d15bd4cda 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx
@@ -30,6 +30,7 @@ export const CancelTab: React.FC<CancelTabProps> = ({
   return (
     <div className="flex flex-col gap-3 pt-3">
       <TransactionButton
+        client={contract.client}
         isLoggedIn={isLoggedIn}
         txChainID={contract.chain.id}
         transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
index 9223d4dad5d..30640a62728 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx
@@ -659,6 +659,7 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
           Cancel
         </Button>
         <TransactionButton
+          client={contract.client}
           isLoggedIn={isLoggedIn}
           txChainID={contract.chain.id}
           isPending={isFormLoading}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
index f3b26340cc2..e00607c9f2e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx
@@ -658,6 +658,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
                   hasRemovedPhases ||
                   !isMultiPhase ? (
                     <TransactionButton
+                      client={contract.client}
                       isLoggedIn={isLoggedIn}
                       txChainID={contract.chain.id}
                       transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
index 3cd9b5319a1..4948c16aff8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/reset-claim-eligibility.tsx
@@ -94,6 +94,7 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
   return (
     <AdminOnly contract={contract} fallback={<div className="pb-5" />}>
       <TransactionButton
+        client={contract.client}
         isLoggedIn={isLoggedIn}
         transactionCount={1}
         type="button"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
index e706e342dd2..4b1ef181ba1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/account/components/deposit-native.tsx
@@ -48,6 +48,7 @@ export const DepositNative: React.FC<DepositNativeProps> = ({
         value={amount}
       />
       <TransactionButton
+        client={client}
         isLoggedIn={isLoggedIn}
         txChainID={v5Chain.id}
         transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
index f61ed87d287..b5af78e870b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx
@@ -61,6 +61,7 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
 
   return (
     <TransactionButton
+      client={contract.client}
       isLoggedIn={isLoggedIn}
       txChainID={contract.chain.id}
       onClick={() => {
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
index fed908fd112..621b03ce0e6 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/BatchMetadata.tsx
@@ -23,7 +23,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
-import { sendAndConfirmTransaction } from "thirdweb";
+import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
 import { BatchMetadataERC721, BatchMetadataERC1155 } from "thirdweb/modules";
 import { parseAttributes } from "utils/parseAttributes";
 import { z } from "zod";
@@ -105,6 +105,7 @@ export function BatchMetadataModuleUI(
     uploadMetadata: (values: UploadMetadataFormValues) => Promise<void>;
     contractChainId: number;
     isLoggedIn: boolean;
+    client: ThirdwebClient;
   },
 ) {
   return (
@@ -122,6 +123,7 @@ export function BatchMetadataModuleUI(
                   isLoggedIn={props.isLoggedIn}
                   uploadMetadata={props.uploadMetadata}
                   contractChainId={props.contractChainId}
+                  client={props.client}
                 />
               )}
               {!props.isOwnerAccount && (
@@ -164,6 +166,7 @@ function UploadMetadataNFTSection(props: {
   uploadMetadata: (values: UploadMetadataFormValues) => Promise<void>;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<UploadMetadataFormValues>({
     resolver: zodResolver(uploadMetadataFormSchema),
@@ -262,6 +265,7 @@ function UploadMetadataNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
+              client={props.client}
               isLoggedIn={props.isLoggedIn}
               size="sm"
               className="min-w-24"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
index ca5cfade396..8893e8b53b8 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Claimable.tsx
@@ -41,6 +41,7 @@ import { useFieldArray, useForm } from "react-hook-form";
 import {
   NATIVE_TOKEN_ADDRESS,
   type PreparedTransaction,
+  type ThirdwebClient,
   ZERO_ADDRESS,
   getContract,
   sendAndConfirmTransaction,
@@ -343,6 +344,7 @@ export function ClaimableModuleUI(
       isLoading: boolean;
     };
     isLoggedIn: boolean;
+    client: ThirdwebClient;
   },
 ) {
   return (
@@ -358,6 +360,7 @@ export function ClaimableModuleUI(
             </AccordionTrigger>
             <AccordionContent className="px-1">
               <MintNFTSection
+                client={props.client}
                 mint={props.mintSection.mint}
                 name={props.name}
                 contractChainId={props.contractChainId}
@@ -390,6 +393,7 @@ export function ClaimableModuleUI(
               {props.name !== "ClaimableERC1155" || props.isValidTokenId ? (
                 props.claimConditionSection.data ? (
                   <ClaimConditionSection
+                    client={props.client}
                     isLoggedIn={props.isLoggedIn}
                     isOwnerAccount={props.isOwnerAccount}
                     claimCondition={
@@ -424,6 +428,7 @@ export function ClaimableModuleUI(
             <AccordionContent className="px-1">
               {props.primarySaleRecipientSection.data ? (
                 <PrimarySaleRecipientSection
+                  client={props.client}
                   isLoggedIn={props.isLoggedIn}
                   isOwnerAccount={props.isOwnerAccount}
                   primarySaleRecipient={
@@ -490,6 +495,7 @@ function ClaimConditionSection(props: {
   tokenId: string;
   noClaimConditionSet: boolean;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const { idToChain } = useAllChainsData();
   const chain = idToChain.get(props.chainId);
@@ -741,6 +747,7 @@ function ClaimConditionSection(props: {
 
               <div className="flex justify-end">
                 <TransactionButton
+                  client={props.client}
                   isLoggedIn={props.isLoggedIn}
                   size="sm"
                   className="min-w-24"
@@ -775,6 +782,7 @@ function PrimarySaleRecipientSection(props: {
   isOwnerAccount: boolean;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<PrimarySaleRecipientFormValues>({
     resolver: zodResolver(primarySaleRecipientFormSchema),
@@ -823,6 +831,7 @@ function PrimarySaleRecipientSection(props: {
 
         <div className="flex justify-end">
           <TransactionButton
+            client={props.client}
             isLoggedIn={props.isLoggedIn}
             size="sm"
             className="min-w-24 gap-2"
@@ -859,6 +868,7 @@ function MintNFTSection(props: {
   name: string;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<MintFormValues>({
     resolver: zodResolver(mintFormSchema),
@@ -940,6 +950,7 @@ function MintNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
+              client={props.client}
               size="sm"
               className="min-w-24 gap-2"
               disabled={mintMutation.isPending}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
index 8216dc0e82c..a2d9b40b26c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx
@@ -27,7 +27,11 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
-import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
+import {
+  type PreparedTransaction,
+  type ThirdwebClient,
+  sendAndConfirmTransaction,
+} from "thirdweb";
 import {
   MintableERC20,
   MintableERC721,
@@ -193,6 +197,7 @@ export function MintableModuleUI(
     isBatchMetadataInstalled: boolean;
     contractChainId: number;
     isLoggedIn: boolean;
+    client: ThirdwebClient;
   },
 ) {
   return (
@@ -216,6 +221,7 @@ export function MintableModuleUI(
                     name={props.name}
                     isBatchMetadataInstalled={props.isBatchMetadataInstalled}
                     contractChainId={props.contractChainId}
+                    client={props.client}
                   />
                 )}
                 {!props.isOwnerAccount && (
@@ -243,6 +249,7 @@ export function MintableModuleUI(
                   update={props.updatePrimaryRecipient}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
+                  client={props.client}
                 />
               </AccordionContent>
             </AccordionItem>
@@ -263,6 +270,7 @@ function PrimarySalesSection(props: {
   isOwnerAccount: boolean;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<UpdateFormValues>({
     resolver: zodResolver(primarySaleRecipientFormSchema),
@@ -312,6 +320,7 @@ function PrimarySalesSection(props: {
 
         <div className="mt-4 flex justify-end">
           <TransactionButton
+            client={props.client}
             isLoggedIn={props.isLoggedIn}
             size="sm"
             className="min-w-24"
@@ -341,6 +350,7 @@ function MintNFTSection(props: {
   isBatchMetadataInstalled: boolean;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<MintFormValues>({
     resolver: zodResolver(mintFormSchema),
@@ -524,6 +534,7 @@ function MintNFTSection(props: {
 
           <div className="flex justify-end">
             <TransactionButton
+              client={props.client}
               isLoggedIn={props.isLoggedIn}
               size="sm"
               className="min-w-24"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
index 09f99194d05..ace2f69f5cd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx
@@ -386,6 +386,7 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
         {/* Submit */}
         <div className="flex justify-end">
           <TransactionButton
+            client={contract.client}
             isLoggedIn={props.isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
index fb31843e0da..3e4d888cd9d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/OpenEditionMetadata.tsx
@@ -23,7 +23,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
-import { sendAndConfirmTransaction } from "thirdweb";
+import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
 import { OpenEditionMetadataERC721 } from "thirdweb/modules";
 import { z } from "zod";
 import { ModuleCardUI, type ModuleCardUIProps } from "./module-card";
@@ -100,6 +100,7 @@ export function OpenEditionMetadataModuleUI(
                 setSharedMetadata={props.setSharedMetadata}
                 contractChainId={props.contractChainId}
                 isLoggedIn={props.isLoggedIn}
+                client={props.client}
               />
             )}
             {!props.isOwnerAccount && (
@@ -122,6 +123,7 @@ function SetSharedMetadataSection(props: {
   setSharedMetadata: (values: SetSharedMetadataFormValues) => Promise<void>;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<SetSharedMetadataFormValues>({
     resolver: zodResolver(setSharedMetadataFormSchema),
@@ -213,6 +215,7 @@ function SetSharedMetadataSection(props: {
           <div className="flex justify-end">
             <TransactionButton
               size="sm"
+              client={props.client}
               className="min-w-24"
               disabled={setSharedMetadataMutation.isPending}
               type="submit"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
index c30121366dc..3583194cf69 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Royalty.tsx
@@ -23,7 +23,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { CircleAlertIcon } from "lucide-react";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
-import { sendAndConfirmTransaction } from "thirdweb";
+import { type ThirdwebClient, sendAndConfirmTransaction } from "thirdweb";
 import { RoyaltyERC721, RoyaltyERC1155 } from "thirdweb/modules";
 import { useReadContract } from "thirdweb/react";
 import { z } from "zod";
@@ -187,6 +187,7 @@ export function RoyaltyModuleUI(
                   setRoyaltyInfoForToken={props.setRoyaltyInfoForToken}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
+                  client={props.client}
                 />
               ) : (
                 <Alert variant="info">
@@ -210,6 +211,7 @@ export function RoyaltyModuleUI(
                   defaultRoyaltyInfo={props.defaultRoyaltyInfo}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
+                  client={props.client}
                 />
               ) : (
                 <Alert variant="info">
@@ -233,6 +235,7 @@ export function RoyaltyModuleUI(
                   transferValidator={props.transferValidator}
                   contractChainId={props.contractChainId}
                   isLoggedIn={props.isLoggedIn}
+                  client={props.client}
                 />
               ) : (
                 <Alert variant="info">
@@ -270,6 +273,7 @@ function RoyaltyInfoPerTokenSection(props: {
   setRoyaltyInfoForToken: (values: RoyaltyInfoFormValues) => Promise<void>;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<RoyaltyInfoFormValues>({
     resolver: zodResolver(royaltyInfoFormSchema),
@@ -349,6 +353,7 @@ function RoyaltyInfoPerTokenSection(props: {
 
           <div className="mt-4 flex justify-end">
             <TransactionButton
+              client={props.client}
               isLoggedIn={props.isLoggedIn}
               size="sm"
               className="min-w-24"
@@ -384,6 +389,7 @@ function DefaultRoyaltyInfoSection(props: {
   update: (values: DefaultRoyaltyFormValues) => Promise<void>;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const [defaultRoyaltyRecipient, defaultRoyaltyPercentage] =
     props.defaultRoyaltyInfo || [];
@@ -453,6 +459,7 @@ function DefaultRoyaltyInfoSection(props: {
 
           <div className="mt-4 flex justify-end">
             <TransactionButton
+              client={props.client}
               size="sm"
               className="min-w-24"
               disabled={updateMutation.isPending}
@@ -484,6 +491,7 @@ function TransferValidatorSection(props: {
   update: (values: TransferValidatorFormValues) => Promise<void>;
   contractChainId: number;
   isLoggedIn: boolean;
+  client: ThirdwebClient;
 }) {
   const form = useForm<TransferValidatorFormValues>({
     resolver: zodResolver(transferValidatorFormSchema),
@@ -531,6 +539,7 @@ function TransferValidatorSection(props: {
 
         <div className="mt-4 flex justify-end">
           <TransactionButton
+            client={props.client}
             isLoggedIn={props.isLoggedIn}
             size="sm"
             className="min-w-24 gap-2"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
index 8234d4f76ac..7a4f069c667 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Transferable.tsx
@@ -185,6 +185,7 @@ export function TransferableModuleUI(
           updateButton={() => {
             return (
               <TransactionButton
+                client={props.client}
                 size="sm"
                 className="min-w-24 gap-2"
                 type="submit"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
index 7d79b2f2aa3..48ff244a1fa 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx
@@ -161,6 +161,7 @@ export function ModuleCard(props: ModuleCardProps) {
               </Button>
 
               <TransactionButton
+                client={contract.client}
                 isLoggedIn={props.isLoggedIn}
                 txChainID={contract.chain.id}
                 transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
index d60c1fda13e..6e45c1dc5e4 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx
@@ -162,6 +162,7 @@ const AirdropTab: React.FC<AirdropTabProps> = ({
             more, please do it in multiple transactions.
           </p>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
index bde50baa23f..515c88710bc 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/burn-tab.tsx
@@ -130,6 +130,7 @@ const BurnTab: React.FC<BurnTabProps> = ({ contract, tokenId, isLoggedIn }) => {
             </Text>
           )}
           <TransactionButton
+            client={contract.client}
             transactionCount={1}
             isPending={isPending}
             disabled={checking1155 || checking721 || isPending || !account}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
index 03c4c73e172..a3e6da385a7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/claim-tab.tsx
@@ -124,6 +124,7 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
         </Flex>
 
         <TransactionButton
+          client={contract.client}
           isLoggedIn={isLoggedIn}
           txChainID={contract.chain.id}
           transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
index 3092391952f..6829cdf39df 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/mint-supply-tab.tsx
@@ -126,6 +126,7 @@ const MintSupplyTab: React.FC<MintSupplyTabProps> = ({
         />
 
         <TransactionButton
+          client={contract.client}
           txChainID={contract.chain.id}
           transactionCount={1}
           isPending={sendAndConfirmTx.isPending}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
index 44d2465b8bd..51225b0f317 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/transfer-tab.tsx
@@ -131,6 +131,7 @@ const TransferTab: React.FC<TransferTabProps> = ({
             )}
           </div>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
index 5998b765086..f610fb41c87 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/update-metadata-form.tsx
@@ -407,6 +407,7 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
           Cancel
         </Button>
         <TransactionButton
+          client={contract.client}
           isLoggedIn={isLoggedIn}
           txChainID={contract.chain.id}
           transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
index 606739e40ab..d672316d0d1 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/batch-lazy-mint-button.tsx
@@ -68,6 +68,7 @@ export const BatchLazyMintButton: React.FC<BatchLazyMintButtonProps> = ({
           </SheetHeader>
           <BatchLazyMint
             isLoggedIn={isLoggedIn}
+            client={contract.client}
             chainId={contract.chain.id}
             onSubmit={async ({ revealType, data }) => {
               // nice, we can set up everything the same for both the only thing that changes is the action string
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
index 37022762dc4..23b1d19b2be 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
@@ -107,6 +107,7 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
         </form>
         <div className="mt-4 flex justify-end">
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
index e51be2b7155..abb33dbd286 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/lazy-mint-form.tsx
@@ -341,6 +341,7 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
           Cancel
         </Button>
         <TransactionButton
+          client={contract.client}
           isLoggedIn={isLoggedIn}
           txChainID={contract.chain.id}
           transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
index ccd85276f44..37026578bf9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/mint-form.tsx
@@ -365,6 +365,7 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
         </Button>
         <TransactionButton
           txChainID={contract.chain.id}
+          client={contract.client}
           transactionCount={1}
           isPending={sendAndConfirmTx.isPending}
           form={MINT_FORM_ID}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
index 89fa82d7a3f..03f7213a6e9 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/reveal-button.tsx
@@ -153,6 +153,7 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
           </form>
           <div className="mt-4 flex justify-end">
             <TransactionButton
+              client={contract.client}
               isLoggedIn={isLoggedIn}
               txChainID={contract.chain.id}
               transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
index 510320a113b..afa81a8359b 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/shared-metadata-form.tsx
@@ -290,6 +290,7 @@ export const SharedMetadataForm: React.FC<{
           Cancel
         </Button>
         <TransactionButton
+          client={contract.client}
           txChainID={contract.chain.id}
           transactionCount={1}
           isPending={sendAndConfirmTx.isPending}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
index f89c0eec013..9bbd1d211cd 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/permissions/components/index.tsx
@@ -127,6 +127,7 @@ export function Permissions({
           </Button>
           <TransactionButton
             isLoggedIn={isLoggedIn}
+            client={contract.client}
             txChainID={contract.chain.id}
             transactionCount={1}
             disabled={!form.formState.isDirty}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
index a1b46fa46e0..748f9edc537 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/delegate-button.tsx
@@ -38,6 +38,7 @@ export const DelegateButton: React.FC<VoteButtonProps> = ({
   return (
     <ToolTipLabel label="You need to delegate tokens to this contract before you can make proposals and vote.">
       <TransactionButton
+        client={contract.client}
         isLoggedIn={isLoggedIn}
         txChainID={contract.chain.id}
         transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
index d63f00a58a7..79948ad4e19 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal-button.tsx
@@ -106,6 +106,7 @@ export const ProposalButton: React.FC<VoteButtonProps> = ({
             Cancel
           </Button>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
index bec0564f445..be8b4ebb010 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx
@@ -137,6 +137,7 @@ export const Proposal: React.FC<IProposal> = ({
       tokensDelegatedQuery.data ? (
         <div className="mt-6 flex gap-2">
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             size="sm"
@@ -151,6 +152,7 @@ export const Proposal: React.FC<IProposal> = ({
             </div>
           </TransactionButton>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             size="sm"
@@ -166,6 +168,7 @@ export const Proposal: React.FC<IProposal> = ({
             </div>
           </TransactionButton>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             size="sm"
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
index 49d1f42ab6f..b27e6187c55 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/claim-tokens/claim-tokens-ui.tsx
@@ -386,6 +386,7 @@ export function ClaimTokenCardUI(props: {
 
           {account ? (
             <TransactionButton
+              client={props.contract.client}
               transactionCount={undefined}
               checkBalance={false}
               isLoggedIn={true}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
index 71bf43990a9..7dc46eacd0c 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/metadata.tsx
@@ -330,6 +330,7 @@ export const SettingsMetadata = ({
 
         <AdminOnly contract={contract}>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
index 83e10c1e079..60cf9102e7d 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/platform-fees.tsx
@@ -176,6 +176,7 @@ export const SettingsPlatformFees = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
index 3016485d36e..0706daba67a 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/primary-sale.tsx
@@ -144,6 +144,7 @@ export const SettingsPrimarySale = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            client={contract.client}
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
             transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
index 27914f20077..df69e74c7cb 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/settings/components/royalties.tsx
@@ -183,6 +183,7 @@ export const SettingsRoyalties = ({
         </Flex>
         <AdminOnly contract={contract}>
           <TransactionButton
+            client={contract.client}
             txChainID={contract.chain.id}
             transactionCount={1}
             disabled={query.isPending || !form.formState.isDirty}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
index 7b6b44f4e51..88a5ab2b4f7 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/split/components/distribute-button.tsx
@@ -77,6 +77,7 @@ export const DistributeButton: React.FC<DistributeButtonProps> = ({
     return (
       <TransactionButton
         isLoggedIn={isLoggedIn}
+        client={contract.client}
         isPending={mutation.isPending}
         onClick={distributeFunds}
         txChainID={contract.chain.id}
@@ -100,6 +101,7 @@ export const DistributeButton: React.FC<DistributeButtonProps> = ({
   return (
     <TransactionButton
       isLoggedIn={isLoggedIn}
+      client={contract.client}
       transactionCount={numTransactions}
       isPending={mutation.isPending}
       onClick={distributeFunds}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
index d863dace2f9..a6150e5eff2 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx
@@ -135,6 +135,7 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
                 </Text>
               )}
               <TransactionButton
+                client={contract.client}
                 isLoggedIn={isLoggedIn}
                 transactionCount={1}
                 isPending={sendTransaction.isPending}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
index d43cffb4c83..88571fb0c4e 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/burn-button.tsx
@@ -98,6 +98,7 @@ export const TokenBurnButton: React.FC<TokenBurnButtonProps> = ({
         <SheetFooter className="mt-10">
           <TransactionButton
             isLoggedIn={isLoggedIn}
+            client={contract.client}
             txChainID={contract.chain.id}
             transactionCount={1}
             form={BURN_FORM_ID}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
index 26e681712dd..c3801de44d5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/claim-button.tsx
@@ -94,6 +94,7 @@ export const TokenClaimButton: React.FC<TokenClaimButtonProps> = ({
           <TransactionButton
             isLoggedIn={isLoggedIn}
             txChainID={contract.chain.id}
+            client={contract.client}
             transactionCount={1}
             form={CLAIM_FORM_ID}
             isPending={form.formState.isSubmitting}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
index 943d927d834..748ca7f68a5 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/mint-button.tsx
@@ -124,6 +124,7 @@ export const TokenMintButton: React.FC<TokenMintButtonProps> = ({
           </form>
           <SheetFooter className="mt-10">
             <TransactionButton
+              client={contract.client}
               isLoggedIn={isLoggedIn}
               txChainID={contract.chain.id}
               transactionCount={1}
diff --git a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
index 7a82288e464..d2b2d2ea336 100644
--- a/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
+++ b/apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/transfer-button.tsx
@@ -101,6 +101,7 @@ export const TokenTransferButton: React.FC<TokenTransferButtonProps> = ({
         </form>
         <SheetFooter className="mt-10">
           <TransactionButton
+            client={contract.client}
             txChainID={contract.chain.id}
             transactionCount={1}
             isLoggedIn={isLoggedIn}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
index 5d8f1f93c8b..332474adb36 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/allowed-operations-section.tsx
@@ -20,7 +20,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { PlusIcon, Trash2Icon } from "lucide-react";
 import { type Control, useFieldArray } from "react-hook-form";
 import type { ThirdwebClient } from "thirdweb";
@@ -163,7 +162,11 @@ export function AllowedOperationsSection({
 
                 {allowedOperationsFields.fields[index]?.signMethod ===
                   "personal_sign" && (
-                  <PersonalSignRestrictions control={control} index={index} />
+                  <PersonalSignRestrictions
+                    control={control}
+                    index={index}
+                    client={client}
+                  />
                 )}
               </div>
             ))}
@@ -449,9 +452,11 @@ function TypedDataRestrictions({
 function PersonalSignRestrictions({
   control,
   index,
+  client,
 }: {
   control: Control<PartnerFormValues>;
   index: number;
+  client: ThirdwebClient;
 }) {
   const personalSignArray = useFieldArray({
     control,
@@ -527,6 +532,7 @@ function PersonalSignRestrictions({
                 control={control}
                 opIndex={index}
                 signIndex={signIndex}
+                client={client}
               />
             ) : (
               <FormField
@@ -573,12 +579,13 @@ function UserOpTransactions({
   control,
   opIndex,
   signIndex,
+  client,
 }: {
   control: Control<PartnerFormValues>;
   opIndex: number;
   signIndex: number;
+  client: ThirdwebClient;
 }) {
-  const client = useThirdwebClient();
   const userOpTransactionsArray = useFieldArray({
     control,
     name: `accessControl.allowedOperations.${opIndex}.allowedPersonalSigns.${signIndex}.allowedTransactions`,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/launch/launch-token.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/launch/launch-token.tsx
index ab756374369..91a9288fa54 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/launch/launch-token.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/launch/launch-token.tsx
@@ -174,6 +174,7 @@ export function LaunchTokenStatus(props: {
         type: "custom",
         custom: (
           <TransactionButton
+            client={props.client}
             variant="default"
             txChainID={Number(formValues.chain)}
             isLoggedIn={true}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
index 690affcdb62..42422b4cbdb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/add-contract-subscription-button.tsx
@@ -2,7 +2,6 @@
 
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import {
   type AddContractSubscriptionInput,
   useEngineAddContractSubscription,
@@ -32,7 +31,7 @@ import { useV5DashboardChain } from "lib/v5-adapter";
 import { CirclePlusIcon } from "lucide-react";
 import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
 import { type UseFormReturn, useForm } from "react-hook-form";
-import { getContract, isAddress } from "thirdweb";
+import { type ThirdwebClient, getContract, isAddress } from "thirdweb";
 import {
   Button,
   Card,
@@ -45,11 +44,12 @@ import {
 interface AddContractSubscriptionButtonProps {
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 export const AddContractSubscriptionButton: React.FC<
   AddContractSubscriptionButtonProps
-> = ({ instanceUrl, authToken }) => {
+> = ({ instanceUrl, authToken, client }) => {
   const disclosure = useDisclosure();
 
   return (
@@ -70,6 +70,7 @@ export const AddContractSubscriptionButton: React.FC<
           instanceUrl={instanceUrl}
           disclosure={disclosure}
           authToken={authToken}
+          client={client}
         />
       )}
     </>
@@ -90,10 +91,12 @@ const AddModal = ({
   instanceUrl,
   disclosure,
   authToken,
+  client,
 }: {
   instanceUrl: string;
   disclosure: UseDisclosureReturn;
   authToken: string;
+  client: ThirdwebClient;
 }) => {
   const { mutate: addContractSubscription } = useEngineAddContractSubscription({
     instanceUrl,
@@ -171,9 +174,17 @@ const AddModal = ({
         <ModalCloseButton />
 
         {modalState === "inputContract" ? (
-          <ModalBodyInputContract form={form} setModalState={setModalState} />
+          <ModalBodyInputContract
+            form={form}
+            setModalState={setModalState}
+            client={client}
+          />
         ) : modalState === "inputData" ? (
-          <ModalBodyInputData form={form} setModalState={setModalState} />
+          <ModalBodyInputData
+            form={form}
+            setModalState={setModalState}
+            client={client}
+          />
         ) : null}
       </ModalContent>
     </Modal>
@@ -183,11 +194,12 @@ const AddModal = ({
 const ModalBodyInputContract = ({
   form,
   setModalState,
+  client,
 }: {
   form: UseFormReturn<AddContractSubscriptionForm>;
   setModalState: Dispatch<SetStateAction<"inputContract" | "inputData">>;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   return (
     <>
       <ModalBody>
@@ -278,9 +290,11 @@ const ModalBodyInputContract = ({
 const ModalBodyInputData = ({
   form,
   setModalState,
+  client,
 }: {
   form: UseFormReturn<AddContractSubscriptionForm>;
   setModalState: Dispatch<SetStateAction<"inputContract" | "inputData">>;
+  client: ThirdwebClient;
 }) => {
   const processEventLogsDisclosure = useDisclosure({
     defaultIsOpen: form.getValues("processEventLogs"),
@@ -372,6 +386,7 @@ const ModalBodyInputData = ({
                           setFilter={(value) =>
                             form.setValue("filterEvents", value)
                           }
+                          client={client}
                         />
                       </Collapse>
                     </div>
@@ -428,6 +443,7 @@ const ModalBodyInputData = ({
                           setFilter={(value) =>
                             form.setValue("filterFunctions", value)
                           }
+                          client={client}
                         />
                       </Collapse>
                     </div>
@@ -464,14 +480,15 @@ const FilterSelector = ({
   form,
   filter,
   setFilter,
+  client,
 }: {
   abiItemType: "function" | "event";
 
   form: UseFormReturn<AddContractSubscriptionForm>;
   filter: string[];
   setFilter: (value: string[]) => void;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   const chain = useV5DashboardChain(form.getValues("chainId"));
   const address = form.getValues("contractAddress");
   const contract = useMemo(
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
index 8afde003a7b..bc11a2eb0a7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/contract-subscriptions-table.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { CopyAddressButton } from "@/components/ui/CopyAddressButton";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import {
   type EngineContractSubscription,
   useEngineRemoveContractSubscription,
@@ -215,6 +214,7 @@ export const ContractSubscriptionTable: React.FC<
             chainId={chainId}
             autoUpdate={autoUpdate}
             authToken={authToken}
+            client={client}
           />
         );
       },
@@ -258,11 +258,12 @@ export const ContractSubscriptionTable: React.FC<
 const ChainLastBlockTimestamp = ({
   chainId,
   blockNumber,
+  client,
 }: {
   chainId: number;
   blockNumber: bigint;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   const chain = useV5DashboardChain(chainId);
   // Get the block timestamp to display how delayed the last processed block is.
   const ethBlockQuery = useQuery({
@@ -298,11 +299,13 @@ const ChainLastBlock = ({
   chainId,
   autoUpdate,
   authToken,
+  client,
 }: {
   instanceUrl: string;
   chainId: number;
   autoUpdate: boolean;
   authToken: string;
+  client: ThirdwebClient;
 }) => {
   const lastBlockQuery = useEngineSubscriptionsLastBlock({
     instanceUrl,
@@ -325,6 +328,7 @@ const ChainLastBlock = ({
           <ChainLastBlockTimestamp
             chainId={chainId}
             blockNumber={BigInt(lastBlockQuery.data)}
+            client={client}
           />
         }
         shouldWrapChildren
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
index bc726d53f97..fba119fe45f 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/components/engine-contract-subscription.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { useEngineContractSubscription } from "@3rdweb-sdk/react/hooks/useEngine";
 import { Flex, FormControl, Switch } from "@chakra-ui/react";
 import { useState } from "react";
@@ -8,16 +7,17 @@ import { FormLabel, Heading, Text, TrackedLink } from "tw-components";
 import { AddContractSubscriptionButton } from "./add-contract-subscription-button";
 import { ContractSubscriptionTable } from "./contract-subscriptions-table";
 
+import type { ThirdwebClient } from "thirdweb";
 interface EngineContractSubscriptionsProps {
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 export const EngineContractSubscriptions: React.FC<
   EngineContractSubscriptionsProps
-> = ({ instanceUrl, authToken }) => {
+> = ({ instanceUrl, authToken, client }) => {
   const [autoUpdate, setAutoUpdate] = useState<boolean>(true);
-  const client = useThirdwebClient();
   const contractSubscriptionsQuery = useEngineContractSubscription({
     instanceUrl,
     authToken,
@@ -67,6 +67,7 @@ export const EngineContractSubscriptions: React.FC<
       <AddContractSubscriptionButton
         instanceUrl={instanceUrl}
         authToken={authToken}
+        client={client}
       />
     </Flex>
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
index a7bbc8a3d67..bf2cdf1cff6 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/contract-subscriptions/page.tsx
@@ -4,7 +4,7 @@ import { EngineContractSubscriptions } from "./components/engine-contract-subscr
 
 export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
-  const { instance, authToken } = await engineInstancePageHandler({
+  const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
     teamSlug: params.team_slug,
     projectSlug: params.project_slug,
@@ -14,6 +14,7 @@ export default async function Page(props: EngineInstancePageProps) {
     <EngineContractSubscriptions
       instanceUrl={instance.url}
       authToken={authToken}
+      client={client}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
index 8b4f7fa4b5b..1ab2d887957 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
@@ -2,7 +2,6 @@
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { UnderlineLink } from "@/components/ui/UnderlineLink";
 import { TrackedUnderlineLink } from "@/components/ui/tracked-link";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import {
   type EngineInstance,
   useEngineBackendWallets,
@@ -21,6 +20,7 @@ interface EngineOverviewProps {
   teamSlug: string;
   projectSlug: string;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 export const EngineOverview: React.FC<EngineOverviewProps> = ({
@@ -28,9 +28,8 @@ export const EngineOverview: React.FC<EngineOverviewProps> = ({
   teamSlug,
   projectSlug,
   authToken,
+  client,
 }) => {
-  const client = useThirdwebClient();
-
   return (
     <div>
       <BackendWalletsSection
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
index b3bde12f86a..eacd6f3a0ae 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/page.tsx
@@ -4,7 +4,7 @@ import type { EngineInstancePageProps } from "./types";
 
 export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
-  const { instance, authToken } = await engineInstancePageHandler({
+  const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
     teamSlug: params.team_slug,
     projectSlug: params.project_slug,
@@ -16,6 +16,7 @@ export default async function Page(props: EngineInstancePageProps) {
       teamSlug={params.team_slug}
       projectSlug={params.project_slug}
       authToken={authToken}
+      client={client}
     />
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
index 25ac436ea03..51ba47c222a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/add-relayer-button.tsx
@@ -1,5 +1,4 @@
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import {
   type CreateRelayerInput,
   useEngineBackendWallets,
@@ -26,17 +25,20 @@ import { useAllChainsData } from "hooks/chains/allChains";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { CirclePlusIcon } from "lucide-react";
 import { useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { isAddress, shortenAddress } from "thirdweb/utils";
 import { Button, FormHelperText, FormLabel } from "tw-components";
 
 interface AddRelayerButtonProps {
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 export const AddRelayerButton: React.FC<AddRelayerButtonProps> = ({
   instanceUrl,
   authToken,
+  client,
 }) => {
   const disclosure = useDisclosure();
 
@@ -58,6 +60,7 @@ export const AddRelayerButton: React.FC<AddRelayerButtonProps> = ({
           instanceUrl={instanceUrl}
           disclosure={disclosure}
           authToken={authToken}
+          client={client}
         />
       )}
     </>
@@ -76,12 +79,13 @@ const AddModal = ({
   instanceUrl,
   disclosure,
   authToken,
+  client,
 }: {
   instanceUrl: string;
   disclosure: UseDisclosureReturn;
   authToken: string;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   const { mutate: createRelayer } = useEngineCreateRelayer({
     instanceUrl,
     authToken,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
index 6529bb420a8..f60712b2a0d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/engine-relayer.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEngineRelayer } from "@3rdweb-sdk/react/hooks/useEngine";
+import type { ThirdwebClient } from "thirdweb";
 import { Heading, Link, Text } from "tw-components";
 import { AddRelayerButton } from "./add-relayer-button";
 import { RelayersTable } from "./relayers-table";
@@ -8,11 +9,13 @@ import { RelayersTable } from "./relayers-table";
 interface EngineRelayerProps {
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 export const EngineRelayer: React.FC<EngineRelayerProps> = ({
   instanceUrl,
   authToken,
+  client,
 }) => {
   const relayers = useEngineRelayer({
     instanceUrl,
@@ -43,8 +46,13 @@ export const EngineRelayer: React.FC<EngineRelayerProps> = ({
         isPending={relayers.isPending}
         isFetched={relayers.isFetched}
         authToken={authToken}
+        client={client}
+      />
+      <AddRelayerButton
+        instanceUrl={instanceUrl}
+        authToken={authToken}
+        client={client}
       />
-      <AddRelayerButton instanceUrl={instanceUrl} authToken={authToken} />
     </div>
   );
 };
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
index 55f5b94bedc..b752fe6382c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/components/relayers-table.tsx
@@ -1,5 +1,4 @@
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import {
   type EngineRelayer,
   type UpdateRelayerInput,
@@ -32,6 +31,7 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import { PencilIcon, Trash2Icon } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import { shortenAddress } from "thirdweb/utils";
 import {
   Button,
@@ -49,6 +49,7 @@ interface RelayersTableProps {
   isPending: boolean;
   isFetched: boolean;
   authToken: string;
+  client: ThirdwebClient;
 }
 
 const columnHelper = createColumnHelper<EngineRelayer>();
@@ -59,12 +60,12 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
   isPending,
   isFetched,
   authToken,
+  client,
 }) => {
   const editDisclosure = useDisclosure();
   const removeDisclosure = useDisclosure();
   const [selectedRelayer, setSelectedRelayer] = useState<EngineRelayer>();
   const { idToChain } = useAllChainsData();
-  const client = useThirdwebClient();
 
   const columns = [
     columnHelper.accessor("chainId", {
@@ -191,6 +192,7 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
           disclosure={editDisclosure}
           instanceUrl={instanceUrl}
           authToken={authToken}
+          client={client}
         />
       )}
       {selectedRelayer && removeDisclosure.isOpen && (
@@ -199,6 +201,7 @@ export const RelayersTable: React.FC<RelayersTableProps> = ({
           disclosure={removeDisclosure}
           instanceUrl={instanceUrl}
           authToken={authToken}
+          client={client}
         />
       )}
     </>
@@ -210,13 +213,14 @@ const EditModal = ({
   disclosure,
   instanceUrl,
   authToken,
+  client,
 }: {
   relayer: EngineRelayer;
   disclosure: UseDisclosureReturn;
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   const { mutate: updateRelayer } = useEngineUpdateRelayer({
     instanceUrl,
     authToken,
@@ -355,13 +359,14 @@ const RemoveModal = ({
   disclosure,
   instanceUrl,
   authToken,
+  client,
 }: {
   relayer: EngineRelayer;
   disclosure: UseDisclosureReturn;
   instanceUrl: string;
   authToken: string;
+  client: ThirdwebClient;
 }) => {
-  const client = useThirdwebClient();
   const { mutate: revokeRelayer } = useEngineRevokeRelayer({
     instanceUrl,
     authToken,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
index c619554fda7..b8a10ccba06 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/relayers/page.tsx
@@ -4,11 +4,17 @@ import { EngineRelayer } from "./components/engine-relayer";
 
 export default async function Page(props: EngineInstancePageProps) {
   const params = await props.params;
-  const { instance, authToken } = await engineInstancePageHandler({
+  const { instance, authToken, client } = await engineInstancePageHandler({
     engineId: params.engineId,
     teamSlug: params.team_slug,
     projectSlug: params.project_slug,
   });
 
-  return <EngineRelayer instanceUrl={instance.url} authToken={authToken} />;
+  return (
+    <EngineRelayer
+      instanceUrl={instance.url}
+      authToken={authToken}
+      client={client}
+    />
+  );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
index 35cdaf0387f..acf5aedc479 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
@@ -8,7 +8,6 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { Form } from "@/components/ui/form";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useState } from "react";
@@ -21,6 +20,7 @@ import ReviewStep from "./ReviewStep";
 
 import { createWebhook } from "@/api/insight/webhooks";
 import { XIcon } from "lucide-react";
+import type { ThirdwebClient } from "thirdweb";
 import { useAbiMultiFetch } from "../hooks/useAbiProcessing";
 import { useTestWebhook } from "../hooks/useTestWebhook";
 import {
@@ -40,16 +40,17 @@ import {
 } from "../utils/webhookTypes";
 
 interface CreateWebhookModalProps {
-  clientId: string;
+  projectClientId: string;
   supportedChainIds: Array<number>;
+  client: ThirdwebClient;
 }
 
 export function CreateWebhookModal({
-  clientId,
+  projectClientId,
   supportedChainIds,
+  client,
 }: CreateWebhookModalProps) {
   const router = useDashboardRouter();
-  const thirdwebClient = useThirdwebClient();
   const [isOpen, setIsOpen] = useState(false);
   const [currentStep, setCurrentStep] = useState<WebhookFormStep>(
     WebhookFormSteps.BasicInfo,
@@ -83,7 +84,7 @@ export function CreateWebhookModal({
 
   const eventAbi = useAbiMultiFetch({
     isOpen,
-    thirdwebClient,
+    thirdwebClient: client,
     chainIds,
     addresses,
     extractSignatures: extractEventSignatures,
@@ -92,7 +93,7 @@ export function CreateWebhookModal({
 
   const txAbi = useAbiMultiFetch({
     isOpen,
-    thirdwebClient,
+    thirdwebClient: client,
     chainIds,
     addresses: toAddresses || "",
     extractSignatures: extractFunctionSignatures,
@@ -127,7 +128,7 @@ export function CreateWebhookModal({
         payload = buildTransactionWebhookPayload(data);
       }
 
-      const response = await createWebhook(payload, clientId);
+      const response = await createWebhook(payload, projectClientId);
       if (response?.error) {
         toast.error(`${response.error}`);
         return;
@@ -213,7 +214,7 @@ export function CreateWebhookModal({
   };
 
   const { testWebhookEndpoint, isTestingMap, testResults, isRecentResult } =
-    useTestWebhook(clientId);
+    useTestWebhook(projectClientId);
 
   const handleTestWebhook = async (webhookUrl: string) => {
     const filterType = formHook.getValues("filterType");
@@ -262,6 +263,7 @@ export function CreateWebhookModal({
 
               {currentStep === WebhookFormSteps.FilterDetails && (
                 <FilterDetailsStep
+                  client={client}
                   form={formHook}
                   eventSignatures={eventAbi.signatures}
                   functionSignatures={txAbi.signatures}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
index ec4f0c6198e..09a8f949d74 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -17,13 +18,11 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { Textarea } from "@/components/ui/textarea";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { cn } from "@/lib/utils";
 import { useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import type { UseFormReturn } from "react-hook-form";
-
-import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
+import type { ThirdwebClient } from "thirdweb";
 import { truncateMiddle } from "../utils/abiUtils";
 import type {
   AbiData,
@@ -46,6 +45,7 @@ interface FilterDetailsStepProps {
   goToPreviousStep: () => void;
   isLoading: boolean;
   supportedChainIds: Array<number>;
+  client: ThirdwebClient;
 }
 
 interface SignatureDropdownProps {
@@ -130,8 +130,8 @@ export function FilterDetailsStep({
   goToPreviousStep,
   isLoading,
   supportedChainIds,
+  client,
 }: FilterDetailsStepProps) {
-  const thirdwebClient = useThirdwebClient();
   const queryClient = useQueryClient();
   const watchFilterType = form.watch("filterType") as
     | "event"
@@ -175,7 +175,7 @@ export function FilterDetailsStep({
                     Array.isArray(field.value) ? field.value.map(Number) : []
                   }
                   onChange={(chainIds) => field.onChange(chainIds.map(String))}
-                  client={thirdwebClient}
+                  client={client}
                   chainIds={supportedChainIds}
                 />
               </FormControl>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
index b7a89b3f20b..3bee109778a 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
@@ -16,6 +16,7 @@ import { format } from "date-fns";
 import { PlayIcon, TrashIcon } from "lucide-react";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
+import type { ThirdwebClient } from "thirdweb";
 import { useTestWebhook } from "../hooks/useTestWebhook";
 import { CreateWebhookModal } from "./CreateWebhookModal";
 import { RelativeTime } from "./RelativeTime";
@@ -31,17 +32,19 @@ function getEventType(filters: WebhookFilters): string {
 
 interface WebhooksTableProps {
   webhooks: WebhookResponse[];
-  clientId: string;
+  projectClientId: string;
   supportedChainIds: number[];
+  client: ThirdwebClient;
 }
 
 export function WebhooksTable({
   webhooks,
-  clientId,
+  projectClientId,
+  client,
   supportedChainIds,
 }: WebhooksTableProps) {
   const [isDeleting, setIsDeleting] = useState<Record<string, boolean>>({});
-  const { testWebhookEndpoint, isTestingMap } = useTestWebhook(clientId);
+  const { testWebhookEndpoint, isTestingMap } = useTestWebhook(projectClientId);
   const router = useDashboardRouter();
 
   const handleDeleteWebhook = async (webhookId: string) => {
@@ -49,7 +52,7 @@ export function WebhooksTable({
 
     try {
       setIsDeleting((prev) => ({ ...prev, [webhookId]: true }));
-      await deleteWebhook(webhookId, clientId);
+      await deleteWebhook(webhookId, projectClientId);
       toast.success("Webhook deleted successfully");
       router.refresh();
     } catch (error) {
@@ -216,8 +219,9 @@ export function WebhooksTable({
     <div className="w-full">
       <div className="mb-4 flex items-center justify-end">
         <CreateWebhookModal
-          clientId={clientId}
+          projectClientId={projectClientId}
           supportedChainIds={supportedChainIds}
+          client={client}
         />
       </div>
       <TWTable
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
index b411631b3d6..f42c8700a52 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
@@ -5,7 +5,9 @@ import {
 } from "@/api/insight/webhooks";
 import { getProject } from "@/api/projects";
 import { TrackedUnderlineLink } from "@/components/ui/tracked-link";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { notFound } from "next/navigation";
+import { getAuthToken } from "../../../../../api/lib/getAuthToken";
 import { CreateWebhookModal } from "./components/CreateWebhookModal";
 import { WebhooksTable } from "./components/WebhooksTable";
 
@@ -13,25 +15,27 @@ export default async function WebhooksPage({
   params,
 }: { params: Promise<{ team_slug: string; project_slug: string }> }) {
   let webhooks: WebhookResponse[] = [];
-  let clientId = "";
   let errorMessage = "";
   let supportedChainIds: number[] = [];
 
-  try {
-    // Await params before accessing properties
-    const resolvedParams = await params;
-    const team_slug = resolvedParams.team_slug;
-    const project_slug = resolvedParams.project_slug;
+  const [authToken, resolvedParams] = await Promise.all([
+    getAuthToken(),
+    params,
+  ]);
 
-    const project = await getProject(team_slug, project_slug);
+  const project = await getProject(
+    resolvedParams.team_slug,
+    resolvedParams.project_slug,
+  );
 
-    if (!project) {
-      notFound();
-    }
+  if (!project || !authToken) {
+    notFound();
+  }
 
-    clientId = project.publishableKey;
+  const projectClientId = project.publishableKey;
 
-    const webhooksRes = await getWebhooks(clientId);
+  try {
+    const webhooksRes = await getWebhooks(projectClientId);
     if (webhooksRes.error) {
       errorMessage = webhooksRes.error;
     } else if (webhooksRes.data) {
@@ -49,6 +53,11 @@ export default async function WebhooksPage({
     console.error("Error loading project or webhooks", error);
   }
 
+  const client = getClientThirdwebClient({
+    jwt: authToken,
+    teamId: project.teamId,
+  });
+
   return (
     <div className="flex grow flex-col">
       <div className="border-b py-10">
@@ -85,7 +94,8 @@ export default async function WebhooksPage({
         ) : webhooks.length > 0 ? (
           <WebhooksTable
             webhooks={webhooks}
-            clientId={clientId}
+            projectClientId={projectClientId}
+            client={client}
             supportedChainIds={supportedChainIds}
           />
         ) : (
@@ -97,7 +107,8 @@ export default async function WebhooksPage({
               </p>
             </div>
             <CreateWebhookModal
-              clientId={clientId}
+              client={client}
+              projectClientId={projectClientId}
               supportedChainIds={supportedChainIds}
             />
           </div>
diff --git a/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
index 703f0018778..36abb6f5c2e 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
@@ -6,6 +6,7 @@ import {
 } from "../../../_utils/authToken";
 import { getSessionById } from "../../api/session";
 import { ChatPageContent } from "../../components/ChatPageContent";
+import { nebulaAppThirdwebClient } from "../../utils/nebulaThirdwebClient";
 
 export default async function Page(props: {
   params: Promise<{
@@ -34,6 +35,7 @@ export default async function Page(props: {
     <ChatPageContent
       accountAddress={accountAddress}
       authToken={authToken}
+      client={nebulaAppThirdwebClient}
       session={session}
       type="new-chat"
       initialParams={undefined}
diff --git a/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
index 7a9fee59956..19d0a4066f7 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
@@ -4,6 +4,7 @@ import {
   getNebulaAuthTokenWalletAddress,
 } from "../../_utils/authToken";
 import { ChatPageContent } from "../components/ChatPageContent";
+import { nebulaAppThirdwebClient } from "../utils/nebulaThirdwebClient";
 
 export default async function Page() {
   const [authToken, accountAddress] = await Promise.all([
@@ -19,6 +20,7 @@ export default async function Page() {
     <ChatPageContent
       accountAddress={accountAddress}
       authToken={authToken}
+      client={nebulaAppThirdwebClient}
       session={undefined}
       type="new-chat"
       initialParams={undefined}
diff --git a/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx b/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
index 0673aa4fa8c..d2eb06179a3 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
@@ -8,10 +8,10 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { ArrowRightIcon, MessageSquareXIcon } from "lucide-react";
 import Link from "next/link";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   useActiveAccount,
   useActiveWalletConnectionStatus,
@@ -35,6 +35,7 @@ export function ChatPageContent(props: {
   session: SessionInfo | undefined;
   accountAddress: string;
   authToken: string;
+  client: ThirdwebClient;
   type: "landing" | "new-chat";
   initialParams:
     | {
@@ -48,7 +49,6 @@ export function ChatPageContent(props: {
   const connectedWallets = useConnectedWallets();
   const setActiveWallet = useSetActiveWallet();
 
-  const client = useThirdwebClient(props.authToken);
   const [userHasSubmittedMessage, setUserHasSubmittedMessage] = useState(false);
   const [messages, setMessages] = useState<Array<ChatMessage>>(() => {
     if (props.session?.history) {
@@ -344,7 +344,7 @@ export function ChatPageContent(props: {
                   authToken={props.authToken}
                   sessionId={sessionId}
                   className="min-w-0 pt-6 pb-32"
-                  client={client}
+                  client={props.client}
                   enableAutoScroll={enableAutoScroll}
                   setEnableAutoScroll={setEnableAutoScroll}
                   sendMessage={handleSendMessage}
@@ -358,7 +358,7 @@ export function ChatPageContent(props: {
                   showContextSelector={true}
                   connectedWallets={connectedWalletsMeta}
                   setActiveWallet={handleSetActiveWallet}
-                  client={client}
+                  client={props.client}
                   prefillMessage={undefined}
                   sendMessage={handleSendMessage}
                   isChatStreaming={isChatStreaming}
diff --git a/apps/dashboard/src/app/nebula-app/(app)/components/ExecuteTransactionCard.tsx b/apps/dashboard/src/app/nebula-app/(app)/components/ExecuteTransactionCard.tsx
index 6d92fcb0464..abb384b03fc 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/components/ExecuteTransactionCard.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/components/ExecuteTransactionCard.tsx
@@ -129,6 +129,7 @@ export function ExecuteTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-5 lg:px-5">
             <TransactionButton
+              client={props.client}
               isPending={props.status.type === "sending"}
               transactionCount={undefined}
               txChainID={txData.chainId}
diff --git a/apps/dashboard/src/app/nebula-app/(app)/components/Swap/SwapCards.tsx b/apps/dashboard/src/app/nebula-app/(app)/components/Swap/SwapCards.tsx
index 4ecc0972f3c..ade5afba0c6 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/components/Swap/SwapCards.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/components/Swap/SwapCards.tsx
@@ -92,6 +92,7 @@ export function SwapTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-4 lg:px-5">
             <TransactionButton
+              client={props.client}
               isPending={props.status.type === "sending"}
               transactionCount={undefined}
               txChainID={swapData.transaction.chainId}
@@ -211,6 +212,7 @@ export function ApproveTransactionCardLayout(props: {
         {props.status.type !== "confirmed" && (
           <div className="flex items-center justify-end border-t px-4 py-4 lg:px-5">
             <TransactionButton
+              client={props.client}
               isPending={isTransactionPending}
               transactionCount={undefined}
               txChainID={swapData.transaction.chainId}
diff --git a/apps/dashboard/src/app/nebula-app/(app)/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/page.tsx
index fff3b9c62b7..541a0c0c884 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/page.tsx
@@ -5,6 +5,7 @@ import {
 } from "../_utils/authToken";
 import { ChatPageContent } from "./components/ChatPageContent";
 import { getChainsForNebula } from "./utils/getChainIds";
+import { nebulaAppThirdwebClient } from "./utils/nebulaThirdwebClient";
 
 export default async function Page(props: {
   searchParams: Promise<{
@@ -28,6 +29,7 @@ export default async function Page(props: {
     <ChatPageContent
       accountAddress={accountAddress}
       authToken={authToken}
+      client={nebulaAppThirdwebClient}
       session={undefined}
       type="landing"
       initialParams={{
diff --git a/apps/dashboard/src/app/nebula-app/login/NebulaConnectEmbedLogin.tsx b/apps/dashboard/src/app/nebula-app/login/NebulaConnectEmbedLogin.tsx
index 9666f535d5e..2ca3c656144 100644
--- a/apps/dashboard/src/app/nebula-app/login/NebulaConnectEmbedLogin.tsx
+++ b/apps/dashboard/src/app/nebula-app/login/NebulaConnectEmbedLogin.tsx
@@ -3,19 +3,20 @@
 import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { NEXT_PUBLIC_TURNSTILE_SITE_KEY } from "@/constants/public-envs";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { Turnstile } from "@marsidev/react-turnstile";
 import { ClientOnly } from "components/ClientOnly/ClientOnly";
 import { isVercel } from "lib/vercel-utils";
 import { useTheme } from "next-themes";
 import { useEffect, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   ConnectEmbed,
   useActiveAccount,
   useActiveWalletConnectionStatus,
 } from "thirdweb/react";
 import { createWallet, inAppWallet } from "thirdweb/wallets";
+import { nebulaAppThirdwebClient } from "../(app)/utils/nebulaThirdwebClient";
 import { getSDKTheme } from "../../(app)/components/sdk-component-theme";
 import { nebulaAAOptions } from "./account-abstraction";
 import {
@@ -100,17 +101,21 @@ function NebulaLoginPageContent(props: {
     screen.id === "login" ||
     !accountAddress
   ) {
-    return <CustomConnectEmbed onLogin={onLogin} />;
+    return (
+      <CustomConnectEmbed onLogin={onLogin} client={nebulaAppThirdwebClient} />
+    );
   }
 
-  return <CustomConnectEmbed onLogin={onLogin} />;
+  return (
+    <CustomConnectEmbed onLogin={onLogin} client={nebulaAppThirdwebClient} />
+  );
 }
 
 function CustomConnectEmbed(props: {
   onLogin: () => void;
+  client: ThirdwebClient;
 }) {
   const { theme } = useTheme();
-  const client = useThirdwebClient();
   const [turnstileToken, setTurnstileToken] = useState<string | undefined>(
     undefined,
   );
@@ -168,7 +173,7 @@ function CustomConnectEmbed(props: {
             },
           }}
           wallets={loginOptions}
-          client={client}
+          client={props.client}
           modalSize="wide"
           theme={getSDKTheme(theme === "light" ? "light" : "dark")}
           className="shadow-lg"
diff --git a/apps/dashboard/src/components/buttons/MismatchButton.tsx b/apps/dashboard/src/components/buttons/MismatchButton.tsx
index 04fe45a3ab0..813dcb4c672 100644
--- a/apps/dashboard/src/components/buttons/MismatchButton.tsx
+++ b/apps/dashboard/src/components/buttons/MismatchButton.tsx
@@ -16,7 +16,6 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { cn } from "@/lib/utils";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { FaucetButton } from "app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton";
@@ -86,6 +85,7 @@ type MistmatchButtonProps = React.ComponentProps<typeof Button> & {
   isLoggedIn: boolean;
   isPending: boolean;
   checkBalance?: boolean;
+  client: ThirdwebClient;
 };
 
 export const MismatchButton = forwardRef<
@@ -104,7 +104,6 @@ export const MismatchButton = forwardRef<
   const activeWalletChain = useActiveWalletChain();
   const [dialog, setDialog] = useState<undefined | "no-funds" | "pay">();
   const { theme } = useTheme();
-  const client = useThirdwebClient();
   const pathname = usePathname();
   const txChain = useV5DashboardChain(txChainId);
   const connectionStatus = useActiveWalletConnectionStatus();
@@ -112,7 +111,7 @@ export const MismatchButton = forwardRef<
   const txChainBalance = useWalletBalance({
     address: account?.address,
     chain: txChain,
-    client,
+    client: props.client,
   });
 
   const networksMismatch = useIsNetworkMismatch(txChainId);
@@ -277,13 +276,13 @@ export const MismatchButton = forwardRef<
                 }}
                 onCloseModal={() => setDialog(undefined)}
                 isLoggedIn={props.isLoggedIn}
-                client={client}
+                client={props.client}
               />
             )}
 
             {dialog === "pay" && (
               <PayEmbed
-                client={client}
+                client={props.client}
                 theme={getSDKTheme(theme === "dark" ? "dark" : "light")}
                 className="!w-auto"
                 payOptions={{
@@ -392,7 +391,7 @@ function NoFundsDialogContent(props: {
           <div>
             {props.chain.id === localhost.id ? (
               // localhost case
-              <GetLocalHostTestnetFunds />
+              <GetLocalHostTestnetFunds client={props.client} />
             ) : chainWithServiceInfoQuery.data.testnet ? (
               // faucet case
               <GetFundsFromFaucet
@@ -571,21 +570,20 @@ const MismatchNotice: React.FC<{
   );
 };
 
-const GetLocalHostTestnetFunds: React.FC = () => {
+const GetLocalHostTestnetFunds = (props: { client: ThirdwebClient }) => {
   const address = useActiveAccount()?.address;
-  const client = useThirdwebClient();
   const requestFunds = async () => {
     if (!address) {
       return toast.error("No active account detected");
     }
     const faucet = privateKeyToAccount({
       privateKey: LOCAL_NODE_PKEY,
-      client,
+      client: props.client,
     });
     const transaction = prepareTransaction({
       to: address,
       chain: localhost,
-      client,
+      client: props.client,
       value: toWei("10"),
     });
     const promise = sendTransaction({
diff --git a/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx b/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
index e7061d8ba53..2767611df94 100644
--- a/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
+++ b/apps/dashboard/src/components/buttons/TransactionButton.stories.tsx
@@ -190,6 +190,7 @@ function Variant(props: {
   return (
     <BadgeContainer label={props.label}>
       <TransactionButton
+        client={storybookThirdwebClient}
         disabled={props.disabled}
         className={props.className}
         variant={props.variant}
diff --git a/apps/dashboard/src/components/buttons/TransactionButton.tsx b/apps/dashboard/src/components/buttons/TransactionButton.tsx
index 6673d472dab..70042e8eefa 100644
--- a/apps/dashboard/src/components/buttons/TransactionButton.tsx
+++ b/apps/dashboard/src/components/buttons/TransactionButton.tsx
@@ -12,6 +12,7 @@ import { useActiveChainAsDashboardChain } from "lib/v5-adapter";
 import { ArrowLeftRightIcon, ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useMemo, useRef, useState } from "react";
+import type { ThirdwebClient } from "thirdweb";
 import {
   useActiveAccount,
   useActiveWallet,
@@ -30,6 +31,7 @@ type TransactionButtonProps = Omit<ButtonProps, "variant"> & {
   variant?: "destructive" | "primary" | "default";
   isLoggedIn: boolean;
   checkBalance?: boolean;
+  client: ThirdwebClient;
 };
 
 export const TransactionButton: React.FC<TransactionButtonProps> = ({
@@ -40,6 +42,7 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
   variant,
   isLoggedIn,
   checkBalance,
+  client,
   ...restButtonProps
 }) => {
   const activeWallet = useActiveWallet();
@@ -64,6 +67,7 @@ export const TransactionButton: React.FC<TransactionButtonProps> = ({
     <Popover open={walletRequiresExternalConfirmation && isPending}>
       <PopoverTrigger asChild>
         <MismatchButton
+          client={client}
           isPending={isPending}
           variant={variant || "primary"}
           isLoggedIn={isLoggedIn}
diff --git a/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx b/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
index a8ade90f858..7a7b4fb563c 100644
--- a/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
+++ b/apps/dashboard/src/components/contract-functions/interactive-abi-function.tsx
@@ -540,6 +540,7 @@ export const InteractiveAbiFunction: React.FC<InteractiveAbiFunctionProps> = (
                 Simulate
               </Button>
               <TransactionButton
+                client={contract.client}
                 disabled={
                   !abiFunction || txSimulation.isPending || mutationLoading
                 }
diff --git a/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx b/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
index 61e86bc0adf..a7f7b65b727 100644
--- a/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
+++ b/apps/dashboard/src/core-ui/batch-upload/batch-lazy-mint.tsx
@@ -19,6 +19,7 @@ import { ChevronLeftIcon, EyeIcon, EyeOffIcon } from "lucide-react";
 import { useRef, useState } from "react";
 import { useDropzone } from "react-dropzone";
 import { useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import type { CreateDelayedRevealBatchParams } from "thirdweb/extensions/erc721";
 import type { NFTInput } from "thirdweb/utils";
 import {
@@ -53,6 +54,7 @@ interface BatchLazyMintEVMProps {
   canCreateDelayedRevealBatch: boolean;
   onSubmit: (formData: SubmitType) => Promise<unknown>;
   chainId: number;
+  client: ThirdwebClient;
 }
 
 type BatchLazyMintProps = BatchLazyMintEVMProps;
@@ -262,6 +264,7 @@ export const BatchLazyMint: ComponentWithChildren<
               </CheckboxWithLabel>
               <div className="w-full md:w-[61%]">
                 <TransactionButton
+                  client={props.client}
                   txChainID={props.chainId}
                   className="mt-4 w-full"
                   transactionCount={1}