{COPY.currentPrivacyVersion(currentPolicyVersion?.normalized ?? "null")}
-- {COPY.currentConsentValidityDays(consentValidityDays)} -
{COPY.decision(`${decision.kind} (${decision.reason})`)}
diff --git a/apps/ledger-live-mobile/src/mvvm/features/AnalyticsConsentDrawer/__tests__/useAnalyticsConsentDrawerViewModel.test.ts b/apps/ledger-live-mobile/src/mvvm/features/AnalyticsConsentDrawer/__tests__/useAnalyticsConsentDrawerViewModel.test.ts index c526dd13cbea..0aee2a29acc6 100644 --- a/apps/ledger-live-mobile/src/mvvm/features/AnalyticsConsentDrawer/__tests__/useAnalyticsConsentDrawerViewModel.test.ts +++ b/apps/ledger-live-mobile/src/mvvm/features/AnalyticsConsentDrawer/__tests__/useAnalyticsConsentDrawerViewModel.test.ts @@ -9,7 +9,7 @@ import { } from "../hooks/useAnalyticsConsentDrawerViewModel"; import { withConsentDrawerOpeningFresh, withConsentDrawerState } from "./helpers"; -/** Fixed clock so `needsConsentRenewal` / consent ISO strings are deterministic. */ +/** Fixed clock so consent ISO strings are deterministic. */ const FIXED_NOW = new Date("2024-01-15T12:00:00.000Z"); const drawerEventPayload = { diff --git a/features/flow/analytics-consent/README.md b/features/flow/analytics-consent/README.md index f2a563016fd5..67e83d49ed86 100644 --- a/features/flow/analytics-consent/README.md +++ b/features/flow/analytics-consent/README.md @@ -8,9 +8,7 @@ acknowledge a new privacy policy, or stay silent. Implements [ADR: Analytics Consent Renewal](https://ledgerhq.atlassian.net/wiki/spaces/Engagement/pages/7249592355): `analyticsOptIn.params.policyVersion` carries major/minor semantics. -Renewal is version-driven only. A stored consent never expires on a timer, so -`analyticsOptIn.params.consentValidityDays` is not read here — it remains for desktop, which -still runs its own rolling window through `libs/ledger-live-common`. +Renewal is version-driven only. A stored consent never expires on a timer. One verdict drives both the consent drawer and the tracking gate, so optional analytics is disabled exactly while a fresh choice is pending. diff --git a/features/flow/analytics-consent/package.json b/features/flow/analytics-consent/package.json index 4506788119df..dbeefed790b7 100644 --- a/features/flow/analytics-consent/package.json +++ b/features/flow/analytics-consent/package.json @@ -2,7 +2,7 @@ "name": "@features/flow-analytics-consent", "version": "0.1.0", "private": true, - "description": "Analytics consent decision engine: policy version major/minor semantics plus rolling consent expiry", + "description": "Analytics consent decision engine: policy version major/minor semantics", "main": "src/index.ts", "types": "src/index.ts", "exports": { diff --git a/features/flow/analytics-consent/src/utils/resolveAnalyticsOptInParams.test.ts b/features/flow/analytics-consent/src/utils/resolveAnalyticsOptInParams.test.ts index b42230ae9901..e697bddd13eb 100644 --- a/features/flow/analytics-consent/src/utils/resolveAnalyticsOptInParams.test.ts +++ b/features/flow/analytics-consent/src/utils/resolveAnalyticsOptInParams.test.ts @@ -23,7 +23,7 @@ describe("resolveAnalyticsOptInParams", () => { }); }); - it("ignores params the mobile decision no longer reads", () => { + it("ignores unknown params (e.g. legacy consentValidityDays)", () => { expect( resolveAnalyticsOptInParams({ params: { policyVersion: 2, consentValidityDays: 730 } }), ).toEqual({ currentPolicyVersion: { major: 2, minor: 0, normalized: "2.0" } }); diff --git a/libs/ledger-live-common/.unimportedrc.json b/libs/ledger-live-common/.unimportedrc.json index 6669ec234715..e54164b0b6ec 100644 --- a/libs/ledger-live-common/.unimportedrc.json +++ b/libs/ledger-live-common/.unimportedrc.json @@ -7,7 +7,6 @@ "src/analytics/featureFlagHelpers/onboardingCounterfeitWarning.ts", "src/analytics/featureFlagHelpers/wallet40.ts", "src/analytics/fundsReceived.ts", - "src/analyticsConsent/index.ts", "src/apps/filtering.ts", "src/apps/formatting.ts", "src/apps/hw.ts", diff --git a/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.test.ts b/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.test.ts deleted file mode 100644 index 03e0e1f45fcc..000000000000 --- a/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { add } from "date-fns"; -import { - needsConsentRenewal, - needsPrivacyPolicyAck, - resolveAnalyticsConsentPhase, -} from "./analyticsConsentUtils"; - -describe("analyticsConsentUtils", () => { - describe("needsPrivacyPolicyAck", () => { - it("returns true when stored version is null", () => { - expect(needsPrivacyPolicyAck(null, 1)).toBe(true); - }); - - it("returns true when stored version is below current", () => { - expect(needsPrivacyPolicyAck(0, 1)).toBe(true); - expect(needsPrivacyPolicyAck(1, 2)).toBe(true); - }); - - it("returns false when stored version matches current", () => { - expect(needsPrivacyPolicyAck(1, 1)).toBe(false); - expect(needsPrivacyPolicyAck(20260531, 20260531)).toBe(false); - }); - - it("supports date-style numeric policy versions", () => { - expect(needsPrivacyPolicyAck(1, 20260531)).toBe(true); - expect(needsPrivacyPolicyAck(20260531, 20261231)).toBe(true); - expect(needsPrivacyPolicyAck(20261231, 20260531)).toBe(false); - }); - }); - - describe("needsConsentRenewal", () => { - const NOW = new Date("2024-06-15T12:00:00.000Z"); - - it("returns true when consent is null or empty", () => { - expect(needsConsentRenewal(null, 365, NOW)).toBe(true); - expect(needsConsentRenewal("", 365, NOW)).toBe(true); - }); - - it("returns false when consent is within the validity window", () => { - const iso = add(NOW, { days: -300 }).toISOString(); - expect(needsConsentRenewal(iso, 365, NOW)).toBe(false); - }); - - it("returns true when consent is past the rolling window", () => { - const iso = add(NOW, { days: -400 }).toISOString(); - expect(needsConsentRenewal(iso, 365, NOW)).toBe(true); - }); - - it("returns false on the deadline instant", () => { - const consent = new Date("2023-06-01T12:00:00.000Z"); - const deadline = add(consent, { days: 365 }); - expect(needsConsentRenewal(consent.toISOString(), 365, deadline)).toBe(false); - }); - - it("returns true immediately after the deadline", () => { - const consent = new Date("2023-06-01T12:00:00.000Z"); - const deadline = add(consent, { days: 365 }); - const justAfter = new Date(deadline.getTime() + 1); - expect(needsConsentRenewal(consent.toISOString(), 365, justAfter)).toBe(true); - }); - - it("respects a shorter configured validity", () => { - const consent = add(NOW, { days: -31 }); - expect(needsConsentRenewal(consent.toISOString(), 30, NOW)).toBe(true); - }); - - it("returns true for invalid ISO strings", () => { - expect(needsConsentRenewal("not-a-date", 365, NOW)).toBe(true); - }); - }); - - describe("resolveAnalyticsConsentPhase", () => { - it("returns current phase when not closed", () => { - expect(resolveAnalyticsConsentPhase("privacy", true, true, false)).toBe("privacy"); - }); - - it("returns consentReconfirm when renewal needed and sharing was on", () => { - expect(resolveAnalyticsConsentPhase("closed", true, false, true)).toBe("consentReconfirm"); - }); - - it("returns consentFresh when renewal needed and sharing was off", () => { - expect(resolveAnalyticsConsentPhase("closed", true, false, false)).toBe("consentFresh"); - }); - - it("returns privacy when only policy update needed", () => { - expect(resolveAnalyticsConsentPhase("closed", false, true, true)).toBe("privacy"); - }); - - it("returns consentFresh when nothing special is needed", () => { - expect(resolveAnalyticsConsentPhase("closed", false, false, true)).toBe("consentFresh"); - }); - }); -}); diff --git a/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.ts b/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.ts deleted file mode 100644 index eea8e40db596..000000000000 --- a/libs/ledger-live-common/src/analyticsConsent/analyticsConsentUtils.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { add, isAfter, isValid, parseISO } from "date-fns"; - -export type AnalyticsConsentPhase = "closed" | "privacy" | "consentFresh" | "consentReconfirm"; - -export function resolveAnalyticsConsentPhase( - currentPhase: AnalyticsConsentPhase, - needsRenewal: boolean, - needsUpdatePrivacy: boolean, - analyticsSharingEnabled: boolean, -): AnalyticsConsentPhase { - if (currentPhase !== "closed") return currentPhase; - if (needsRenewal) return analyticsSharingEnabled ? "consentReconfirm" : "consentFresh"; - if (needsUpdatePrivacy) return "privacy"; - return "consentFresh"; -} - -export function needsPrivacyPolicyAck( - storedVersion: number | null, - currentVersion: number, -): boolean { - if (storedVersion == null) return true; - return storedVersion < currentVersion; -} - -export function needsConsentRenewal( - consentDateIso: string | null, - consentValidityDays: number, - now: Date = new Date(), -): boolean { - if (consentDateIso == null || consentDateIso === "") return true; - const consentDate = parseISO(consentDateIso); - if (!isValid(consentDate)) return true; - const deadline = add(consentDate, { days: consentValidityDays }); - return isAfter(now, deadline); -} diff --git a/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.test.ts b/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.test.ts deleted file mode 100644 index 4700bea11ce1..000000000000 --- a/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { resolveAnalyticsOptInParams } from "./analyticsOptInParams"; - -describe("resolveAnalyticsOptInParams", () => { - it("returns defaults when feature or params is missing", () => { - expect(resolveAnalyticsOptInParams(undefined)).toEqual({ - policyVersion: 1, - consentValidityDays: 365, - }); - expect(resolveAnalyticsOptInParams({})).toEqual({ - policyVersion: 1, - consentValidityDays: 365, - }); - }); - - it("coerces string numbers from remote params", () => { - expect( - resolveAnalyticsOptInParams({ - params: { policyVersion: "2", consentValidityDays: "180" }, - }), - ).toEqual({ policyVersion: 2, consentValidityDays: 180 }); - }); - - it("merges partial params with defaults", () => { - expect(resolveAnalyticsOptInParams({ params: { policyVersion: 3 } })).toEqual({ - policyVersion: 3, - consentValidityDays: 365, - }); - }); -}); diff --git a/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.ts b/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.ts deleted file mode 100644 index 14d8d7df8c11..000000000000 --- a/libs/ledger-live-common/src/analyticsConsent/analyticsOptInParams.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { z } from "zod"; - -const analyticsOptInParamsSchema = z.object({ - policyVersion: z.coerce.number().finite().catch(1), - consentValidityDays: z.coerce.number().finite().int().min(1).catch(365), -}); - -export type AnalyticsOptInParams = z.infer