Skip to content

Commit 4e8d690

Browse files
committed
fix: remove event listener in ummount
1 parent 904f1c0 commit 4e8d690

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

packages/extension-polkagate/src/hooks/useAssetsBalances.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ export default function useAssetsBalances (accounts: AccountJson[] | null, setAl
317317
return;
318318
}
319319

320-
worker.addEventListener('message', (messageEvent: MessageEvent<string>) => {
320+
const handleMessage = (messageEvent: MessageEvent<string>) => {
321321
const message = messageEvent.data;
322322

323323
if (!message) {
@@ -384,7 +384,13 @@ export default function useAssetsBalances (accounts: AccountJson[] | null, setAl
384384
console.log('_assets :::', _assets);
385385

386386
combineAndSetAssets(_assets);
387-
});
387+
};
388+
389+
worker.addEventListener('message', handleMessage);
390+
391+
return () => {
392+
worker.removeEventListener('message', handleMessage);
393+
};
388394
}, [combineAndSetAssets, handleRequestCount, worker]);
389395

390396
const fetchAssetOnRelayChain = useCallback((_addresses: string[], chainName: string) => {

packages/extension-polkagate/src/hooks/useNFT.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default function useNFT (accountsFromContext: AccountJson[] | null) {
3737
setFetching(true);
3838
worker.postMessage({ functionName: NFT_FUNCTION_NAME, parameters: { addresses } });
3939

40-
worker.addEventListener('message', (messageEvent: MessageEvent<string>) => {
40+
const handleMessage = (messageEvent: MessageEvent<string>) => {
4141
const NFTs = messageEvent.data;
4242

4343
if (!NFTs) {
@@ -68,7 +68,13 @@ export default function useNFT (accountsFromContext: AccountJson[] | null) {
6868
saveToStorage(parsedNFTsInfo.results);
6969

7070
// setFetching(false);
71-
});
71+
};
72+
73+
worker.addEventListener('message', handleMessage);
74+
75+
return () => {
76+
worker.removeEventListener('message', handleMessage);
77+
};
7278
}, [notify, saveToStorage, t, worker]);
7379

7480
useEffect(() => {

0 commit comments

Comments
 (0)