diff --git a/pages/multi/[address]/index.tsx b/pages/multi/[address]/index.tsx index b5220f4..3c9318d 100644 --- a/pages/multi/[address]/index.tsx +++ b/pages/multi/[address]/index.tsx @@ -29,14 +29,14 @@ const Multipage = () => { const [txType, setTxType] = useState(null); const [holdings, setHoldings] = useState([]); - const [multisigAddress, setMultisigAddress] = useState(""); const [accountOnChain, setAccountOnChain] = useState(null); const [pubkey, setPubkey] = useState(); const [accountError, setAccountError] = useState(null); + const multisigAddress = router.query.address?.toString(); const explorerHref = explorerLinkAccount( process.env.NEXT_PUBLIC_EXPLORER_LINK_ACCOUNT || "", - multisigAddress, + multisigAddress || "", ); const closeForm = () => { @@ -70,12 +70,10 @@ const Multipage = () => { ); useEffect(() => { - const address = router.query.address?.toString(); - if (address) { - setMultisigAddress(address); - fetchMultisig(address); + if (multisigAddress) { + fetchMultisig(multisigAddress); } - }, [fetchMultisig, router.query.address]); + }, [fetchMultisig, multisigAddress]); return ( @@ -107,7 +105,7 @@ const Multipage = () => { ) : null} - {!!txType && !!accountOnChain ? ( + {txType && multisigAddress && accountOnChain ? ( { setCurrentSignatures((prevState: DbSignature[]) => [...prevState, signature]); @@ -101,11 +100,10 @@ const TransactionPage = ({ ); useEffect(() => { - const address = router.query.address?.toString(); - if (address) { - fetchMultisig(address); + if (multisigAddress) { + fetchMultisig(multisigAddress); } - }, [fetchMultisig, router.query.address]); + }, [fetchMultisig, multisigAddress]); const broadcastTx = async () => { try {