do not use polling for new metamask provider

trufflesuite · Oct 21, 2018 · 36e2758 · 36e2758
1 parent 52955c6
commit 36e2758
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 76 deletions.
diff --git a/dist/drizzle.js b/dist/drizzle.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/drizzleStatus/drizzleStatusSaga.js b/src/drizzleStatus/drizzleStatusSaga.js
@@ -38,12 +38,12 @@ function * initializeDrizzle (action) {
 
     const syncAlways = options.syncAlways
 
-    if (web3.currentProvider.isMetaMask) {
-      // Using MetaMask, attempt block polling.
+    if (web3.currentProvider.isMetaMask && !window.ethereum) {
+      // Using old MetaMask, attempt block polling.
       const interval = options.polls.blocks
       yield put({ type: 'BLOCKS_POLLING', drizzle, interval, web3, syncAlways })
     } else {
-      // Not using MetaMask, attempt subscription block listening.
+      // Not using old MetaMask, attempt subscription block listening.
       yield put({ type: 'BLOCKS_LISTENING', drizzle, web3, syncAlways })
     }