Merge branch 'master' into multi-sign

diff --cc src/features/transactions/actions.js
Simple merge

diff --cc src/features/transactions/components/New/New.jsx
index 6846958,da74ced..6d432d7
--- 1/src/features/transactions/components/New/New.jsx
--- 2/src/features/transactions/components/New/New.jsx
+++ b/src/features/transactions/components/New/New.jsx
@@@ -98,40 -252,40 +252,40 @@@ class Form extends React.Component 
                remove={this.removeActionItem}
              />)}
  
-             <div className={`btn-group ${styles.addActionContainer} ${this.state.showDropdown && 'open'}`}>
-               <DropdownButton
-                 className={`btn btn-default ${styles.addAction}`}
-                 id='input-dropdown-addon'
-                 title='+ Add action'
-                 onSelect={this.addActionItem}
-               >
-                 <MenuItem eventKey='issue'>Issue</MenuItem>
-                 <MenuItem eventKey='spend_account'>Spend from account</MenuItem>
-                 {/*<MenuItem eventKey='spend_account_unspent_output'>Spend unspent output</MenuItem>*/}
-                 <MenuItem eventKey='control_account'>Control with account</MenuItem>
-                 <MenuItem eventKey='control_receiver'>Control with receiver</MenuItem>
-                 <MenuItem eventKey='control_address'>Control with address</MenuItem>
-                 <MenuItem eventKey='retire'>Retire</MenuItem>
-                 {/*<MenuItem eventKey='set_transaction_reference_data'>Set transaction reference data</MenuItem>*/}
-               </DropdownButton>
-             </div>
-         </FormSection>
- 
-         {!this.state.showAdvanced &&
+           <div className={`btn-group ${styles.addActionContainer} ${this.state.showDropdown && 'open'}`}>
+             <DropdownButton
+               className={`btn btn-default ${styles.addAction}`}
+               id='input-dropdown-addon'
+               title='+ Add action'
+               onSelect={this.addActionItem}
+             >
+               <MenuItem eventKey='issue'>Issue</MenuItem>
+               <MenuItem eventKey='spend_account'>Spend from account</MenuItem>
+               {/*<MenuItem eventKey='spend_account_unspent_output'>Spend unspent output</MenuItem>*/}
+               <MenuItem eventKey='control_account'>Control with account</MenuItem>
+               <MenuItem eventKey='control_receiver'>Control with receiver</MenuItem>
+               <MenuItem eventKey='control_address'>Control with address</MenuItem>
+               <MenuItem eventKey='retire'>Retire</MenuItem>
+               {/*<MenuItem eventKey='set_transaction_reference_data'>Set transaction reference data</MenuItem>*/}
+             </DropdownButton>
+           </div>
+         </FormSection>}
+ 
 -        {false && !this.state.showAdvanced &&
 -        <FormSection>
 -          <a href='#'
 -             className={styles.showAdvanced}
 -             onClick={(e) => {
 -               e.preventDefault()
 -               this.setState({showAdvanced: true})
 -             }}
 -          >
 -            Show advanced options
 -          </a>
 -        </FormSection>
++        {this.state.showAdvance && !this.state.showAdvanced &&
 +          <FormSection>
 +            <a href='#'
 +              className={styles.showAdvanced}
 +              onClick={(e) => {
 +                e.preventDefault()
 +                this.setState({showAdvanced: true})
 +              }}
 +            >
 +              Show advanced options
 +            </a>
 +          </FormSection>
          }
  
-         {this.state.showAdvanced && <FormSection title='Advanced Options'>
 -        {false && this.state.showAdvanced && <FormSection title='Advanced Options'>
++        {this.state.showAdvance && this.state.showAdvanced && <FormSection title='Advanced Options'>
            <div>
              <TextField
                title='Base transaction'