@exodus/balances 12.5.0 → 12.6.0

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.
 
+## [12.6.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@12.5.1...@exodus/balances@12.6.0) (2024-01-12)
+
+### Features
+
+- move assets with balances count atom to balances module ([#5379](https://github.com/ExodusMovement/exodus-hydra/issues/5379)) ([4d86b5a](https://github.com/ExodusMovement/exodus-hydra/commit/4d86b5a080cf9cf8bebf029e474cfe138a73d49e))
+
+## [12.5.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@12.5.0...@exodus/balances@12.5.1) (2024-01-11)
+
+### Bug Fixes
+
+- unconfirmed balance selector must account only for incomming txs ([#5351](https://github.com/ExodusMovement/exodus-hydra/issues/5351)) ([4cf6565](https://github.com/ExodusMovement/exodus-hydra/commit/4cf656532f7b336734d3fc091f00e92642b5fa9c))
+
 ## [12.5.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@12.4.0...@exodus/balances@12.5.0) (2024-01-11)
 
 ### Features

package/atoms/assets-with-balance-count.js

@@ -0,0 +1,21 @@
+import { compute } from '@exodus/atoms'
+
+const createAssetsWithBalanceCountAtom = ({ balancesAtom }) => {
+  const selector = ({ balances }) => {
+    const assetsWithBalances = new Set()
+
+    Object.values(balances).forEach((accountBalances) => {
+      Object.keys(accountBalances).forEach((assetName) => {
+        if (!accountBalances[assetName]?.balance.isZero) {
+          assetsWithBalances.add(assetName)
+        }
+      })
+    })
+
+    return assetsWithBalances.size
+  }
+
+  return compute({ atom: balancesAtom, selector })
+}
+
+export default createAssetsWithBalanceCountAtom

package/atoms/index.js

@@ -1,3 +1,4 @@
+import createAssetsWithBalanceCountAtom from './assets-with-balance-count'
 import createBalancesAtom from './balances'
 import createFundedWalletAccountsAtom from './funded-wallet-accounts'
 import createHasBalanceAtom from './has-balance'
@@ -22,3 +23,10 @@ export const fundedWalletAccountsAtomDefinition = {
   factory: createFundedWalletAccountsAtom,
   dependencies: ['balancesAtom', 'enabledWalletAccountsAtom'],
 }
+
+export const assetsWithBalanceCountAtomDefinition = {
+  id: 'assetsWithBalanceCountAtom',
+  type: 'atom',
+  factory: createAssetsWithBalanceCountAtom,
+  dependencies: ['balancesAtom'],
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "description": "Tracks crypto balances across enabled wallet accounts.",
   "author": "Exodus Movement Inc.",
   "license": "UNLICENSED",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.94",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^4.0.1",
+    "@exodus/assets-feature": "^4.1.0",
     "@exodus/bitcoin-meta": "^1.0.1",
     "@exodus/blockchain-metadata": "^9.0.1",
     "@exodus/ethereum-meta": "^1.0.30",
@@ -58,5 +58,5 @@
     "jest": "^29.1.2",
     "redux": "^4.2.1"
   },
-  "gitHead": "49b8b73234d3e602779ec5965b600eb1398ed6c7"
+  "gitHead": "873f103b45c562e5fd3369a30bfb7c7e95363efa"
 }

package/plugins/analytics.js

@@ -1,16 +1,26 @@
-const createBalancesAnalyticsPlugin = ({ analytics, hasBalanceAtom }) => {
-  let unsubscribe
+const createBalancesAnalyticsPlugin = ({
+  analytics,
+  hasBalanceAtom,
+  assetsWithBalanceCountAtom,
+}) => {
+  let subscriptions = []
 
   const onStart = () => {
-    analytics.requireDefaultProperties(['hasBalance'])
+    analytics.requireDefaultProperties(['hasBalance', 'numberOfAssets'])
 
-    unsubscribe = hasBalanceAtom.observe((hasBalance) => {
+    const unsubscribeBalanceAtom = hasBalanceAtom.observe((hasBalance) =>
       analytics.setDefaultProperties({ hasBalance })
-    })
+    )
+
+    const unsubscribeBalanceCountAtom = assetsWithBalanceCountAtom.observe((numberOfAssets) =>
+      analytics.setDefaultProperties({ numberOfAssets })
+    )
+
+    subscriptions = [unsubscribeBalanceAtom, unsubscribeBalanceCountAtom]
   }
 
   const onStop = () => {
-    unsubscribe?.()
+    subscriptions.forEach((unsubscribe) => unsubscribe())
   }
 
   return { onStart, onStop }

package/plugins/index.js

@@ -12,5 +12,5 @@ export const balancesAnalyticsPluginDefinition = {
   id: 'balancesAnalyticsPlugin',
   type: 'plugin',
   factory: createBalancesAnalyticsPlugin,
-  dependencies: ['analytics', 'hasBalanceAtom'],
+  dependencies: ['analytics', 'hasBalanceAtom', 'assetsWithBalanceCountAtom'],
 }

package/redux/selectors/get-unconfirmed-balance.js

@@ -5,11 +5,11 @@ export const getUnconfirmedBalance = ({ asset, txs }) => {
   let result = asset.currency.ZERO
 
   for (const tx of txs) {
-    const isIncommingTX = tx.coinAmount.isPositive
+    const isIncommingTX = !tx.sent
     const isUnconfirmed = !tx.failed && tx.pending
 
-    if (isUnconfirmed) {
-      result = isIncommingTX ? result.add(tx.coinAmount) : result.sub(tx.coinAmount)
+    if (isUnconfirmed && isIncommingTX) {
+      result = result.add(tx.coinAmount)
     }
   }