@exodus/activity-txs 4.4.2 → 4.5.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.5.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.3...@exodus/activity-txs@4.5.0) (2025-01-15)
+
+### Features
+
+- feat: add account to activity (#11090)
+
+## [4.4.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.1...@exodus/activity-txs@4.4.3) (2025-01-05)
+
+### Bug Fixes
+
+- fix: activity id generation (#10846)
+
+- fix: assume asset.api.getActivity is async (#10848)
+
+### License
+
+- license: re-license under MIT license (#10580)
+
 ## [4.4.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.1...@exodus/activity-txs@4.4.2) (2024-11-25)
 
 ### License

package/README.md

@@ -16,7 +16,7 @@ Additionally, it offers extra Redux selectors to retrieve activity, limited by s
 
 ## Usage
 
-This feature is designed to be used together with `@exodus/headless`. See [Using the SDK](../../docs/docs-website/docs/development/using-the-sdk.md) for more details.
+This feature is designed to be used together with `@exodus/headless`. See [Using the SDK](../../docs/development/using-the-sdk.md) for more details.
 
 ### API Side
 
@@ -49,7 +49,7 @@ selectors.activityTxs.createMultiActivity({
 
 ### UI Side
 
-See [using the sdk](../../docs/docs-website/docs/development/using-the-sdk.md#events) for more details on basic UI-side setup.
+See [using the sdk](../../docs/development/using-the-sdk.md#events) for more details on basic UI-side setup.
 
 ```js
 import selectors from '~/ui/flux/selectors'

package/atoms/activity-txs.js

@@ -1,8 +1,7 @@
 import { combine, compute } from '@exodus/atoms'
 import { createSelector } from 'reselect'
-import { memoize } from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
-import { mapValues } from '@exodus/basic-utils'
 import { createDeepEqualOutputSelector } from '@exodus/core-selectors/utils/deep-equal'
+import { memoize } from '@exodus/basic-utils'
 
 const createAssetSourceActivityTxsSelector = memoize(
   ({ assetName, walletAccount }) =>
@@ -92,44 +91,70 @@ const createActivityTxsAtom = ({ txLogsAtom, accountStatesAtom, assetsModule })
     accountStates: accountStatesAtom,
   })
 
-  let prevResult
+  let prevResult = Object.create(null)
 
-  const selector = ({ txLogs, accountStates }) => {
+  const selector = async ({ txLogs, accountStates }) => {
     const { value } = txLogs
     const { value: accountStatesValue } = accountStates
-    const result = mapValues(value, (accountTxLogs, walletAccount) =>
-      mapValues(accountTxLogs, (assetTxSet, assetName) => {
-        const asset = assetsModule.getAsset(assetName)
-        const baseAssetName = asset.baseAsset.name
-
-        if (asset?.api?.getActivityTxs) {
-          let activityOptions
-          if (asset?.api?.getActivityOptions) {
-            const baseAssetAccountState = accountStatesValue?.[walletAccount]?.[baseAssetName]
-
-            activityOptions = createAssetSourceActivityOptionsSelector({
-              assetName,
-              walletAccount,
-            })({
-              accountState: baseAssetAccountState,
-              asset,
-            })
-          }
 
-          return createAssetSourceActivityTxsSelector({ assetName, walletAccount })({
-            asset,
-            txs: createAssetSourceTxsSelector({ assetName, walletAccount })({
+    // Process each wallet account asynchronously
+    const resultEntries = await Promise.all(
+      Object.entries(value).map(async ([walletAccount, accountTxLogs]) => {
+        // Process each asset within the wallet account asynchronously
+        const assetEntries = await Promise.all(
+          Object.entries(accountTxLogs).map(async ([assetName, assetTxSet]) => {
+            const asset = assetsModule.getAsset(assetName)
+            const baseAssetName = asset.baseAsset.name
+
+            if (asset?.api?.getActivityTxs) {
+              let activityOptions
+
+              if (asset?.api?.getActivityOptions) {
+                const baseAssetAccountState = accountStatesValue?.[walletAccount]?.[baseAssetName]
+
+                const getOptionsForAssetSource = createAssetSourceActivityOptionsSelector({
+                  assetName,
+                  walletAccount,
+                })
+
+                activityOptions = await getOptionsForAssetSource({
+                  accountState: baseAssetAccountState,
+                  asset,
+                })
+              }
+
+              const txs = createAssetSourceTxsSelector({ assetName, walletAccount })({
+                txSet: assetTxSet,
+              })
+
+              const getActivityForAssetSource = createAssetSourceActivityTxsSelector({
+                assetName,
+                walletAccount,
+              })
+
+              const activityTxs = await getActivityForAssetSource({
+                asset,
+                txs,
+                activityOptions,
+              })
+
+              return [assetName, activityTxs]
+            }
+
+            const txs = createAssetSourceTxsSelector({ assetName, walletAccount })({
               txSet: assetTxSet,
-            }),
-            activityOptions,
+            })
+
+            return [assetName, txs]
           })
-        }
+        )
 
-        return createAssetSourceTxsSelector({ assetName, walletAccount })({
-          txSet: assetTxSet,
-        })
+        return [walletAccount, Object.fromEntries(assetEntries)]
       })
     )
+
+    const result = Object.fromEntries(resultEntries)
+
     if (areActivitiesEqual(result, prevResult)) {
       return prevResult
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -43,21 +43,22 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^5.14.1",
+    "@exodus/assets-feature": "^6.0.3",
     "@exodus/available-assets": "^8.7.0",
     "@exodus/bitcoin-plugin": "^1.4.2",
-    "@exodus/connected-origins": "^4.1.0",
-    "@exodus/fiat-ramp": "^10.17.4",
-    "@exodus/nfts": "^9.4.1",
-    "@exodus/orders": "^4.13.0",
-    "@exodus/personal-notes": "^3.6.3",
+    "@exodus/connected-origins": "^4.1.1",
+    "@exodus/fiat-ramp": "^11.0.2",
+    "@exodus/logger": "^1.2.3",
+    "@exodus/nfts": "^9.4.2",
+    "@exodus/orders": "^4.14.0",
+    "@exodus/personal-notes": "^3.7.0",
     "@exodus/redux-dependency-injection": "^4.1.1",
-    "@exodus/wallet-accounts": "^17.1.1",
+    "@exodus/wallet-accounts": "^17.1.3",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97156baad5ad86796c5eb3721264ba7b0ebb6332"
+  "gitHead": "37312a59cf95083b1130ee950a9709302614cc07"
 }

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

@@ -83,7 +83,7 @@ const createAssetSourceBaseActivitySelectorDefinition = {
                   personalNote,
                 })
 
-                activityResult.push(formattedTx)
+                activityResult.push({ ...formattedTx, walletAccount })
               }
             }
 
@@ -101,9 +101,10 @@ const createAssetSourceBaseActivitySelectorDefinition = {
                 // Prevent dups by checking if this order already exists.
                 if (orderIdsFromActivity.has(order.orderId)) return
 
-                const formattedItem = formatUnindexedOrder({ assetName, assets, order })
-
-                activityResult.push(formattedItem)
+                activityResult.push({
+                  ...formatUnindexedOrder({ assetName, assets, order }),
+                  walletAccount,
+                })
               })
             }
 

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

@@ -1,4 +1,4 @@
-import { memoize } from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
+import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 
 const createBatchedAssetSourceActivityByIdSelector = {

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

@@ -1,7 +1,13 @@
-import { memoize, get, groupBy, merge } from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
+import { get, groupBy, merge } from 'lodash'
 import { createSelector } from 'reselect'
 import { Tx } from '@exodus/models'
+import { memoize } from '@exodus/basic-utils'
 
+// 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.
+// An order can be matched using any transaction ID from this array.
+// Each transaction will match the order, but we can deduplicate them later using `order.id` to display single activity item
 const collapseBatch = ({ batch, assets }) => {
   const asset = assets[batch[0].coinName]
   const isToken = asset.baseAsset.name !== asset.name

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

@@ -1,4 +1,4 @@
-import { memoize } from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
+import { memoize } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 
 const createLimitedAssetSourceSelectorDefinition = {

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

@@ -16,8 +16,9 @@ export function isPending(tx, asset) {
 }
 
 const generateTxActivityId = ({ tx, asset }) => {
-  const sentIndex = tx.data?.sentIndex
-  return sentIndex ? `${asset.name}.${tx.txId}_${sentIndex}` : `${asset.name}.${tx.txId}`
+  const index = tx.data?.activityIndex
+
+  return index ? `${asset.name}.${tx.txId}_${index}` : `${asset.name}.${tx.txId}`
 }
 
 export const formatTxActivity = ({ tx, asset, personalNote }) => {