Merge pull request #4538 from EdgeApp/jon/fix/asset-stataus-appversion

Support version-specific targeting of AssetStatus messages

Author: Jon-edge

package.json

@@ -143,7 +143,7 @@
     "edge-currency-monero": "^1.1.1",
     "edge-currency-plugins": "^2.3.0",
     "edge-exchange-plugins": "^0.21.11",
-    "edge-info-server": "^1.0.1",
+    "edge-info-server": "^1.0.2",
     "edge-login-ui-rn": "^2.14.1",
     "ethers": "^5.6.0",
     "paraswap": "^5.2.0",

src/components/scenes/TransactionListScene.tsx

@@ -5,6 +5,7 @@ import { EdgeCurrencyWallet, EdgeTokenMap, EdgeTransaction } from 'edge-core-js'
 import { asAssetStatus, AssetStatus } from 'edge-info-server/types'
 import * as React from 'react'
 import { RefreshControl } from 'react-native'
+import { getVersion } from 'react-native-device-info'
 
 import { SPECIAL_CURRENCY_INFO } from '../../constants/WalletAndCurrencyConstants'
 import { useHandler } from '../../hooks/useHandler'
@@ -52,7 +53,7 @@ function TransactionListComponent(props: Props) {
   const flashList = React.useRef<FlashList<ListItem>>(null)
   const [searching, setSearching] = React.useState(false)
   const [searchText, setSearchText] = React.useState('')
-  const [assetStatuses, setAssetStatuses] = React.useState<AssetStatus[]>()
+  const [assetStatuses, setAssetStatuses] = React.useState<AssetStatus[]>([])
 
   // Selectors:
   const exchangeDenom = useSelector(state => getExchangeDenomination(state, pluginId, currencyCode))
@@ -146,7 +147,16 @@ function TransactionListComponent(props: Props) {
   React.useEffect(() => {
     fetchInfo(`v1/assetStatus/${pluginId}${tokenId == null ? '' : `_${tokenId}`}`)
       .then(async res => {
-        setAssetStatuses(asArray(asAssetStatus)(await res.json()))
+        const allAssetStatuses: AssetStatus[] = asArray(asAssetStatus)(await res.json())
+        const version = getVersion()
+
+        // Filter for assetStatuses relevant to this instance of the app
+        setAssetStatuses(
+          allAssetStatuses.filter(assetStatus => {
+            const { appId, appVersions } = assetStatus
+            return (appId == null || appId === config.appId) && (appVersions == null || appVersions.includes(version))
+          })
+        )
       })
       .catch(console.error)
   }, [pluginId, tokenId])
@@ -178,12 +188,10 @@ function TransactionListComponent(props: Props) {
           onSearchingChange={setSearching}
           onSearchTextChange={setSearchText}
         />
-        {assetStatuses != null && assetStatuses.length > 0
-          ? assetStatuses.map(assetStatus =>
-              assetStatus.appId == null || assetStatus.appId === config.appId ? (
-                <AssetStatusCard assetStatus={assetStatus} key={`${String(assetStatus.localeStatusTitle)}-${String(assetStatus.localeStatusBody)}`} />
-              ) : null
-            )
+        {assetStatuses.length > 0
+          ? assetStatuses.map(assetStatus => (
+              <AssetStatusCard assetStatus={assetStatus} key={`${String(assetStatus.localeStatusTitle)}-${String(assetStatus.localeStatusBody)}`} />
+            ))
           : null}
       </>
     )

yarn.lock

@@ -7774,10 +7774,10 @@ edge-exchange-plugins@^0.21.11:
     utf8 "^3.0.0"
     xrpl "^2.10.0"
 
-edge-info-server@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/edge-info-server/-/edge-info-server-1.0.1.tgz#3cdb4c8e017fd3a674a145264291cb81d78ec404"
-  integrity sha512-/CrEQ7eSCOkPuFhrOGQm304WvyRQsrvgKIQSCMEjoiEO9yL83S5fTCrcbwDj5LY2t+fhRp5bKwXNlo2xOqzVJQ==
+edge-info-server@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/edge-info-server/-/edge-info-server-1.0.2.tgz#7454683a8c4e56cbcbb0e97aa7d6651c3f73f833"
+  integrity sha512-jtXuLLXsIf8Fmgq1maZ64Pt2lzjfSkgA/CTDRQ8i2tzOjci7JwYxsOKCf2gW6OOdoSovvFdJwWHNJvEldCDZbw==
   dependencies:
     cleaners "^0.3.16"