Skip to content

Commit bc8932d

Browse files
feat: migrate createApi Assets from LLD to common and plugged it to LLM
1 parent 036b008 commit bc8932d

File tree

20 files changed

+100
-42
lines changed

20 files changed

+100
-42
lines changed

.changeset/thin-waves-appear.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"ledger-live-desktop": minor
3+
"live-mobile": minor
4+
"@ledgerhq/live-common": minor
5+
---
6+
7+
Migrate createApi Assets from LLD to live-common and plugged it to LLM

apps/ledger-live-desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@ledgerhq/types-cryptoassets": "workspace:^",
8989
"@ledgerhq/types-devices": "workspace:^",
9090
"@ledgerhq/types-live": "workspace:^",
91-
"@reduxjs/toolkit": "2.0.1",
91+
"@reduxjs/toolkit": "2.8.2",
9292
"@sentry/electron": "5.2.0",
9393
"@sentry/node": "8.16.0",
9494
"@tanstack/react-query": "5.28.9",

apps/ledger-live-desktop/src/newArch/features/ModularDrawer/ModularDrawerFlowManager.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
bitcoinCurrency,
2323
ethereumCurrency,
2424
} from "../__mocks__/useSelectAssetFlow.mock";
25-
import { assetsDataApi } from "./data/state-manager/api";
25+
import { assetsDataApi } from "@ledgerhq/live-common/modularDrawer/data/state-manager/api";
2626
import ModularDrawerFlowManager from "./ModularDrawerFlowManager";
2727
import { ModularDrawerFlowManagerProps } from "./types";
2828

apps/ledger-live-desktop/src/newArch/features/ModularDrawer/hooks/useModularDrawerData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { useMemo } from "react";
22
import { CurrenciesByProviderId, LoadingStatus } from "@ledgerhq/live-common/deposit/type";
3-
import { useAssetsData } from "./useAssetsData";
43
import { getLoadingStatus } from "../utils/getLoadingStatus";
54
import { findCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
65
import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
6+
import { useAssetsData } from "@ledgerhq/live-common/modularDrawer/hooks/useAssetsData";
77

88
interface UseModularDrawerDataProps {
99
currencies?: CryptoOrTokenCurrency[];

apps/ledger-live-desktop/src/renderer/createStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { configureStore, Middleware } from "@reduxjs/toolkit";
22
import logger from "~/renderer/middlewares/logger";
33
import reducers, { State } from "~/renderer/reducers";
4-
import { assetsDataApi } from "~/newArch/features/ModularDrawer/data/state-manager/api";
4+
import { assetsDataApi } from "@ledgerhq/live-common/modularDrawer/data/state-manager/api";
55

66
type Props = {
77
state?: State;

apps/ledger-live-desktop/src/renderer/reducers/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import trustchain from "./trustchain";
1717
import { TrustchainStore } from "@ledgerhq/ledger-key-ring-protocol/store";
1818
import { getEnv } from "@ledgerhq/live-env";
1919
import countervalues, { CountervaluesState } from "./countervalues";
20-
import { assetsDataApi } from "~/newArch/features/ModularDrawer/data/state-manager/api";
20+
import { assetsDataApi } from "@ledgerhq/live-common/modularDrawer/data/state-manager/api";
2121

2222
export type State = {
2323
accounts: AccountsState;

apps/ledger-live-mobile/__tests__/test-renderer.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import { INITIAL_STATE as AUTH_INITIAL_STATE } from "~/reducers/auth";
4444
import StyleProvider from "~/StyleProvider";
4545
import CustomLiveAppProvider from "./CustomLiveAppProvider";
4646
import { getFeature } from "./featureFlags";
47+
import { assetsDataApi } from "@ledgerhq/live-common/modularDrawer/data/state-manager/api";
4748

4849
const INITIAL_STATE: State = {
4950
accounts: ACCOUNTS_INITIAL_STATE,
@@ -68,6 +69,7 @@ const INITIAL_STATE: State = {
6869
walletconnect: WALLET_CONNECT_INITIAL_STATE,
6970
walletSync: WALLETSYNC_INITIAL_STATE,
7071
auth: AUTH_INITIAL_STATE,
72+
assetsDataApi: assetsDataApi.reducer(undefined, { type: "INIT" }),
7173
};
7274

7375
type ExtraOptions = RenderOptions & {

apps/ledger-live-mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"@react-navigation/native": "6.1.17",
134134
"@react-navigation/native-stack": "6.9.26",
135135
"@react-navigation/stack": "6.3.29",
136-
"@reduxjs/toolkit": "2.0.1",
136+
"@reduxjs/toolkit": "2.8.2",
137137
"@segment/analytics-react-native": "2.20.5",
138138
"@segment/sovran-react-native": "1.1.3",
139139
"@sentry/react-native": "6.13.0",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import { Steps } from "LLM/features/WalletSync/types/Activation";
4141
import { NftStatus } from "@ledgerhq/live-nft/types";
4242
import { SupportedBlockchain } from "@ledgerhq/live-nft/supported";
4343
import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
44+
import { AnyAction } from "redux";
4445

4546
// === ACCOUNTS ACTIONS ===
4647

@@ -655,4 +656,5 @@ export type ActionsPayload =
655656
| Action<ProtectPayload>
656657
| Action<EarnPayload>
657658
| Action<MarketPayload>
658-
| Action<NftPayload>;
659+
| Action<NftPayload>
660+
| AnyAction;
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
import Config from "react-native-config";
2-
import { configureStore } from "@reduxjs/toolkit";
2+
import { configureStore, Tuple } from "@reduxjs/toolkit";
33
import reducers from "~/reducers";
44
import Rectotron from "~/ReactotronConfig";
5+
import { assetsDataApi } from "@ledgerhq/live-common/modularDrawer/data/state-manager/api";
56

7+
// === STORE CONFIGURATION ===
68
export const store = configureStore({
79
reducer: reducers,
810
devTools: !!Config.DEBUG_RNDEBUGGER,
911
middleware: getDefaultMiddleware =>
10-
getDefaultMiddleware({ serializableCheck: false, immutableCheck: false }),
11-
...(__DEV__ && {
12-
enhancers: getDefaultEnhancers => getDefaultEnhancers().concat(Rectotron.createEnhancer()),
13-
}),
12+
getDefaultMiddleware({ serializableCheck: false, immutableCheck: false }).concat(
13+
assetsDataApi.middleware,
14+
),
15+
16+
enhancers: getDefaultEnhancers =>
17+
new Tuple(
18+
...(__DEV__ ? [...getDefaultEnhancers(), Rectotron.createEnhancer()] : []),
19+
...getDefaultEnhancers(),
20+
),
1421
});
1522

1623
export type StoreType = typeof store;

0 commit comments

Comments
 (0)