diff --git a/Cargo.lock b/Cargo.lock index 479cd0068..e38d8aeb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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)", ] diff --git a/js/package.json b/js/package.json index 9090a4bed..a3d32cd42 100644 --- a/js/package.json +++ b/js/package.json @@ -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 ", @@ -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", diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js index 4e5a9ff85..9337b1430 100644 --- a/js/src/modals/DeployContract/deployContract.js +++ b/js/src/modals/DeployContract/deployContract.js @@ -150,15 +150,20 @@ class DeployContract extends Component { const title = realSteps ? null - : (deployError - ? - : + ) ); const waiting = realSteps @@ -195,9 +200,7 @@ class DeployContract extends Component { } return ( - + ); } diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js index 2f5541bf1..91ac9ebf2 100644 --- a/js/src/modals/PasswordManager/passwordManager.js +++ b/js/src/modals/PasswordManager/passwordManager.js @@ -117,8 +117,15 @@ class PasswordManager extends Component { { address } - Hint - { passwordHint || '-' } + + + diff --git a/js/src/modals/SaveContract/saveContract.js b/js/src/modals/SaveContract/saveContract.js index 242ba1593..7f45b6aa5 100644 --- a/js/src/modals/SaveContract/saveContract.js +++ b/js/src/modals/SaveContract/saveContract.js @@ -15,12 +15,11 @@ // along with Parity. If not, see . 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={ + + } >
+ } + hint={ + + } value={ name } error={ nameError } onChange={ this.onChangeName } @@ -72,9 +86,14 @@ export default class SaveContract extends Component { renderDialogActions () { const cancelBtn = (