Skip to content
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

Fix/wallet locked issue #1698

Closed
wants to merge 4 commits into from
Closed

Fix/wallet locked issue #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90f1f81
Merge branch 'V3' of github.com:WalletConnect/web3modal into V3
svenvoskamp Jan 3, 2024
24919fc
fix styling on light mode
svenvoskamp Jan 3, 2024
e038dd9
add isUnlocked check
svenvoskamp Jan 3, 2024
fb0a901
Merge branch 'V3' into fix/wallet-locked-issue
svenvoskamp Jan 3, 2024
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
5 changes: 3 additions & 2 deletions packages/ui/src/composites/wui-list-accordion/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ export default css`
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(to top, rgb(42, 42, 42), transparent);
border-radius: var(--wui-border-radius-xs);
background: linear-gradient(to top, var(--wui-color-bg-200), transparent);
border-bottom-left-radius: var(--wui-border-radius-xs);
border-bottom-right-radius: var(--wui-border-radius-xs);
}

.heightContent {
Expand Down
10 changes: 9 additions & 1 deletion packages/wagmi/src/connectors/EIP6963Connector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,18 @@ export class EIP6963Connector extends InjectedConnector {
if (!eip6963Wallet || connectedEIP6963Rdns !== eip6963Wallet.info.rdns) {
glitch-txs marked this conversation as resolved.
Show resolved Hide resolved
return true
}
}

if (
(eip6963Wallet && eip6963Wallet.provider._state?.isUnlocked === undefined) ||
(eip6963Wallet && eip6963Wallet.provider._state?.isUnlocked)
Comment on lines +80 to +81
Copy link
Collaborator

@tomiir tomiir Jan 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't it be the same to check
if (eip6963Wallet && eip6963Wallet.provider?._state?.isUnlocked === true) { return true }

) {
this.#eip6963Wallet = eip6963Wallet

return super.isAuthorized()
}

return super.isAuthorized()
return false
}

public override async getProvider() {
Expand Down
Loading