@exodus/activity-txs 4.3.4 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/README.md +2 -2
  3. package/package.json +13 -14
  4. package/redux/selectors/create-asset-source-base-activity.js +25 -17
  5. package/redux/utils/activity-formatters/format-swap-activity.js +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,19 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [4.4.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.3.5...@exodus/activity-txs@4.4.0) (2024-10-04)
7
+
8
+ ### Features
9
+
10
+ - support pending orders ([#9742](https://github.com/ExodusMovement/exodus-hydra/issues/9742)) ([3e78668](https://github.com/ExodusMovement/exodus-hydra/commit/3e786689bb3522432e389ca737d46f132953f34c))
11
+ - use atoms v9 ([#9651](https://github.com/ExodusMovement/exodus-hydra/issues/9651)) ([524aa61](https://github.com/ExodusMovement/exodus-hydra/commit/524aa61f69c81e6ac00b2f94ea830688a105b3e4))
12
+
13
+ ## [4.3.5](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.3.4...@exodus/activity-txs@4.3.5) (2024-09-25)
14
+
15
+ ### Bug Fixes
16
+
17
+ - activity txs orders dependency should be optional ([#9430](https://github.com/ExodusMovement/exodus-hydra/issues/9430)) ([706c081](https://github.com/ExodusMovement/exodus-hydra/commit/706c0819fa47b4683b3b0a5e7d4ce29ff0d7f9a9))
18
+
6
19
  ## [4.3.4](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.3.3...@exodus/activity-txs@4.3.4) (2024-09-16)
7
20
 
8
21
  ### Bug Fixes
package/README.md CHANGED
@@ -16,7 +16,7 @@ Additionally, it offers extra Redux selectors to retrieve activity, limited by s
16
16
 
17
17
  ## Usage
18
18
 
19
- This feature is designed to be used together with `@exodus/headless`. See [Using the SDK](../../docs/using-the-sdk.md) for more details.
19
+ 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.
20
20
 
21
21
  ### API Side
22
22
 
@@ -49,7 +49,7 @@ selectors.activityTxs.createMultiActivity({
49
49
 
50
50
  ### UI Side
51
51
 
52
- See [using the sdk](../../docs/using-the-sdk.md#events) for more details on basic UI-side setup.
52
+ See [using the sdk](../../docs/docs-website/docs/development/using-the-sdk.md#events) for more details on basic UI-side setup.
53
53
 
54
54
  ```js
55
55
  import selectors from '~/ui/flux/selectors'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@exodus/activity-txs",
3
- "version": "4.3.4",
3
+ "version": "4.4.0",
4
4
  "description": "The activity-txs feature",
5
5
  "author": "Exodus Movement, Inc.",
6
6
  "repository": {
@@ -30,11 +30,10 @@
30
30
  "test": "run -T exodus-test --jest --esbuild"
31
31
  },
32
32
  "dependencies": {
33
- "@exodus/atoms": "^8.1.1",
33
+ "@exodus/atoms": "^9.0.0",
34
34
  "@exodus/basic-utils": "^3.0.1",
35
35
  "@exodus/core-selectors": "^1.5.0",
36
36
  "@exodus/models": "^12.0.1",
37
- "@exodus/module": "^1.2.2",
38
37
  "@exodus/multi-account-redux": "^2.0.1",
39
38
  "@exodus/typeforce": "^1.19.0",
40
39
  "lodash": "^4.17.21",
@@ -44,22 +43,22 @@
44
43
  "devDependencies": {
45
44
  "@exodus/assets": "^8.0.95",
46
45
  "@exodus/assets-base": "^8.1.10",
47
- "@exodus/assets-feature": "^5.11.3",
48
- "@exodus/available-assets": "^8.5.0",
46
+ "@exodus/assets-feature": "^5.13.1",
47
+ "@exodus/available-assets": "^8.6.0",
49
48
  "@exodus/bitcoin-plugin": "^1.4.2",
50
49
  "@exodus/blockchain-metadata": "^15.5.0",
51
- "@exodus/connected-origins": "^3.4.0",
52
- "@exodus/dependency-injection": "^3.0.0",
53
- "@exodus/dependency-preprocessors": "^6.0.5",
54
- "@exodus/fiat-ramp": "^10.12.1",
55
- "@exodus/nfts": "^9.3.7",
56
- "@exodus/orders": "^4.11.3",
50
+ "@exodus/connected-origins": "^4.0.0",
51
+ "@exodus/dependency-injection": "^3.1.0",
52
+ "@exodus/dependency-preprocessors": "^6.3.0",
53
+ "@exodus/fiat-ramp": "^10.14.2",
54
+ "@exodus/nfts": "^9.4.0",
55
+ "@exodus/orders": "^4.12.0",
57
56
  "@exodus/personal-notes": "^3.6.3",
58
57
  "@exodus/redux-dependency-injection": "^4.0.3",
59
- "@exodus/storage-memory": "^2.2.0",
60
- "@exodus/wallet-accounts": "^16.10.2",
58
+ "@exodus/storage-memory": "^2.2.1",
59
+ "@exodus/wallet-accounts": "^17.0.0",
61
60
  "@types/minimalistic-assert": "^1.0.1",
62
61
  "redux": "^4.2.1"
63
62
  },
64
- "gitHead": "258c9637436b53f8bb3e77836e2e3505c81a6969"
63
+ "gitHead": "e156047047673e249a00450b9ac704d6c6abc4ac"
65
64
  }
package/redux/selectors/create-asset-source-base-activity.js CHANGED
@@ -6,6 +6,8 @@ import { formatUnindexedOrder } from '../utils/activity-formatters/format-swap-a
6
6
  const EMPTY = Object.freeze([])
7
7
 
8
8
  const groupTxsWithSameOrder = ({ txs, orderSet, isIndexless }) => {
9
+ if (!orderSet) return txs.map((tx) => ({ tx, type: 'tx' }))
10
+
9
11
  const getOrder = (tx) => orderSet.getByTxId(tx.txId)
10
12
  const exchangeByOrderId = new Map()
11
13
  const result = []
@@ -38,6 +40,8 @@ const groupTxsWithSameOrder = ({ txs, orderSet, isIndexless }) => {
38
40
  return result
39
41
  }
40
42
 
43
+ const noop = () => null
44
+
41
45
  const createAssetSourceBaseActivitySelectorDefinition = {
42
46
  id: 'createAssetSourceBaseActivity',
43
47
  selectorFactory: (
@@ -47,13 +51,15 @@ const createAssetSourceBaseActivitySelectorDefinition = {
47
51
  getPersonalNoteByTxIdSelector
48
52
  ) =>
49
53
  memoize(
50
- ({ assetName, walletAccount, ...rest }) => {
54
+ ({ assetName, walletAccount, displayOrderWithoutTx = false, ...rest }) => {
51
55
  const batchedTxsSelector = createBatchedAssetSourceSelector({
52
56
  assetName,
53
57
  walletAccount,
54
58
  ...rest,
55
59
  })
56
- const orderSelector = createOrdersInAccountSelector(walletAccount)
60
+ const orderSelector = createOrdersInAccountSelector.isFallback
61
+ ? noop
62
+ : createOrdersInAccountSelector(walletAccount)
57
63
  return createSelector(
58
64
  assetsSelector,
59
65
  batchedTxsSelector,
@@ -64,22 +70,24 @@ const createAssetSourceBaseActivitySelectorDefinition = {
64
70
  const isIndexless = assets[assetName]?.baseAsset?.api?.features?.noHistory
65
71
  const groupedTxs = groupTxsWithSameOrder({ txs, orderSet, isIndexless })
66
72
 
67
- for (const group of groupedTxs) {
68
- const { tx, order, type: formatterType } = group
69
- const personalNote = getPersonalNoteByTxId
70
- ? getPersonalNoteByTxId(tx.txId)
71
- : undefined
72
- const formattedTx = formattersByType.get(formatterType)({
73
- asset: assets[tx.coinName],
74
- order,
75
- tx,
76
- personalNote,
77
- })
78
-
79
- activityResult.push(formattedTx)
73
+ if (groupedTxs) {
74
+ for (const group of groupedTxs) {
75
+ const { tx, order, type: formatterType } = group
76
+ const personalNote = getPersonalNoteByTxId
77
+ ? getPersonalNoteByTxId(tx.txId)
78
+ : undefined
79
+ const formattedTx = formattersByType.get(formatterType)({
80
+ asset: assets[tx.coinName],
81
+ order,
82
+ tx,
83
+ personalNote,
84
+ })
85
+
86
+ activityResult.push(formattedTx)
87
+ }
80
88
  }
81
89
 
82
- if (isIndexless) {
90
+ if (orderSet && (isIndexless || displayOrderWithoutTx)) {
83
91
  const orderIdsFromActivity = new Set(activityResult.map((tx) => tx.orderId))
84
92
  const ordersForIndexlessAssets = [...orderSet].filter(
85
93
  (order) =>
@@ -109,7 +117,7 @@ const createAssetSourceBaseActivitySelectorDefinition = {
109
117
  dependencies: [
110
118
  { module: 'assets', selector: 'all' },
111
119
  { selector: 'createBatchedAssetSourceSelector' },
112
- { module: 'orders', selector: 'createOrdersInAccount' },
120
+ { module: 'orders', selector: 'createOrdersInAccount', optional: true },
113
121
  { module: 'personalNotes', selector: 'get', optional: true },
114
122
  ],
115
123
  }
package/redux/utils/activity-formatters/format-swap-activity.js CHANGED
@@ -43,7 +43,7 @@ const getSwapSharedProps = ({
43
43
  ...getSharedProps({
44
44
  txId,
45
45
  date,
46
- id: `swap.${assetName}.${order?.id || txId}`,
46
+ id: `swap.${assetName}.${order?.orderId || txId}`,
47
47
  assetName,
48
48
  type: getOrderType({ tx, order }),
49
49
  pending,