From 28d0d00a7f4d10d48942842f07aa90fa6c929296 Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <kauffj@gmail.com>
Date: Thu, 20 Apr 2017 21:08:23 -0400
Subject: [PATCH] fix drawer highlight and drawer balance

---
 ui/js/component/drawer/view.jsx | 12 ++++++------
 ui/js/component/link/view.js    |  2 +-
 ui/js/main.js                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/js/component/drawer/view.jsx b/ui/js/component/drawer/view.jsx
index d2a381b88..da65cd523 100644
--- a/ui/js/component/drawer/view.jsx
+++ b/ui/js/component/drawer/view.jsx
@@ -7,16 +7,17 @@ const DrawerItem = (props) => {
     currentPage,
     href,
     subPages,
+    badge,
     label,
     linkClick,
     icon,
   } = props
   const isSelected = (
-    currentPage == href.substr(1) ||
+    currentPage == href.substr(0) ||
     (subPages && subPages.indexOf(currentPage) != -1)
   )
 
-  return <Link icon={icon} label={label} onClick={() => linkClick(href)} className={ 'drawer-item ' + (isSelected ? 'drawer-item-selected' : '') } />
+  return <Link icon={icon} badge={badge} label={label} onClick={() => linkClick(href)} className={ 'drawer-item ' + (isSelected ? 'drawer-item-selected' : '') } />
 }
 
 var drawerImageStyle = { //@TODO: remove this, img should be properly scaled once size is settled
@@ -32,9 +33,9 @@ class Drawer extends React.Component {
   componentDidMount() {
     const { updateBalance } = this.props
 
-    this._balanceSubscribeId = lbry.balanceSubscribe(function(balance) {
+    this._balanceSubscribeId = lbry.balanceSubscribe((balance) => {
       updateBalance(balance)
-    }.bind(this));
+    });
   }
   componentWillUnmount() {
     if (this._balanceSubscribeId) {
@@ -46,7 +47,6 @@ class Drawer extends React.Component {
     const {
       closeDrawerClick,
       logoClick,
-      currentPage,
       balance,
     } = this.props
 
@@ -58,7 +58,7 @@ class Drawer extends React.Component {
       <DrawerItem {...this.props} href='discover' label="Discover" icon="icon-search"  />
       <DrawerItem {...this.props} href='publish' label="Publish" icon="icon-upload" />
       <DrawerItem {...this.props} href='downloaded' subPages={['published']} label="My Files" icon='icon-cloud-download' />
-      <DrawerItem {...this.props} href="wallet" subPages={['send', 'receive', 'claim', 'referral']} label="My Wallet" badge={lbry.formatCredits(balance) } icon="icon-bank" />
+      <DrawerItem {...this.props} href="wallet" subPages={['send', 'receive', 'claim']} label="My Wallet" badge={lbry.formatCredits(balance) } icon="icon-bank" />
       <DrawerItem {...this.props} href='settings' label="Settings" icon='icon-gear' />
       <DrawerItem {...this.props} href='help' label="Help" icon='icon-question-circle' />
     </nav>)
diff --git a/ui/js/component/link/view.js b/ui/js/component/link/view.js
index e4b361241..65f2e1992 100644
--- a/ui/js/component/link/view.js
+++ b/ui/js/component/link/view.js
@@ -15,7 +15,7 @@ const Link = (props) => {
     disabled,
   } = props
 
-
+console.log(props);
   const className = (props.className || '') +
     (!props.className && !props.button ? 'button-text' : '') + // Non-button links get the same look as text buttons
     (props.button ? ' button-block button-' + props.button + ' button-set-item' : '') +
diff --git a/ui/js/main.js b/ui/js/main.js
index c346a0e5c..14c22c9c0 100644
--- a/ui/js/main.js
+++ b/ui/js/main.js
@@ -35,7 +35,7 @@ var init = function() {
 
   function onDaemonReady() {
     window.sessionStorage.setItem('loaded', 'y'); //once we've made it here once per session, we don't need to show splash again
-    ReactDOM.render(<Provider store={store}><div>{ lbryio.enabled ? <AuthOverlay/> : '' }<App /><SnackBar /></div></Provider>, canvas)
+      ReactDOM.render(<Provider store={store}><div>{ lbryio.enabled ? <AuthOverlay/> : '' }<App /><SnackBar /></div></Provider>, canvas)
   }
 
   if (window.sessionStorage.getItem('loaded') == 'y') {