Merge pull request #1531 from Conflux-Chain/fix/ethereum

Fix/ethereum

Author: AngeliaQ

.yarn/versions/f67ceb35.yml

@@ -0,0 +1,4 @@
+releases:
+  browser-extension: patch
+  helios: patch
+  helios-inpage: patch

packages/inpage/setup-inpage-provider.js

@@ -93,12 +93,12 @@ function setupProvider() {
   })
 
   window.fluent = PROVIDER
+  // do not lock window.ethereum if it's not defined
+  if (!window.ethereum) window.ethereum = PROVIDER
   Object.defineProperty(window, 'conflux', {value: PROVIDER, writable: false})
-  if (
-    !window.ethereum ||
-    window.localStorage.getItem(FLUENT_OVERRIDE_WINDOW_DOT_ETHEREUM)
-  ) {
+  if (window.localStorage.getItem(FLUENT_OVERRIDE_WINDOW_DOT_ETHEREUM)) {
     try {
+      // only lock window.ethereum when priority connection is enabled
       Object.defineProperty(window, 'ethereum', {
         value: PROVIDER,
         writable: false,