Merge pull request #23 from fluencelabs/add-btn-for-wallet

Add wallet button on proof page
fluencelabs · Mar 18, 2024 · 16180a7 · 16180a7
2 parents a279b01 + 4f29b19
commit 16180a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/web/src/context/web3Context.js b/web/src/context/web3Context.js
@@ -47,10 +47,10 @@ const defaultProvider = new providers.JsonRpcProvider(
 export const Web3Context = createContext(null);
 
 export const Web3ContextProvider = ({ children }) => {
-  const { open, close } = useWeb3Modal()
+  const { open } = useWeb3Modal()
   const [provider, setProvider] = useState(defaultProvider);
   const { walletProvider } = useWeb3ModalProvider();
-  const { address, chainId, isConnected } = useWeb3ModalAccount();
+  const { address } = useWeb3ModalAccount();
   const { disconnect: disconnectWallet } = useDisconnect();
 
   const connect = useCallback(async () => {

diff --git a/web/src/pages/proof-page/proof-page.js b/web/src/pages/proof-page/proof-page.js
@@ -16,7 +16,7 @@ import styles from "./proof-page.module.css";
 import { hideString } from "../../utils";
 
 import { checkHasClaimed, storeProof } from "../../store/actions/governance";
-import { ROUTE_CLAIMED, ROUTE_DONE } from "../../constants/routes";
+import { ROUTE_CLAIMED, ROUTE_DONE, ROUTE_WALLET } from "../../constants/routes";
 import { toast } from "react-toastify";
 import { Buffer } from "buffer";
 import { findEthereumSig } from "../../utils/asn1";
@@ -27,8 +27,6 @@ import abis from "../../contracts";
 
 const ProofPage = () => {
   const { address, provider, network } = useWeb3Connection();
-  const { proof } = useSelector((state) => state.governance.values);
-  const [haveProof, setHaveProof] = useState(!!proof);
   const { hasClaimed } = useSelector((state) => state.governance);
   console.log("address", address);
 
@@ -46,17 +44,14 @@ const ProofPage = () => {
     }
   }, [hasClaimed]);
 
-  function fromHex(str) {
-    if (str.startsWith("0x")) {
-      return Buffer.from(str.slice(2), "hex");
-    } else {
-      return Buffer.from(str, "hex");
-    }
-  }
-
   const handleForm = async (e) => {
     e.preventDefault();
 
+    if (!address) {
+      navigate(ROUTE_WALLET);
+      return;
+    }
+
     try {
       // TODO: validate data better
       let [userId, tmpEthAddrNoPrefix, signatureHex, merkleProofHex] =
@@ -292,7 +287,7 @@ const ProofPage = () => {
                 </ul>
 
                 <div className={styles.dashboard__button}>
-                  <Button type="large" text="Submit proof" />
+                  <Button type="large" text={address ? "Submit proof" : "Connect wallet"} />
                 </div>
                 <p className={styles.dashboard__paragraph}>
                   If you are not comfortable submiting the proof via web UI, you