-
Notifications
You must be signed in to change notification settings - Fork 101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat/264 - Handle third-party extension events #310
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
09c2165
Enable event handling for Keplr account changes
jurevans 702b1a8
Clean up, add placeholders for Metamask
jurevans 876a9a1
Register ethereum provider events for Metamask
jurevans ab079b1
Provide optional callbacks for handling extension events (for ethereum)
jurevans 7362742
Remove unnecessary log
jurevans bd35ab2
Removed erroneous (and unused) event definition
jurevans File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 5 additions & 12 deletions
17
apps/namada-interface/src/services/extensionEvents/handlers/keplr.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,15 @@ | ||
import { Dispatch } from "react"; | ||
|
||
import { chains } from "@anoma/chains"; | ||
import { Keplr } from "@anoma/integrations"; | ||
|
||
import { addAccounts, fetchBalances } from "slices/accounts"; | ||
|
||
export const KeplrAccountChangedHandler = | ||
(dispatch: Dispatch<unknown>, integration: Keplr) => | ||
async (event: CustomEventInit) => { | ||
const chainId = event.detail?.chainId; | ||
const chain = chains[chainId]; | ||
(dispatch: Dispatch<unknown>, integration: Keplr) => async () => { | ||
const accounts = await integration.accounts(); | ||
|
||
if (chain.extension.id === "keplr") { | ||
const accounts = await integration.accounts(); | ||
|
||
if (accounts) { | ||
dispatch(addAccounts(accounts)); | ||
dispatch(fetchBalances()); | ||
} | ||
if (accounts) { | ||
dispatch(addAccounts(accounts)); | ||
dispatch(fetchBalances()); | ||
} | ||
}; |
19 changes: 5 additions & 14 deletions
19
apps/namada-interface/src/services/extensionEvents/handlers/metamask.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,13 @@ | ||
import { Dispatch } from "react"; | ||
|
||
import { chains } from "@anoma/chains"; | ||
import { Metamask } from "@anoma/integrations"; | ||
|
||
import { addAccounts, fetchBalances } from "slices/accounts"; | ||
|
||
export const MetamaskAccountChangedHandler = | ||
(dispatch: Dispatch<unknown>, integration: Metamask) => | ||
async (event: CustomEventInit) => { | ||
const chainId = event.detail?.chainId; | ||
const chain = chains[chainId]; | ||
|
||
if (chain.extension.id === "metamask") { | ||
const accounts = await integration.accounts(); | ||
(dispatch: Dispatch<unknown>, integration: Metamask) => async () => { | ||
const accounts = await integration.accounts(); | ||
|
||
if (accounts) { | ||
dispatch(addAccounts(accounts)); | ||
dispatch(fetchBalances()); | ||
} | ||
if (accounts) { | ||
dispatch(addAccounts(accounts)); | ||
dispatch(fetchBalances()); | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,43 @@ | ||
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 | ||
useCapture = false, | ||
registerCallback?: EventCallback, | ||
removeCallback?: EventCallback | ||
): void => { | ||
useEffect(() => { | ||
window.addEventListener(event, handler, useCapture); | ||
registerCallback | ||
? registerCallback(event, handler) | ||
: window.addEventListener(event, handler, useCapture); | ||
|
||
return () => { | ||
if (removeCallback) { | ||
return removeCallback(event, handler); | ||
} | ||
window.removeEventListener(event, handler); | ||
}; | ||
}, deps); | ||
}; | ||
|
||
export const useEventListenerOnce = ( | ||
event: string, | ||
handler: (e: CustomEventInit) => void, | ||
useCapture = false | ||
handler: EventHandler, | ||
useCapture = false, | ||
registerCallback?: EventCallback, | ||
removeCallback?: EventCallback | ||
): void => { | ||
useEventListener(event, handler, [], useCapture); | ||
useEventListener( | ||
event, | ||
handler, | ||
[], | ||
useCapture, | ||
registerCallback, | ||
removeCallback | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,19 @@ | ||
// Constants defining events which may be subscribed to | ||
|
||
// Anoma extension events | ||
export enum Events { | ||
AccountChanged = "anoma-account-changed", | ||
TransferStarted = "anoma-transfer-started", | ||
TransferCompleted = "anoma-transfer-completed", | ||
UpdatedBalances = "anoma-updated-balances", | ||
} | ||
|
||
// Keplr extension events | ||
export enum KeplrEvents { | ||
AccountChanged = "keplr_keystorechange", | ||
} | ||
|
||
// Metamask extension window.ethereum events | ||
export enum MetamaskEvents { | ||
AccountChanged = "accountsChanged", | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just a question, but are these guaranteed to run one after the other i.e. is it possible balances will be fetched for the wrong account?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIK in this case it will work because addAccounts is synchronous
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahhh, I see it now. I just assumed
addAccounts
was also asynchronous. Thanks!