From 8e3e3129c5952a898f55d50b68d2e98972a92074 Mon Sep 17 00:00:00 2001
From: emizzle <ericmastro@status.im>
Date: Fri, 10 Aug 2018 12:38:55 +1000
Subject: [PATCH] Fix rebase

---
 embark-ui/src/reducers/index.js | 1 +
 embark-ui/src/routes.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/embark-ui/src/reducers/index.js b/embark-ui/src/reducers/index.js
index 3b941247e..47795b15d 100644
--- a/embark-ui/src/reducers/index.js
+++ b/embark-ui/src/reducers/index.js
@@ -87,6 +87,7 @@ function entities(state = entitiesDefaultState, action) {
 }
 
 function errorMessage(state = null, action) {
+  return action.error || state;
 }
 
 function loading(_state = false, action) {
diff --git a/embark-ui/src/routes.js b/embark-ui/src/routes.js
index 8b3158b51..346b510f5 100644
--- a/embark-ui/src/routes.js
+++ b/embark-ui/src/routes.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {Route, Switch} from 'react-router-dom';
 
 import HomeContainer from './containers/HomeContainer';
+import AccountsContainer from './containers/AccountsContainer';
 import ContractsContainer from './containers/ContractsContainer';
 import NoMatch from './components/NoMatch';
 import ExplorerLayout from './components/ExplorerLayout';