@ledgerhq/live-common 27.2.0-nightly.3 → 27.2.0

package/src/families/ripple/speculos-deviceActions.ts

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -14,13 +15,37 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Amount",
         button: "Rr",
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount),
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+              prefixCode: true,
+            },
+            status.amount,
+            {
+              showCode: true,
+              disableRounding: true,
+              joinFragmentsSeparator: " ",
+            }
+          ).replace(/\s/g, " "),
       },
       {
         title: "Fee",
         button: "Rr",
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.estimatedFees),
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+              prefixCode: true,
+            },
+            status.estimatedFees,
+            {
+              showCode: true,
+              disableRounding: true,
+              joinFragmentsSeparator: " ",
+            }
+          ).replace(/\s/g, " "),
       },
       {
         title: "Destination Tag",

package/src/families/solana/speculos-deviceActions.ts

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import BigNumber from "bignumber.js";
 import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
@@ -16,11 +17,12 @@ function ellipsis(str: string) {
   return `${str.slice(0, 7)}..${str.slice(-7)}`;
 }
 
-function formatAmount(c: CryptoCurrency, amount: number) {
-  const currency = getMainCurrency(c);
-  return formatDeviceAmount(currency, new BigNumber(amount), {
-    postfixCode: true,
-  });
+function formatAmount(currency: CryptoCurrency, amount: number) {
+  const unit = getMainCurrency(currency).units[0];
+  return formatCurrencyUnit(unit, new BigNumber(amount), {
+    disableRounding: true,
+    showCode: true,
+  }).replace(/\s/g, " ");
 }
 
 export const acceptTransferTransaction: DeviceAction<Transaction, any> =

package/src/families/stellar/api/horizon.ts

@@ -3,7 +3,7 @@ import StellarSdk, {
   // @ts-expect-error stellar-sdk ts definition missing?
   AccountRecord,
   NotFoundError,
-  NetworkError as StellarSdkNetworkError,
+  NetworkError,
 } from "stellar-sdk";
 import { getEnv } from "../../../env";
 import { getCryptoCurrencyById, parseCurrencyUnit } from "../../../currencies";
@@ -14,7 +14,7 @@ import {
   rawOperationsToOperations,
   getReservedBalance,
 } from "../logic";
-import { LedgerAPI4xx, LedgerAPI5xx, NetworkError } from "@ledgerhq/errors";
+import { NetworkDown, LedgerAPI4xx, LedgerAPI5xx } from "@ledgerhq/errors";
 import { requestInterceptor, responseInterceptor } from "../../../network";
 import type { BalanceAsset } from "../types";
 import { NetworkCongestionLevel, Signer } from "../types";
@@ -127,12 +127,8 @@ export const fetchAccount = async (
     assets = account.balances?.filter((balance) => {
       return balance.asset_type !== "native";
     });
-  } catch (e: any) {
-    if (e instanceof NotFoundError || e?.response?.status === 400) {
-      balance.balance = "0";
-    } else {
-      throw new NetworkError();
-    }
+  } catch (e) {
+    balance.balance = "0";
   }
 
   const formattedBalance = parseCurrencyUnit(
@@ -209,11 +205,11 @@ export const fetchOperations = async ({
     }
 
     if (
-      e instanceof StellarSdkNetworkError ||
+      e instanceof NetworkError ||
       errorMsg.match(/ECONNRESET|ECONNREFUSED|ENOTFOUND|EPIPE|ETIMEDOUT/) ||
       errorMsg.match(/undefined is not an object/)
     ) {
-      throw new NetworkError();
+      throw new NetworkDown();
     }
 
     throw e;

package/src/families/stellar/speculos-deviceActions.ts

@@ -1,11 +1,14 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { deviceActionFlow } from "../../bot/specs";
 
 const expectedAmount = ({ account, status, transaction }) => {
   if (transaction.assetCode && transaction.assetIssuer) {
-    const amount = formatDeviceAmount(account.currency, status.amount);
+    const amount = formatCurrencyUnit(account.unit, status.amount, {
+      disableRounding: true,
+      useGrouping: false,
+    });
 
     return `${amount} ${transaction.assetCode}@${truncateAddress(
       transaction.assetIssuer,
@@ -14,9 +17,12 @@ const expectedAmount = ({ account, status, transaction }) => {
     )}`;
   }
 
-  return formatDeviceAmount(account.currency, status.amount, {
-    postfixCode: true,
-  });
+  return (
+    formatCurrencyUnit(account.unit, status.amount, {
+      disableRounding: true,
+      useGrouping: false,
+    }) + " XLM"
+  );
 };
 
 const truncateAddress = (stellarAddress: string, start = 6, end = 6) =>

package/src/families/tezos/speculos-deviceActions.ts

@@ -1,7 +1,8 @@
 // @flow
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -37,18 +38,24 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
       {
         title: "Amount",
         button: "Rr",
-        expectedValue: ({ account, transaction }) =>
-          formatDeviceAmount(account.currency, transaction.amount, {
-            hideCode: true,
-          }),
+        expectedValue: ({ account, transaction }) => {
+          const amount = transaction.amount;
+          return formatCurrencyUnit(account.unit, amount, {
+            disableRounding: true,
+            joinFragmentsSeparator: " ",
+          }).replace(/\s/g, " ");
+        },
       },
       {
         title: "Fee",
         button: "Rr",
-        expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.estimatedFees, {
-            hideCode: true,
-          }),
+        expectedValue: ({ account, status }) => {
+          const amount = status.estimatedFees;
+          return formatCurrencyUnit(account.currency.units[0], amount, {
+            disableRounding: true,
+            joinFragmentsSeparator: " ",
+          }).replace(/\s/g, " ");
+        },
       },
       {
         title: "Source",

package/src/families/tron/speculos-deviceActions.ts

@@ -1,5 +1,6 @@
 import type { DeviceAction } from "../../bot/types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { deviceActionFlow } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
 import type { Transaction, Vote } from "./types";
 
 function subAccount(subAccountId, account) {
@@ -39,9 +40,16 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Amount",
         button: "Rr",
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount, {
-            hideCode: true,
-          }),
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+            },
+            status.amount,
+            {
+              disableRounding: true,
+            }
+          ),
       },
       {
         title: "Token",

package/lib/exchange/swap/getProviders.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=getProviders.test.d.ts.map

package/lib/exchange/swap/getProviders.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getProviders.test.d.ts","sourceRoot":"","sources":["../../../src/exchange/swap/getProviders.test.ts"],"names":[],"mappings":""}