Merge branch 'master' into ui-2

js/src/ui/ConfirmDialog/confirmDialog.js

@@ -47,14 +47,14 @@ export default function ConfirmDialog ({ busy, children, className, disabledConf
     <Portal
       buttons={ [
         <Button
-          disabled={ disabledDeny }
+          disabled={ disabledDeny || busy }
           icon={ iconDeny || <CancelIcon /> }
           key='deny'
           label={ labelDeny || DEFAULT_NO }
           onClick={ onDeny }
         />,
         <Button
-          disabled={ disabledConfirm }
+          disabled={ disabledConfirm || busy }
           icon={ iconConfirm || <CheckIcon /> }
           key='confirm'
           label={ labelConfirm || DEFAULT_YES }

js/src/ui/package.json

@@ -34,7 +34,7 @@
     "react-dropzone": "3.7.3",
     "react-event-listener": "^0.4.0",
     "react-portal": "3.0.0",
-    "react-qr-reader": "1.0.3",
+    "react-qr-reader": "1.1.3",
     "recharts": "0.15.2",
     "semantic-ui-css": "2.2.10",
     "semantic-ui-react": "0.68.2",

js/src/views/Address/Delete/delete.js

@@ -41,8 +41,13 @@ class Delete extends Component {
     newError: PropTypes.func
   };
 
+  state = {
+    isBusy: false
+  };
+
   render () {
     const { account, confirmMessage, visible } = this.props;
+    const { isBusy } = this.state;
 
     if (!visible) {
       return null;
@@ -50,6 +55,7 @@ class Delete extends Component {
 
     return (
       <ConfirmDialog
+        busy={ isBusy }
         className={ styles.delete }
         title={
           <FormattedMessage
@@ -99,6 +105,8 @@ class Delete extends Component {
     const { api, router } = this.context;
     const { account, route, newError } = this.props;
 
+    this.setState({ isBusy: true });
+
     api.parity
       .removeAddress(account.address)
       .then(() => {