Merge branch 'master' into ng-accounts-backup

js/src/views/Dapps/Summary/summary.js

@@ -39,8 +39,8 @@ export default class Summary extends Component {
     }
 
     const url = `/app/${app.builtin ? 'global' : 'local'}/${app.url || app.id}`;
-    const image = app.image
-      ? <img src={ app.image } className={ styles.image } />
+    const image = app.image || app.iconUrl
+      ? <img src={ app.image || `http://127.0.0.1:8080/${app.id}/${app.iconUrl}` } className={ styles.image } />
       : <div className={ styles.image }>&nbsp;</div>;
 
     return (

js/src/views/ParityBar/parityBar.css

@@ -43,7 +43,7 @@
 .expanded {
   right: 16px;
   width: 964px;
-  height: 288px;
+  height: 300px;
   border-radius: 4px 4px 0 0;
   overflow-y: auto;
   display: flex;
@@ -53,6 +53,7 @@
 .expanded .content {
   flex: 1;
   overflow: auto;
+  display: flex;
 }
 
 .corner {

js/src/views/Signer/components/TransactionFinished/TransactionFinished.js

@@ -80,7 +80,7 @@ export default class TransactionFinished extends Component {
     if (!chain || !fromBalance || !toBalance) {
       return (
         <div className={ `${styles.container} ${className}` }>
-          <CircularProgress size={ 1 } />
+          <CircularProgress size={ 60 } />
         </div>
       );
     }

js/src/views/Signer/components/TransactionPending/TransactionPending.js

@@ -81,7 +81,7 @@ export default class TransactionPending extends Component {
     if (!this.state.chain) {
       return (
         <div className={ `${styles.container} ${className}` }>
-          <CircularProgress size={ 1 } />
+          <CircularProgress size={ 60 } />
         </div>
       );
     }