Add create new account routes, fix conflicts from uat updates

3 files changed, 3 insertions, 4 deletions

diff --git a/ui/app/components/pages/settings/index.js b/ui/app/components/pages/settings/index.js
index 39e9b26ed..384ae4b41 100644
--- a/ui/app/components/pages/settings/index.js
+++ b/ui/app/components/pages/settings/index.js
@@ -5,7 +5,7 @@ const h = require('react-hyperscript')
 const TabBar = require('../../tab-bar')
 const Settings = require('./settings')
 const Info = require('./info')
-const { SETTINGS_ROUTE, INFO_ROUTE } = require('../../../routes')
+const { DEFAULT_ROUTE, SETTINGS_ROUTE, INFO_ROUTE } = require('../../../routes')
 
 class Config extends Component {
   renderTabs () {
@@ -30,7 +30,7 @@ class Config extends Component {
       h('.main-container.settings', {}, [
         h('.settings__header', [
           h('div.settings__close-button', {
-            onClick: () => history.push('/'),
+            onClick: () => history.push(DEFAULT_ROUTE),
           }),
           this.renderTabs(),
         ]),
diff --git a/ui/app/components/pages/settings/info.js b/ui/app/components/pages/settings/info.js
index d8155eb9b..87479c84e 100644
--- a/ui/app/components/pages/settings/info.js
+++ b/ui/app/components/pages/settings/info.js
@@ -100,7 +100,6 @@ Info.propTypes = {
   displayWarning: PropTypes.func,
   revealSeedConfirmation: PropTypes.func,
   warning: PropTypes.string,
-  goHome: PropTypes.func,
   location: PropTypes.object,
   history: PropTypes.object,
 }
diff --git a/ui/app/components/pages/settings/settings.js b/ui/app/components/pages/settings/settings.js
index fb3f20a95..5506df1ae 100644
--- a/ui/app/components/pages/settings/settings.js
+++ b/ui/app/components/pages/settings/settings.js
@@ -11,7 +11,7 @@ const { exportAsFile } = require('../../../util')
 const SimpleDropdown = require('../../dropdowns/simple-dropdown')
 const ToggleButton = require('react-toggle-button')
 const { REVEAL_SEED_ROUTE } = require('../../../routes')
-const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
+const { OLD_UI_NETWORK_TYPE } = require('../../../../../app/scripts/config').enums
 
 const getInfuraCurrencyOptions = () => {
   const sortedCurrencies = infuraCurrencies.objects.sort((a, b) => {