Merge pull request #1390 from KyberNetwork/update-web3js-and-remove-u…

…nused-codes

Update web3js & Remove get block information to checking node connected

package.json

@@ -74,7 +74,7 @@
     "trezor-connect": "^7.0.3",
     "underscore": "^1.8.3",
     "walletlink": "^1.0.0",
-    "web3": "^1.0.0-beta.33",
+    "web3": "^1.2.4",
     "web3-providers-ws": "^1.0.0-beta.34",
     "webpack-dev-server": "^3.1.10",
     "websocket": "^1.0.25",

src/js/actions/globalActions.js

@@ -1,5 +1,3 @@
-import * as converter from "../utils/converter"
-
 export function updateBlock(ethereum, block) {
   return {
     type: "GLOBAL.NEW_BLOCK_INCLUDED_PENDING",
@@ -21,13 +19,6 @@ export function updateBlockFailed(error) {
   }
 }
 
-// export function updateRate(ethereum, source, reserve, ownerAddr) {
-//   return {
-//     type: "GLOBAL.RATE_UPDATED_PENDING",
-//     payload: {ethereum, source, reserve, ownerAddr}
-//   }
-// }
-
 export function updateAllRate(ethereum, tokens) {
   return {
     type: 'GLOBAL.RATE_UPDATE_ALL_PENDING',
@@ -42,13 +33,6 @@ export function updateAllRateComplete(rates, rateUSD) {
   }
 }
 
-export function updateAllRateUSD(ethereum) {
-  return {
-    type: 'GLOBAL.UPDATE_RATE_USD_PENDING',
-    payload: { ethereum }
-  }
-}
-
 export function updateAllRateUSDComplete(rateETHUSD) {
   return {
     type: 'GLOBAL.UPDATE_RATE_USD_FULFILLED',
@@ -123,21 +107,6 @@ export function goToRoute(route) {
   }
 }
 
-
-// export function updateHistoryExchange(ethereum, page, itemPerPage, isAutoFetch) {
-//   return {
-//     type: "GLOBAL.UPDATE_HISTORY_EXCHANGE",
-//     payload: { ethereum, page, itemPerPage, isAutoFetch }
-//   }
-// }
-
-// export function updateHistory(logs, latestBlock, page, eventsCount, isAutoFetch) {
-//   return {
-//     type: "GLOBAL.UPDATE_HISTORY",
-//     payload: { logs, latestBlock, page, eventsCount, isAutoFetch }
-//   }
-// }
-
 export function checkConnection(ethereum, count, maxCount, isCheck) {
   return {
     type: "GLOBAL.CHECK_CONNECTION",
@@ -206,7 +175,6 @@ export function setAnalyzeError(networkIssues, reserveIssues, txHash) {
   }
 }
 
-
 export function throwErrorMematamask(err) {
   return {
     type: "GLOBAL.THROW_ERROR_METAMASK",
@@ -228,13 +196,6 @@ export function setNotiHandler(notiService) {
   }
 }
 
-// export function setMaxGasPrice() {
-//   return {
-//     type: "GLOBAL.SET_MAX_GAS_PRICE",
-//   }
-// }
-
-
 export function setNetworkError(error) {
   return {
     type: "GLOBAL.SET_NETWORK_ERROR",
@@ -255,12 +216,6 @@ export function closeChangeWallet() {
   }
 }
 
-// export function updateTokenStatus() {
-//   return {
-//     type: "GLOBAL.UPDATE_TOKEN_STATUS"
-//   }
-// }
-
 export function setOnMobile(isIOS, isAndroid) {
   return {
     type: "GLOBAL.SET_ON_MOBILE",

src/js/components/Transaction/index.js

@@ -1,11 +1,2 @@
 export { default as TransferForm } from './TransferForm.js';
-
-// export { default as PassphraseModal } from './PassphraseModal.js';
-// export { default as ConfirmTransferModal } from './ConfirmTransferModal.js';
-// export { default as ApproveModal } from './ApproveModal.js';
-// export { default as PostExchangeBtn } from './PostExchangeBtn.js';
-// export { default as PostTransferBtn } from './PostTransferBtn.js';
-
-export { default as TransactionConfig } from './TransactionConfig.js'
 export { default as TransactionLoadingView } from "./TransactionLoadingView.js"
-// export { default as AnalyzeLogModal } from "./AnalyzeLogModal.js"

src/js/containers/Exchange/Exchange.js

@@ -120,7 +120,7 @@ export default class Exchange extends React.Component {
     this.props.dispatch(exchangeActions.caculateAmount(sourceTokenDecimals, destTokenDecimals))
   }
 
-  setInvervalProcess = () => {
+  setIntervalProcess = () => {
     this.setInterValGroup( this.checkKyberEnable, 10000)
     this.setInterValGroup( this.fetchRateExchange, 10000)
     this.setInterValGroup( this.fetchGasExchange, 10000)
@@ -147,7 +147,7 @@ export default class Exchange extends React.Component {
   }
 
   componentDidMount = () =>{
-    this.setInvervalProcess()
+    this.setIntervalProcess()
 
     var {sourceTokenSymbol, sourceToken, destTokenSymbol, destToken} = this.getTokenInit()
 

src/js/containers/Exchange/ExchangeBody.js

@@ -343,7 +343,6 @@ class ExchangeBody extends React.Component {
         isAdvanceActive={this.props.exchange.isAdvanceActive}
         minConversionRate={minConversionRate}
         type="exchange"
-        maxGasPrice={this.props.exchange.maxGasPrice}
       />
     )
   };

src/js/reducers/accountReducer.js

@@ -63,9 +63,6 @@ const account = (state= JSON.parse(JSON.stringify(initState)), action) => {
     case "ACCOUNT.CLOSE_LOADING_IMPORT":{
       return {...state, loading: false}
     }
-    case "ACCOUNT.CLOSE_LOADING_IMPORT": {
-      return {...state, loading: false}
-    }
     case "ACCOUNT.THROW_ERROR": { 
       var error =    {
         error: action.payload, showError: true

src/js/reducers/exchangeReducer.js

@@ -199,10 +199,6 @@ const exchange = (state = initState, action) => {
 
       return newState
     }
-    // case "EXCHANGE.SET_CAP_EXCHANGE": {
-    //   newState.maxCap = action.payload.maxCap
-    //   return newState
-    // }
     case "GLOBAL.SET_GAS_PRICE_COMPLETE": {
       if (!newState.isEditGasPrice) {
         var { safeLowGas, standardGas, fastGas, superFastGas, defaultGas, selectedGas } = action.payload

src/js/sagas/connectionActions.js

@@ -57,7 +57,7 @@ export function* createNewConnection(action) {
   var connectionInstance = new EthereumService()
 
   yield put.resolve(setConnection(connectionInstance))
-  connectionInstance.subcribe()
+  connectionInstance.subscribe()
   yield put.resolve(setMaxGasPrice(connectionInstance))
 
   var web3Service = web3Package.newWeb3Instance()