From a2fdf38316b51cecec9ffdb72a7bad0812a13912 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Tue, 13 Jun 2017 11:34:43 +0200
Subject: [PATCH] Additional merge fixes

---
 js/src/ui/Form/Input/input.js                 |  4 --
 js/src/ui/VaultCard/Accounts/accounts.spec.js | 11 +++--
 js/src/views/Accounts/accounts.js             | 11 ++---
 js/src/views/Settings/Views/defaults.js       | 35 --------------
 js/src/views/Settings/Views/views.js          | 47 -------------------
 5 files changed, 11 insertions(+), 97 deletions(-)

diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index 153cd1dbf..72fa2d1cd 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -172,17 +172,13 @@ export default class Input extends Component {
     );
   }
 
-<<<<<<< HEAD
   onChange = (event, { value }) => {
-=======
-  onChange = (event, value) => {
     if (!this.props.allowPaste) {
       if (value.length - this.state.value.length > 8) {
         return;
       }
     }
 
->>>>>>> master
     event.persist();
 
     this.setValue(value, () => {
diff --git a/js/src/ui/VaultCard/Accounts/accounts.spec.js b/js/src/ui/VaultCard/Accounts/accounts.spec.js
index e03388cfc..daf83df0a 100644
--- a/js/src/ui/VaultCard/Accounts/accounts.spec.js
+++ b/js/src/ui/VaultCard/Accounts/accounts.spec.js
@@ -16,12 +16,11 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
+import sinon from 'sinon';
 
 import Accounts from './';
 
 let component;
-<<<<<<< HEAD:js/src/ui/VaultCard/Accounts/accounts.spec.js
-=======
 let store;
 
 function createStore () {
@@ -46,13 +45,17 @@ function createStore () {
 
   return store;
 }
->>>>>>> master:js/src/views/Application/TabBar/tabBar.spec.js
 
 function render (props = {}) {
   component = shallow(
     <Accounts
       { ...props }
-    />
+    />,
+    {
+      context: {
+        store: createStore()
+      }
+    }
   );
 
   return component;
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index 977283abf..25ff83432 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -24,8 +24,8 @@ import { bindActionCreators } from 'redux';
 
 import HardwareStore from '@parity/shared/mobx/hardwareStore';
 import { setVisibleAccounts } from '@parity/shared/redux/providers/personalActions';
-import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '@parity/ui';
-import { AddIcon, FileDownloadIcon } from '@parity/ui/Icons';
+import { Actionbar, ActionbarSearch, ActionbarSort, Button, DappLink, Page } from '@parity/ui';
+import { AddIcon, KeyIcon, FileDownloadIcon } from '@parity/ui/Icons';
 
 import CreateWallet from './CreateWallet';
 import CreateAccount from './CreateAccount';
@@ -241,10 +241,7 @@ class Accounts extends Component {
 
   renderActionbar () {
     const buttons = [
-<<<<<<< HEAD
-=======
       this.renderVaultsButton(),
->>>>>>> master
       <Button
         key='newAccount'
         icon={ <AddIcon /> }
@@ -336,7 +333,7 @@ class Accounts extends Component {
     }
 
     return (
-      <Link
+      <DappLink
         to='/vaults'
         key='vaults'
       >
@@ -350,7 +347,7 @@ class Accounts extends Component {
           }
           onClick={ this.onVaultsClick }
         />
-      </Link>
+      </DappLink>
     );
   }
 
diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
index 4609dd012..9712fdf72 100644
--- a/js/src/views/Settings/Views/defaults.js
+++ b/js/src/views/Settings/Views/defaults.js
@@ -24,41 +24,6 @@ const defaultViews = {
     icon: <AppsIcon />,
     route: '/apps',
     value: 'app'
-<<<<<<< HEAD
-=======
-  },
-
-  contracts: {
-    active: false,
-    onlyPersonal: true,
-    icon: <ContactsIcon />,
-    route: '/contracts',
-    value: 'contract'
-  },
-
-  status: {
-    active: false,
-    onlyPersonal: true,
-    icon: <StatusIcon />,
-    route: '/status',
-    value: 'status'
-  },
-
-  signer: {
-    active: true,
-    fixed: true,
-    icon: <FingerprintIcon />,
-    route: '/signer',
-    value: 'signer'
-  },
-
-  settings: {
-    active: true,
-    fixed: true,
-    icon: <SettingsIcon />,
-    route: '/settings',
-    value: 'settings'
->>>>>>> master
   }
 };
 
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index a8d792f22..3fea9a9b4 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -78,53 +78,6 @@ class Views extends Component {
                 />
               )
             }
-<<<<<<< HEAD
-=======
-            {
-              this.renderView('contracts',
-                <FormattedMessage
-                  id='settings.views.contracts.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.contracts.description'
-                  defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
-                />
-              )
-            }
-            {
-              this.renderView('status',
-                <FormattedMessage
-                  id='settings.views.status.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.status.description'
-                  defaultMessage='See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).'
-                />
-              )
-            }
-            {
-              this.renderView('signer',
-                <FormattedMessage
-                  id='settings.views.signer.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.signer.description'
-                  defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by decentralized applications.'
-                />
-              )
-            }
-            {
-              this.renderView('settings',
-                <FormattedMessage
-                  id='settings.views.settings.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.settings.description'
-                  defaultMessage='This view. Allows you to customize the application in term of options, operation and look and feel.'
-                />
-              )
-            }
->>>>>>> master
           </div>
         </div>
       </Container>