fix(Refresh): some websocket fixes, and merge conflict fixes

packages/blockchain-wallet-v4-frontend/src/data/components/requestBtc/sagaRegister.js

@@ -1,13 +1,11 @@
-import { takeEvery, takeLatest } from 'redux-saga/effects'
+import { takeLatest } from 'redux-saga/effects'
 import * as requestAT from './actionTypes'
-import * as AT from '../../actionTypes'
 import sagas from './sagas'
 
 export default () => {
   const requestBtcSagas = sagas()
 
   return function * () {
     yield takeLatest(requestAT.REQUEST_BTC_FIRST_STEP_SUBMIT_CLICKED, requestBtcSagas.firstStepSubmitClicked)
-    yield takeEvery(AT.core.webSocket.bitcoin.PAYMENT_RECEIVED, requestBtcSagas.btcPaymentReceived)
   }
 }

packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.js

@@ -11,7 +11,6 @@ import priceChart from './priceChart/sagaRegister'
 import priceTicker from './priceTicker/sagaRegister'
 import refresh from './refresh/sagaRegister'
 import requestBtc from './requestBtc/sagaRegister'
-import requestEth from './requestEth/sagaRegister'
 import sendBch from './sendBch/sagaRegister'
 import sendBtc from './sendBtc/sagaRegister'
 import sendEth from './sendEth/sagaRegister'
@@ -32,7 +31,6 @@ export default ({ api, coreSagas }) => function * () {
   yield fork(priceTicker({ coreSagas }))
   yield fork(refresh())
   yield fork(requestBtc())
-  yield fork(requestEth())
   yield fork(sendBch({ api, coreSagas }))
   yield fork(sendBtc({ api, coreSagas }))
   yield fork(sendEth({ api, coreSagas }))

packages/blockchain-wallet-v4-frontend/src/data/components/sagas.js

@@ -10,7 +10,6 @@ import priceChart from './priceChart/sagas'
 import priceTicker from './priceTicker/sagas'
 import refresh from './refresh/sagas'
 import requestBtc from './requestBtc/sagas'
-import requestEth from './requestEth/sagas'
 import sendBch from './sendBch/sagas'
 import sendBtc from './sendBtc/sagas'
 import sendEth from './sendEth/sagas'
@@ -31,7 +30,6 @@ export default ({ api, coreSagas }) => ({
   priceTicker: priceTicker({ coreSagas }),
   refresh: refresh(),
   requestBtc: requestBtc(),
-  requestEth: requestEth(),
   sendBch: sendBch({ api, coreSagas }),
   sendBtc: sendBtc({ api, coreSagas }),
   sendEth: sendEth({ api, coreSagas }),

packages/blockchain-wallet-v4-frontend/src/data/middleware/webSocket/bch/sagas.js

@@ -26,13 +26,13 @@ export default ({ api, bchSocket }) => {
         case 'utx':
           // Find out if the transaction is sent/received to show a notification
           const context = yield select(selectors.core.wallet.getContext)
-          const data = yield call(api.fetchBlockchainData, context, { n: 50, offset: 0 })
+          const data = yield call(api.fetchBchData, context, { n: 50, offset: 0 })
           const transactions = data.txs || []
           for (let i in transactions) {
             const transaction = transactions[i]
             if (equals(transaction.hash, message.x.hash)) {
               if (transaction.result > 0) {
-                yield put(actions.alerts.displaySuccess(T.PAYMENT_RECEIVED_BTC))
+                yield put(actions.alerts.displaySuccess(T.PAYMENT_RECEIVED_BCH))
               }
               break
             }

packages/blockchain-wallet-v4-frontend/src/data/middleware/webSocket/btc/sagas.js

@@ -6,7 +6,6 @@ import * as T from 'services/AlertService'
 import { Wrapper } from 'blockchain-wallet-v4/src/types'
 import { Socket } from 'blockchain-wallet-v4/src/network'
 
-// TO REVIEW
 export default ({ api, btcSocket }) => {
   const send = btcSocket.send.bind(btcSocket)
 
@@ -52,7 +51,7 @@ export default ({ api, btcSocket }) => {
             }
           }
           // Refresh data
-          yield put(actions.core.data.bch.fetchData())
+          yield put(actions.core.data.bitcoin.fetchData())
           // If we are on the transaction page, fetch transactions related to the selected account
           const pathname = yield select(selectors.router.getPathname)
           if (equals(pathname, '/btc/transactions')) {

packages/blockchain-wallet-v4-frontend/src/data/middleware/webSocket/eth/sagas.js

@@ -3,11 +3,10 @@ import * as actions from '../../../actions'
 import * as actionTypes from '../../../actionTypes'
 import * as selectors from '../../../selectors'
 import * as T from 'services/AlertService'
-import { equals, prop } from 'ramda'
+import { equals } from 'ramda'
 const ACCOUNT_SUB = 'account_sub'
 const BLOCK_SUB = 'block_sub'
 
-// TO REVIEW
 export default ({ api, ethSocket }) => {
   const send = ethSocket.send.bind(ethSocket)