feat(dynamic erc20): load all erc20 rates on login

blockchain · Jul 15, 2021 · 7077346 · 7077346
1 parent ed17312
commit 7077346
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Display/FiatDisplay/index.tsx b/packages/blockchain-wallet-v4-frontend/src/components/Display/FiatDisplay/index.tsx
@@ -21,7 +21,7 @@ class FiatDisplayContainer extends React.PureComponent<Props> {
         return
       }
       if (coinfig.type.erc20Address) {
-        return this.props.ethActions.fetchErc20Rates(this.props.coin)
+        return
       }
       return this.props[`${toLower(coin)}Actions`].fetchRates()
     }

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/coins/model/swap.ts b/packages/blockchain-wallet-v4-frontend/src/data/coins/model/swap.ts
@@ -7,19 +7,15 @@ export const SUPPORTED_COINS: Array<CoinType | string> = [
   'BTC',
   'ETH',
   'BCH',
-  'AAVE',
   'YFI',
   'DOT',
   'XLM',
-  'PAX',
-  'USDT',
-  'WDGLD',
-  'ALGO',
+  'ALGO'
 ]
 
 // used in the coin/account selector in Swap
 export const SWAP_ACCOUNTS_SELECTOR: CoinAccountSelectorType = {
   coins: SUPPORTED_COINS,
   nonCustodialAccounts: true,
-  tradingAccounts: true,
+  tradingAccounts: true
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/refresh/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/refresh/sagas.ts
@@ -42,11 +42,7 @@ export default () => {
     yield put(actions.core.data.xlm.fetchRates())
     yield put(actions.core.data.dot.fetchRates())
     yield put(actions.core.data.algo.fetchRates())
-    yield put(actions.core.data.eth.fetchErc20Rates('pax'))
-    yield put(actions.core.data.eth.fetchErc20Rates('usdt'))
-    yield put(actions.core.data.eth.fetchErc20Rates('wdgld'))
-    yield put(actions.core.data.eth.fetchErc20Rates('aave'))
-    yield put(actions.core.data.eth.fetchErc20Rates('yfi'))
+    yield put(actions.core.data.eth.fetchErc20Rates())
   }
 
   const refreshClicked = function* () {

diff --git a/...ntend/src/modals/SimpleBuy/CryptoSelection/CryptoSelector/CryptoItem/template.success.tsx b/...ntend/src/modals/SimpleBuy/CryptoSelection/CryptoSelector/CryptoItem/template.success.tsx
@@ -46,7 +46,7 @@ const IconBackground = styled.div`
   background: white;
 `
 const StyledIcon = styled(Icon)<{ background: string }>`
-  background: rgba(${(props) => hexToRgb(props.theme[props.background])}, 0.15);
+  background: rgba(${(props) => hexToRgb(props.theme[props.background] || '#000000')}, 0.15);
   border-radius: 50%;
 
   & :not(::before) {

diff --git a/packages/blockchain-wallet-v4-frontend/src/store/index.js b/packages/blockchain-wallet-v4-frontend/src/store/index.js
@@ -60,7 +60,7 @@ const configuredStore = async function () {
   const erc20Res = await fetch(`${options.domains.api}/assets/currencies/erc20`)
   const erc20s = await erc20Res.json()
   // TODO: erc20 phase 2, remove this whitelist
-  const coins = ['AAVE', 'PAX', 'USDT', 'WDGLD', 'YFI']
+  const coins = ['AAVE', 'PAX', 'USDC', 'USDT', 'WDGLD', 'YFI']
   const erc20sSupportedBeforeDynamicChange = erc20s.currencies.filter((erc20) =>
     coins.includes(erc20.symbol)
   )

diff --git a/packages/blockchain-wallet-v4/src/redux/data/eth/actions.ts b/packages/blockchain-wallet-v4/src/redux/data/eth/actions.ts
@@ -170,8 +170,7 @@ export const fetchErc20DataFailure = (token, error) => ({
 })
 
 // RATES
-export const fetchErc20Rates = (token) => ({
-  payload: { token },
+export const fetchErc20Rates = () => ({
   type: AT.FETCH_ERC20_RATES
 })
 export const fetchErc20RatesLoading = (token) => ({

diff --git a/packages/blockchain-wallet-v4/src/redux/data/eth/sagas.ts b/packages/blockchain-wallet-v4/src/redux/data/eth/sagas.ts
@@ -242,7 +242,6 @@ export default ({ api }: { api: APIType }) => {
           // TODO: erc20 phase 2, key off hash not symbol
           const symbol = toUpper(val.tokenSymbol)
           yield put(A.fetchErc20DataLoading(symbol))
-          yield put(A.fetchErc20Rates(symbol))
           const contract = val.tokenHash
           const tokenData = data.tokenAccounts.find(
             ({ tokenHash }) => toLower(tokenHash) === toLower(contract as string)
@@ -260,15 +259,20 @@ export default ({ api }: { api: APIType }) => {
     }
   }
 
-  const fetchErc20Rates = function* (action) {
-    const { token } = action.payload
-    try {
-      yield put(A.fetchErc20RatesLoading(token))
-      const data = yield call(api.getErc20Ticker, toUpper(token))
-      yield put(A.fetchErc20RatesSuccess(token, data))
-    } catch (e) {
-      yield put(A.fetchErc20RatesFailure(token, e.message))
-    }
+  const fetchErc20Rates = function* () {
+    const tokens = S.getErc20Coins()
+
+    yield all(
+      tokens.map(function* (token) {
+        try {
+          yield put(A.fetchErc20RatesLoading(token))
+          const data = yield call(api.getErc20Ticker, toUpper(token))
+          yield put(A.fetchErc20RatesSuccess(token, data))
+        } catch (e) {
+          yield put(A.fetchErc20RatesFailure(token, e.message))
+        }
+      })
+    )
   }
 
   const watchErc20Transactions = function* () {

diff --git a/packages/blockchain-wallet-v4/src/redux/data/eth/selectors.js b/packages/blockchain-wallet-v4/src/redux/data/eth/selectors.js
@@ -66,6 +66,9 @@ export const getErc20Balance = (state, token) => {
 export const getErc20CurrentBalance = (state, token) => {
   return path([dataPath, 'eth', 'current_balance', token])(state) || Remote.NotAsked
 }
+export const getErc20Coins = () => {
+  return Object.keys(window.coins).filter((coin) => window.coins[coin].coinfig.type.erc20Address)
+}
 export const getErc20Transactions = (state, token) => {
   return path([dataPath, 'eth', 'transactions', token])(state) || Remote.NotAsked
 }