@exodus/activity-txs 6.1.1 → 6.1.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@6.1.1...@exodus/activity-txs@6.1.2) (2026-05-08)
+
+### Bug Fixes
+
+- fix(activity-txs): fiat order duplicates (#16369)
+
 ## [6.1.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@6.1.0...@exodus/activity-txs@6.1.1) (2026-03-24)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -32,10 +32,10 @@
     "test": "run -T exodus-test --jest"
   },
   "dependencies": {
-    "@exodus/atoms": "^9.0.0",
-    "@exodus/basic-utils": "^3.7.3",
+    "@exodus/atoms": "^10.3.3",
+    "@exodus/basic-utils": "^5.0.0",
     "@exodus/core-selectors": "^4.0.0",
-    "@exodus/models": "^12.0.1",
+    "@exodus/models": "^13.0.0",
     "@exodus/multi-account-redux": "^2.0.1",
     "@exodus/safe-string": "^1.3.0",
     "@exodus/typeforce": "^1.19.0",
@@ -45,19 +45,19 @@
   },
   "devDependencies": {
     "@exodus/assets": "^11.0.0",
-    "@exodus/assets-base": "^10.0.0",
-    "@exodus/assets-feature": "^9.0.1",
+    "@exodus/assets-base": "^12.0.0",
+    "@exodus/assets-feature": "^9.2.2",
     "@exodus/available-assets": "^8.11.0",
     "@exodus/bitcoin-plugin": "^2.0.0",
     "@exodus/connected-origins": "^4.3.0",
-    "@exodus/error-tracking": "^3.3.2",
-    "@exodus/fiat-ramp": "^15.18.0",
+    "@exodus/error-tracking": "^3.4.0",
+    "@exodus/fiat-ramp": "^15.21.1",
     "@exodus/logger": "^1.2.3",
     "@exodus/nfts": "^9.6.2",
-    "@exodus/orders": "^6.0.9",
+    "@exodus/orders": "^6.1.3",
     "@exodus/personal-notes": "^3.9.0",
-    "@exodus/redux-dependency-injection": "^4.1.2",
-    "@exodus/wallet-accounts": "^20.3.0",
+    "@exodus/redux-dependency-injection": "^4.5.0",
+    "@exodus/wallet-accounts": "^20.4.3",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
@@ -65,5 +65,5 @@
     "access": "public",
     "provenance": false
   },
-  "gitHead": "ba7c7b44e52c27e667210aef6dedd9bbdc05f4e5"
+  "gitHead": "372a71f57099176bee974600b6ca683d60c3b6eb"
 }

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

@@ -4,6 +4,45 @@ import assert from 'minimalistic-assert'
 import { TX_TYPES } from '../constants/tx-types.js'
 import { ORDER_STATUS, ORDER_TYPES } from '@exodus/models/lib/fiat-order/constants.js'
 
+const ORDER_TX_MATCH_WINDOW_MS = 3 * 24 * 60 * 60 * 1000
+
+const NON_MATCHABLE_ORDER_STATUSES = new Set([
+  ORDER_STATUS.failed,
+  ORDER_STATUS.refunded,
+  ORDER_STATUS.expired,
+  ORDER_STATUS.error,
+])
+
+const findMatchingOrderIndex = ({ activityItem, ordersWithoutTx }) => {
+  const coinAmount = activityItem.tx?.coinAmount
+  if (!coinAmount) {
+    return -1
+  }
+
+  const txTime = activityItem.date?.getTime?.()
+  if (!Number.isFinite(txTime)) {
+    return -1
+  }
+
+  const absAmount = coinAmount.abs()
+
+  return ordersWithoutTx.findIndex((order) => {
+    const isSell = order.orderType === ORDER_TYPES.sell
+    if (isSell !== activityItem.tx.sent) {
+      return false
+    }
+
+    const orderAmount = isSell ? order.fromAmount : order.toAmount
+    if (!orderAmount || !absAmount.equals(orderAmount)) {
+      return false
+    }
+
+    const orderTime = order.date?.getTime?.()
+
+    return Number.isFinite(orderTime) && Math.abs(txTime - orderTime) <= ORDER_TX_MATCH_WINDOW_MS
+  })
+}
+
 const selectorFactory =
   (visibleOrdersSelector) =>
   ({ createActivitySelector }) => {
@@ -20,8 +59,8 @@ const selectorFactory =
           }
 
           let hasChanges = false
-          const pendingFiatOrdersWithoutTx = []
           const fiatOrdersWithoutTx = []
+          const matchableOrdersWithoutTx = []
 
           if (displayFiatOrdersWithoutTx) {
             for (const order of fiatOrders) {
@@ -34,8 +73,8 @@ const selectorFactory =
 
               if (isRelatedBuyOrder || isRelatedSellOrder) {
                 fiatOrdersWithoutTx.push(order)
-                if (order.exodusStatus === ORDER_STATUS.in_progress) {
-                  pendingFiatOrdersWithoutTx.push(order)
+                if (!NON_MATCHABLE_ORDER_STATUSES.has(order.exodusStatus)) {
+                  matchableOrdersWithoutTx.push(order)
                 }
               }
             }
@@ -57,24 +96,24 @@ const selectorFactory =
                   type: TX_TYPES.FIAT,
                 })
               }
-            } else {
-              if (activityItem.pending && pendingFiatOrdersWithoutTx.length > 0) {
-                const matchingOrderIndex = pendingFiatOrdersWithoutTx.findIndex((order) => {
-                  const orderAmount =
-                    order.orderType === ORDER_TYPES.sell ? order.fromAmount : order.toAmount
 
-                  return activityItem.tx?.coinAmount?.abs().equals(orderAmount)
-                })
+              continue
+            }
 
-                if (matchingOrderIndex !== -1) {
-                  hasChanges = true
-                  pendingFiatOrdersWithoutTx.splice(matchingOrderIndex, 1)
-                  continue
-                }
-              }
+            if (matchableOrdersWithoutTx.length > 0) {
+              const matchingOrderIndex = findMatchingOrderIndex({
+                activityItem,
+                ordersWithoutTx: matchableOrdersWithoutTx,
+              })
 
-              resultActivity.push(activityItem)
+              if (matchingOrderIndex !== -1) {
+                matchableOrdersWithoutTx.splice(matchingOrderIndex, 1)
+                hasChanges = true
+                continue
+              }
             }
+
+            resultActivity.push(activityItem)
           }
 
           for (const fiatOrder of fiatOrdersWithoutTx) {