Fix merge errors

common/components/ConfirmationModal/components/Body/Body.tsx

@@ -6,13 +6,14 @@ import { connect } from 'react-redux';
 import { AppState } from 'reducers';
 import './Body.scss';
 import { getNetworkConfig } from 'selectors/config';
+import { NetworkConfig } from 'types/network';
 
 interface State {
   showDetails: boolean;
 }
 
 interface StateProps {
-  network: AppState['config']['network'];
+  network: NetworkConfig;
 }
 
 class BodyClass extends React.Component<StateProps, State> {

common/components/ConfirmationModal/components/Body/components/Amounts.tsx

@@ -6,7 +6,7 @@ import { getAllUSDValuesFromSerializedTx, AllUSDValues } from 'selectors/rates';
 import { SerializedTxParams, getParamsFromSerializedTx } from 'selectors/transaction';
 import { connect } from 'react-redux';
 import { getNetworkConfig } from 'selectors/config';
-import { NetworkConfig } from 'config';
+import { NetworkConfig } from 'types/network';
 
 interface StateProps extends SerializedTxParams, AllUSDValues {
   network: NetworkConfig;

common/components/ConfirmationModal/components/Body/components/Details.tsx

@@ -4,9 +4,9 @@ import './Details.scss';
 import { SerializedTransaction } from 'components/renderCbs';
 import { AppState } from 'reducers';
 import { getNodeConfig } from 'selectors/config';
-import { NodeConfig } from 'config';
 import { connect } from 'react-redux';
 import { TokenValue } from 'libs/units';
+import { NodeConfig } from 'types/node';
 
 interface StateProps {
   node: NodeConfig;

common/components/CurrentCustomMessage.tsx

@@ -4,7 +4,8 @@ import { AppState } from 'reducers';
 import { getCurrentTo, ICurrentTo } from 'selectors/transaction';
 import { getAllTokens } from 'selectors/config';
 import { getWalletInst } from 'selectors/wallet';
-import { getAddressMessage, Token } from 'config';
+import { getAddressMessage } from 'config';
+import { Token } from 'types/network';
 
 interface ReduxProps {
   currentTo: ICurrentTo;

common/libs/wallet/non-deterministic/web3.ts

@@ -70,7 +70,7 @@ export default class Web3Wallet implements IFullWallet {
 
   private async networkCheck(lib: Web3Node) {
     const netId = await lib.getNetVersion();
-    const netName = networkIdToName(netId);
+    const netName = networkIdToName(netId as any);
     if (this.network !== netName) {
       throw new Error(
         `Expected MetaMask / Mist network to be ${

common/reducers/config/networks/staticNetworks.ts

@@ -129,7 +129,7 @@ const INITIAL_STATE: State = {
     chainId: 2,
     isCustom: false,
     color: '#673ab7',
-    blockExplorer: makeExplorer('http://www.gander.tech'),
+    blockExplorer: makeExplorer('https://www.gander.tech'),
     tokens: require('config/tokens/exp.json'),
     contracts: require('config/contracts/exp.json'),
     dPathFormats: {

spec/integration/data.int.ts

@@ -6,6 +6,7 @@ import EtherscanNode from 'libs/nodes/etherscan';
 import InfuraNode from 'libs/nodes/infura';
 import RpcNodeTestConfig from './RpcNodeTestConfig';
 import { StaticNodeConfig } from 'types/node';
+import { staticNodesExpectedState } from '../reducers/config/nodes/staticNodes.spec';
 
 const v = new Validator();
 
@@ -79,4 +80,6 @@ const mapNodeEndpoints = (nodes: { [key: string]: StaticNodeConfig }) => {
   });
 };
 
-mapNodeEndpoints(NODES);
+mapNodeEndpoints((staticNodesExpectedState.initialState as any) as {
+  [key: string]: StaticNodeConfig;
+});

spec/pages/SendTransaction.spec.tsx

@@ -11,7 +11,7 @@ import { config } from 'reducers/config';
 Enzyme.configure({ adapter: new Adapter() });
 
 it('render snapshot', () => {
-  const testStateConfig = config(undefined, {});
+  const testStateConfig = config(undefined as any, {} as any);
   const testState = {
     wallet: {},
     balance: {},

spec/reducers/config/networks/staticNetworks.spec.ts

@@ -115,7 +115,7 @@ const expectedInitialState = {
     chainId: 2,
     isCustom: false,
     color: '#673ab7',
-    blockExplorer: makeExplorer('http://www.gander.tech'),
+    blockExplorer: makeExplorer('https://www.gander.tech'),
     tokens: require('config/tokens/exp.json'),
     contracts: require('config/contracts/exp.json'),
     dPathFormats: {