Merge pull request #169 from poanetwork/develop-1.x

Merge the develop-1.x branch to the master-1.x branch

Author: akolotov

src/components/Bridge.js

@@ -187,7 +187,9 @@ export class Bridge extends React.Component {
         await this._sendToHome(amount)
       }
     } catch(e) {
-      alertStore.setLoading(false)
+      if(!e.message.includes('not mined within 50 blocks') && !e.message.includes('Failed to subscribe to new newBlockHeaders')) {
+        alertStore.setLoading(false)
+      }
     }
   }
 

src/components/Loading.js

@@ -19,6 +19,7 @@ export class Loading extends React.Component {
           stroke={ 4 }
           progress={progress}
           confirmationNumber={blockConfirmations}
+          hideConfirmationNumber={loadingStepIndex > 1}
         />}
         {loadingStepIndex === 0 && (<img className="loading" src={loadingLogo} alt="loading"/>)}
         {loadingStepIndex === 0 && <div className="loading-i" />}

src/components/ProgressRing.js

@@ -7,9 +7,10 @@ export class ProgressRing extends Component {
   }
 
   render() {
-    const { radius, stroke, progress, confirmationNumber } = this.props
+    const { radius, stroke, progress, confirmationNumber, hideConfirmationNumber } = this.props
     const { circumference, normalizedRadius } = this.state
     const strokeDashoffset = circumference - progress / 100 * circumference
+    const confirmations = hideConfirmationNumber ? '' : `${confirmationNumber}/8`
     return (
       <svg
         height={radius * 2}
@@ -36,7 +37,7 @@ export class ProgressRing extends Component {
           cy={ radius }
         />
         <text x="28" y="47" fontFamily="Nunito" fontSize="18" fill="white">
-          {confirmationNumber}/8
+          {confirmations}
         </text>
       </svg>
     );

src/stores/TxStore.js

@@ -39,7 +39,7 @@ class TxStore {
           addPendingTransaction()
           this.getTxReceipt(hash)
         }).on('error', (e) => {
-          if(!e.message.includes('not mined within 50 blocks')){
+          if(!e.message.includes('not mined within 50 blocks') && !e.message.includes('Failed to subscribe to new newBlockHeaders')){
             this.alertStore.setLoading(false)
             this.alertStore.pushError('Transaction rejected on Metamask');
           }

src/stores/utils/web3.js

@@ -4,31 +4,24 @@ import Web3Utils from 'web3-utils'
 const getWeb3 = () => {
   return new Promise(function (resolve, reject) {
     // Wait for loading completion to avoid race conditions with web3 injection timing.
-    window.addEventListener('load', function () {
+    window.addEventListener('load',async function () {
       let web3 = window.web3
+      const { ethereum } = window
 
-      // Checking if Web3 has been injected by the browser (Mist/MetaMask)
-      if (typeof web3 !== 'undefined') {
-        // Use Mist/MetaMask's provider.
+      if (ethereum) {
+        web3 = new window.Web3(ethereum)
+        try {
+          // Request account access
+          await ethereum.enable()
+          processWeb3(web3, resolve,  reject)
+        } catch (error) {
+          console.log(error)
+          const errorMsg = `Wallet account rejected by user`
+          reject({message: errorMsg})
+        }
+      } else if (typeof web3 !== 'undefined') {
         web3 = new window.Web3(web3.currentProvider)
-        web3.version.getNetwork((err, netId) => {
-          const netIdName = getNetworkName(netId)
-          console.log(`This is ${netIdName} network.`, netId)
-          document.title = `${netIdName} - Bridge UI dApp`
-          const defaultAccount = web3.eth.defaultAccount || null;
-          if(defaultAccount === null){
-            reject({message: 'Please unlock your metamask and refresh the page'})
-          }
-          const results = {
-            web3Instance: new Web3(web3.currentProvider),
-            netIdName,
-            netId,
-            injectedWeb3: true,
-            defaultAccount
-          }
-          resolve(results)
-        })
-
+        processWeb3(web3, resolve,  reject)
       } else {
         // Fallback to localhost if no web3 injection.
         const errorMsg = `Metamask is not installed. Please go to
@@ -94,3 +87,23 @@ export const estimateGas = async (web3, to, gasPrice, from, value, data) =>{
 }
 
 export const getGasPrices = () => fetch('https://gasprice.poa.network/').then(response => response.json())
+
+const processWeb3 = (web3, resolve,  reject) => {
+  web3.version.getNetwork((err, netId) => {
+    const netIdName = getNetworkName(netId)
+    console.log(`This is ${netIdName} network.`, netId)
+    document.title = `${netIdName} - Bridge UI dApp`
+    const defaultAccount = web3.eth.defaultAccount || null;
+    if(defaultAccount === null){
+      reject({message: 'Please unlock your wallet and refresh the page'})
+    }
+    const results = {
+      web3Instance: new Web3(web3.currentProvider),
+      netIdName,
+      netId,
+      injectedWeb3: true,
+      defaultAccount
+    }
+    resolve(results)
+  })
+}