From c3c09eb3892f1e8e45a7f23c191519a83b158560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Prohaszka?= Date: Mon, 22 Apr 2024 18:06:54 +0200 Subject: [PATCH] fix: mobile and desktop solana import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Prohaszka --- .../families/solana/DelegationFlowModal/Body.tsx | 2 +- .../solana/DelegationFlowModal/steps/StepAmount.tsx | 2 +- .../shared/components/LedgerByFigmentTCLink.tsx | 2 +- .../families/solana/DelegationFlow/SelectAmount.tsx | 2 +- .../src/families/solana/DelegationFlow/Summary.tsx | 6 ++++-- .../src/families/solana/Delegations/Row.tsx | 2 +- .../src/families/solana/Delegations/index.tsx | 2 +- libs/ledger-live-common/src/families/solana/logic.ts | 11 +++++++++++ libs/ledger-live-common/src/families/solana/types.ts | 2 ++ 9 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 libs/ledger-live-common/src/families/solana/logic.ts create mode 100644 libs/ledger-live-common/src/families/solana/types.ts 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 index 0577673baadf..fba52495656e 100644 --- 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/apps/ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/steps/StepAmount.tsx b/apps/ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/steps/StepAmount.tsx index f3874c5fd402..30eaebd99f24 100644 --- a/apps/ledger-live-desktop/src/renderer/families/solana/DelegationFlowModal/steps/StepAmount.tsx +++ b/apps/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/apps/ledger-live-desktop/src/renderer/families/solana/shared/components/LedgerByFigmentTCLink.tsx b/apps/ledger-live-desktop/src/renderer/families/solana/shared/components/LedgerByFigmentTCLink.tsx index 356497eb7bec..d47e5089a14d 100644 --- a/apps/ledger-live-desktop/src/renderer/families/solana/shared/components/LedgerByFigmentTCLink.tsx +++ b/apps/ledger-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-mobile/src/families/solana/DelegationFlow/SelectAmount.tsx b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/SelectAmount.tsx index 95bb13715c12..ce996d3834e7 100644 --- 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/Summary.tsx b/apps/ledger-live-mobile/src/families/solana/DelegationFlow/Summary.tsx index b05f89b366d2..abf7776eec5e 100644 --- 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/Delegations/Row.tsx b/apps/ledger-live-mobile/src/families/solana/Delegations/Row.tsx index 49186086fabb..bd249a4e4d00 100644 --- 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 index acd97d4b53bf..cb8a1122a7b1 100644 --- 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 new file mode 100644 index 000000000000..a73e81295b84 --- /dev/null +++ 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 new file mode 100644 index 000000000000..9bcdbf8cc5eb --- /dev/null +++ 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";