Merge pull request #1572 from bitshares/1525_ClearVotingProxy

Issue 1525 - Clear Voting Proxy
bitshares · Jun 7, 2018 · d3aa2eb · d3aa2eb
2 parents d698904 + 121d30d
commit d3aa2eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx
@@ -61,7 +61,7 @@ class AccountSelector extends React.Component {
         if (this.props.onAccountChanged && account)
             this.props.onAccountChanged(account);
 
-        if (!this.props.typeahead && !!accountName)
+        if (!this.props.typeahead && accountName)
             this.onInputChanged(accountName);
     }
 
@@ -119,7 +119,7 @@ class AccountSelector extends React.Component {
         // - Always returns account object
         if (!typeahead) {
             if (onChange) onChange(_accountName);
-            if (onAccountChanged) onAccountChanged(_account);
+            if (onAccountChanged && _account) onAccountChanged(_account);
         }
     }
 

diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx
@@ -678,15 +678,14 @@ class AccountVoting extends React.Component {
 
         let proxyInput = (
             <AccountSelector
-                hideImage
-                style={{width: "50%", maxWidth: 350}}
+                style={{width: "50%", maxWidth: 250, marginBottom: 10}}
                 account={this.state.current_proxy_input}
                 accountName={this.state.current_proxy_input}
                 onChange={this.onProxyChange.bind(this)}
                 onAccountChanged={this.onProxyAccountFound}
-                typeahead={true}
                 tabIndex={1}
                 placeholder="Proxy not set"
+                hideImage
             >
                 <span
                     style={{

diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx
@@ -247,9 +247,7 @@ class RecentTransactions extends React.Component {
         ).sort(compareOps);
         let historyCount = history.length;
 
-        style = style ? style : {};
-        style.width = "100%";
-        style.height = "100%";
+        style = style ? style : {width: "100%", height: "100%"};
 
         let options = null;
         if (true || this.props.showFilters) {