Refactor .request response to handle success and fails.

rsksmart · Apr 7, 2021 · 3788c2d · 3788c2d
1 parent bc0553c
commit 3788c2d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/pages/dapp/browser.js b/src/pages/dapp/browser.js
@@ -328,15 +328,20 @@ class DAppBrowser extends Component {
             }
 
             // ensure window.ethereum.send and window.ethereum.sendAsync are not undefined
-            setInterval(() => {
+            setTimeout(() => {
               if (!window.ethereum.send) {
                 window.ethereum.send = sendAsync;
               }
               if (!window.ethereum.sendAsync) {
                 window.ethereum.sendAsync = sendAsync;
               }
               if (!window.ethereum.request) {
-                window.ethereum.request = (payload) => sendAsync(payload).then(response => response.result)
+                window.ethereum.request = (payload) =>
+                  new Promise((resolve, reject) =>
+                    sendAsync(payload).then(response =>
+                      response.result
+                        ? resolve(response.result)
+                        : reject(new Error(response.message || 'provider error'))));
               }
             }, 1000)
           }