@ledgerhq/live-common 34.44.0 → 34.45.0-nightly.1

package/src/hw/hooks/useGenuineCheck.ts

@@ -7,6 +7,8 @@ import type {
   GetGenuineCheckFromDeviceIdResult,
   GetGenuineCheckFromDeviceIdOutput,
 } from "../getGenuineCheckFromDeviceId";
+import { isDmkError } from "../../deviceSDK/tasks/core";
+import { DmkError } from "@ledgerhq/device-management-kit";
 
 export type GenuineState = "unchecked" | "genuine" | "non-genuine";
 export type DevicePermissionState =
@@ -33,7 +35,7 @@ export type UseGenuineCheckDependencies = {
 export type UseGenuineCheckResult = {
   genuineState: GenuineState;
   devicePermissionState: DevicePermissionState;
-  error: Error | null;
+  error: Error | DmkError | null;
   resetGenuineCheckState: () => void;
 };
 
@@ -46,6 +48,9 @@ const clearTimeoutRef = (timeoutRef: MutableRefObject<NodeJS.Timeout | null>) =>
   }
 };
 
+const isDmkDeviceDisconnectedError = (e: unknown): e is DmkError =>
+  isDmkError(e) && e._tag === "DeviceDisconnectedWhileSendingError";
+
 /**
  * Hook to check that a device is genuine
  * It replaces a DeviceAction if we're only interested in getting the genuine check
@@ -71,7 +76,7 @@ export const useGenuineCheck = ({
   const [genuineState, setGenuineState] = useState<GenuineState>("unchecked");
   const [devicePermissionState, setDevicePermissionState] =
     useState<DevicePermissionState>("unrequested");
-  const [error, setError] = useState<Error | null>(null);
+  const [error, setError] = useState<Error | DmkError | null>(null);
   const timeoutRef = useRef<NodeJS.Timeout | null>(null);
 
   const resetGenuineCheckState = useCallback(() => {
@@ -126,7 +131,7 @@ export const useGenuineCheck = ({
         clearTimeoutRef(timeoutRef);
         if (e instanceof UserRefusedAllowManager) {
           setDevicePermissionState("refused");
-        } else if (e instanceof Error) {
+        } else if (e instanceof Error || isDmkDeviceDisconnectedError(e)) {
           // Probably an error of type DisconnectedDeviceDuringOperation or something else
           setError(e);
         } else {
@@ -138,7 +143,13 @@ export const useGenuineCheck = ({
     return () => {
       sub.unsubscribe();
     };
-  }, [isHookEnabled, deviceId, lockedDeviceTimeoutMs, getGenuineCheckFromDeviceId]);
+  }, [
+    isHookEnabled,
+    deviceId,
+    lockedDeviceTimeoutMs,
+    getGenuineCheckFromDeviceId,
+    permissionTimeoutMs,
+  ]);
 
   return {
     genuineState,

package/src/modularDrawer/utils/getBalanceAndFiatValue.ts

@@ -0,0 +1,53 @@
+import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/formatCurrencyUnit";
+import { isAccount } from "@ledgerhq/coin-framework/account/helpers";
+import {
+  getPortfolioCount,
+  getBalanceHistoryWithCountervalue,
+} from "@ledgerhq/live-countervalues/portfolio";
+import type { CounterValuesState } from "@ledgerhq/live-countervalues/types";
+import { Currency } from "@ledgerhq/types-cryptoassets";
+import { Account, TokenAccount } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
+
+/**
+ *
+ * @param account - The account to get the balance and fiat value for
+ * @param state - The current state of countervalues
+ * @param toCurrency - The currency to convert to
+ * @param discreet - Whether to show the balance in discreet mode
+ * @param showCode - Whether to show the currency code in the formatted balance
+ * @returns An object containing the balance and fiat value
+ */
+export const getBalanceAndFiatValue = (
+  account: Account | TokenAccount,
+  state: CounterValuesState,
+  toCurrency: Currency,
+  discreet: boolean = false,
+  showCode: boolean = true,
+) => {
+  const isAnAccount = isAccount(account);
+  const details = isAnAccount ? account.currency : account.token;
+  const balance = formatCurrencyUnit(details.units[0], account.balance, {
+    showCode,
+    discreet,
+  });
+
+  const count = getPortfolioCount([account], "day");
+  const { history, countervalueAvailable } = getBalanceHistoryWithCountervalue(
+    account,
+    "day",
+    count,
+    state,
+    toCurrency,
+  );
+
+  if (!countervalueAvailable) return { balance, fiatValue: undefined };
+
+  const { countervalue } = history[history.length - 1] ?? {};
+  const fiatValue = formatCurrencyUnit(toCurrency.units[0], BigNumber(countervalue ?? 0), {
+    showCode,
+    discreet,
+  });
+
+  return { balance, fiatValue };
+};

package/src/modularDrawer/utils/index.ts

@@ -1,6 +1,7 @@
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { CurrenciesByProviderId } from "../../deposit/type";
 import { haveOneCommonProvider } from "./haveOneCommonProvider";
+import { getBalanceAndFiatValue } from "./getBalanceAndFiatValue";
 
 function isCorrespondingCurrency(
   elem: CryptoOrTokenCurrency,
@@ -27,4 +28,9 @@ const getEffectiveCurrency = (
   return provider.currenciesByNetwork.find(elem => currencyIds.includes(elem.id)) ?? currency;
 };
 
-export { isCorrespondingCurrency, getEffectiveCurrency, haveOneCommonProvider };
+export {
+  isCorrespondingCurrency,
+  getEffectiveCurrency,
+  haveOneCommonProvider,
+  getBalanceAndFiatValue,
+};

package/src/wallet-api/Exchange/server.ts

@@ -571,6 +571,9 @@ export const handlers = ({
               targetCurrencyId: toCurrency?.id,
               hardwareWalletType: deviceInfo?.modelId as DeviceModelId,
               swapAppVersion,
+              fromAccountId: fromAccount.id,
+              toAccountId: toAccount?.id,
+              amount: amountExpectedTo.toString(),
             });
 
             resolve({ operationHash, swapId });
@@ -587,6 +590,13 @@ export const handlers = ({
               hardwareWalletType: deviceInfo?.modelId as DeviceModelId,
               swapType: quoteId ? "fixed" : "float",
               swapAppVersion,
+              fromAccountId: fromAccount.id,
+              toAccountId: toAccount?.id,
+              refundAddress,
+              payoutAddress,
+              amount: amountExpectedTo.toString(),
+              seedIdFrom: mainFromAccount.seedIdentifier,
+              seedIdTo: toParentAccount?.seedIdentifier || (toAccount as Account)?.seedIdentifier,
             });
 
             reject(error);