-
Notifications
You must be signed in to change notification settings - Fork 906
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
Allow Disconnect of MWA #960
base: master
Are you sure you want to change the base?
Changes from all commits
3cdb221
4ea7236
f61090c
5642ba7
c72209f
1651cbd
af496bd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,10 +76,7 @@ export function WalletProvider({ | |
} | ||
return [mobileWalletAdapter, ...adaptersWithStandardAdapters]; | ||
}, [adaptersWithStandardAdapters, mobileWalletAdapter]); | ||
const [walletName, setWalletName] = useLocalStorage<WalletName | null>( | ||
localStorageKey, | ||
getIsMobile(adaptersWithStandardAdapters) ? SolanaMobileWalletAdapterWalletName : null | ||
); | ||
const [walletName, setWalletName] = useLocalStorage<WalletName | null>(localStorageKey, null); | ||
const adapter = useMemo( | ||
() => adaptersWithMobileWalletAdapter.find((a) => a.name === walletName) ?? null, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One possibility for this: if the only item in This preserves the existing behavior if the user is on Android mobile (so no other wallets are being injected), the app is passing |
||
[adaptersWithMobileWalletAdapter, walletName] | ||
|
@@ -105,8 +102,6 @@ export function WalletProvider({ | |
if (!adapter) return; | ||
function handleDisconnect() { | ||
if (isUnloadingRef.current) return; | ||
// Leave the adapter selected in the event of a disconnection. | ||
if (walletName === SolanaMobileWalletAdapterWalletName && getIsMobile(adaptersWithStandardAdapters)) return; | ||
setWalletName(null); | ||
} | ||
adapter.on('disconnect', handleDisconnect); | ||
|
@@ -150,7 +145,7 @@ export function WalletProvider({ | |
}; | ||
}, [adaptersWithStandardAdapters, walletName]); | ||
const handleConnectError = useCallback(() => { | ||
if (adapter && adapter.name !== SolanaMobileWalletAdapterWalletName) { | ||
if (adapter) { | ||
// If any error happens while connecting, unset the adapter. | ||
changeWallet(null); | ||
} | ||
|
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.
Not sure there's anything good to be done about this, but if the user has opened the app before, I think it'll probably still have MWA in local storage and selected by default.