fix merge issues

This commit is contained in:
Iuri Matias 2018-08-07 17:43:15 -04:00 committed by Pascal Precht
parent 17c8a4927e
commit bb844caa48
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
3 changed files with 3 additions and 6 deletions

View File

@ -16,9 +16,7 @@ const rootReducer = combineReducers({
contractProfile: contractProfileReducer,
blocks: blocksReducer,
transactions: transactionsReducer,
commands: commandsReducer,
contracts: contractsReducer,
contract: contractReducer
commands: commandsReducer
});
export default rootReducer;

View File

@ -16,7 +16,6 @@ const routes = (
<Route path="/embark/explorer/" component={ExplorerLayout} />
<Route path="/embark/processes/" component={ProcessesLayout} />
<Route path="/embark/explorer/accounts" component={AccountsContainer} />
<Route path="/embark/processes" component={ProcessesContainer} />
<Route path="/embark/contracts/:contractName" component={ContractLayout} />
<Route path="/embark/contracts" component={ContractsContainer} />
<Route component={NoMatch} />

View File

@ -154,9 +154,9 @@ export default function *root() {
fork(watchFetchProcessLogs),
fork(watchListenToProcessLogs),
fork(watchFetchBlock),
fork(watchFetchTransactions)
fork(watchFetchTransactions),
fork(watchFetchTransaction),
fork(watchPostCommand)
fork(watchPostCommand),
fork(watchFetchBlocks),
fork(watchFetchContracts),
fork(watchFetchContract),