Merge pull request #176 from poanetwork/develop

Merge the develop branch to the master branch

Author: akolotov

src/stores/TxStore.js

@@ -2,6 +2,7 @@ import { action, observable } from "mobx";
 import { estimateGas } from './utils/web3'
 import { addPendingTransaction, removePendingTransaction } from './utils/testUtils'
 import { getUnit } from './utils/bridgeMode'
+import yn from '../components/utils/yn'
 
 class TxStore {
   @observable txsValues = {}
@@ -112,21 +113,21 @@ class TxStore {
               this.alertStore.setBlockConfirmations(8)
               this.alertStore.setLoadingStepIndex(2)
 
-              if (process.env.REACT_APP_FOREIGN_WITHOUT_EVENTS) {
-                this.foreignStore.addWaitingForConfirmation(hash)
-              } else {
+              if (yn(process.env.REACT_APP_FOREIGN_WITHOUT_EVENTS)) {
                 this.foreignStore.waitUntilProcessed(hash).then(() => {
                   this.alertStore.setLoadingStepIndex(3)
                   const unitReceived = getUnit(this.rootStore.bridgeMode).unitForeign
                   setTimeout(() => {
                       this.alertStore.pushSuccess(
-                        `${unitReceived} received on ${this.homeStore.networkName}`,
+                        `${unitReceived} received on ${this.foreignStore.networkName}`,
                         this.alertStore.FOREIGN_TRANSFER_SUCCESS
                       )
                     }
                     , 2000)
                   removePendingTransaction()
                 })
+              } else {
+                this.foreignStore.addWaitingForConfirmation(hash)
               }
             } else {
               if(blockConfirmations > 0) {
@@ -141,22 +142,21 @@ class TxStore {
               this.alertStore.setBlockConfirmations(8)
               this.alertStore.setLoadingStepIndex(2)
 
-              if (process.env.REACT_APP_FOREIGN_WITHOUT_EVENTS) {
-                this.homeStore.addWaitingForConfirmation(hash)
+              if (yn(process.env.REACT_APP_HOME_WITHOUT_EVENTS)) {
+                this.homeStore.waitUntilProcessed(hash, this.txsValues[hash]).then(() => {
+                  this.alertStore.setLoadingStepIndex(3)
+                  const unitReceived = getUnit(this.rootStore.bridgeMode).unitHome
+                  setTimeout(() => {
+                      this.alertStore.pushSuccess(
+                        `${unitReceived} received on ${this.homeStore.networkName}`,
+                        this.alertStore.HOME_TRANSFER_SUCCESS
+                      )
+                    }
+                    , 2000)
+                  removePendingTransaction()
+                })
               } else {
-                this.homeStore.waitUntilProcessed(hash, this.txsValues[hash])
-                  .then(() => {
-                    this.alertStore.setLoadingStepIndex(3)
-                    const unitReceived = getUnit(this.rootStore.bridgeMode).unitHome
-                    setTimeout(() => {
-                        this.alertStore.pushSuccess(
-                          `${unitReceived} received on ${this.foreignStore.networkName}`,
-                          this.alertStore.HOME_TRANSFER_SUCCESS
-                        )
-                      }
-                      , 2000)
-                    removePendingTransaction()
-                  })
+                this.homeStore.addWaitingForConfirmation(hash)
               }
             } else {
               if(blockConfirmations > 0) {

src/stores/utils/bridgeMode.js

@@ -53,8 +53,8 @@ export const getUnit = (bridgeMode) => {
     unitHome = 'Tokens'
     unitForeign = 'Tokens'
   } else if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
-    unitHome = 'Tokens'
-    unitForeign = 'Native coins'
+    unitHome = 'Native coins'
+    unitForeign = 'Tokens'
   } else {
     throw new Error(`Unrecognized bridge mode: ${bridgeMode}`)
   }