diff --git a/app/reducers/ticker.js b/app/reducers/ticker.js
index ed8c1747..56af853a 100644
--- a/app/reducers/ticker.js
+++ b/app/reducers/ticker.js
@@ -56,8 +56,8 @@ export const fetchTicker = () => async (dispatch) => {
// Receive IPC event for receiveCryptocurrency
export const receiveCryptocurrency = (event, currency) => (dispatch) => {
dispatch({ type: SET_CURRENCY, currency: cryptoTickers[currency] })
- // dispatch({ type: SET_CRYPTO, crypto: cryptoTickers[currency] })
- dispatch({ type: SET_CRYPTO, crypto: 'ltc' })
+ dispatch({ type: SET_CRYPTO, crypto: cryptoTickers[currency] })
+ // dispatch({ type: SET_CRYPTO, crypto: 'ltc' })
}
diff --git a/app/routes/app/components/components/Nav.js b/app/routes/app/components/components/Nav.js
index 18566695..55a4a8eb 100644
--- a/app/routes/app/components/components/Nav.js
+++ b/app/routes/app/components/components/Nav.js
@@ -14,8 +14,8 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
setCurrency('btc')}
+ className={`${styles.currency} ${ticker.currency === ticker.crypto ? styles.active : ''} hint--bottom`}
+ onClick={() => setCurrency(ticker.crypto)}
>
@@ -31,10 +31,10 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
{ticker.currency === 'usd' ? : }
{
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(balance.walletBalance)
- :
+ ticker.currency === 'usd' ?
btc.satoshisToUsd(balance.walletBalance, currentTicker.price_usd)
+ :
+ btc.satoshisToBtc(balance.walletBalance)
}
@@ -42,10 +42,10 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
{ticker.currency === 'usd' ? : }
{
- ticker.currency === 'btc' ?
- btc.satoshisToBtc(balance.channelBalance)
- :
+ ticker.currency === 'usd' ?
btc.satoshisToUsd(balance.channelBalance, currentTicker.price_usd)
+ :
+ btc.satoshisToBtc(balance.channelBalance)
}
@@ -69,12 +69,6 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
Wallet
-
-
-
- Settings
-
-