chore: review fixes

Author: ishaba

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/PendingTransferProposalsDetails.tsx

@@ -120,7 +120,7 @@ export function View({
           </Text>
         </Flex>
 
-        {!isExpired && timeRemaining && (
+        {!isExpired && !!timeRemaining && (
           <Flex mb={8}>
             <Text variant="paragraph" color="neutral.c70" mb={2}>
               {t("canton.pendingTransactions.expiresIn")}

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/__tests__/test-utils.ts

@@ -79,9 +79,9 @@ export const createProcessedProposal = (
   overrides: Partial<ProcessedProposal> = {},
 ): ProcessedProposal => {
   const futureMicros = (Date.now() + 3600000) * 1000;
-  const expiresAt = new Date(futureMicros / 1000);
+  const expiresAt = overrides.expiresAt ?? new Date(futureMicros / 1000);
   const day = new Date(expiresAt);
-  day.setUTCHours(0, 0, 0, 0);
+  day.setHours(0, 0, 0, 0);
   return {
     contractId: "contract-1",
     sender: "sender-xpub",

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/__tests__/transferProposals.test.ts

@@ -1,32 +1,15 @@
-/* eslint-disable @typescript-eslint/consistent-type-assertions */
 import { BigNumber } from "bignumber.js";
 import {
   processTransferProposals,
   groupByDay,
   isValidRestoreModalState,
   INSTRUCTION_TYPE_MAP,
 } from "../utils/transferProposals";
-import type { ProcessedProposal, RawTransferProposal } from "../types";
+import type { RawTransferProposal } from "../types";
+import { ACCOUNT_XPUB, createRawProposal, createProcessedProposal } from "./test-utils";
 
-const ACCOUNT_XPUB = "account-xpub";
 const OTHER_XPUB = "other-xpub";
 
-const buildRawProposal = (overrides: {
-  contract_id: string;
-  sender: string;
-  receiver: string;
-  expires_at_micros?: number;
-  memo?: string;
-}) => ({
-  amount: "1000000",
-  instrument_id: "instrument-1",
-  instrument_admin: "",
-  update_id: "",
-  expires_at_micros: Date.now() * 1000 + 3600000000,
-  memo: "",
-  ...overrides,
-});
-
 describe("processTransferProposals", () => {
   it("should return empty incoming and outgoing arrays when given no proposals", () => {
     const result = processTransferProposals([], ACCOUNT_XPUB);
@@ -35,12 +18,7 @@ describe("processTransferProposals", () => {
   });
 
   it("should classify a proposal as incoming when sender differs from accountXpub", () => {
-    const raw = buildRawProposal({
-      contract_id: "contract-1",
-      sender: OTHER_XPUB,
-      receiver: ACCOUNT_XPUB,
-    });
-
+    const raw = createRawProposal("contract-1", OTHER_XPUB, ACCOUNT_XPUB);
     const { incoming, outgoing } = processTransferProposals([raw], ACCOUNT_XPUB);
 
     expect(incoming).toHaveLength(1);
@@ -49,12 +27,7 @@ describe("processTransferProposals", () => {
   });
 
   it("should classify a proposal as outgoing when sender matches accountXpub", () => {
-    const raw = buildRawProposal({
-      contract_id: "contract-2",
-      sender: ACCOUNT_XPUB,
-      receiver: OTHER_XPUB,
-    });
-
+    const raw = createRawProposal("contract-2", ACCOUNT_XPUB, OTHER_XPUB);
     const { incoming, outgoing } = processTransferProposals([raw], ACCOUNT_XPUB);
 
     expect(outgoing).toHaveLength(1);
@@ -64,9 +37,9 @@ describe("processTransferProposals", () => {
 
   it("should correctly split a mixed list into incoming and outgoing", () => {
     const proposals = [
-      buildRawProposal({ contract_id: "in-1", sender: OTHER_XPUB, receiver: ACCOUNT_XPUB }),
-      buildRawProposal({ contract_id: "out-1", sender: ACCOUNT_XPUB, receiver: OTHER_XPUB }),
-      buildRawProposal({ contract_id: "in-2", sender: OTHER_XPUB, receiver: ACCOUNT_XPUB }),
+      createRawProposal("in-1", OTHER_XPUB, ACCOUNT_XPUB),
+      createRawProposal("out-1", ACCOUNT_XPUB, OTHER_XPUB),
+      createRawProposal("in-2", OTHER_XPUB, ACCOUNT_XPUB),
     ];
 
     const { incoming, outgoing } = processTransferProposals(proposals, ACCOUNT_XPUB);
@@ -77,10 +50,7 @@ describe("processTransferProposals", () => {
 
   it("should mark a proposal as expired when its expiry timestamp is in the past", () => {
     const pastMicros = (Date.now() - 10000) * 1000;
-    const raw = buildRawProposal({
-      contract_id: "expired-1",
-      sender: OTHER_XPUB,
-      receiver: ACCOUNT_XPUB,
+    const raw = createRawProposal("expired-1", OTHER_XPUB, ACCOUNT_XPUB, {
       expires_at_micros: pastMicros,
     });
 
@@ -91,10 +61,7 @@ describe("processTransferProposals", () => {
 
   it("should mark a proposal as not expired when its expiry timestamp is in the future", () => {
     const futureMicros = (Date.now() + 3600000) * 1000;
-    const raw = buildRawProposal({
-      contract_id: "active-1",
-      sender: OTHER_XPUB,
-      receiver: ACCOUNT_XPUB,
+    const raw = createRawProposal("active-1", OTHER_XPUB, ACCOUNT_XPUB, {
       expires_at_micros: futureMicros,
     });
 
@@ -105,10 +72,7 @@ describe("processTransferProposals", () => {
 
   it("should correctly map raw field names to the ProcessedProposal shape", () => {
     const futureMicros = (Date.now() + 3600000) * 1000;
-    const raw = buildRawProposal({
-      contract_id: "contract-map",
-      sender: OTHER_XPUB,
-      receiver: ACCOUNT_XPUB,
+    const raw = createRawProposal("contract-map", OTHER_XPUB, ACCOUNT_XPUB, {
       expires_at_micros: futureMicros,
       memo: "test memo",
     });
@@ -127,14 +91,9 @@ describe("processTransferProposals", () => {
   });
 
   it("should default memo to an empty string when it is null or undefined", () => {
-    const raw = {
-      ...buildRawProposal({
-        contract_id: "no-memo",
-        sender: OTHER_XPUB,
-        receiver: ACCOUNT_XPUB,
-      }),
+    const raw = createRawProposal("no-memo", OTHER_XPUB, ACCOUNT_XPUB, {
       memo: undefined,
-    };
+    });
 
     const { incoming } = processTransferProposals(
       [raw as unknown as RawTransferProposal],
@@ -146,33 +105,20 @@ describe("processTransferProposals", () => {
 });
 
 describe("groupByDay", () => {
-  const makeProposal = (contractId: string, expiresAt: Date): ProcessedProposal => {
-    const day = new Date(expiresAt);
-    day.setUTCHours(0, 0, 0, 0);
-    return {
-      contractId,
-      sender: OTHER_XPUB,
-      receiver: ACCOUNT_XPUB,
-      amount: new BigNumber("1000000"),
-      instrumentId: "instrument-1",
-      memo: "",
-      expiresAtMicros: expiresAt.getTime() * 1000,
-      isExpired: false,
-      isIncoming: true,
-      expiresAt,
-      day,
-    };
-  };
-
   it("should return an empty array when given no proposals", () => {
     expect(groupByDay([])).toEqual([]);
   });
 
   it("should return a single group for proposals that all expire on the same day", () => {
-    const date = new Date("2025-06-15T10:00:00Z");
     const proposals = [
-      makeProposal("contract-1", date),
-      makeProposal("contract-2", new Date("2025-06-15T14:00:00Z")),
+      createProcessedProposal({
+        contractId: "contract-1",
+        expiresAt: new Date("2025-06-15T10:00:00Z"),
+      }),
+      createProcessedProposal({
+        contractId: "contract-2",
+        expiresAt: new Date("2025-06-15T14:00:00Z"),
+      }),
     ];
 
     const result = groupByDay(proposals);
@@ -182,19 +128,33 @@ describe("groupByDay", () => {
   });
 
   it("should return multiple groups for proposals that expire on different days", () => {
-    const day1 = new Date("2025-06-15T10:00:00Z");
-    const day2 = new Date("2025-06-16T10:00:00Z");
-    const proposals = [makeProposal("contract-1", day1), makeProposal("contract-2", day2)];
+    const proposals = [
+      createProcessedProposal({
+        contractId: "contract-1",
+        expiresAt: new Date("2025-06-15T10:00:00Z"),
+      }),
+      createProcessedProposal({
+        contractId: "contract-2",
+        expiresAt: new Date("2025-06-16T10:00:00Z"),
+      }),
+    ];
 
     const result = groupByDay(proposals);
 
     expect(result).toHaveLength(2);
   });
 
   it("should sort day groups in descending order so the latest day appears first", () => {
-    const earlier = new Date("2025-06-14T10:00:00Z");
-    const later = new Date("2025-06-16T10:00:00Z");
-    const proposals = [makeProposal("contract-old", earlier), makeProposal("contract-new", later)];
+    const proposals = [
+      createProcessedProposal({
+        contractId: "contract-old",
+        expiresAt: new Date("2025-06-14T10:00:00Z"),
+      }),
+      createProcessedProposal({
+        contractId: "contract-new",
+        expiresAt: new Date("2025-06-16T10:00:00Z"),
+      }),
+    ];
 
     const result = groupByDay(proposals);
 
@@ -235,6 +195,10 @@ describe("isValidRestoreModalState", () => {
   it("should return false when contractId is not a string", () => {
     expect(isValidRestoreModalState({ action: "accept", contractId: 123 })).toBe(false);
   });
+
+  it("should return false for prototype-chain property names like toString", () => {
+    expect(isValidRestoreModalState({ action: "toString", contractId: "contract-1" })).toBe(false);
+  });
 });
 
 describe("INSTRUCTION_TYPE_MAP", () => {

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/__tests__/usePendingTransferProposalsDetailsViewModel.test.ts

@@ -2,6 +2,10 @@ import { act, renderHook } from "@tests/test-renderer";
 import { usePendingTransferProposalsDetailsViewModel } from "../usePendingTransferProposalsDetailsViewModel";
 import { createCantonAccount, createProcessedProposal } from "./test-utils";
 
+jest.mock("@react-native-clipboard/clipboard", () => ({
+  setString: jest.fn(),
+}));
+
 describe("usePendingTransferProposalsDetailsViewModel", () => {
   const account = createCantonAccount();
   const onOpenModal = jest.fn();

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/components/ProposalRow.tsx

@@ -64,7 +64,7 @@ export function View({
             <Text variant="small" color="neutral.c70" mr={2}>
               {formattedTime}
             </Text>
-            {!isExpired && timeRemaining && (
+            {!isExpired && !!timeRemaining && (
               <Text variant="small" color="neutral.c70">
                 • {timeRemaining}
               </Text>

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/components/useProposalRowViewModel.ts

@@ -1,7 +1,7 @@
 import { useTimeRemaining } from "@ledgerhq/live-common/families/canton/react";
 import type { Unit } from "@ledgerhq/types-cryptoassets";
 import { Account } from "@ledgerhq/types-live";
-import { BigNumber } from "bignumber.js";
+import type { BigNumber } from "bignumber.js";
 import { useCallback } from "react";
 import { hoursAndMinutesOptionsSelector } from "~/components/DateFormat/FormatDate";
 import { useSelector } from "~/context/hooks";

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/types.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "bignumber.js";
+import type { BigNumber } from "bignumber.js";
 
 export type TransferProposalAction = "accept" | "reject" | "withdraw";
 

apps/ledger-live-mobile/src/families/canton/PendingTransferProposals/utils/transferProposals.ts

@@ -16,7 +16,7 @@ export const INSTRUCTION_TYPE_MAP: Record<TransferProposalAction, TransferInstru
 
 const startOfDay = (date: Date): Date => {
   const d = new Date(date);
-  d.setUTCHours(0, 0, 0, 0);
+  d.setHours(0, 0, 0, 0);
   return d;
 };
 
@@ -90,5 +90,5 @@ export const isValidRestoreModalState = (value: unknown): value is RestoreModalS
   if (typeof value !== "object" || value === null) return false;
   if (!("action" in value) || !("contractId" in value)) return false;
   if (typeof value.action !== "string" || typeof value.contractId !== "string") return false;
-  return value.action in INSTRUCTION_TYPE_MAP;
+  return Object.prototype.hasOwnProperty.call(INSTRUCTION_TYPE_MAP, value.action);
 };