fix: mobile and desktop solana import

Signed-off-by: Stéphane Prohaszka <[email protected]>
LedgerHQ · Apr 22, 2024 · a82fe74 · a82fe74
1 parent 0f75dee
commit a82fe74
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 12 deletions.
diff --git a/apps/ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/Body.tsx b/apps/ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/Body.tsx
@@ -25,7 +25,7 @@ import StepConfirmation, { StepConfirmationFooter } from "./steps/StepConfirmati
 import StepValidator, { StepValidatorFooter } from "./steps/StepValidator";
 import { St, StepProps, StepId } from "./types";
 import { Device } from "@ledgerhq/live-common/hw/actions/types";
-import { defaultVoteAccAddrByCurrencyId } from "@ledgerhq/live-common/families/solana/utils";
+import { defaultVoteAccAddrByCurrencyId } from "@ledgerhq/live-common/families/solana/logic";
 export type Data = {
   account: SolanaAccount;
   source?: string;

diff --git a/...ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/steps/StepAmount.tsx b/...ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/steps/StepAmount.tsx
@@ -1,5 +1,5 @@
 import { getMainAccount } from "@ledgerhq/live-common/account/index";
-import { SOLANA_DELEGATION_RESERVE } from "@ledgerhq/live-common/families/solana/utils";
+import { SOLANA_DELEGATION_RESERVE } from "@ledgerhq/live-common/families/solana/logic";
 import React, { Fragment, PureComponent } from "react";
 import { Trans } from "react-i18next";
 import TrackPage from "~/renderer/analytics/TrackPage";

diff --git a/...ger-live-desktop/src/renderer/families/solana/shared/components/LedgerByFigmentTCLink.tsx b/...ger-live-desktop/src/renderer/families/solana/shared/components/LedgerByFigmentTCLink.tsx
@@ -3,7 +3,7 @@ import LinkWithExternalIcon from "~/renderer/components/LinkWithExternalIcon";
 import { useTranslation } from "react-i18next";
 import { urls } from "~/config/urls";
 import { openURL } from "~/renderer/linking";
-import { LEDGER_VALIDATOR } from "@ledgerhq/live-common/families/solana/utils";
+import { LEDGER_VALIDATOR } from "@ledgerhq/live-common/families/solana/logic";
 import { Transaction } from "@ledgerhq/live-common/families/solana/types";
 type Props = {
   transaction: Transaction;

diff --git a/apps/ledger-live-desktop/src/renderer/families/solana/shared/components/ValidatorRow.tsx b/apps/ledger-live-desktop/src/renderer/families/solana/shared/components/ValidatorRow.tsx
@@ -1,6 +1,6 @@
 import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
 import { getAddressExplorer, getDefaultExplorerView } from "@ledgerhq/live-common/explorers";
-import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/validator-app/index";
+import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/logic";
 import { CryptoCurrency, Unit } from "@ledgerhq/types-cryptoassets";
 import { BigNumber } from "bignumber.js";
 import React, { useCallback } from "react";

diff --git a/apps/ledger-live-desktop/src/renderer/families/solana/shared/fields/ValidatorsField.tsx b/apps/ledger-live-desktop/src/renderer/families/solana/shared/fields/ValidatorsField.tsx
@@ -1,6 +1,6 @@
 import { getAccountUnit } from "@ledgerhq/live-common/account/index";
 import { useValidators } from "@ledgerhq/live-common/families/solana/react";
-import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/validator-app/index";
+import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/logic";
 import { SolanaAccount } from "@ledgerhq/live-common/families/solana/types";
 
 import React, { useMemo, useState, useCallback } from "react";

diff --git a/apps/ledger-live-mobile/src/families/solana/DelegationFlow/SelectAmount.tsx b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/SelectAmount.tsx
@@ -2,7 +2,7 @@ import { getAccountUnit } from "@ledgerhq/live-common/account/index";
 import { getAccountCurrency } from "@ledgerhq/live-common/account/helpers";
 import { getAccountBridge } from "@ledgerhq/live-common/bridge/index";
 import useBridgeTransaction from "@ledgerhq/live-common/bridge/useBridgeTransaction";
-import { SOLANA_DELEGATION_RESERVE } from "@ledgerhq/live-common/families/solana/utils";
+import { SOLANA_DELEGATION_RESERVE } from "@ledgerhq/live-common/families/solana/logic";
 import { useTheme } from "@react-navigation/native";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";

diff --git a/apps/ledger-live-mobile/src/families/solana/DelegationFlow/SelectValidator.tsx b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/SelectValidator.tsx
@@ -1,6 +1,6 @@
 import { getAccountUnit } from "@ledgerhq/live-common/account/index";
 import { useValidators } from "@ledgerhq/live-common/families/solana/react";
-import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/validator-app/index";
+import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/logic";
 import { AccountLike } from "@ledgerhq/types-live";
 import { Text } from "@ledgerhq/native-ui";
 import { useTheme } from "@react-navigation/native";

diff --git a/apps/ledger-live-mobile/src/families/solana/DelegationFlow/Summary.tsx b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/Summary.tsx
@@ -6,8 +6,10 @@ import {
   Transaction as SolanaTransaction,
   TransactionModel,
 } from "@ledgerhq/live-common/families/solana/types";
-import { assertUnreachable } from "@ledgerhq/live-common/families/solana/utils";
-import { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/validator-app/index";
+import {
+  assertUnreachable,
+  ValidatorsAppValidator,
+} from "@ledgerhq/live-common/families/solana/logic";
 import { AccountLike } from "@ledgerhq/types-live";
 import { Text } from "@ledgerhq/native-ui";
 import { useTheme } from "@react-navigation/native";

diff --git a/apps/ledger-live-mobile/src/families/solana/DelegationFlow/types.ts b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/types.ts
@@ -5,7 +5,7 @@ import type {
   TransactionStatus,
 } from "@ledgerhq/live-common/families/solana/types";
 import { ParamListBase, RouteProp } from "@react-navigation/native";
-import type { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/validator-app/index";
+import type { ValidatorsAppValidator } from "@ledgerhq/live-common/families/solana/logic";
 import type { Operation } from "@ledgerhq/types-live";
 import type { Device } from "@ledgerhq/live-common/hw/actions/types";
 import { ScreenName } from "~/const";

diff --git a/apps/ledger-live-mobile/src/families/solana/Delegations/Row.tsx b/apps/ledger-live-mobile/src/families/solana/Delegations/Row.tsx
@@ -1,6 +1,6 @@
 import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
 import { SolanaStakeWithMeta } from "@ledgerhq/live-common/families/solana/types";
-import { sweetch } from "@ledgerhq/live-common/families/solana/utils";
+import { sweetch } from "@ledgerhq/live-common/families/solana/logic";
 import { Currency, Unit } from "@ledgerhq/types-cryptoassets";
 import { Text } from "@ledgerhq/native-ui";
 import { useTheme } from "@react-navigation/native";

diff --git a/apps/ledger-live-mobile/src/families/solana/Delegations/index.tsx b/apps/ledger-live-mobile/src/families/solana/Delegations/index.tsx
@@ -16,7 +16,7 @@ import {
   assertUnreachable,
   sweetch,
   tupleOfUnion,
-} from "@ledgerhq/live-common/families/solana/utils";
+} from "@ledgerhq/live-common/families/solana/logic";
 import { AccountLike } from "@ledgerhq/types-live";
 import { Box, Text } from "@ledgerhq/native-ui";
 import { useNavigation, useTheme } from "@react-navigation/native";

diff --git a/libs/ledger-live-common/src/families/solana/logic.ts b/libs/ledger-live-common/src/families/solana/logic.ts
@@ -0,0 +1,11 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-solana/logic";
+export {
+  defaultVoteAccAddrByCurrencyId,
+  SOLANA_DELEGATION_RESERVE,
+  LEDGER_VALIDATOR,
+  assertUnreachable,
+  sweetch,
+  tupleOfUnion,
+} from "@ledgerhq/coin-solana/utils";
+export { ValidatorsAppValidator } from "@ledgerhq/coin-solana/validator-app/index";
diff --git a/libs/ledger-live-common/src/families/solana/types.ts b/libs/ledger-live-common/src/families/solana/types.ts
@@ -0,0 +1,2 @@
+// Encapsulate for LLD et LLM
+export * from "@ledgerhq/coin-solana/types";