@exodus/activity-txs 4.1.5 → 4.2.1

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.2.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.2.0...@exodus/activity-txs@4.2.1) (2024-05-30)
+
+### Bug Fixes
+
+- memoize activity selectors ([#7223](https://github.com/ExodusMovement/exodus-hydra/issues/7223)) ([cf4cb47](https://github.com/ExodusMovement/exodus-hydra/commit/cf4cb478355548d355180c81ad15b0558d0d7ad6))
+
+## [4.2.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.1.5...@exodus/activity-txs@4.2.0) (2024-05-29)
+
+### Features
+
+- order in activity ([#7220](https://github.com/ExodusMovement/exodus-hydra/issues/7220)) ([b32e3e0](https://github.com/ExodusMovement/exodus-hydra/commit/b32e3e0dd8d16e937c91017665f85c7ff1291120))
+
 ## [4.1.5](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.1.4...@exodus/activity-txs@4.1.5) (2024-05-29)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.1.5",
+  "version": "4.2.1",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -51,7 +51,7 @@
     "@exodus/connected-origins": "^3.3.1",
     "@exodus/dependency-injection": "^2.2.0",
     "@exodus/dependency-preprocessors": "^5.2.0",
-    "@exodus/fiat-ramp": "^10.6.0",
+    "@exodus/fiat-ramp": "^10.7.1",
     "@exodus/nfts": "^9.3.0",
     "@exodus/orders": "^4.9.0",
     "@exodus/personal-notes": "^3.6.0",
@@ -61,5 +61,5 @@
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
-  "gitHead": "8f22879093e8b3fb64fd273ae4d60d3f02f911eb"
+  "gitHead": "9169f83b1c385d7b59703e0bc763a544d28b46a8"
 }

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

@@ -5,15 +5,17 @@ const createBatchedAssetSourceActivityByIdSelector = {
   id: 'createBatchedAssetSourceActivityById',
   dependencies: [{ selector: 'createBatchedAssetSourceSelector' }],
   selectorFactory: (createBatchedAssetSourceSelector) =>
-    memoize(({ assetName, walletAccount, limit }) =>
-      createSelector(
-        createBatchedAssetSourceSelector({ assetName, walletAccount, limit }),
-        (transformedTxs) =>
-          transformedTxs.reduce((acc, tx) => {
-            ;(acc[tx.txId] || (acc[tx.txId] = [])).push(tx)
-            return acc
-          }, Object.create(null))
-      )
+    memoize(
+      ({ assetName, walletAccount, limit }) =>
+        createSelector(
+          createBatchedAssetSourceSelector({ assetName, walletAccount, limit }),
+          (transformedTxs) =>
+            transformedTxs.reduce((acc, tx) => {
+              ;(acc[tx.txId] || (acc[tx.txId] = [])).push(tx)
+              return acc
+            }, Object.create(null))
+        ),
+      ({ assetName, walletAccount, limit }) => `${assetName}_${walletAccount}_${limit}`
     ),
 }
 

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

@@ -58,17 +58,19 @@ const createBatchedAssetSourceSelectorDefinition = {
     personalNotesWithBatchIdSelector,
     assetsSelector
   ) =>
-    memoize(({ assetName, walletAccount, limit }) =>
-      createSelector(
-        createLimitedAssetSourceSelector({ assetName, walletAccount, limit }),
-        personalNotesWithBatchIdSelector,
-        assetsSelector,
-        (txs, personalNotesWithBatchId, assets) => {
-          return personalNotesWithBatchId.size > 0
-            ? groupAndCollapseBatched({ txs, personalNotesWithBatchId, assets })
-            : txs
-        }
-      )
+    memoize(
+      ({ assetName, walletAccount, limit }) =>
+        createSelector(
+          createLimitedAssetSourceSelector({ assetName, walletAccount, limit }),
+          personalNotesWithBatchIdSelector,
+          assetsSelector,
+          (txs, personalNotesWithBatchId, assets) => {
+            return personalNotesWithBatchId.size > 0
+              ? groupAndCollapseBatched({ txs, personalNotesWithBatchId, assets })
+              : txs
+          }
+        ),
+      ({ assetName, walletAccount, limit }) => `${assetName}_${walletAccount}_${limit}`
     ),
 }
 

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

@@ -5,10 +5,12 @@ const createLimitedAssetSourceSelectorDefinition = {
   id: 'createLimitedAssetSourceSelector',
   dependencies: [{ selector: 'createAssetSourceSelector' }],
   selectorFactory: (createAssetSourceSelector) =>
-    memoize(({ assetName, walletAccount, limit }) =>
-      createSelector(createAssetSourceSelector({ assetName, walletAccount }), (txs) =>
-        limit ? txs.slice(-limit) : txs
-      )
+    memoize(
+      ({ assetName, walletAccount, limit }) =>
+        createSelector(createAssetSourceSelector({ assetName, walletAccount }), (txs) =>
+          limit ? txs.slice(-limit) : txs
+        ),
+      ({ assetName, walletAccount, limit }) => `${assetName}_${walletAccount}_${limit}`
     ),
 }
 

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

@@ -31,7 +31,8 @@ const selectorFactory =
           let result = activities.flat()
           if (dedupExchange) {
             result = result.filter((activityItem) => {
-              const { orderId } = activityItem
+              const { order } = activityItem
+              const orderId = order?.orderId
               if (orderId) {
                 if (!ordersIncluded.has(orderId)) {
                   ordersIncluded.add(orderId)

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

@@ -52,9 +52,7 @@ const getSwapSharedProps = ({
       received: order.toAsset === assetName,
     }),
     tx,
-    fromAsset: order.fromAsset,
-    toAsset: order.toAsset,
-    orderId: order.orderId,
+    order,
     displayAmount,
     personalNote,
   }