Merge pull request #2808 from blockchain/fix/interest-account-dropdowns

fix(interest): show all interest accounts
blockchain · Dec 8, 2020 · 0cd7c31 · 0cd7c31
2 parents d29e02f + 87bc32e
commit 0cd7c31
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
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
@@ -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/...ockchain-wallet-v4-frontend/src/scenes/Transactions/TransactionList/template.interest.tsx b/...ockchain-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<Props> = () => {
       <Column>
         <NavLink
           style={{ textDecoration: 'none' }}
-          to='/interest'
+          to='/interest/history'
           data-e2e='visitEarnInterestPage'
         >
           <Button
-            data-e2e='visitEarnInterestPageButton'
+            data-e2e='viewInterestTransaction'
             nature='primary'
             height='48px'
             size='16px'
           >
-            <Icon
-              name='percentage'
-              color='white'
-              style={{ marginRight: '8px' }}
-            />
             <FormattedMessage
-              id='layouts.wallet.menuleft.navigation.earninterest'
-              defaultMessage='Earn Interest'
+              id='copy.viewTransactions'
+              defaultMessage='View Transactions'
             />
           </Button>
         </NavLink>

diff --git a/.../blockchain-wallet-v4-frontend/src/scenes/Transactions/WalletBalanceDropdown/selectors.ts b/.../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