fix: solana tests and linting issues

hoodieshq · Dec 25, 2023 · 9a39bc6 · 9a39bc6
1 parent b4b120f
commit 9a39bc6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/apps/ledger-live-mobile/src/families/solana/SendRowsFee.tsx b/apps/ledger-live-mobile/src/families/solana/SendRowsFee.tsx
@@ -39,7 +39,7 @@ export default function SolanaFeeRow({ account, parentAccount, status }: Props)
 
   const fees = (status as SolanaTransactionStatus).estimatedFees;
 
-  const unit = getAccountUnit(account.type === "TokenAccount" ? parentAccount : account);
+  const unit = getAccountUnit(account.type === "TokenAccount" ? parentAccount || account : account);
   const currency = getAccountCurrency(account);
 
   return (

diff --git a/libs/ledger-live-common/src/families/solana/bridge.integration.test.ts b/libs/ledger-live-common/src/families/solana/bridge.integration.test.ts
@@ -39,7 +39,7 @@ import {
 import { encodeAccountIdWithTokenAccountAddress, MAX_MEMO_LENGTH } from "./logic";
 import createTransaction from "./js-createTransaction";
 import { compact } from "lodash/fp";
-import { assertUnreachable } from "./utils";
+import { SYSTEM_ACCOUNT_RENT_EXEMPT, assertUnreachable } from "./utils";
 import { getEnv } from "@ledgerhq/live-env";
 import { ChainAPI } from "./api";
 import {
@@ -69,7 +69,7 @@ const testOnChainData = {
   validatorAddress: "9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF",
   fees: {
     stakeAccountRentExempt: 2282880,
-    systemAccountRentExempt: 890880,
+    systemAccountRentExempt: SYSTEM_ACCOUNT_RENT_EXEMPT,
     lamportsPerSignature: 5000,
   },
   // ---  maybe outdated or not real, fine for tests ---

diff --git a/libs/ledger-live-common/src/families/solana/specs.ts b/libs/ledger-live-common/src/families/solana/specs.ts
@@ -19,7 +19,7 @@ import {
   acceptTransferTokensWithATACreationTransaction,
   acceptTransferTransaction,
 } from "./speculos-deviceActions";
-import { assertUnreachable } from "./utils";
+import { SYSTEM_ACCOUNT_RENT_EXEMPT, assertUnreachable } from "./utils";
 import { getCurrentSolanaPreloadData } from "./js-preload-data";
 import { sample } from "lodash/fp";
 import BigNumber from "bignumber.js";
@@ -78,9 +78,14 @@ const solana: AppSpec<Transaction> = {
         };
       },
       test: input => {
-        const { account } = input;
-        botTest("account balance should be zero", () =>
-          expect(account.spendableBalance.toNumber()).toBe(0),
+        const { accountBeforeTransaction, operation } = input;
+        const extimatedMaxSpendable = BigNumber.max(
+          accountBeforeTransaction.spendableBalance.minus(SYSTEM_ACCOUNT_RENT_EXEMPT),
+          0,
+        ).toNumber();
+
+        botTest("operation value should be estimated max spendable", () =>
+          expect(operation.value.toNumber()).toBe(extimatedMaxSpendable),
         );
         expectCorrectBalanceChange(input);
         expectCorrectMemo(input);

diff --git a/libs/ledger-live-common/src/families/solana/speculos-deviceActions.ts b/libs/ledger-live-common/src/families/solana/speculos-deviceActions.ts
@@ -28,7 +28,7 @@ function formatAmount(c: CryptoCurrency | TokenCurrency, amount: number) {
 // There's a bug on the device where the token currency is being displayed as "???"
 // Temporarily replace "0.05 USDC" on "0.05 ???" to pass tokens tests
 function formatTokenAmount(c: TokenCurrency, amount: number) {
-  return formatAmount(c, amount).replace(/\D+$/, "???");
+  return formatAmount(c, amount).replace(/\D+$/, " ???");
 }
 
 function findTokenAccount(account: Account, id: string) {

diff --git a/libs/ledger-live-common/src/families/solana/utils.ts b/libs/ledger-live-common/src/families/solana/utils.ts
@@ -16,6 +16,8 @@ export const LEDGER_VALIDATOR: ValidatorsAppValidator = {
   totalScore: 6,
 };
 
+export const SYSTEM_ACCOUNT_RENT_EXEMPT = 890880;
+
 export const assertUnreachable = (_: never): never => {
   throw new Error("unreachable assertion failed");
 };