grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into new-chains

Browse Source
This commit is contained in:
Gav 2017-03-02 15:42:03 +01:00
commit bb3b2311bf
14 changed files with 233 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1706,7 +1706,7 @@ dependencies = [
[[package]]
name = "parity-ui-precompiled"
version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#dddb47d1808c73d42916722c6a955c1b37605828"
source = "git+https://github.com/ethcore/js-precompiled.git#c02649776ec9636511d90f869a19e746a3eb8654"
dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

3
js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "0.3.108",
"version": "0.3.110",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",
@ -200,6 +200,7 @@
"scryptsy": "2.0.0",
"solc": "ngotchac/solc-js",
"store": "1.3.20",
"uglify-js": "2.8.2",
"useragent.js": "0.5.6",
"utf8": "2.1.2",
"valid-url": "1.0.9",

23
js/src/modals/DeployContract/deployContract.js
View File

@ -150,15 +150,20 @@ class DeployContract extends Component {
const title = realSteps
? null
: (deployError
? <FormattedMessage
id='deployContract.title.failed'
defaultMessage='deployment failed'
: (
deployError
? (
<FormattedMessage
id='deployContract.title.failed'
defaultMessage='deployment failed'
/>
: <FormattedMessage
id='deployContract.title.rejected'
defaultMessage='rejected'
)
: (
<FormattedMessage
id='deployContract.title.rejected'
defaultMessage='rejected'
/>
)
);
const waiting = realSteps
@ -195,9 +200,7 @@ class DeployContract extends Component {
}
return (
<Warning
warning={ errorEstimated }
/>
<Warning warning={ errorEstimated } />
);
}

11
js/src/modals/PasswordManager/passwordManager.js
View File

@ -117,8 +117,15 @@ class PasswordManager extends Component {
{ address }
</span>
<span className={ styles.passwordHint }>
<span className={ styles.hintLabel }>Hint </span>
{ passwordHint || '-' }
<span className={ styles.hintLabel }>
<FormattedMessage
id='passwordChange.passwordHint'
defaultMessage='Hint {hint}'
values={ {
hint: passwordHint || '-'
} }
/>
</span>
</span>
</div>
</div>

42
js/src/modals/SaveContract/saveContract.js
View File

@ -15,12 +15,11 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import SaveIcon from 'material-ui/svg-icons/content/save';
import ContentClear from 'material-ui/svg-icons/content/clear';
import { FormattedMessage } from 'react-intl';
import { Button, Form, Input, Portal } from '~/ui';
import Editor from '~/ui/Editor';
import { CancelIcon, SaveIcon } from '~/ui/Icons';
import { ERRORS, validateName } from '~/util/validation';
import styles from './saveContract.css';
@ -46,13 +45,28 @@ export default class SaveContract extends Component {
buttons={ this.renderDialogActions() }
onClose={ this.onClose }
open
title='save contract'
title={
<FormattedMessage
id='saveContract.title'
defaultMessage='save contract'
/>
}
>
<div>
<Form>
<Input
label='contract name'
hint='choose a name for this contract'
label={
<FormattedMessage
id='saveContract.name.label'
defaultMessage='contract name'
/>
}
hint={
<FormattedMessage
id='saveContract.name.hint'
defaultMessage='choose a name for this contract'
/>
}
value={ name }
error={ nameError }
onChange={ this.onChangeName }
@ -72,9 +86,14 @@ export default class SaveContract extends Component {
renderDialogActions () {
const cancelBtn = (
<Button
icon={ <ContentClear /> }
icon={ <CancelIcon /> }
key='cancel'
label='Cancel'
label={
<FormattedMessage
id='saveContract.buttons.cancel'
defaultMessage='Cancel'
/>
}
onClick={ this.onClose }
/>
);
@ -83,7 +102,12 @@ export default class SaveContract extends Component {
<Button
icon={ <SaveIcon /> }
key='save'
label='Save'
label={
<FormattedMessage
id='saveContract.buttons.save'
defaultMessage='Save'
/>
}
disabled={ !!this.state.nameError }
onClick={ this.onSave }
/>

69
js/src/modals/Transfer/Details/details.js
View File

@ -14,8 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import { Checkbox } from 'material-ui';
import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import Form, { Input, InputAddressSelect, AddressSelect } from '~/ui/Form';
import { nullableProptype } from '~/util/proptypes';
@ -57,7 +58,15 @@ export default class Details extends Component {
render () {
const { all, extras, tag, total, totalError, value, valueError } = this.props;
const label = `amount to transfer (in ${tag})`;
const label = (
<FormattedMessage
id='transfer.details.amount.label'
defaultMessage='amount to transfer (in {tag})'
values={ {
tag
} }
/>
);
return (
<Form>
@ -69,7 +78,12 @@ export default class Details extends Component {
<Input
disabled={ all }
label={ label }
hint='the amount to transfer to the recipient'
hint={
<FormattedMessage
id='transfer.details.amount.hint'
defaultMessage='the amount to transfer to the recipient'
/>
}
value={ value }
error={ valueError }
onChange={ this.onEditValue }
@ -78,7 +92,12 @@ export default class Details extends Component {
<div>
<Checkbox
checked={ all }
label='full account balance'
label={
<FormattedMessage
id='transfer.details.fullBalance.label'
defaultMessage='full account balance'
/>
}
onCheck={ this.onCheckAll }
style={ CHECK_STYLE }
/>
@ -88,7 +107,12 @@ export default class Details extends Component {
<div>
<Input
disabled
label='total transaction amount'
label={
<FormattedMessage
id='transfer.details.total.label'
defaultMessage='total transaction amount'
/>
}
error={ totalError }
>
<div className={ styles.inputoverride }>
@ -100,7 +124,12 @@ export default class Details extends Component {
<div>
<Checkbox
checked={ extras }
label='advanced sending options'
label={
<FormattedMessage
id='transfer.details.advanced.label'
defaultMessage='advanced sending options'
/>
}
onCheck={ this.onCheckExtras }
style={ CHECK_STYLE }
/>
@ -122,8 +151,18 @@ export default class Details extends Component {
<AddressSelect
accounts={ senders }
error={ senderError }
label='sender address'
hint='the sender address'
label={
<FormattedMessage
id='transfer.details.sender.label'
defaultMessage='sender address'
/>
}
hint={
<FormattedMessage
id='transfer.details.sender.hint'
defaultMessage='the sender address'
/>
}
value={ sender }
onChange={ this.onEditSender }
balances={ sendersBalances }
@ -138,8 +177,18 @@ export default class Details extends Component {
return (
<div className={ styles.address }>
<InputAddressSelect
label='recipient address'
hint='the recipient address'
label={
<FormattedMessage
id='transfer.details.recipient.label'
defaultMessage='recipient address'
/>
}
hint={
<FormattedMessage
id='transfer.details.recipient.hint'
defaultMessage='the recipient address'
/>
}
error={ recipientError }
value={ recipient }
onChange={ this.onEditRecipient }

56
js/src/modals/Transfer/transfer.js
View File

@ -181,11 +181,21 @@ class Transfer extends Component {
<div>
<br />
<div>
<p>This transaction needs confirmation from other owners.</p>
<p>
<FormattedMessage
id='transfer.wallet.confirmation'
defaultMessage='This transaction needs confirmation from other owners.'
/>
</p>
<Input
style={ { width: '50%', margin: '0 auto' } }
value={ this.store.operation }
label='operation hash'
label={
<FormattedMessage
id='transfer.wallet.operationHash'
defaultMessage='operation hash'
/>
}
readOnly
allowCopy
/>
@ -254,7 +264,12 @@ class Transfer extends Component {
<Button
icon={ <CancelIcon /> }
key='cancel'
label='Cancel'
label={
<FormattedMessage
id='transfer.buttons.cancel'
defaultMessage='Cancel'
/>
}
onClick={ this.handleClose }
/>
);
@ -263,7 +278,12 @@ class Transfer extends Component {
disabled={ !this.store.isValid }
icon={ <NextIcon /> }
key='next'
label='Next'
label={
<FormattedMessage
id='transfer.buttons.next'
defaultMessage='Next'
/>
}
onClick={ this.store.onNext }
/>
);
@ -271,16 +291,31 @@ class Transfer extends Component {
<Button
icon={ <PrevIcon /> }
key='back'
label='Back'
label={
<FormattedMessage
id='transfer.buttons.back'
defaultMessage='Back'
/>
}
onClick={ this.store.onPrev }
/>
);
const sendBtn = (
<Button
disabled={ !this.store.isValid || sending }
icon={ <IdentityIcon address={ account.address } button /> }
icon={
<IdentityIcon
address={ account.address }
button
/>
}
key='send'
label='Send'
label={
<FormattedMessage
id='transfer.buttons.send'
defaultMessage='Send'
/>
}
onClick={ this.store.onSend }
/>
);
@ -288,7 +323,12 @@ class Transfer extends Component {
<Button
icon={ <DoneIcon /> }
key='close'
label='Close'
label={
<FormattedMessage
id='transfer.buttons.close'
defaultMessage='Close'
/>
}
onClick={ this.handleClose }
/>
);

13
js/src/modals/Verification/Done/done.js
View File

@ -15,7 +15,9 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component } from 'react';
import SuccessIcon from 'material-ui/svg-icons/navigation/check';
import { FormattedMessage } from 'react-intl';
import { DoneIcon } from '~/ui/Icons';
import styles from './done.css';
@ -23,8 +25,13 @@ export default class Done extends Component {
render () {
return (
<div className={ styles.container }>
<SuccessIcon />
<p className={ styles.message }>Congratulations, your account is verified!</p>
<DoneIcon />
<p className={ styles.message }>
<FormattedMessage
id='verification.done.message'
defaultMessage='Congratulations, your account is verified!'
/>
</p>
</div>
);
}

10
js/src/modals/Verification/GatherData/gatherData.js
View File

@ -18,12 +18,10 @@ import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import BigNumber from 'bignumber.js';
import { Checkbox } from 'material-ui';
import InfoIcon from 'material-ui/svg-icons/action/info-outline';
import SuccessIcon from 'material-ui/svg-icons/navigation/check';
import ErrorIcon from 'material-ui/svg-icons/navigation/close';
import { fromWei } from '~/api/util/wei';
import { Form, Input } from '~/ui';
import { DoneIcon, ErrorIcon, InfoIcon } from '~/ui/Icons';
import { nullableProptype } from '~/util/proptypes';
import smsTermsOfService from '~/3rdparty/sms-verification/terms-of-service';
@ -81,7 +79,7 @@ export default class GatherData extends Component {
if (isServerRunning) {
return (
<div className={ styles.container }>
<SuccessIcon />
<DoneIcon />
<p className={ styles.message }>
<FormattedMessage
id='ui.verification.gatherData.isServerRunning.true'
@ -166,7 +164,7 @@ export default class GatherData extends Component {
} else if (accountIsVerified === false) {
return (
<div className={ styles.container }>
<SuccessIcon />
<DoneIcon />
<p className={ styles.message }>
<FormattedMessage
id='ui.verification.gatherData.accountIsVerified.false'
@ -209,7 +207,7 @@ export default class GatherData extends Component {
} else if (accountHasRequested === false) {
return (
<div className={ styles.container }>
<SuccessIcon />
<DoneIcon />
<p className={ styles.message }>
<FormattedMessage
id='ui.verification.gatherData.accountHasRequested.false'

10
js/src/modals/Verification/QueryCode/queryCode.js
View File

@ -42,7 +42,15 @@ export default class QueryCode extends Component {
return (
<Form>
<p>The verification code has been sent to { receiver }.</p>
<p>
<FormattedMessage
id='verification.code.sent'
defaultMessage='The verification code has been sent to {receiver}.'
values={ {
receiver
} }
/>
</p>
<Input
autoFocus
label={

21
js/src/modals/Verification/SendConfirmation/sendConfirmation.js
View File

@ -15,6 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import { nullableProptype } from '~/util/proptypes';
import TxHash from '~/ui/TxHash';
@ -34,14 +35,28 @@ export default class SendConfirmation extends Component {
const { step, tx } = this.props;
if (step === POSTING_CONFIRMATION) {
return (<p>The verification code will be sent to the contract. Please authorize this using the Parity Signer.</p>);
return (
<p>
<FormattedMessage
id='verification.confirmation.authorise'
defaultMessage='The verification code will be sent to the contract. Please authorize this using the Parity Signer.'
/>
</p>);
}
if (step === POSTED_CONFIRMATION) {
return (
<div className={ styles.centered }>
<TxHash hash={ tx } maxConfirmations={ 2 } />
<p>Please keep this window open.</p>
<TxHash
hash={ tx }
maxConfirmations={ 2 }
/>
<p>
<FormattedMessage
id='verification.confirmation.windowOpen'
defaultMessage='Please keep this window open.'
/>
</p>
</div>
);
}

29
js/src/modals/Verification/SendRequest/sendRequest.js
View File

@ -15,6 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl';
import { nullableProptype } from '~/util/proptypes';
import TxHash from '~/ui/TxHash';
@ -35,19 +36,39 @@ export default class SendRequest extends Component {
switch (step) {
case POSTING_REQUEST:
return (<p>A verification request will be sent to the contract. Please authorize this using the Parity Signer.</p>);
return (
<p>
<FormattedMessage
id='verification.request.authorise'
defaultMessage='A verification request will be sent to the contract. Please authorize this using the Parity Signer.'
/>
</p>
);
case POSTED_REQUEST:
return (
<div className={ styles.centered }>
<TxHash hash={ tx } maxConfirmations={ 1 } />
<p>Please keep this window open.</p>
<TxHash
hash={ tx }
maxConfirmations={ 1 }
/>
<p>
<FormattedMessage
id='verification.request.windowOpen'
defaultMessage='Please keep this window open.'
/>
</p>
</div>
);
case REQUESTING_CODE:
return (
<p>Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.</p>
<p>
<FormattedMessage
id='verification.request.requesting'
defaultMessage='Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.'
/>
</p>
);
default:

3
js/src/modals/Verification/verification.js
View File

@ -19,11 +19,10 @@ import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import { observer } from 'mobx-react';
import { observable } from 'mobx';
import DoneIcon from 'material-ui/svg-icons/action/done-all';
import CancelIcon from 'material-ui/svg-icons/content/clear';
import { Button, IdentityIcon, Portal } from '~/ui';
import RadioButtons from '~/ui/Form/RadioButtons';
import { CancelIcon, DoneIcon } from '~/ui/Icons';
import SMSVerificationStore from './sms-store';
import EmailVerificationStore from './email-store';

1
js/src/ui/Icons/index.js
View File

@ -37,6 +37,7 @@ export FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
export FileIcon from 'material-ui/svg-icons/editor/insert-drive-file';
export FingerprintIcon from 'material-ui/svg-icons/action/fingerprint';
export GasIcon from 'material-ui/svg-icons/maps/local-gas-station';
export InfoIcon from 'material-ui/svg-icons/action/info-outline';
export KeyIcon from 'material-ui/svg-icons/communication/vpn-key';
export KeyboardIcon from 'material-ui/svg-icons/hardware/keyboard';
export LinkIcon from 'material-ui/svg-icons/content/link';