fix web3modal

itublockchain · Nov 19, 2023 · bdb3b4f · bdb3b4f
1 parent d4bea74
commit bdb3b4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
@@ -1207,7 +1207,6 @@ export const deployedContracts = {
     },
     PublicResolver: {
       address: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
-<<<<<<< Updated upstream
       abi: [
         {
           inputs: [
@@ -2752,8 +2751,6 @@ export const deployedContracts = {
     },
     PublicResolver: {
       address: "0x747BccC32a03230b62C07A8375f418Ca2a358d21",
-=======
->>>>>>> Stashed changes
       abi: [
         {
           inputs: [

diff --git a/packages/nextjs/pages/_app.tsx b/packages/nextjs/pages/_app.tsx
@@ -4,15 +4,16 @@ import Navbar from "@/components/Navbar"
 import { Lexend } from "next/font/google"
 const lexend = Lexend({ subsets: ["latin"] })
 
-import { Web3Modal } from "../context/Web3Modal";
+import { Web3Modal } from "../context/Web3Modal"
 
 function MyApp({ Component, pageProps }: AppProps) {
 	return (
-			<Web3Modal>
-				<div className={lexend.className}>
-					<w3m-button />
-				</div>
-			</Web3Modal>
+		<Web3Modal>
+			<div className={lexend.className}>
+				<Navbar />
+				<Component {...pageProps} />
+			</div>
+		</Web3Modal>
 	)
 }