diff --git a/web/cashtab/src/components/Home/Tx.js b/web/cashtab/src/components/Home/Tx.js --- a/web/cashtab/src/components/Home/Tx.js +++ b/web/cashtab/src/components/Home/Tx.js @@ -106,12 +106,6 @@ font-weight: 700; margin: 0; } - .genesis { - color: ${props => props.theme.genesisGreen}; - } - .received { - color: ${props => props.theme.eCashBlue}; - } h4 { font-size: 12px; color: ${props => props.theme.lightWhite}; @@ -192,12 +186,7 @@ font-weight: 700; margin: 0; } - .genesis { - color: ${props => props.theme.genesisGreen}; - } - .received { - color: ${props => props.theme.eCashBlue}; - } + h4 { font-size: 12px; color: ${props => props.theme.lightWhite}; @@ -245,6 +234,14 @@ overflow: hidden; text-overflow: ellipsis; `; + +const TokenTxAmtGenesis = styled(TokenTxAmt)` + color: ${props => props.theme.genesisGreen} !important; +`; +const TokenTxAmtReceived = styled(TokenTxAmt)` + color: ${props => props.theme.eCashBlue} !important; +`; + const TokenName = styled.h4` text-align: right; white-space: nowrap; @@ -437,7 +434,7 @@ .transactionType === 'GENESIS' ? ( <> - + +{' '} {data.tokenInfo.qtyReceived.toString()} @@ -446,7 +443,7 @@ .tokenInfo .tokenTicker } - + { data @@ -479,7 +476,7 @@ ) : ( - + +{' '} {data.tokenInfo.qtyReceived.toString()} @@ -488,7 +485,7 @@ .tokenInfo .tokenTicker } - + { data @@ -553,7 +550,7 @@ > ) : ( <> - + + {formatBalance( fromLegacyDecimals( @@ -563,7 +560,7 @@ { currency.ticker } - + {fiatPrice !== null && !isNaN( diff --git a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap --- a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap +++ b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap @@ -3,15 +3,15 @@ exports[`Wallet with BCH balances 1`] = ` Array [ MigrationTestAlpha 0 @@ -19,26 +19,26 @@ , Transactions eTokens @@ -87,15 +87,15 @@ exports[`Wallet with BCH balances and tokens 1`] = ` Array [ MigrationTestAlpha 0 @@ -103,26 +103,26 @@ , Transactions eTokens @@ -171,15 +171,15 @@ exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [ MigrationTestAlpha 0.06 @@ -187,26 +187,26 @@ , Transactions eTokens @@ -274,15 +274,15 @@ exports[`Wallet without BCH balance 1`] = ` Array [ MigrationTestAlpha 0 @@ -290,26 +290,26 @@ , Transactions eTokens