Merge branch 'master' into ui-2

# Conflicts: # js/src/views/ContractDevelop/store.js
2017-05-05 10:08:10 +02:00
parent 5d78488fef 25853b915e
commit 9b025cf8c1
15 changed files with 172 additions and 72 deletions
--- a/js/src/shell/ParityBar/parityBar.js
+++ b/js/src/shell/ParityBar/parityBar.js
@@ -83,7 +83,10 @@ class ParityBar extends Component {
    dappsStore
      .on('loaded', (app) => {
        this.app = app;
-        this.loadPosition();
+
+        if (this.props.dapp) {
+          this.loadPosition();
+        }
      });

    if (this.props.dapp) {