Skip to content

Fix: handle both loaded and loading states for keplr detection #51

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.

Sign up for GitHub

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

Open
junyoungcross wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: handle both loaded and loading states for keplr detection #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions client-react-hooks/src/keplr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ export const getKeplr = async (): Promise<Keplr> => {
return window.keplr;
}

if (document.readyState === "complete" && window.keplr) {
return window.keplr;
if (document.readyState === "complete") {
if (window.keplr) {
return window.keplr;
}
return Promise.reject(new Error("Failed to find keplr"));
}

return new Promise((resolve) => {
const documentStateChange = (event: Event) => {
if (
event.target &&
(event.target as Document).readyState === "complete"
) {
return new Promise((resolve, reject) => {
const onReadyStateChange = () => {
if (document.readyState === "complete") {
document.removeEventListener("readystatechange", onReadyStateChange);
if (window.keplr) {
resolve(window.keplr);
document.removeEventListener("readystatechange", documentStateChange);
} else {
throw new Error("Failed to find keplr");
reject(new Error("Failed to find keplr"));
}
}
};

document.addEventListener("readystatechange", documentStateChange);
document.addEventListener("readystatechange", onReadyStateChange);
});
};
Loading