From 5f049d7fc10b9c50c0ac1689d8f8afa13584d00c Mon Sep 17 00:00:00 2001
From: Yu Jiang Tham <yoojbruin@gmail.com>
Date: Mon, 18 Mar 2024 22:52:48 -0400
Subject: [PATCH] Cleanup

---
 package.json                              |  2 +-
 src/components/prove/SubmitQuery.tsx      | 10 +++-------
 src/components/ui/AdvanceStepButton.tsx   |  4 ++--
 src/components/web3/SwitchChainButton.tsx |  4 ++--
 src/lib/webappSettings.ts                 |  1 +
 src/shared/constants.ts                   |  4 ----
 6 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 src/shared/constants.ts

diff --git a/package.json b/package.json
index d8fb7f3..ece5739 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "axiom-scaffold-nextjs",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/src/components/prove/SubmitQuery.tsx b/src/components/prove/SubmitQuery.tsx
index ec3bfc5..922debc 100644
--- a/src/components/prove/SubmitQuery.tsx
+++ b/src/components/prove/SubmitQuery.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Constants } from "@/shared/constants";
 import { useEffect, useState } from "react";
 import {
   useWatchContractEvent,
@@ -8,11 +7,11 @@ import {
   useSimulateContract,
 } from "wagmi";
 import Button from "../ui/Button";
+import Decimals from "../ui/Decimals";
 import { useRouter } from "next/navigation";
 import { formatEther, formatUnits } from "viem";
 import Link from "next/link";
 import { useAxiomCircuit } from '@axiom-crypto/react';
-import Decimals from "../ui/Decimals";
 import { WebappSettings } from "@/lib/webappSettings";
 
 export default function SubmitQuery() {
@@ -23,11 +22,8 @@ export default function SubmitQuery() {
   // Prepare hook for the sendQuery transaction
   // Note: builtQuery should not be null because we check this in BuildQuery.tsx
   const { data } = useSimulateContract({
+    ...builtQuery!,
     address: builtQuery!.address as `0x${string}`,
-    abi: builtQuery!.abi,
-    functionName: builtQuery!.functionName,
-    value: builtQuery!.value,
-    args: builtQuery!.args,
   });
   const { writeContract, isSuccess, isError, isPending } = useWriteContract();
 
@@ -90,7 +86,7 @@ export default function SubmitQuery() {
       return null;
     }
     return (
-      <Link href={`${Constants.EXPLORER_BASE_URL}/query/${builtQuery?.queryId}`} target="_blank">
+      <Link href={`${WebappSettings.explorerBaseUrl}/query/${builtQuery?.queryId}`} target="_blank">
         View status on Axiom Explorer
       </Link>
     )
diff --git a/src/components/ui/AdvanceStepButton.tsx b/src/components/ui/AdvanceStepButton.tsx
index e7f6fa9..263bfea 100644
--- a/src/components/ui/AdvanceStepButton.tsx
+++ b/src/components/ui/AdvanceStepButton.tsx
@@ -4,9 +4,9 @@ import { classes } from "@/lib/utils";
 import Link from "next/link";
 import ConnectWallet from '@/components/web3/ConnectWallet'
 import { useAccount, useSwitchChain } from "wagmi";
-import { Constants } from "@/shared/constants";
 import SwitchChainButton from "../web3/SwitchChainButton";
 import Button from "./Button";
+import { WebappSettings } from "@/lib/webappSettings";
 
 export default function AdvanceStepButton({ label, href, selected, disabled }:{
   label: string,
@@ -19,7 +19,7 @@ export default function AdvanceStepButton({ label, href, selected, disabled }:{
   if (!isConnected) {
     return <ConnectWallet />
   }
-  if (chainId !== Constants.CHAIN_ID_SEPOLIA) {
+  if (chainId !== Number(WebappSettings.chainId)) {
     return <SwitchChainButton switchChain={switchChain} />
   }
   return (
diff --git a/src/components/web3/SwitchChainButton.tsx b/src/components/web3/SwitchChainButton.tsx
index e3e04a4..2fb1f1e 100644
--- a/src/components/web3/SwitchChainButton.tsx
+++ b/src/components/web3/SwitchChainButton.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { Constants } from "@/shared/constants"
 import Button from "../ui/Button"
 import { SwitchChainMutate } from "wagmi/query";
 import { Config } from "wagmi";
+import { WebappSettings } from "@/lib/webappSettings";
 
 export default function SwitchChainButton({ switchChain }: {
   switchChain: SwitchChainMutate<Config, unknown>;
 }) {
   return (
-    <Button onClick={() => switchChain({ chainId: Constants.CHAIN_ID_SEPOLIA })}>
+    <Button onClick={() => switchChain({ chainId: Number(WebappSettings.chainId) })}>
       Switch to Sepolia
     </Button>
   )
diff --git a/src/lib/webappSettings.ts b/src/lib/webappSettings.ts
index 0c34e2c..d647761 100644
--- a/src/lib/webappSettings.ts
+++ b/src/lib/webappSettings.ts
@@ -9,4 +9,5 @@ export const WebappSettings = {
   chainId: "11155111",
   callbackTarget: "0x50F2D5c9a4A35cb922a631019287881f56A00ED5",
   callbackAbi: AverageBalanceAbi,
+  explorerBaseUrl: "https://explorer.axiom.xyz/v2/sepolia",
 }
\ No newline at end of file
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
deleted file mode 100644
index 6621c68..0000000
--- a/src/shared/constants.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const Constants = Object.freeze({
-  EXPLORER_BASE_URL: "https://explorer.axiom.xyz/v2/sepolia",
-  CHAIN_ID_SEPOLIA: 11155111,
-});