@exodus/activity-txs 5.0.0 → 5.0.2

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.
 
+## [5.0.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@5.0.1...@exodus/activity-txs@5.0.2) (2025-11-05)
+
+### Bug Fixes
+
+- fix(activity-txs): missing batched same tx id fiat orders (#14323)
+
+## [5.0.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@5.0.0...@exodus/activity-txs@5.0.1) (2025-10-01)
+
+### Bug Fixes
+
+- fix: prevent base asset transactions from showing as swap activity (#13967)
+
 ## [5.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.8.0...@exodus/activity-txs@5.0.0) (2025-05-29)
 
 ### ⚠ BREAKING CHANGES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -45,23 +45,24 @@
   "devDependencies": {
     "@exodus/assets": "^11.0.0",
     "@exodus/assets-base": "^10.0.0",
-    "@exodus/assets-feature": "^8.1.1",
-    "@exodus/available-assets": "^8.7.0",
+    "@exodus/assets-feature": "^8.7.1",
+    "@exodus/available-assets": "^8.8.0",
     "@exodus/bitcoin-plugin": "^1.4.2",
     "@exodus/connected-origins": "^4.3.0",
-    "@exodus/error-tracking": "^2.0.0",
-    "@exodus/fiat-ramp": "^12.9.0",
+    "@exodus/error-tracking": "^3.2.0",
+    "@exodus/fiat-ramp": "^15.5.0",
     "@exodus/logger": "^1.2.3",
-    "@exodus/nfts": "^9.5.1",
-    "@exodus/orders": "^5.3.0",
-    "@exodus/personal-notes": "^3.8.0",
-    "@exodus/redux-dependency-injection": "^4.1.1",
-    "@exodus/wallet-accounts": "^17.5.2",
+    "@exodus/nfts": "^9.6.1",
+    "@exodus/orders": "^5.5.2",
+    "@exodus/personal-notes": "^3.9.0",
+    "@exodus/redux-dependency-injection": "^4.1.2",
+    "@exodus/wallet-accounts": "^20.2.1",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": false
   },
-  "gitHead": "4cc92d5c28fdd93aca7cdfd6d3518e4b905e9b0d"
+  "gitHead": "e327423c6bddd97049003f3a2d31af9ba7aedc44"
 }

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

@@ -10,6 +10,19 @@ const groupTxsWithSameOrder = ({ txs, orderSet, isIndexless }) => {
 
   const getOrder = (tx) => {
     const foundOrder = orderSet.getByTxId(tx.txId)
+
+    // If this is a base asset (fee-only tx), don't attach the order
+    // Base asset is not involved in the swap itself (not fromAsset or toAsset)
+    if (foundOrder) {
+      const isFromAsset = tx.coinName === foundOrder.fromAsset
+      const isToAsset = tx.coinName === foundOrder.toAsset
+
+      // Base asset transactions should be treated as normal txs, not swaps
+      if (!isFromAsset && !isToAsset) {
+        return
+      }
+    }
+
     const isBatchedTx = tx.coinName === 'bitcoin' && tx.data.sent?.[tx.data.sentIndex]
     const isValidTx =
       isBatchedTx && foundOrder?.fromAmount

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

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports -- TODO: Fix this the next time the file is edited.
 import lodash from 'lodash'
 import { createSelector } from 'reselect'
 import { Tx } from '@exodus/models'

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

@@ -1,6 +1,7 @@
 import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 import assert from 'minimalistic-assert'
+// eslint-disable-next-line no-restricted-imports -- TODO: Fix this the next time the file is edited.
 import lodash from 'lodash'
 
 const { uniqBy } = lodash

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

@@ -27,15 +27,19 @@ const selectorFactory =
 
             const resultActivity = []
             for (const activityItem of activity) {
-              const fiatOrder = fiatOrders.getByTxId(activityItem.txId)
+              const fiatOrdersByTx = fiatOrders.getAllByTxId(activityItem.txId)
 
-              if (fiatOrder) {
+              if (fiatOrdersByTx.length > 0) {
                 hasChanges = true
-                resultActivity.push({
-                  ...activityItem,
-                  fiatOrder,
-                  type: TX_TYPES.FIAT,
-                })
+
+                for (const fiatOrder of fiatOrdersByTx) {
+                  resultActivity.push({
+                    ...activityItem,
+                    fiatOrder,
+                    id: `${activityItem.id}.${fiatOrder.orderId}`,
+                    type: TX_TYPES.FIAT,
+                  })
+                }
               } else {
                 resultActivity.push(activityItem)
               }