fix: remove event listener in ummount

PolkaGate · Dec 3, 2024 · 4e8d690 · 4e8d690
1 parent 904f1c0
commit 4e8d690
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/extension-polkagate/src/hooks/useAssetsBalances.ts b/packages/extension-polkagate/src/hooks/useAssetsBalances.ts
@@ -317,7 +317,7 @@ export default function useAssetsBalances (accounts: AccountJson[] | null, setAl
       return;
     }
 
-    worker.addEventListener('message', (messageEvent: MessageEvent<string>) => {
+    const handleMessage = (messageEvent: MessageEvent<string>) => {
       const message = messageEvent.data;
 
       if (!message) {
@@ -384,7 +384,13 @@ export default function useAssetsBalances (accounts: AccountJson[] | null, setAl
       console.log('_assets :::', _assets);
 
       combineAndSetAssets(_assets);
-    });
+    };
+
+    worker.addEventListener('message', handleMessage);
+
+    return () => {
+      worker.removeEventListener('message', handleMessage);
+    };
   }, [combineAndSetAssets, handleRequestCount, worker]);
 
   const fetchAssetOnRelayChain = useCallback((_addresses: string[], chainName: string) => {

diff --git a/packages/extension-polkagate/src/hooks/useNFT.tsx b/packages/extension-polkagate/src/hooks/useNFT.tsx
@@ -37,7 +37,7 @@ export default function useNFT (accountsFromContext: AccountJson[] | null) {
     setFetching(true);
     worker.postMessage({ functionName: NFT_FUNCTION_NAME, parameters: { addresses } });
 
-    worker.addEventListener('message', (messageEvent: MessageEvent<string>) => {
+    const handleMessage = (messageEvent: MessageEvent<string>) => {
       const NFTs = messageEvent.data;
 
       if (!NFTs) {
@@ -68,7 +68,13 @@ export default function useNFT (accountsFromContext: AccountJson[] | null) {
       saveToStorage(parsedNFTsInfo.results);
 
       // setFetching(false);
-    });
+    };
+
+    worker.addEventListener('message', handleMessage);
+
+    return () => {
+      worker.removeEventListener('message', handleMessage);
+    };
   }, [notify, saveToStorage, t, worker]);
 
   useEffect(() => {