diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts b/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts index 1525d2a1654..3b58bf1571a 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts @@ -377,6 +377,7 @@ type MessagesType = { 'copy.swap_verify_id': 'Verify your identity to increase how much you can Swap everyday.' 'copy.swap_your_crypto': 'Swap Your Crypto' 'copy.viewTransaction': 'View Transaction' + 'copy.viewTransactions': 'View Transactions' 'copy.to': 'To' 'copy.to:': 'To: ' 'copy.transaction_fee': 'Transaction Fee' diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/TransactionList/template.interest.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/TransactionList/template.interest.tsx index 4d13d88f749..9b692eb9d8a 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/TransactionList/template.interest.tsx +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/TransactionList/template.interest.tsx @@ -1,4 +1,4 @@ -import { Button, Icon, Text } from 'blockchain-info-components' +import { Button, Text } from 'blockchain-info-components' import { FormattedMessage } from 'react-intl' import { NavLink } from 'react-router-dom' import media from 'services/ResponsiveService' @@ -52,23 +52,18 @@ const InterestTransactions: React.FC = () => { diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/WalletBalanceDropdown/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/WalletBalanceDropdown/selectors.ts index 06ac004461f..724499bd27a 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/WalletBalanceDropdown/selectors.ts +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/WalletBalanceDropdown/selectors.ts @@ -24,7 +24,7 @@ export const getData = (state, ownProps: OwnProps) => { excludeLockbox: true, excludeImported: true, includeCustodial: true, - includeInterest: false, + includeInterest: true, includeAll: false }) balanceDataR = balanceSelectors.getBtcBalance(state) @@ -33,7 +33,8 @@ export const getData = (state, ownProps: OwnProps) => { addressDataR = getBchAddressData(state, { coin: 'BCH', excludeLockbox: true, - includeCustodial: true + includeCustodial: true, + includeInterest: true }) balanceDataR = balanceSelectors.getBchBalance(state) break @@ -64,15 +65,15 @@ export const getData = (state, ownProps: OwnProps) => { case 'WDGLD': addressDataR = getErc20AddressData(state, { coin: 'WDGLD', - includeCustodial: true, - includeInterest: true + includeCustodial: true }) balanceDataR = balanceSelectors.getWdgldBalance(state) break case 'XLM': addressDataR = getXlmAddressData(state, { excludeLockbox: true, - includeCustodial: true + includeCustodial: true, + includeInterest: true }) balanceDataR = balanceSelectors.getXlmBalance(state) break