Merge branch 'master' into rpc-middleware

.gitlab-ci.yml

@@ -525,6 +525,6 @@ js-release:
     - if [ "$JS_FILES_MODIFIED" = 0  ]; then echo "skip js build"; else ./js/scripts/install-deps.sh;fi
   script:
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js build"; else ./js/scripts/build.sh&./js/scripts/release.sh; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js build"; else ./js/scripts/build.sh&&./js/scripts/release.sh; fi
   tags:
     - javascript

Cargo.lock

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

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.74",
+  "version": "0.2.75",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

js/src/views/Application/TabBar/tabBar.js

@@ -19,6 +19,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
 import { Tab as MUITab } from 'material-ui/Tabs';
+import { isEqual } from 'lodash';
 
 import { Badge, Tooltip } from '../../../ui';
 
@@ -162,9 +163,13 @@ class TabBar extends Component {
   }
 
   shouldComponentUpdate (nextProps, nextState) {
+    const prevViews = this.props.views.map((v) => v.id).sort();
+    const nextViews = nextProps.views.map((v) => v.id).sort();
+
     return (nextProps.hash !== this.props.hash) ||
       (nextProps.pending.length !== this.props.pending.length) ||
-      (nextState.activeViewId !== this.state.activeViewId);
+      (nextState.activeViewId !== this.state.activeViewId) ||
+      (!isEqual(prevViews, nextViews));
   }
 
   render () {
@@ -217,7 +222,7 @@ class TabBar extends Component {
             active={ active }
             view={ view }
             onChange={ this.onChange }
-            key={ index }
+            key={ view.id }
             pendings={ pending.length }
           >
             { body }

js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.css

@@ -19,6 +19,7 @@
 
 .transaction {
   flex: 1;
+  overflow: auto;
 }
 
 .transaction > * {