Merge pull request #3 from 0xsequence/opt_refactor

waas: otp refactor changes
0xsequence · Nov 21, 2023 · f6e2307 · f6e2307
2 parents 9a6c1f0 + 83870f0
commit f6e2307
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@0xsequence/design-system": "^1.0.13",
     "@0xsequence/indexer": "^1.1.3",
     "@0xsequence/network": "^1.1.3",
-    "@0xsequence/waas": "0.0.0-20231113164400",
+    "@0xsequence/waas": "0.0.0-20231121142317",
     "@react-oauth/google": "^0.11.1",
     "@vanilla-extract/css": "^1.12.0",
     "axios": "^1.6.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/App.tsx b/src/App.tsx
@@ -22,8 +22,8 @@ function App() {
   const [walletAddress, setWalletAddress] = useState<string>()
   const [fetchWalletAddressError, setFetchWalletAddressError] = useState<string>()
 
-  const [sessionValidationSalt, setSessionValidationSalt] = useState<string | undefined>()
   const [sessionValidationCode, setSessionValidationCode] = useState<string[]>([])
+  const [isValidateSessionPending, setIsValidateSessionPending] = useState(false)
   const [isFinishValidateSessionPending, setIsFinishValidateSessionPending] = useState(false)
 
   useEffect(() => {
@@ -47,28 +47,33 @@ function App() {
 
   useEffect(() => {
     const code = sessionValidationCode.join('')
-    if (code.length === 6 && sessionValidationSalt) {
-      sequence.finishValidateSession(sessionValidationSalt, code)
+    if (code.length === 6) {
       setIsFinishValidateSessionPending(true)
+      sequence.finishValidateSession(code)
     }
   }, [sessionValidationCode])
 
-  sequence.onValidationRequired(salt => {
-    setSessionValidationSalt(salt)
-    sequence.waitForSessionValid(600 * 1000, 4000).then((isValid: boolean) => {
-      console.log('isValid', isValid)
-      if (isValid) {
-        setSessionValidationSalt(undefined)
-      }
-      setSessionValidationCode([])
-      setIsFinishValidateSessionPending(false)
+  useEffect(() => {
+    const removeCallback = sequence.onValidationRequired(() => {
+      setIsValidateSessionPending(true)
+
+      sequence.waitForSessionValid(600 * 1000, 4000).then((isValid: boolean) => {
+        console.log('isValid', isValid)
+        setSessionValidationCode([])
+        setIsValidateSessionPending(false)
+        setIsFinishValidateSessionPending(false)
+      })
     })
-  })
+    return () => {
+      removeCallback.then((cb: any) => cb())
+    }
+  }, []);
+
 
   return (
     <>
       <AnimatePresence>
-        {sessionValidationSalt && (
+        {isValidateSessionPending && (
           <Modal>
             <div
               style={{