Merge branch 'add-safe-1.4-rebase' of https://github.com/zkemail/emai…

…l-recovery-demo into add-safe-1.4-rebase
zkemail · Sep 17, 2024 · 662d84a · 662d84a
2 parents 603fd8b + 066ca68
commit 662d84a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 46 deletions.
diff --git a/src/components/GuardianSetup.tsx b/src/components/GuardianSetup.tsx
@@ -190,13 +190,23 @@ const GuardianSetup = () => {
 
       console.debug("recovery configured");
 
-      const command = getRequestGuardianCommand(address);
+      // const command = getRequestGuardianCommand(address);
+
+      const command = await readContract(config, {
+        abi: safeEmailRecoveryModuleAbi,
+        address: safeEmailRecoveryModule as `0x${string}`,
+        functionName: "acceptanceCommandTemplates",
+        args: [],
+      });
+
+      console.log(command[0].join().replace(',', ' ').replace('{ethAddr}', address), "command")
+
       const { requestId } = await relayer.acceptanceRequest(
         safeEmailRecoveryModule as `0x${string}`,
         guardianEmail,
         acctCode,
         templateIdx,
-        command
+        command[0].join()?.replaceAll(',', ' ').replaceAll('{ethAddr}', address)
       );
 
       console.debug("accept req id", requestId);

diff --git a/src/components/RequestedRecoveries.tsx b/src/components/RequestedRecoveries.tsx
@@ -71,13 +71,13 @@ const RequestedRecoveries = () => {
 
     console.log(getRecoveryRequest.currentWeight, getGuardianConfig.threshold);
 
-    // if (getRecoveryRequest.currentWeight < getGuardianConfig.threshold && getGuardianConfig.threshold!==0n) {
-    //   setButtonState(BUTTON_STATES.TRIGGER_RECOVERY);
-    // } else {
-    //   setButtonState(BUTTON_STATES.COMPLETE_RECOVERY);
-    //   setLoading(false);
-    //   clearInterval(interval);
-    // }
+    if (getRecoveryRequest.currentWeight < getGuardianConfig.threshold) {
+      setButtonState(BUTTON_STATES.TRIGGER_RECOVERY);
+    } else {
+      setButtonState(BUTTON_STATES.COMPLETE_RECOVERY);
+      setLoading(false);
+      clearInterval(interval);
+    }
     setIsButtonStateLoading(false);
   };
 
@@ -119,18 +119,19 @@ const RequestedRecoveries = () => {
       );
     }
 
-    const command = getRequestsRecoveryCommandForSafe13(
-      safeOwnersData[0],
-      safeWalletAddress,
-      newOwner
-    );
+    const command = await readContract(config, {
+      abi: safeEmailRecoveryModuleAbi,
+      address: safeEmailRecoveryModule as `0x${string}`,
+      functionName: "recoveryCommandTemplates",
+      args: [],
+    });
 
     try {
       const { requestId } = await relayer.recoveryRequest(
         safeEmailRecoveryModule as string,
         guardianEmailAddress,
         templateIdx,
-        command
+        command[0].join()?.replaceAll(',', ' ').replace('{ethAddr}', safeWalletAddress).replace('{ethAddr}', safeOwnersData[0]).replace('{ethAddr}', newOwner)
       );
       setGuardianRequestId(requestId);
 

diff --git a/src/components/burnerWallet/GuardianSetup.tsx b/src/components/burnerWallet/GuardianSetup.tsx
@@ -251,32 +251,6 @@ const GuardianSetup = () => {
         }
       );
 
-      // const guardianSalt = await relayer.getAccountSalt(
-      //   acctCode,
-      //   guardianEmail
-      // );
-      // const guardianAddr = await readContract(config, {
-      //   abi: universalEmailRecoveryModuleAbi,
-      //   address: universalEmailRecoveryModule as `0x${string}`,
-      //   functionName: "computeEmailAuthAddress",
-      //   args: [address, guardianSalt],
-      // });
-
-      // await writeContractAsync({
-      //   abi: universalEmailRecoveryModuleAbi,
-      //   address: universalEmailRecoveryModule as `0x${string}`,
-      //   functionName: "configureRecovery",
-      //   args: [
-      //     [guardianAddr],
-      //     [1n],
-      //     1n,
-      //     recoveryDelay * TIME_UNITS[recoveryDelayUnit].multiplier,
-      //     recoveryExpiry * 60 * 60 * 24 * 30,
-      //   ],
-      // });
-
-      console.debug("recovery configured");
-
       const subject = getRequestGuardianCommand(address);
       const { requestId } = await relayer.acceptanceRequest(
         universalEmailRecoveryModule as `0x${string}`,
@@ -286,8 +260,6 @@ const GuardianSetup = () => {
         subject
       );
 
-      console.debug("accept req id", requestId);
-
       // Setting up interval for polling
       interval = setInterval(() => {
         checkIfRecoveryIsConfigured();

diff --git a/src/pages/landingPage.tsx b/src/pages/landingPage.tsx
@@ -8,15 +8,18 @@ import gnosisSafeLogo from "../assets/gnosis-safe-logo.svg";
 import AccountBalanceWalletOutlinedIcon from "@mui/icons-material/AccountBalanceWalletOutlined";
 import Toggle from "../components/Toggle";
 import { Link } from "react-router-dom";
-import { useState } from "react";
+import { useContext, useState } from "react";
 import FlowInfoCard from "../components/FlowsInfoCard";
+import { STEPS } from "../constants";
+import { StepsContext } from "../App";
 
 type actionType = "SAFE_WALLET" | "BURNER_WALLET" | "WALLET_RECOVERY";
 type FlowType = "setup" | "recover";
 
 const LandingPage = () => {
   const theme = useTheme();
   const [flow, setFlow] = useState<FlowType>("setup");
+  const stepsContext = useContext(StepsContext);
 
   const navigate = useNavigate();
 
@@ -25,12 +28,15 @@ const LandingPage = () => {
   };
 
   const handleClick = async (action: actionType) => {
+    await stepsContext?.setStep(STEPS.CONNECT_WALLETS);
+    await localStorage.removeItem('accountCode')
+    await localStorage.removeItem('burnerWalletConfig')
+
+
     switch (action) {
       case "SAFE_WALLET":
         return navigate("/safe-wallet");
       case "BURNER_WALLET":
-        await localStorage.removeItem('accountCode')
-        await localStorage.removeItem('burnerWalletConfig')
         return navigate("/burner-wallet");
       case "WALLET_RECOVERY":
         return navigate("/wallet-recovery");