Merge branch 'main' into return-use-account-balance

scaffold-eth · May 1, 2024 · b728465 · b728465
2 parents a8db932 + 0abf227
commit b728465
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 226 deletions.
diff --git a/packages/nextjs/components/SwitchTheme.tsx b/packages/nextjs/components/SwitchTheme.tsx
@@ -33,12 +33,10 @@ export const SwitchTheme = ({ className }: { className?: string }) => {
         onChange={handleToggle}
         checked={isDarkMode}
       />
-      {
-        <label htmlFor="theme-toggle" className={`swap swap-rotate ${!isDarkMode ? "swap-active" : ""}`}>
-          <SunIcon className="swap-on h-5 w-5" />
-          <MoonIcon className="swap-off h-5 w-5" />
-        </label>
-      }
+      <label htmlFor="theme-toggle" className={`swap swap-rotate ${!isDarkMode ? "swap-active" : ""}`}>
+        <SunIcon className="swap-on h-5 w-5" />
+        <MoonIcon className="swap-off h-5 w-5" />
+      </label>
     </div>
   );
 };
diff --git a/packages/nextjs/hooks/scaffold-eth/useScaffoldWriteContract.ts b/packages/nextjs/hooks/scaffold-eth/useScaffoldWriteContract.ts
@@ -10,8 +10,8 @@ import { notification } from "~~/utils/scaffold-eth";
 import {
   ContractAbi,
   ContractName,
-  scaffoldWriteContractOptions,
-  scaffoldWriteContractVariables,
+  ScaffoldWriteContractOptions,
+  ScaffoldWriteContractVariables,
 } from "~~/utils/scaffold-eth/contract";
 
 /**
@@ -36,8 +36,8 @@ export const useScaffoldWriteContract = <TContractName extends ContractName>(
   const sendContractWriteAsyncTx = async <
     TFunctionName extends ExtractAbiFunctionNames<ContractAbi<TContractName>, "nonpayable" | "payable">,
   >(
-    variables: scaffoldWriteContractVariables<TContractName, TFunctionName>,
-    options?: scaffoldWriteContractOptions,
+    variables: ScaffoldWriteContractVariables<TContractName, TFunctionName>,
+    options?: ScaffoldWriteContractOptions,
   ) => {
     if (!deployedContractData) {
       notification.error("Target Contract is not deployed, did you forget to run `yarn deploy`?");
@@ -86,8 +86,8 @@ export const useScaffoldWriteContract = <TContractName extends ContractName>(
     TContractName extends ContractName,
     TFunctionName extends ExtractAbiFunctionNames<ContractAbi<TContractName>, "nonpayable" | "payable">,
   >(
-    variables: scaffoldWriteContractVariables<TContractName, TFunctionName>,
-    options?: Omit<scaffoldWriteContractOptions, "onBlockConfirmation" | "blockConfirmations">,
+    variables: ScaffoldWriteContractVariables<TContractName, TFunctionName>,
+    options?: Omit<ScaffoldWriteContractOptions, "onBlockConfirmation" | "blockConfirmations">,
   ) => {
     if (!deployedContractData) {
       notification.error("Target Contract is not deployed, did you forget to run `yarn deploy`?");

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -20,6 +20,7 @@
     "@uniswap/sdk-core": "^4.0.1",
     "@uniswap/v2-sdk": "^3.0.1",
     "blo": "^1.0.1",
+    "burner-connector": "^0.0.3",
     "daisyui": "4.5.0",
     "next": "^14.0.4",
     "next-themes": "^0.2.1",

diff --git a/packages/nextjs/services/web3/wagmi-burner/burnerWalletConfig.ts b/packages/nextjs/services/web3/wagmi-burner/burnerWalletConfig.ts
diff --git a/packages/nextjs/services/web3/wagmi-burner/createBurnerConnector.ts b/packages/nextjs/services/web3/wagmi-burner/createBurnerConnector.ts
diff --git a/packages/nextjs/services/web3/wagmiConnectors.tsx b/packages/nextjs/services/web3/wagmiConnectors.tsx
@@ -1,4 +1,3 @@
-import { burnerWalletConfig } from "./wagmi-burner/burnerWalletConfig";
 import { connectorsForWallets } from "@rainbow-me/rainbowkit";
 import {
   coinbaseWallet,
@@ -8,6 +7,7 @@ import {
   safeWallet,
   walletConnectWallet,
 } from "@rainbow-me/rainbowkit/wallets";
+import { rainbowkitBurnerWallet } from "burner-connector";
 import * as chains from "viem/chains";
 import scaffoldConfig from "~~/scaffold.config";
 
@@ -21,7 +21,7 @@ const wallets = [
   rainbowWallet,
   safeWallet,
   ...(!targetNetworks.some(network => network.id !== (chains.hardhat as chains.Chain).id) || !onlyLocalBurnerWallet
-    ? [burnerWalletConfig]
+    ? [rainbowkitBurnerWallet]
     : []),
 ];
 

diff --git a/packages/nextjs/utils/scaffold-eth/contract.ts b/packages/nextjs/utils/scaffold-eth/contract.ts
@@ -179,7 +179,7 @@ export type UseScaffoldReadConfig<
     Omit<UseReadContractParameters, "chainId" | "abi" | "address" | "functionName" | "args">
 >;
 
-export type scaffoldWriteContractVariables<
+export type ScaffoldWriteContractVariables<
   TContractName extends ContractName,
   TFunctionName extends ExtractAbiFunctionNames<ContractAbi<TContractName>, WriteAbiStateMutability>,
 > = IsContractDeclarationMissing<
@@ -197,7 +197,7 @@ export type TransactorFuncOptions = {
   blockConfirmations?: number;
 };
 
-export type scaffoldWriteContractOptions = MutateOptions<
+export type ScaffoldWriteContractOptions = MutateOptions<
   WriteContractReturnType,
   WriteContractErrorType,
   WriteVariables,