Provide optional callbacks for handling extension events (for ethereum)

anoma · Jul 5, 2023 · ab079b1 · ab079b1
1 parent 876a9a1
commit ab079b1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/apps/namada-interface/src/services/extensionEvents/provider.tsx b/apps/namada-interface/src/services/extensionEvents/provider.tsx
@@ -58,7 +58,12 @@ export const ExtensionEventsProvider: React.FC = (props): JSX.Element => {
     MetamaskEvents.AccountChanged,
     metamaskAccountChangedHandler,
     false,
-    true
+    (event, handler) => {
+      window.ethereum.on(event, handler);
+    },
+    (event, handler) => {
+      window.ethereum.removeListener(event, handler);
+    }
   );
 
   return (

diff --git a/packages/hooks/src/useEvent.ts b/packages/hooks/src/useEvent.ts
@@ -1,20 +1,24 @@
 import { useEffect } from "react";
 
+type EventHandler = (e: CustomEventInit) => void;
+type EventCallback = (event: string, handler: EventHandler) => void;
+
 export const useEventListener = (
   event: string,
-  handler: (e: CustomEventInit) => void,
+  handler: EventHandler,
   deps?: React.DependencyList,
   useCapture = false,
-  isEthereumEvent = false
+  registerCallback?: EventCallback,
+  removeCallback?: EventCallback
 ): void => {
   useEffect(() => {
-    isEthereumEvent
-      ? window.ethereum.on(event, handler)
+    registerCallback
+      ? registerCallback(event, handler)
       : window.addEventListener(event, handler, useCapture);
 
     return () => {
-      if (isEthereumEvent) {
-        return window.ethereum.removeListener(event, handler);
+      if (removeCallback) {
+        return removeCallback(event, handler);
       }
       window.removeEventListener(event, handler);
     };
@@ -23,9 +27,17 @@ export const useEventListener = (
 
 export const useEventListenerOnce = (
   event: string,
-  handler: (e: CustomEventInit) => void,
+  handler: EventHandler,
   useCapture = false,
-  isEthereumEvent = false
+  registerCallback?: EventCallback,
+  removeCallback?: EventCallback
 ): void => {
-  useEventListener(event, handler, [], useCapture, isEthereumEvent);
+  useEventListener(
+    event,
+    handler,
+    [],
+    useCapture,
+    registerCallback,
+    removeCallback
+  );
 };