Skip to content

Commit 7e84a1b

Browse files
committed
fix(useMetamask.ts): only invoke hookCleanerFn if it's a function and defined
1 parent c529df5 commit 7e84a1b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/useMetamask.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const ACCOUNTS_CHANGED = "accountsChanged"
1515
const ON_DISCONNECT = "disconnect"
1616
const ONE_MINUTE_IN_MS = 60000
1717
const EMPTY_BALANCE = "0.00"
18+
const isFunction = (f) => typeof f === "function"
1819

1920
function useMetamask(onMetamaskHook?): UseMatamaskAPI {
2021
const [error, setError] = useState(null)
@@ -54,7 +55,8 @@ function useMetamask(onMetamaskHook?): UseMatamaskAPI {
5455
metamask.on(ACCOUNTS_CHANGED, setAccounts)
5556
metamask.on(ON_DISCONNECT, handleDisconnect)
5657
metamask.request({ method: "eth_accounts" }).then(setAccounts)
57-
hookCleanerFn = onMetamaskHook ? onMetamaskHook(metamask) : noOp
58+
const hookCleaner = isFunction(onMetamaskHook) && onMetamaskHook(metamask)
59+
hookCleanerFn = isFunction(hookCleaner) ? hookCleaner : noOp
5860
}
5961
window.addEventListener(EVENTS.ON_METAMASK_ERROR, handleEventError)
6062
return () => {

0 commit comments

Comments
 (0)