Additional merge fixes

This commit is contained in:
Jaco Greeff 2017-06-13 11:34:43 +02:00
parent 7bbd48a2bd
commit a2fdf38316
5 changed files with 11 additions and 97 deletions

View File

@ -172,17 +172,13 @@ export default class Input extends Component {
); );
} }
<<<<<<< HEAD
onChange = (event, { value }) => { onChange = (event, { value }) => {
=======
onChange = (event, value) => {
if (!this.props.allowPaste) { if (!this.props.allowPaste) {
if (value.length - this.state.value.length > 8) { if (value.length - this.state.value.length > 8) {
return; return;
} }
} }
>>>>>>> master
event.persist(); event.persist();
this.setValue(value, () => { this.setValue(value, () => {

View File

@ -16,12 +16,11 @@
import { shallow } from 'enzyme'; import { shallow } from 'enzyme';
import React from 'react'; import React from 'react';
import sinon from 'sinon';
import Accounts from './'; import Accounts from './';
let component; let component;
<<<<<<< HEAD:js/src/ui/VaultCard/Accounts/accounts.spec.js
=======
let store; let store;
function createStore () { function createStore () {
@ -46,13 +45,17 @@ function createStore () {
return store; return store;
} }
>>>>>>> master:js/src/views/Application/TabBar/tabBar.spec.js
function render (props = {}) { function render (props = {}) {
component = shallow( component = shallow(
<Accounts <Accounts
{ ...props } { ...props }
/> />,
{
context: {
store: createStore()
}
}
); );
return component; return component;

View File

@ -24,8 +24,8 @@ import { bindActionCreators } from 'redux';
import HardwareStore from '@parity/shared/mobx/hardwareStore'; import HardwareStore from '@parity/shared/mobx/hardwareStore';
import { setVisibleAccounts } from '@parity/shared/redux/providers/personalActions'; import { setVisibleAccounts } from '@parity/shared/redux/providers/personalActions';
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '@parity/ui'; import { Actionbar, ActionbarSearch, ActionbarSort, Button, DappLink, Page } from '@parity/ui';
import { AddIcon, FileDownloadIcon } from '@parity/ui/Icons'; import { AddIcon, KeyIcon, FileDownloadIcon } from '@parity/ui/Icons';
import CreateWallet from './CreateWallet'; import CreateWallet from './CreateWallet';
import CreateAccount from './CreateAccount'; import CreateAccount from './CreateAccount';
@ -241,10 +241,7 @@ class Accounts extends Component {
renderActionbar () { renderActionbar () {
const buttons = [ const buttons = [
<<<<<<< HEAD
=======
this.renderVaultsButton(), this.renderVaultsButton(),
>>>>>>> master
<Button <Button
key='newAccount' key='newAccount'
icon={ <AddIcon /> } icon={ <AddIcon /> }
@ -336,7 +333,7 @@ class Accounts extends Component {
} }
return ( return (
<Link <DappLink
to='/vaults' to='/vaults'
key='vaults' key='vaults'
> >
@ -350,7 +347,7 @@ class Accounts extends Component {
} }
onClick={ this.onVaultsClick } onClick={ this.onVaultsClick }
/> />
</Link> </DappLink>
); );
} }

View File

@ -24,41 +24,6 @@ const defaultViews = {
icon: <AppsIcon />, icon: <AppsIcon />,
route: '/apps', route: '/apps',
value: 'app' 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
} }
}; };

View File

@ -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>
</div> </div>
</Container> </Container>