Skip to content

Commit 8cf08cc

Browse files
committed
Make token logos show in sidebar rather than parent
Revert random style change
1 parent 1821342 commit 8cf08cc

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/modules/UI/components/ControlPanel/ControlPanelConnector.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,18 @@ const mapStateToProps = (state: State) => {
2020

2121
if (guiWallet && currencyCode) {
2222
const isoFiatCurrencyCode = guiWallet.isoFiatCurrencyCode
23-
currencyLogo = guiWallet.symbolImage
23+
// if selected currencyCode is parent wallet currencyCode
24+
if (guiWallet.currencyCode === currencyCode) {
25+
currencyLogo = guiWallet.symbolImage
26+
} else {
27+
// otherwise it is likely a token, so find the metaToken object and get symbolImage
28+
const metaToken = guiWallet.metaTokens.find(metaToken => currencyCode === metaToken.currencyCode)
29+
if (metaToken && metaToken.symbolImage) {
30+
currencyLogo = metaToken.symbolImage
31+
} else {
32+
currencyLogo = guiWallet.symbolImage
33+
}
34+
}
2435
secondaryDisplayCurrencyCode = guiWallet.fiatCurrencyCode
2536
secondaryToPrimaryRatio = getExchangeRate(state, currencyCode, isoFiatCurrencyCode)
2637
primaryDisplayDenomination = getDisplayDenominationFull(state, currencyCode)

src/styles/SettingsComponentsStyle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export const styles = {
9595
padding: 3
9696
},
9797
customNodesInput: {
98+
height: 128,
9899
color: THEME.COLORS.GRAY_1,
99100
fontSize: 15,
100101
fontFamily: THEME.FONTS.DEFAULT,

0 commit comments

Comments
 (0)