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

Fix rebase

This commit is contained in:
emizzle 2018-08-10 12:38:55 +10:00 committed by Pascal Precht
parent 8caa478968
commit 8e3e3129c5
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ function entities(state = entitiesDefaultState, action) {
} }
function errorMessage(state = null, action) { function errorMessage(state = null, action) {
return action.error || state;
} }
function loading(_state = false, action) { function loading(_state = false, action) {

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

@ -2,6 +2,7 @@ import React from 'react';
import {Route, Switch} from 'react-router-dom'; import {Route, Switch} from 'react-router-dom';
import HomeContainer from './containers/HomeContainer'; import HomeContainer from './containers/HomeContainer';
import AccountsContainer from './containers/AccountsContainer';
import ContractsContainer from './containers/ContractsContainer'; import ContractsContainer from './containers/ContractsContainer';
import NoMatch from './components/NoMatch'; import NoMatch from './components/NoMatch';
import ExplorerLayout from './components/ExplorerLayout'; import ExplorerLayout from './components/ExplorerLayout';