Merge remote-tracking branch 'origin/master' into check-updates

js/src/modals/ExecuteContract/executeContract.js

@@ -66,7 +66,7 @@ class ExecuteContract extends Component {
     onFromAddressChange: PropTypes.func.isRequired
   }
 
-  gasStore = new GasPriceEditor.Store(this.context.api, this.props.gasLimit);
+  gasStore = new GasPriceEditor.Store(this.context.api, { gasLimit: this.props.gasLimit });
 
   state = {
     amount: '0',

js/src/modals/Transfer/store.js

@@ -112,7 +112,7 @@ export default class TransferStore {
     this.isWallet = account && account.wallet;
     this.newError = newError;
 
-    this.gasStore = new GasPriceStore(api, gasLimit);
+    this.gasStore = new GasPriceStore(api, { gasLimit });
 
     if (this.isWallet) {
       this.wallet = props.wallet;

js/src/modals/Transfer/transfer.js

@@ -80,8 +80,9 @@ class Transfer extends Component {
       <div className={ styles.hdraccount }>
         <div className={ styles.hdrimage }>
           <IdentityIcon
-            inline center
-            address={ account.address } />
+            address={ account.address }
+            center
+            inline />
         </div>
         <div className={ styles.hdrdetails }>
           <div className={ styles.hdrname }>
@@ -165,18 +166,18 @@ class Transfer extends Component {
         balance={ balance }
         extras={ extras }
         images={ images }
-        senders={ senders }
+        onChange={ this.store.onUpdateDetails }
         recipient={ recipient }
         recipientError={ recipientError }
         sender={ sender }
         senderError={ senderError }
+        senders={ senders }
         sendersBalances={ sendersBalances }
         tag={ tag }
         total={ total }
         totalError={ totalError }
         value={ value }
         valueError={ valueError }
-        onChange={ this.store.onUpdateDetails }
         wallet={ account.wallet && this.props.wallet }
       />
     );