fix missing tokenInfos

Emurgo · Jan 26, 2022 · 49d85c9 · 49d85c9
1 parent cc60a22
commit 49d85c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/legacy/components/Common/MultiAsset/AssetList.js b/legacy/components/Common/MultiAsset/AssetList.js
@@ -3,9 +3,11 @@
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {FlatList, Text, TouchableOpacity, View} from 'react-native'
+import {useSelector} from 'react-redux'
 
 import type {TokenEntry} from '../../../crypto/MultiToken'
 import globalMessages, {txLabels} from '../../../i18n/global-messages'
+import {availableAssetsSelector} from '../../../selectors'
 import type {Token} from '../../../types/HistoryTransaction'
 import {formatTokenAmount, getName, getTicker, getTokenFingerprint} from '../../../utils/format'
 import assetListSendStyle from './styles/AssetListSend.style'
@@ -63,6 +65,7 @@ type AssetListProps = {
 const AssetList = ({assets, assetsMetadata, styles, onSelect}: AssetListProps) => {
   const intl = useIntl()
   const colors = [styles.rowColor1, styles.rowColor2]
+  const availableAssets = useSelector(availableAssetsSelector)
 
   return (
     <View>
@@ -78,7 +81,7 @@ const AssetList = ({assets, assetsMetadata, styles, onSelect}: AssetListProps) =
           renderItem={({item, index}) => (
             <AssetRow
               asset={item}
-              assetMetadata={assetsMetadata[item.identifier]}
+              assetMetadata={assetsMetadata[item.identifier] || availableAssets[item.identifier]}
               styles={styles}
               backColor={colors[index % colors.length]}
               onSelect={onSelect}

diff --git a/src/TxHistory/AssetList.tsx b/src/TxHistory/AssetList.tsx
@@ -8,7 +8,7 @@ import {useSelector} from 'react-redux'
 
 import {Text} from '../../legacy/components/UiKit'
 import globalMessages, {actionMessages} from '../../legacy/i18n/global-messages'
-import {tokenBalanceSelector, tokenInfoSelector} from '../../legacy/selectors'
+import {availableAssetsSelector, tokenBalanceSelector, tokenInfoSelector} from '../../legacy/selectors'
 import {COLORS} from '../../legacy/styles/config'
 import {formatTokenAmount, getAssetDenominationOrId, getTokenFingerprint} from '../../legacy/utils/format'
 import AdaImage from '../assets/img/icon/asset_ada.png'
@@ -26,12 +26,13 @@ export const AssetList = ({refreshing, onRefresh}: AssetListProps) => {
   const strings = useStrings()
   const tokenBalance = useSelector(tokenBalanceSelector)
   const assetTokenInfos = useSelector(tokenInfoSelector)
+  const availableAssets = useSelector(availableAssetsSelector)
   const assetTokens: Array<TokenEntry> = tokenBalance.values
 
   const orderedTokens = assetTokens
     .sort((a, b) => (a.amount.isGreaterThan(b.amount) ? -1 : 1))
     .sort((a) => (getTokenInfo(assetTokenInfos, a)?.isDefault ? -1 : 1))
-    .filter((t) => assetTokenInfos[t.identifier] != null)
+    .filter((t) => assetTokenInfos[t.identifier] || availableAssets[t.identifier])
 
   const handleOnPressNFTs = () => Alert.alert(strings.soon, strings.soon)
   const handleOnPressTokens = () => Alert.alert(strings.soon, strings.soon)
@@ -55,7 +56,7 @@ export const AssetList = ({refreshing, onRefresh}: AssetListProps) => {
           <AssetItem
             key={assetToken.identifier}
             assetToken={assetToken}
-            tokenInfo={assetTokenInfos[assetToken.identifier]}
+            tokenInfo={assetTokenInfos[assetToken.identifier] || availableAssets[assetToken.identifier]}
           />
         )}
         ItemSeparatorComponent={() => <Spacer height={16} />}