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(
+ />,
+ {
+ 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
}
@@ -336,7 +333,7 @@ class Accounts extends Component {
}
return (
-
@@ -350,7 +347,7 @@ class Accounts extends Component {
}
onClick={ this.onVaultsClick }
/>
-
+
);
}
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: ,
route: '/apps',
value: 'app'
-<<<<<<< HEAD
-=======
- },
-
- contracts: {
- active: false,
- onlyPersonal: true,
- icon: ,
- route: '/contracts',
- value: 'contract'
- },
-
- status: {
- active: false,
- onlyPersonal: true,
- icon: ,
- route: '/status',
- value: 'status'
- },
-
- signer: {
- active: true,
- fixed: true,
- icon: ,
- route: '/signer',
- value: 'signer'
- },
-
- settings: {
- active: true,
- fixed: true,
- icon: ,
- 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',
- ,
-
- )
- }
- {
- this.renderView('status',
- ,
-
- )
- }
- {
- this.renderView('signer',
- ,
-
- )
- }
- {
- this.renderView('settings',
- ,
-
- )
- }
->>>>>>> master