embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embark-ui/src/reducers/index.js
View File

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

1
embark-ui/src/routes.js
View File

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

4
embark-ui/src/sagas/index.js
View File

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