Skip to content

Commit 65e9c15

Browse files
committed
feat: optimize inject provider
1 parent b93a0b0 commit 65e9c15

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

packages/inpage/setup-inpage-provider.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {rpcStream} from '@fluent-wallet/extension-runtime/rpc-stream.js'
22
import {initProvider} from '@fluent-wallet/provider-api'
3-
import {takeOver} from './take-over-portal'
43
import {announceProvider} from './eip-6963'
54
import {v4 as uuid} from 'uuid'
65

@@ -94,16 +93,17 @@ function setupProvider() {
9493
})
9594

9695
window.fluent = PROVIDER
97-
if (!window.ethereum) window.ethereum = PROVIDER
9896
Object.defineProperty(window, 'conflux', {value: PROVIDER, writable: false})
99-
takeOver(PROVIDER, 'cfx')
100-
if (window.localStorage.getItem(FLUENT_OVERRIDE_WINDOW_DOT_ETHEREUM)) {
97+
if (
98+
!window.ethereum ||
99+
window.localStorage.getItem(FLUENT_OVERRIDE_WINDOW_DOT_ETHEREUM)
100+
) {
101101
try {
102102
Object.defineProperty(window, 'ethereum', {
103103
value: PROVIDER,
104104
writable: false,
105+
configurable: false,
105106
})
106-
takeOver(PROVIDER, 'eth')
107107
} catch (error) {
108108
console.log('Failed to override window.ethereum', error)
109109
}

0 commit comments

Comments
 (0)