From a3f96951c2d6f2c8607e4fa270b5484e838b2e42 Mon Sep 17 00:00:00 2001 From: Simon Liang Date: Thu, 10 Aug 2017 11:34:26 +0800 Subject: [PATCH] connected wallet view dropdown button with real data --- ui/app/components/wallet-view.js | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 56aac1f13..7d4b8cd51 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -11,7 +11,6 @@ const selectors = require('../selectors') module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView) function mapStateToProps (state) { - return { network: state.metamask.network, sidebarOpen: state.appState.sidebarOpen, @@ -25,8 +24,8 @@ function mapStateToProps (state) { function mapDispatchToProps (dispatch) { return { - showSendPage: () => {dispatch(actions.showSendPage())}, - hideSidebar: () => {dispatch(actions.hideSidebar())}, + showSendPage: () => { dispatch(actions.showSendPage()) }, + hideSidebar: () => { dispatch(actions.hideSidebar()) }, } } @@ -38,7 +37,7 @@ function WalletView () { const noop = () => {} WalletView.prototype.render = function () { - const { network, responsiveDisplayClassname, style, identities, selectedAddress } = this.props + const { network, responsiveDisplayClassname, style, identities, selectedAddress, selectedIdentity } = this.props return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), { style: {}, @@ -46,7 +45,7 @@ WalletView.prototype.render = function () { // TODO: Separate component: wallet account details h('div.flex-column', { - style: {} + style: {}, }, [ h('div.flex-row.account-options-menu', { @@ -92,9 +91,9 @@ WalletView.prototype.render = function () { ]), h('span.account-name', { - style: {} + style: {}, }, [ - 'Account 1' + selectedIdentity.name, ]), h(AccountDropdowns, { @@ -103,30 +102,31 @@ WalletView.prototype.render = function () { left: 'calc(50% + 28px + 5.5px)', top: '19.5%', }, - selected: selectedAddress, + selectedAddress, network, identities, enableAccountsSelector: true, }, []), ]), + ]), h(Content, { - title: 'Wallet', - amount: '1001.124 ETH', - fiatValue: '$300,000.00 USD', - active: true, + title: 'Wallet', + amount: '1001.124 ETH', + fiatValue: '$300,000.00 USD', + active: true, }), // Wallet contents h(Content, { - title: "Total Token Balance", - amount: "45.439 ETH", - fiatValue: "$13,000.00 USD", + title: 'Total Token Balance', + amount: '45.439 ETH', + fiatValue: '$13,000.00 USD', active: false, style: { marginTop: '1.3em', - } - }) + }, + }), ]) }