Improve multisig

alephium · Aug 29, 2023 · 5a55111 · 5a55111
1 parent 2b46044
commit 5a55111
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/src/components/Multisig/BuildMultisigTx.tsx b/src/components/Multisig/BuildMultisigTx.tsx
@@ -40,6 +40,17 @@ import CopyTextarea from '../Misc/CopyTextarea'
 import { useAlephium, useExplorer, useExplorerFE } from '../../utils/utils'
 
 function BuildMultisigTx() {
+  const initialValues = useMemo(() => {
+    const storedValue = window.localStorage.getItem(newMultisigTxStorageKey)
+    if (storedValue) {
+      try {
+        return JSON.parse(storedValue) as typeof defaultNewMultisigTx
+      } catch (e) {
+        console.log('Failed to parse stored value')
+        return defaultNewMultisigTx
+      }
+    }
+  }, [])
   const form = useForm<{
     multisig: string
     signers: string[]
@@ -53,7 +64,7 @@ function BuildMultisigTx() {
       `destinations.${FORM_INDEX}.alphAmount`,
       `signatures.${FORM_INDEX}.signature`,
     ],
-    initialValues: defaultNewMultisigTx,
+    initialValues: initialValues,
     validate: {
       multisig: (value) => (value === '' ? 'Please select multisig' : null),
       destinations: {
@@ -75,6 +86,7 @@ function BuildMultisigTx() {
       },
     },
   })
+
   const allMultisig = useAllMultisig()
 
   const [submitTxResult, setSubmitTxResult] = useState<
@@ -184,17 +196,6 @@ function BuildMultisigTx() {
     return allMultisig.find((c) => c.name === form.values.multisig)!
   }, [form.values.multisig, allMultisig])
 
-  useEffect(() => {
-    const storedValue = window.localStorage.getItem(newMultisigTxStorageKey)
-    if (storedValue) {
-      try {
-        form.setValues(JSON.parse(storedValue))
-      } catch (e) {
-        console.log('Failed to parse stored value')
-      }
-    }
-  }, [])
-
   useEffect(() => {
     window.localStorage.setItem(
       newMultisigTxStorageKey,
@@ -203,7 +204,7 @@ function BuildMultisigTx() {
   }, [form.values])
 
   const reset = useCallback(() => {
-    form.reset()
+    form.setValues(defaultNewMultisigTx)
     setBuildTxError(undefined)
   }, [form, setBuildTxError])
 

diff --git a/src/components/Multisig/CreateMultisig.tsx b/src/components/Multisig/CreateMultisig.tsx
@@ -18,6 +18,7 @@ import { IconGripVertical, IconSquareRoundedMinus } from '@tabler/icons-react'
 import { useEffect, useMemo, useRef } from 'react'
 import MyBox from '../Misc/MyBox'
 import {
+  MultisigConfig,
   addMultisigConfig,
   buildMultisigAddress,
   defaultNewMultisig,
@@ -35,9 +36,20 @@ function getPubkeyIndexByPath(path: string): number {
 }
 
 function CreateMultisig() {
+  const initialValues = useMemo(() => {
+    const storedValue = window.localStorage.getItem(newMultisigStorageKey)
+    if (storedValue) {
+      try {
+        return JSON.parse(storedValue) as MultisigConfig
+      } catch (e) {
+        console.log('Failed to parse stored value')
+        return defaultNewMultisig
+      }
+    }
+  }, [])
   const form = useForm({
     validateInputOnChange: [`pubkeys.${FORM_INDEX}.pubkey`],
-    initialValues: defaultNewMultisig,
+    initialValues: initialValues,
     validate: {
       name: (value) =>
         value === ''
@@ -66,17 +78,6 @@ function CreateMultisig() {
   const handlers = useRef<NumberInputHandlers>()
   const navigate = useNavigate()
 
-  useEffect(() => {
-    const storedValue = window.localStorage.getItem(newMultisigStorageKey)
-    if (storedValue) {
-      try {
-        form.setValues(JSON.parse(storedValue))
-      } catch (e) {
-        console.log('Failed to parse stored value')
-      }
-    }
-  }, [])
-
   useEffect(() => {
     window.localStorage.setItem(
       newMultisigStorageKey,
@@ -181,7 +182,7 @@ function CreateMultisig() {
           </DragDropContext>
 
           <Group position="apart" mt="lg">
-            <Button variant="light" radius={'md'} onClick={() => form.reset()}>
+            <Button variant="light" radius={'md'} onClick={() => form.setValues(defaultNewMultisig)}>
               Reset Signers
             </Button>
             <Button