Skip to content

Commit 0d34e05

Browse files
committed
refactor(countervalues): move portfolio to live-common
Move portfolio.ts, portfolioReact.tsx, ranges.ts, and assetsDistribution.ts from live-countervalues / live-countervalues-react into libs/ledger-live-common/src/portfolio/. This removes the account-entity blocker from live-countervalues: rate logic only remains in that package. Published packages (live-countervalues, live-countervalues-react) keep inferTrackingPairForAccounts* in logic.ts since their own index.tsx re-exports it. - 13 consumer import paths updated (apps and live-common internal mocks) - portfolio.tsx renamed portfolioReact.tsx to avoid base-name collision with portfolio.ts - live-common jest config gains TZ=America/New_York to match snapshot generation timezone - currencies resolver restricted to bitcoin+ethereum in portfolio.test.ts to match the seeded genAccount output from the original test environment
1 parent aca2555 commit 0d34e05

25 files changed

Lines changed: 190 additions & 322 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
"@ledgerhq/live-countervalues": minor
3+
"@ledgerhq/live-countervalues-react": minor
4+
"@ledgerhq/live-common": minor
5+
---
6+
7+
Move portfolio and account-coupled logic to live-common
8+
9+
`portfolio.ts`, the React `portfolioReact.tsx`, the internal `ranges.ts` and `assetsDistribution.ts`
10+
helpers, and the `inferTrackingPairForAccounts*` tests migrate from the countervalues packages into
11+
`libs/ledger-live-common/src/portfolio/`. This removes the account-entity blocker from the
12+
countervalues epic: `live-countervalues` is now rate logic only.
13+
14+
`live-countervalues`: `portfolio` entry point removed; `src/internal/` directory removed.
15+
`live-countervalues-react`: `portfolio` entry point removed; package now contains only `index.tsx`.
16+
`live-common`: `portfolio/portfolio` and `portfolio/portfolioReact` entry points added.

apps/ledger-live-desktop/src/mvvm/features/Assets/hooks/__tests__/useAllCurrencyTrends.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useCountervaluesState } from "@ledgerhq/live-countervalues-react";
33
import {
44
getCurrencyPortfolio,
55
getCurrentBalanceCountervalueChange,
6-
} from "@ledgerhq/live-countervalues/portfolio";
6+
} from "@ledgerhq/live-common/portfolio/portfolio";
77
import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
88
import type { CurrencyPortfolio } from "@ledgerhq/types-live";
99
import { genAccount } from "@ledgerhq/ledger-wallet-framework/mocks/account";

apps/ledger-live-desktop/src/mvvm/features/Assets/hooks/useAllCurrencyTrends.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useCountervaluesState } from "@ledgerhq/live-countervalues-react";
55
import {
66
getCurrencyPortfolio,
77
getCurrentBalanceCountervalueChange,
8-
} from "@ledgerhq/live-countervalues/portfolio";
8+
} from "@ledgerhq/live-common/portfolio/portfolio";
99
import { counterValueCurrencySelector } from "~/renderer/reducers/settings";
1010
import type { AssetTableItem } from "../types";
1111

apps/ledger-live-desktop/src/mvvm/features/Portfolio/__integrations__/Portfolio.integration.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import i18next from "~/renderer/i18n/init";
66
import PortfolioPage from "../index";
77
import type { Portfolio as PortfolioType } from "@ledgerhq/types-live";
88
import { PortfolioView } from "../PortfolioView";
9-
import * as portfolioReact from "@ledgerhq/live-countervalues-react/portfolio";
9+
import * as portfolioReact from "@ledgerhq/live-common/portfolio/portfolioReact";
1010
import * as countervaluesReact from "@ledgerhq/live-countervalues-react";
1111
import { useNavigate } from "react-router";
1212
import { BTC_ACCOUNT, EMPTY_BTC_ACCOUNT } from "../../__mocks__/accounts.mock";

apps/ledger-live-desktop/src/mvvm/hooks/__tests__/usePortfolioBalance.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { bitcoinCurrency } from "LLD/features/__mocks__/useSelectAssetFlow.mock"
66
import { INITIAL_STATE } from "~/renderer/reducers/settings";
77
import { DEFAULT_PORTFOLIO_RANGE } from "LLD/utils/constants";
88
import { SYNC_SETTLE_GUARD_MS } from "@ledgerhq/live-common/bridge/react/useSyncLifecycle";
9-
import * as portfolioReact from "@ledgerhq/live-countervalues-react/portfolio";
9+
import * as portfolioReact from "@ledgerhq/live-common/portfolio/portfolioReact";
1010
import { setLastUserSyncClickTimestamp } from "~/renderer/reducers/syncRefresh";
1111
import { mockPoll, mockOnUserRefresh, mockBridgeSync, defaultPortfolio } from "./fixtures";
1212

apps/ledger-live-desktop/src/mvvm/hooks/usePortfolioBalance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
counterValueCurrencySelector,
1212
selectedTimeRangeSelector,
1313
} from "~/renderer/reducers/settings";
14-
import { usePortfolioThrottled } from "@ledgerhq/live-countervalues-react/portfolio";
14+
import { usePortfolioThrottled } from "@ledgerhq/live-common/portfolio/portfolioReact";
1515
import {
1616
selectLastUserSyncClickTimestamp,
1717
selectHasCompletedInitialSync,

apps/ledger-live-desktop/src/renderer/actions/general.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
flattenSortAccounts,
1515
sortAccountsComparatorFromOrder,
1616
} from "@ledgerhq/live-common/account/ordering";
17-
import { useDistribution as useLegacyDistribution } from "@ledgerhq/live-countervalues-react/portfolio";
17+
import { useDistribution as useLegacyDistribution } from "@ledgerhq/live-common/portfolio/portfolioReact";
1818
import {
1919
useAssetDistribution,
2020
type DistributionOpts,

apps/ledger-live-desktop/src/renderer/actions/portfolio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
usePortfolio as usePortfolioRaw,
88
useBalanceHistoryWithCountervalue as useBalanceHistoryWithCountervalueRaw,
99
useCurrencyPortfolio as useCurrencyPortfolioRaw,
10-
} from "@ledgerhq/live-countervalues-react/portfolio";
10+
} from "@ledgerhq/live-common/portfolio/portfolioReact";
1111
import { filterAccountsExcludingBlacklisted } from "@ledgerhq/live-common/account/filterAccountsExcludingBlacklisted";
1212
import {
1313
blacklistedTokenIdsSelector,

apps/ledger-live-mobile/src/actions/general.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
useCalculateCountervalueCallback as useCalculateCountervalueCallbackCommon,
1212
useTrackingPairForAccounts,
1313
} from "@ledgerhq/live-countervalues-react";
14-
import { useDistribution as useLegacyDistribution } from "@ledgerhq/live-countervalues-react/portfolio";
14+
import { useDistribution as useLegacyDistribution } from "@ledgerhq/live-common/portfolio/portfolioReact";
1515
import {
1616
useAssetDistribution,
1717
type DistributionOpts,

apps/ledger-live-mobile/src/hooks/portfolio.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import type { AccountLike, PortfolioRange } from "@ledgerhq/types-live";
44
import {
55
useBalanceHistoryWithCountervalue as useBalanceHistoryWithCountervalueCommon,
66
usePortfolioThrottled,
7-
} from "@ledgerhq/live-countervalues-react/portfolio";
8-
import { GetPortfolioOptionsType } from "@ledgerhq/live-countervalues/portfolio";
7+
} from "@ledgerhq/live-common/portfolio/portfolioReact";
8+
import { GetPortfolioOptionsType } from "@ledgerhq/live-common/portfolio/portfolio";
99
import { filterAccountsExcludingBlacklisted } from "@ledgerhq/live-common/account/filterAccountsExcludingBlacklisted";
1010
import {
1111
blacklistedTokenIdsSelector,

0 commit comments

Comments
 (0)