Skip to content

Commit

Permalink
fix interaction with Pocket Universe and other extensions that set th…
Browse files Browse the repository at this point in the history
…e injected provider to not be configurable (#36)
  • Loading branch information
mholtzman authored Mar 17, 2023
1 parent 7075cc9 commit c34b04d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 37 deletions.
25 changes: 2 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frame-extension",
"version": "0.10.1",
"version": "0.10.2",
"repository": {
"type": "git",
"url": "git://github.com/floating/frame-extension.git"
Expand Down
30 changes: 18 additions & 12 deletions src/frame.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
import EventEmitter from 'events'
import EthereumProvider from 'ethereum-provider'

function setProvider() {
const existingProvider = Object.getOwnPropertyDescriptor(window, 'ethereum')

if (existingProvider?.configurable) {
Object.defineProperty(window, 'ethereum', {
value: provider,
writable: true,
configurable: true,
enumerable: true
})
} else {
window.ethereum = provider
}
}


function shimWeb3(provider, appearAsMetaMask) {
let loggedCurrentProvider = false

Expand Down Expand Up @@ -119,12 +135,7 @@ if (mmAppear) {
}
}

Object.defineProperty(window, 'ethereum', {
value: provider,
writable: true,
configurable: true,
enumerable: true
})
setProvider()

shimWeb3(window.ethereum, mmAppear)

Expand All @@ -134,12 +145,7 @@ const embedded = {

document.addEventListener('readystatechange', (e) => {
if (document.readyState === 'interactive') {
Object.defineProperty(window, 'ethereum', {
value: provider,
writable: true,
configurable: true,
enumerable: true
})
setProvider()
}
})

Expand Down
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Frame Companion",
"version": "0.10.1",
"version": "0.10.2",
"manifest_version": 2,
"description": "Frame companion creates an injected connection to Frame desktop wallet (required) on macOS, Windows or Linux.",
"homepage_url": "https://github.com/floating/frame",
Expand Down

0 comments on commit c34b04d

Please sign in to comment.