@exodus/activity-txs 4.2.2 → 4.3.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.3.0...@exodus/activity-txs@4.3.1) (2024-07-18)
+
+**Note:** Version bump only for package @exodus/activity-txs
+
+## [4.3.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.2.2...@exodus/activity-txs@4.3.0) (2024-06-13)
+
+### Features
+
+- optional personal notes for activity ([#7377](https://github.com/ExodusMovement/exodus-hydra/issues/7377)) ([092f07d](https://github.com/ExodusMovement/exodus-hydra/commit/092f07d5d18c1afc2933672af77edd0c5bac98a5))
+
 ## [4.2.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.2.1...@exodus/activity-txs@4.2.2) (2024-06-11)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.2.2",
+  "version": "4.3.1",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -30,7 +30,7 @@
     "test": "run -T jest"
   },
   "dependencies": {
-    "@exodus/atoms": "^7.0.5",
+    "@exodus/atoms": "^8.0.0",
     "@exodus/basic-utils": "^2.3.0",
     "@exodus/core-selectors": "^1.5.0",
     "@exodus/models": "^10.1.0",
@@ -44,22 +44,22 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^5.4.0",
-    "@exodus/available-assets": "^8.2.1",
+    "@exodus/assets-feature": "^5.8.1",
+    "@exodus/available-assets": "^8.3.1",
     "@exodus/bitcoin-plugin": "^1.4.2",
-    "@exodus/blockchain-metadata": "^15.3.3",
-    "@exodus/connected-origins": "^3.3.1",
-    "@exodus/dependency-injection": "^2.2.0",
-    "@exodus/dependency-preprocessors": "^5.2.0",
-    "@exodus/fiat-ramp": "^10.7.3",
-    "@exodus/nfts": "^9.3.0",
-    "@exodus/orders": "^4.10.0",
-    "@exodus/personal-notes": "^3.6.0",
-    "@exodus/redux-dependency-injection": "^3.1.0",
+    "@exodus/blockchain-metadata": "^15.3.4",
+    "@exodus/connected-origins": "^3.3.3",
+    "@exodus/dependency-injection": "^2.3.1",
+    "@exodus/dependency-preprocessors": "^6.0.1",
+    "@exodus/fiat-ramp": "^10.9.1",
+    "@exodus/nfts": "^9.3.2",
+    "@exodus/orders": "^4.10.1",
+    "@exodus/personal-notes": "^3.6.1",
+    "@exodus/redux-dependency-injection": "^3.2.3",
     "@exodus/storage-memory": "^2.1.1",
-    "@exodus/wallet-accounts": "^16.5.2",
+    "@exodus/wallet-accounts": "^16.8.1",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
-  "gitHead": "58fc182cc37da5908ac11c3fbabf7a7f30f3d833"
+  "gitHead": "a76a22c96445bcaa05e18de0e0c323cf9dd04cba"
 }

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

@@ -66,7 +66,9 @@ const createAssetSourceBaseActivitySelectorDefinition = {
 
             for (const group of groupedTxs) {
               const { tx, order, type: formatterType } = group
-              const personalNote = getPersonalNoteByTxId(tx.txId)
+              const personalNote = getPersonalNoteByTxId
+                ? getPersonalNoteByTxId(tx.txId)
+                : undefined
               const formattedTx = formattersByType.get(formatterType)({
                 asset: assets[tx.coinName],
                 order,
@@ -108,7 +110,7 @@ const createAssetSourceBaseActivitySelectorDefinition = {
     { module: 'assets', selector: 'all' },
     { selector: 'createBatchedAssetSourceSelector' },
     { module: 'orders', selector: 'createOrdersInAccount' },
-    { module: 'personalNotes', selector: 'get' },
+    { module: 'personalNotes', selector: 'get', optional: true },
   ],
 }
 

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

@@ -14,13 +14,13 @@ const collapseBatch = ({ batch, assets }) => {
     (sum, otherTx) => (otherTx.feeAmount ? sum.add(otherTx.feeAmount) : sum),
     (isToken ? asset.baseAsset : asset).currency.ZERO
   )
-  const baseData = batch[0].data || {}
+  const baseData = batch[0].data || Object.create(null)
   const batchedIds = batch.map((tx) => tx.txId)
 
   const txJSON = batch[0].toJSON()
 
   return Tx.fromJSON(
-    merge({}, txJSON, {
+    merge(Object.create(null), txJSON, {
       coinAmount: totalBatchValue,
       coinName: asset.name,
       feeAmount: totalBatchFee,
@@ -50,7 +50,7 @@ const createBatchedAssetSourceSelectorDefinition = {
   id: 'createBatchedAssetSourceSelector',
   dependencies: [
     { selector: 'createLimitedAssetSourceSelector' },
-    { module: 'personalNotes', selector: 'withBatchId' },
+    { module: 'personalNotes', selector: 'withBatchId', optional: true },
     { module: 'assets', selector: 'all' },
   ],
   selectorFactory: (
@@ -60,16 +60,18 @@ const createBatchedAssetSourceSelectorDefinition = {
   ) =>
     memoize(
       ({ assetName, walletAccount, limit }) =>
-        createSelector(
-          createLimitedAssetSourceSelector({ assetName, walletAccount, limit }),
-          personalNotesWithBatchIdSelector,
-          assetsSelector,
-          (txs, personalNotesWithBatchId, assets) => {
-            return personalNotesWithBatchId.size > 0
-              ? groupAndCollapseBatched({ txs, personalNotesWithBatchId, assets })
-              : txs
-          }
-        ),
+        personalNotesWithBatchIdSelector.isFallback
+          ? createLimitedAssetSourceSelector({ 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}`
     ),
 }