1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Close sidebar on token selection.

This commit is contained in:
Dan 2017-09-28 09:25:04 -02:30 committed by Chi Kei Chan
parent a4838b1c57
commit b55a40c7f1
2 changed files with 20 additions and 4 deletions

View File

@ -15,6 +15,7 @@ function mapStateToProps (state) {
userAddress: selectors.getSelectedAddress(state), userAddress: selectors.getSelectedAddress(state),
tokenExchangeRates: state.metamask.tokenExchangeRates, tokenExchangeRates: state.metamask.tokenExchangeRates,
ethToUSDRate: state.metamask.conversionRate, ethToUSDRate: state.metamask.conversionRate,
sidebarOpen: state.appState.sidebarOpen,
} }
} }
@ -22,6 +23,7 @@ function mapDispatchToProps (dispatch) {
return { return {
setSelectedToken: address => dispatch(actions.setSelectedToken(address)), setSelectedToken: address => dispatch(actions.setSelectedToken(address)),
updateTokenExchangeRate: token => dispatch(actions.updateTokenExchangeRate(token)), updateTokenExchangeRate: token => dispatch(actions.updateTokenExchangeRate(token)),
hideSidebar: () => dispatch(actions.hideSidebar()),
} }
} }
@ -52,6 +54,8 @@ TokenCell.prototype.render = function () {
selectedTokenAddress, selectedTokenAddress,
tokenExchangeRates, tokenExchangeRates,
ethToUSDRate, ethToUSDRate,
hideSidebar,
sidebarOpen,
// userAddress, // userAddress,
} = props } = props
@ -73,13 +77,16 @@ TokenCell.prototype.render = function () {
}) })
formattedUSD = `$${currentTokenInUSD} USD`; formattedUSD = `$${currentTokenInUSD} USD`;
} }
return ( return (
h('div.token-list-item', { h('div.token-list-item', {
className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`, className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`,
// style: { cursor: network === '1' ? 'pointer' : 'default' }, // style: { cursor: network === '1' ? 'pointer' : 'default' },
// onClick: this.view.bind(this, address, userAddress, network), // onClick: this.view.bind(this, address, userAddress, network),
onClick: () => setSelectedToken(address), onClick: () => {
setSelectedToken(address)
selectedTokenAddress !== address && sidebarOpen && hideSidebar()
},
}, [ }, [
h(Identicon, { h(Identicon, {

View File

@ -40,7 +40,13 @@ function WalletView () {
} }
WalletView.prototype.renderWalletBalance = function () { WalletView.prototype.renderWalletBalance = function () {
const { selectedTokenAddress, selectedAccount, unsetSelectedToken } = this.props const {
selectedTokenAddress,
selectedAccount,
unsetSelectedToken,
hideSidebar,
sidebarOpen
} = this.props
const selectedClass = selectedTokenAddress const selectedClass = selectedTokenAddress
? '' ? ''
: 'wallet-balance-wrapper--active' : 'wallet-balance-wrapper--active'
@ -49,7 +55,10 @@ WalletView.prototype.renderWalletBalance = function () {
return h('div', { className }, [ return h('div', { className }, [
h('div.wallet-balance', h('div.wallet-balance',
{ {
onClick: unsetSelectedToken, onClick: () => {
unsetSelectedToken()
selectedTokenAddress && sidebarOpen && hideSidebar()
},
}, },
[ [
h(BalanceComponent, { h(BalanceComponent, {