diff --git a/src/accountBalances/accountBalancesSaga.js b/src/accountBalances/accountBalancesSaga.js index 6fa67ea..377e28c 100644 --- a/src/accountBalances/accountBalancesSaga.js +++ b/src/accountBalances/accountBalancesSaga.js @@ -1,7 +1,7 @@ import { call, put, select, takeLatest } from 'redux-saga/effects' import { - ACCOUNT_BALANCES_FAILED, ACCOUNT_BALANCE_FETCHED, + ACCOUNT_BALANCES_FAILED, ACCOUNT_BALANCES_FETCHED, ACCOUNT_BALANCES_FETCHING } from './accountBalancesActions' diff --git a/src/blocks/blocksSaga.js b/src/blocks/blocksSaga.js index 8292263..091e7bc 100644 --- a/src/blocks/blocksSaga.js +++ b/src/blocks/blocksSaga.js @@ -1,5 +1,5 @@ import { END, eventChannel } from 'redux-saga' -import { call, put, take, takeEvery, takeLatest, all } from 'redux-saga/effects' +import { all, call, put, take, takeEvery, takeLatest } from 'redux-saga/effects' import * as BlocksActions from './blockActions' /* diff --git a/src/contracts/contractsSaga.js b/src/contracts/contractsSaga.js index 5021f1c..d50d342 100644 --- a/src/contracts/contractsSaga.js +++ b/src/contracts/contractsSaga.js @@ -2,8 +2,6 @@ import { END, eventChannel } from 'redux-saga' import { call, put, select, take, takeEvery } from 'redux-saga/effects' import * as ContractActions from './constants' import * as TransactionsActions from '../transactions/transactionsActions' -import { ACCOUNTS_FAILED, ACCOUNTS_FETCHED, ACCOUNTS_FETCHING } from '../accounts/accountsActions' -import { getNetworkId } from '../web3/web3Saga' /* * Events diff --git a/src/drizzleStatus/drizzleStatusSaga.js b/src/drizzleStatus/drizzleStatusSaga.js index 42f76b6..7879f5e 100644 --- a/src/drizzleStatus/drizzleStatusSaga.js +++ b/src/drizzleStatus/drizzleStatusSaga.js @@ -1,13 +1,13 @@ import { call, put, takeLatest } from 'redux-saga/effects' // Initialization Functions -import { initializeWeb3, getNetworkId } from '../web3/web3Saga' +import { getNetworkId, initializeWeb3 } from '../web3/web3Saga' import { getAccounts } from '../accounts/accountsSaga' import { getAccountBalances } from '../accountBalances/accountBalancesSaga' import * as DrizzleActions from './drizzleActions' import * as BlocksActions from '../blocks/blockActions' -import { NETWORK_ID_CHANGED, NETWORK_IDS, NETWORK_MISMATCH } from '../web3/web3Actions' +import { NETWORK_IDS, NETWORK_MISMATCH } from '../web3/web3Actions' import { CONTRACT_NOT_DEPLOYED } from '../contracts/constants' import { isContractDeployed } from '../contracts/contractsSaga' diff --git a/src/generateStore.js b/src/generateStore.js index 7d12a67..603b364 100644 --- a/src/generateStore.js +++ b/src/generateStore.js @@ -1,5 +1,5 @@ import { all, fork } from 'redux-saga/effects' -import { createStore, applyMiddleware, compose, combineReducers } from 'redux' +import { applyMiddleware, combineReducers, compose, createStore } from 'redux' import createSagaMiddleware from 'redux-saga' import drizzleSagas from './rootSaga' import drizzleReducers from './reducer' diff --git a/src/mergeOptions.js b/src/mergeOptions.js index f30bd87..10ddeae 100644 --- a/src/mergeOptions.js +++ b/src/mergeOptions.js @@ -1,5 +1,5 @@ const merge = require('deepmerge'); -import isPlainObject from 'is-plain-object'; +import isPlainObject from 'is-plain-object' export default function (defaultOptions, newOptions) { return merge(defaultOptions, newOptions, { diff --git a/src/web3/web3Saga.js b/src/web3/web3Saga.js index 9171e75..d3fc3ee 100644 --- a/src/web3/web3Saga.js +++ b/src/web3/web3Saga.js @@ -1,4 +1,4 @@ -import { call, put, takeLatest } from 'redux-saga/effects' +import { call, put } from 'redux-saga/effects' import * as Action from './web3Actions' const Web3 = require('web3');