diff --git a/.gitea/workflows/deploy-frontend.yaml b/.gitea/workflows/deploy-frontend.yaml index 1f604639..789fa08e 100644 --- a/.gitea/workflows/deploy-frontend.yaml +++ b/.gitea/workflows/deploy-frontend.yaml @@ -47,11 +47,11 @@ jobs: cat > packages/deployer/config.yml < void; isVisible: boolean; }) => { + const { setIframe, isNetworkAvailable, networkData } = useAddNetwork(); + useEffect(() => { const handleMessage = (event: MessageEvent) => { if (event.origin !== VITE_WALLET_IFRAME_URL) return; - if (event.data.type === 'WALLET_ACCOUNTS_DATA') { + if (event.data.type === WALLET_ACCOUNTS_DATA) { setIsDataReceived(true); if (event.data.data.length === 0) { - console.error(`Accounts not present for chainId: ${VITE_LACONICD_CHAIN_ID}`); + console.error(`Accounts not present for chainId: ${networkData?.chainId}`); return; } @@ -41,9 +44,14 @@ const ApproveTransactionModal = ({ return () => { window.removeEventListener('message', handleMessage); }; - }, []); + }, [networkData]); const getDataFromWallet = useCallback(() => { + if (!networkData) { + console.error('networkData should not be empty'); + return; + } + const iframe = document.getElementById('walletIframe') as HTMLIFrameElement; if (!iframe.contentWindow) { @@ -53,12 +61,18 @@ const ApproveTransactionModal = ({ iframe.contentWindow.postMessage( { - type: 'REQUEST_WALLET_ACCOUNTS', - chainId: VITE_LACONICD_CHAIN_ID, + type: REQUEST_WALLET_ACCOUNTS, + chainId: networkData.chainId, }, VITE_WALLET_IFRAME_URL, ); - }, []); + }, [networkData]); + + useEffect(() => { + if (isNetworkAvailable) { + getDataFromWallet(); + } + }, [isNetworkAvailable, getDataFromWallet]) return ( @@ -80,7 +94,7 @@ const ApproveTransactionModal = ({ }} >