@exodus/activity-txs 4.6.4 → 4.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.
 
+## [4.7.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.6.5...@exodus/activity-txs@4.7.0) (2025-05-14)
+
+### Features
+
+- feat: make activity-txs to proper ESM (#12451)
+
+## [4.6.5](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.6.4...@exodus/activity-txs@4.6.5) (2025-04-03)
+
+### Bug Fixes
+
+- fix: filter out tx activities associated with a spam nft (#11950)
+
 ## [4.6.4](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.6.3...@exodus/activity-txs@4.6.4) (2025-02-12)
 
 ### Performance

package/atoms/activity-txs.js

@@ -1,6 +1,6 @@
 import { combine, compute } from '@exodus/atoms'
 import { createSelector } from 'reselect'
-import { createDeepEqualOutputSelector } from '@exodus/core-selectors/utils/deep-equal'
+import { createDeepEqualOutputSelector } from '@exodus/core-selectors/utils/deep-equal.js'
 import { memoize } from '@exodus/basic-utils'
 
 const createAssetSourceActivityTxsSelector = memoize(

package/atoms/index.js

@@ -1 +1 @@
-export { default as activityTxsAtomDefinition } from './activity-txs'
+export { default as activityTxsAtomDefinition } from './activity-txs.js'

package/index.js

@@ -1,5 +1,5 @@
-import { activityTxsAtomDefinition } from './atoms'
-import activityTxsPluginDefinition from './plugin'
+import { activityTxsAtomDefinition } from './atoms/index.js'
+import activityTxsPluginDefinition from './plugin/index.js'
 
 const activityTxs = () => ({
   id: 'activityTxs',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.6.4",
+  "version": "4.7.0",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -12,6 +12,7 @@
   "bugs": {
     "url": "https://github.com/ExodusMovement/exodus-hydra/issues?q=is%3Aissue+is%3Aopen+label%3Aactivity-txs"
   },
+  "type": "module",
   "main": "index.js",
   "files": [
     "api",
@@ -28,12 +29,12 @@
   "scripts": {
     "lint": "run -T eslint -c ../../eslint.config.mjs",
     "lint:fix": "yarn lint --fix",
-    "test": "run -T exodus-test --jest --esbuild"
+    "test": "run -T exodus-test --jest"
   },
   "dependencies": {
     "@exodus/atoms": "^9.0.0",
     "@exodus/basic-utils": "^3.0.1",
-    "@exodus/core-selectors": "^1.5.0",
+    "@exodus/core-selectors": "^4.0.0",
     "@exodus/models": "^12.0.1",
     "@exodus/multi-account-redux": "^2.0.1",
     "@exodus/typeforce": "^1.19.0",
@@ -42,25 +43,25 @@
     "reselect": "^3.0.1"
   },
   "devDependencies": {
-    "@exodus/assets": "^8.0.95",
-    "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^6.1.0",
+    "@exodus/assets": "^11.0.0",
+    "@exodus/assets-base": "^10.0.0",
+    "@exodus/assets-feature": "^7.4.0",
     "@exodus/available-assets": "^8.7.0",
     "@exodus/bitcoin-plugin": "^1.4.2",
-    "@exodus/connected-origins": "^4.1.1",
-    "@exodus/error-tracking": "^1.3.1",
-    "@exodus/fiat-ramp": "^12.2.0",
+    "@exodus/connected-origins": "^4.3.0",
+    "@exodus/error-tracking": "^2.0.0",
+    "@exodus/fiat-ramp": "^12.8.0",
     "@exodus/logger": "^1.2.3",
-    "@exodus/nfts": "^9.5.0",
-    "@exodus/orders": "^4.15.0",
-    "@exodus/personal-notes": "^3.7.0",
+    "@exodus/nfts": "^9.5.1",
+    "@exodus/orders": "^5.1.0",
+    "@exodus/personal-notes": "^3.8.0",
     "@exodus/redux-dependency-injection": "^4.1.1",
-    "@exodus/wallet-accounts": "^17.3.0",
+    "@exodus/wallet-accounts": "^17.5.2",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16fb1f9330a353da411f5023911cf60075ab0a54"
+  "gitHead": "17d1ef8aaa53945779cb0099a0e4d55ceeb59afc"
 }

package/redux/index.js

@@ -1,8 +1,8 @@
-import id from './id'
-import initialState from './initial-state'
-import selectorDefinitions from './selectors'
-import helper from './multi-account-helper'
-import { setAccounts } from '@exodus/multi-account-redux/src/common'
+import id from './id.js'
+import initialState from './initial-state.js'
+import selectorDefinitions from './selectors/index.js'
+import helper from './multi-account-helper.js'
+import { setAccounts } from '@exodus/multi-account-redux/src/common.js'
 
 const activityTxsReduxDefinition = {
   id,

package/redux/initial-state.js

@@ -1,4 +1,4 @@
-import helper from './multi-account-helper'
+import helper from './multi-account-helper.js'
 
 const initialState = helper.createInitialState()
 

package/redux/selectors/create-asset-source-base-activity.js

@@ -1,7 +1,7 @@
 import { createSelector } from 'reselect'
 import { memoize } from '@exodus/basic-utils'
-import { formattersByType } from '../utils/activity-formatters'
-import { formatUnindexedOrder } from '../utils/activity-formatters/format-swap-activity'
+import { formattersByType } from '../utils/activity-formatters/index.js'
+import { formatUnindexedOrder } from '../utils/activity-formatters/format-swap-activity.js'
 
 const EMPTY = Object.freeze([])
 

package/redux/selectors/create-batched-asset-source.js

@@ -1,8 +1,10 @@
-import { get, groupBy, merge } from 'lodash'
+import lodash from 'lodash'
 import { createSelector } from 'reselect'
 import { Tx } from '@exodus/models'
 import { memoize } from '@exodus/basic-utils'
 
+const { get, groupBy, merge } = lodash
+
 // TODO: Remove in the future.
 // Batch swapping transactions using personal notes is no longer needed.
 // Now, we write the `order.txsIds` array, which contains information about setup, swap transactions, and more.

package/redux/selectors/create-multi-activity.js

@@ -1,7 +1,9 @@
 import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 import assert from 'minimalistic-assert'
-import { uniqBy } from 'lodash'
+import lodash from 'lodash'
+
+const { uniqBy } = lodash
 
 const selectorFactory =
   () =>

package/redux/selectors/create-with-fiat-activity.js

@@ -1,7 +1,7 @@
 import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 import assert from 'minimalistic-assert'
-import { TX_TYPES } from '../constants/tx-types'
+import { TX_TYPES } from '../constants/tx-types.js'
 
 const selectorFactory =
   (visibleOrdersSelector, assetsSelector) =>

package/redux/selectors/create-with-nfts-activity.js

@@ -1,10 +1,10 @@
 import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 import assert from 'minimalistic-assert'
-import { formatNftTx, formatUnindexedNftTx } from '../utils/activity-formatters/format-nft'
+import { formatNftTx, formatUnindexedNftTx } from '../utils/activity-formatters/format-nft.js'
 
 const selectorFactory =
-  (createAssetSourceNftTxsById, assetsSelector) =>
+  (createAssetSourceNftTxsById, activeNftsSelector, assetsSelector) =>
   ({ createActivitySelector, nftsNetworkNameToAssetName }) => {
     assert(createActivitySelector, 'please provide activitySelector')
     assert(nftsNetworkNameToAssetName, 'please provide nftsNetworkNameToAssetName')
@@ -12,7 +12,7 @@ const selectorFactory =
     return memoize(
       ({ assetName, walletAccount, ...rest }) => {
         const activitySelector = createActivitySelector({ assetName, walletAccount, ...rest })
-        if (createAssetSourceNftTxsById.isFallback) {
+        if (createAssetSourceNftTxsById.isFallback || activeNftsSelector.isFallback) {
           return activitySelector
         }
 
@@ -20,9 +20,17 @@ const selectorFactory =
         assert(nftsSelector, 'nfts redux feature must be installed to use this selector')
         return createSelector(
           nftsSelector,
+          activeNftsSelector,
           assetsSelector,
           activitySelector,
-          (nftsByTxId, assets, activity) => {
+          (nftsByTxId, activeNfts, assets, activity) => {
+            const spamNftIdsSet = new Set(
+              Object.values(activeNfts)
+                .flat()
+                .filter((nft) => nft.isSpam)
+                .map(({ id }) => id && id.toLowerCase())
+            )
+
             const indexedNftTxIds = new Set()
             const resultActivity = []
             let hasChanges = false
@@ -30,28 +38,34 @@ const selectorFactory =
               const nft = nftsByTxId.get(activityItem.txId)
 
               if (nft) {
-                hasChanges = true
-                indexedNftTxIds.add(nft.txId)
-                resultActivity.push(
-                  formatNftTx({
-                    ...activityItem,
-                    nft,
-                    asset: assets[activityItem.assetName],
-                    assetName: activityItem.assetName,
-                  })
-                )
+                const nftIdLower = nft.nftId && nft.nftId.toLowerCase()
+                if (!nftIdLower || !spamNftIdsSet.has(nftIdLower)) {
+                  hasChanges = true
+                  indexedNftTxIds.add(nft.txId)
+                  resultActivity.push(
+                    formatNftTx({
+                      ...activityItem,
+                      nft,
+                      asset: assets[activityItem.assetName],
+                      assetName: activityItem.assetName,
+                    })
+                  )
+                }
               } else {
                 resultActivity.push(activityItem)
               }
             }
 
             ;[...nftsByTxId.values()]
-              .filter(
-                (nftTx) =>
+              .filter((nftTx) => {
+                const nftIdLower = nftTx.nftId && nftTx.nftId.toLowerCase()
+                return (
                   Object.hasOwn(nftsNetworkNameToAssetName, nftTx.network) &&
                   assetName === nftsNetworkNameToAssetName[nftTx.network] &&
-                  !indexedNftTxIds.has(nftTx.txId)
-              )
+                  !indexedNftTxIds.has(nftTx.txId) &&
+                  (!nftIdLower || !spamNftIdsSet.has(nftIdLower))
+                )
+              })
               .forEach((nftTx) => {
                 hasChanges = true
                 const assetName = nftsNetworkNameToAssetName[nftTx.network]
@@ -77,6 +91,7 @@ const createWithNftsActivitySelectorDefinition = {
   selectorFactory,
   dependencies: [
     { module: 'nfts', selector: 'createAssetSourceNftTxsById', optional: true },
+    { module: 'nfts', selector: 'activeNfts', optional: true },
     { module: 'assets', selector: 'all' },
   ],
 }

package/redux/selectors/index.js

@@ -1,12 +1,12 @@
-import createLimitedAssetSourceSelectorDefinition from './create-limited-asset-source'
-import createBatchedAssetSourceSelector from './create-batched-asset-source'
-import createBatchedAssetSourceActivityByIdSelector from './create-batched-asset-source-by-id'
-import createAssetSourceBaseActivitySelectorDefinition from './create-asset-source-base-activity'
-import createWithNftsActivitySelectorDefinition from './create-with-nfts-activity'
-import createWithFiatActivitySelectorDefinition from './create-with-fiat-activity'
-import createWithConnectionsActivitySelectorDefinition from './create-with-connections-activity'
-import createFullActivitySelectorDefinition from './create-full-activity'
-import createMultiActivitySelectorDefinition from './create-multi-activity'
+import createLimitedAssetSourceSelectorDefinition from './create-limited-asset-source.js'
+import createBatchedAssetSourceSelector from './create-batched-asset-source.js'
+import createBatchedAssetSourceActivityByIdSelector from './create-batched-asset-source-by-id.js'
+import createAssetSourceBaseActivitySelectorDefinition from './create-asset-source-base-activity.js'
+import createWithNftsActivitySelectorDefinition from './create-with-nfts-activity.js'
+import createWithFiatActivitySelectorDefinition from './create-with-fiat-activity.js'
+import createWithConnectionsActivitySelectorDefinition from './create-with-connections-activity.js'
+import createFullActivitySelectorDefinition from './create-full-activity.js'
+import createMultiActivitySelectorDefinition from './create-multi-activity.js'
 
 export default [
   createLimitedAssetSourceSelectorDefinition,

package/redux/utils/activity-formatters/format-nft.js

@@ -1,6 +1,6 @@
-import { getSharedProps } from './get-shared-props'
-import { TX_TYPES } from '../../constants/tx-types'
-import { isPending } from './format-tx-activity'
+import { getSharedProps } from './get-shared-props.js'
+import { TX_TYPES } from '../../constants/tx-types.js'
+import { isPending } from './format-tx-activity.js'
 
 export const formatUnindexedNftTx = ({ assetName, nftTx }) => {
   return {

package/redux/utils/activity-formatters/format-swap-activity.js

@@ -1,5 +1,5 @@
-import { getSharedProps } from './get-shared-props'
-import { TX_TYPES } from '../../constants/tx-types'
+import { getSharedProps } from './get-shared-props.js'
+import { TX_TYPES } from '../../constants/tx-types.js'
 
 const FINAL_ORDER_STATUS = {
   inProgress: 'in-progress',

package/redux/utils/activity-formatters/format-tx-activity.js

@@ -1,5 +1,5 @@
-import { TX_TYPES } from '../../constants/tx-types'
-import { getSharedProps } from './get-shared-props'
+import { TX_TYPES } from '../../constants/tx-types.js'
+import { getSharedProps } from './get-shared-props.js'
 
 function getTxType({ tx }) {
   return tx.sent ? TX_TYPES.SENT : TX_TYPES.RECEIVED

package/redux/utils/activity-formatters/index.js

@@ -1,5 +1,5 @@
-import { formatSwapActivity } from './format-swap-activity'
-import { formatTxActivity } from './format-tx-activity'
+import { formatSwapActivity } from './format-swap-activity.js'
+import { formatTxActivity } from './format-tx-activity.js'
 
 export const formattersByType = new Map([
   ['exchange', formatSwapActivity],