Skip to content

Commit 121d30d

Browse files
committed
Disable Typeahead on Proxy Voting Selection
Fix "fixed" value on RecentTransactions Minor fixes to AccountSelector
1 parent 99867a6 commit 121d30d

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

app/components/Account/AccountSelector.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class AccountSelector extends React.Component {
6161
if (this.props.onAccountChanged && account)
6262
this.props.onAccountChanged(account);
6363

64-
if (!this.props.typeahead && !!accountName)
64+
if (!this.props.typeahead && accountName)
6565
this.onInputChanged(accountName);
6666
}
6767

@@ -119,7 +119,7 @@ class AccountSelector extends React.Component {
119119
// - Always returns account object
120120
if (!typeahead) {
121121
if (onChange) onChange(_accountName);
122-
if (onAccountChanged) onAccountChanged(_account);
122+
if (onAccountChanged && _account) onAccountChanged(_account);
123123
}
124124
}
125125

app/components/Account/AccountVoting.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -678,15 +678,14 @@ class AccountVoting extends React.Component {
678678

679679
let proxyInput = (
680680
<AccountSelector
681-
hideImage
682-
style={{width: "50%", maxWidth: 350}}
681+
style={{width: "50%", maxWidth: 250, marginBottom: 10}}
683682
account={this.state.current_proxy_input}
684683
accountName={this.state.current_proxy_input}
685684
onChange={this.onProxyChange.bind(this)}
686685
onAccountChanged={this.onProxyAccountFound}
687-
typeahead={true}
688686
tabIndex={1}
689687
placeholder="Proxy not set"
688+
hideImage
690689
>
691690
<span
692691
style={{

app/components/Account/RecentTransactions.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,7 @@ class RecentTransactions extends React.Component {
247247
).sort(compareOps);
248248
let historyCount = history.length;
249249

250-
style = style ? style : {};
251-
style.width = "100%";
252-
style.height = "100%";
250+
style = style ? style : {width: "100%", height: "100%"};
253251

254252
let options = null;
255253
if (true || this.props.showFilters) {

0 commit comments

Comments
 (0)