@exodus/assets-feature 3.5.0 → 3.7.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.6.0...@exodus/assets-feature@3.7.0) (2023-10-25)
+
+### Features
+
+- **assets-feature:** start custom tokens monitor on unlock ([#4562](https://github.com/ExodusMovement/exodus-hydra/issues/4562)) ([adcd284](https://github.com/ExodusMovement/exodus-hydra/commit/adcd2849d7ed383ebe494b123a20e60ae4e89d58))
+
+## [3.6.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.5.0...@exodus/assets-feature@3.6.0) (2023-10-20)
+
+### Features
+
+- handle builtIn tokens in search ([#4469](https://github.com/ExodusMovement/exodus-hydra/issues/4469)) ([fce5b61](https://github.com/ExodusMovement/exodus-hydra/commit/fce5b615d39e0d612f4b51e43a8fab1fa004e4e7))
+
 ## [3.5.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.4.0...@exodus/assets-feature@3.5.0) (2023-10-17)
 
 ### Features

package/module/assets-module.js

@@ -21,6 +21,26 @@ import {
 } from './constants'
 import { getAssetFromAssetId, getFetchErrorMessage, isDisabledCustomToken } from './utils'
 
+const FILTERED_FIELDS = [
+  'assetId',
+  'baseAssetName',
+  'displayName',
+  'displayTicker',
+  'gradientColors',
+  'gradientCoords',
+  'icon', // there is no icon field in built in assets, but there may be for custom tokens (TODO?)
+  'isBuiltIn',
+  'isCustomToken',
+  'lifecycleStatus',
+  'name',
+  'primaryColor',
+  'properName',
+  'properTicker',
+  'ticker',
+]
+
+const filterBuiltInProps = (asset) => ({ ...pick(asset, FILTERED_FIELDS), assetName: asset.name })
+
 const getFetchCacheKey = (baseAssetName, assetId) => `${assetId}-${baseAssetName}`
 
 const _isDisabledCustomToken = (token) => token.lifecycleStatus === STATUS.DISABLED
@@ -169,26 +189,7 @@ export class AssetsModule extends ExodusModule {
     const asset = this.#getAssetFromAssetId(assetId, baseAssetName)
     if (asset) {
       // either built-in asset (isBuiltIn === true) or previously added custom token (isCustomToken === true)
-      return {
-        ...pick(asset, [
-          'assetId',
-          'baseAssetName',
-          'displayName',
-          'displayTicker',
-          'gradientColors',
-          'gradientCoords',
-          'icon', // there is no icon field in built in assets, but there may be for custom tokens (TODO?)
-          'isBuiltIn',
-          'isCustomToken',
-          'lifecycleStatus',
-          'name',
-          'primaryColor',
-          'properName',
-          'properTicker',
-          'ticker',
-        ]),
-        assetName: asset.name,
-      }
+      return filterBuiltInProps(asset)
     }
 
     const key = getFetchCacheKey(baseAssetName, assetId)
@@ -291,7 +292,7 @@ export class AssetsModule extends ExodusModule {
     const validTokens = tokensToAdd.filter(this.#validateCustomToken).map(normalizeToken)
     if (validTokens.length !== tokensToAdd.length) this._logger.warn('Invalid Custom Token schema')
 
-    const { fetchedAndHandledTokens, added, updated } = this.#handleFetchedTokens(tokens)
+    const { fetchedAndHandledTokens, added, updated } = this.#handleFetchedTokens(validTokens)
 
     if (fetchedAndHandledTokens.length > 0) {
       await this.#storeCustomTokens(fetchedAndHandledTokens)
@@ -351,11 +352,14 @@ export class AssetsModule extends ExodusModule {
       { baseAssetName: baseAssetNames, lifecycleStatus, query, excludeTags },
       'tokens'
     )
-    const validTokens = tokens.filter(this.#validateCustomToken).map(normalizeToken)
+    const validTokens = tokens.filter(this.#validateCustomToken)
 
     if (validTokens.length !== tokens.length) this._logger.warn('Invalid Custom Token schema')
 
-    return validTokens
+    return validTokens.map((token) => {
+      const asset = this.#getAssetFromAssetId(token.assetId, token.baseAssetName)
+      return asset ? filterBuiltInProps(asset) : normalizeToken(token)
+    })
   }
 
   #getCustomTokensNetworkNames = () =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "3.5.0",
+  "version": "3.7.0",
   "license": "UNLICENSED",
   "description": "Assets module, clients and apis",
   "main": "index.js",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
-    "@exodus/atoms": "^5.7.2",
+    "@exodus/atoms": "^6.0.0",
     "@exodus/available-assets": "^7.0.0",
     "@exodus/bitcoin-meta": "^1.0.1",
     "@exodus/bitcoin-plugin": "^1.0.3",
@@ -55,12 +55,12 @@
     "@exodus/osmosis-plugin": "^1.0.0",
     "@exodus/redux-dependency-injection": "^3.0.0",
     "@exodus/storage-memory": "^2.1.1",
-    "@exodus/wallet-accounts": "^14.1.0",
+    "@exodus/wallet-accounts": "^14.2.0",
     "@exodus/wild-emitter": "^1.0.0",
     "eslint": "^8.44.0",
     "events": "^3.3.0",
     "jest": "^29.1.2",
     "redux": "^4.0.0"
   },
-  "gitHead": "28aeb225a8d874b836e19a6c305b9b8543f261c4"
+  "gitHead": "c083b9655607e20206217c44bd55bd1b68e3c9b4"
 }

package/plugin/index.js

@@ -1,7 +1,13 @@
 import { mapValues, pickBy } from '@exodus/basic-utils'
 import { createAtomObserver } from '@exodus/atoms'
 
-const createAssetsPlugin = ({ port, assetsModule, disabledPurposesAtom, multiAddressModeAtom }) => {
+const createAssetsPlugin = ({
+  port,
+  assetsModule,
+  customTokensMonitor,
+  disabledPurposesAtom,
+  multiAddressModeAtom,
+}) => {
   const emitAssetsLoad = () => {
     const assets = assetsModule.getAssets()
     port.emit('assets-load', {
@@ -41,6 +47,14 @@ const createAssetsPlugin = ({ port, assetsModule, disabledPurposesAtom, multiAdd
     emitAssetsLoad()
   }
 
+  const onUnlock = () => {
+    customTokensMonitor.start()
+  }
+
+  const onLock = () => {
+    customTokensMonitor.stop()
+  }
+
   const onStop = () => {
     listeners.forEach(([event, callback]) => {
       assetsModule.removeListener(event, callback)
@@ -53,14 +67,20 @@ const createAssetsPlugin = ({ port, assetsModule, disabledPurposesAtom, multiAdd
     await assetsModule.clear()
   }
 
-  return { onStart, onLoad, onStop, onClear }
+  return { onStart, onLoad, onUnlock, onLock, onStop, onClear }
 }
 
 const assetsPluginDefinition = {
   id: 'assetsPlugin',
   type: 'plugin',
   factory: createAssetsPlugin,
-  dependencies: ['port', 'assetsModule', 'disabledPurposesAtom', 'multiAddressModeAtom'],
+  dependencies: [
+    'port',
+    'assetsModule',
+    'customTokensMonitor',
+    'disabledPurposesAtom',
+    'multiAddressModeAtom',
+  ],
 }
 
 export default assetsPluginDefinition