fix: treat dismissal of cards the same ways as notifications'

Author: marcotoniut-ledger

apps/ledger-live-desktop/src/renderer/actions/constants.ts

@@ -1,7 +1,8 @@
 // Action types
 
 /** Settings --------- */
-export const PURGE_ANONYMOUS_USER_NOTIFICATIONS = "settings/purgeAnonymousUserNotifications";
+export const PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS =
+  "settings/purgeExpiredAnonymousUserNotifications";
 export const RESET_HIDDEN_NFT_COLLECTIONS = "settings/resetHiddenNftCollections";
 export const TOGGLE_MARKET_WIDGET = "settings/toggleMarketWidget";
 export const TOGGLE_MEMOTAG_INFO = "settings/toggleShouldDisplayMemoTagInfo";

apps/ledger-live-desktop/src/renderer/actions/settings.ts

@@ -26,7 +26,7 @@ import { useRefreshAccountsOrdering } from "~/renderer/actions/general";
 import { Language, Locale } from "~/config/languages";
 import { Layout } from "LLD/features/Collectibles/types/Layouts";
 import {
-  PURGE_ANONYMOUS_USER_NOTIFICATIONS,
+  PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS,
   RESET_HIDDEN_NFT_COLLECTIONS,
   TOGGLE_MARKET_WIDGET,
   TOGGLE_MEMOTAG_INFO,
@@ -391,7 +391,7 @@ export const setDismissedContentCards = (payload: { id: string; timestamp: numbe
   payload,
 });
 
-export const clearDismissedContentCards = (payload: string[]) => ({
+export const clearDismissedContentCards = (payload: { now: Date }) => ({
   type: "CLEAR_DISMISSED_CONTENT_CARDS",
   payload,
 });
@@ -462,16 +462,15 @@ export const toggleShouldDisplayMemoTagInfo = (payload: boolean) => {
   };
 };
 
-export const purgeAnonymousUserNotifications = (payload: { cutoff: number }) => {
+export const purgeExpiredAnonymousUserNotifications = (payload: { now: Date }) => {
   return {
-    type: PURGE_ANONYMOUS_USER_NOTIFICATIONS,
+    type: PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS,
     payload,
   };
 };
 
 export const updateAnonymousUserNotifications = (payload: {
   notifications: SettingsState["anonymousUserNotifications"];
-  purgeState?: boolean;
 }) => {
   return {
     type: UPDATE_ANONYMOUS_USER_NOTIFICATIONS,

apps/ledger-live-desktop/src/renderer/hooks/useBraze.ts

@@ -1,10 +1,6 @@
 import * as braze from "@braze/web-sdk";
 import { ClassicCard } from "@braze/web-sdk";
-import {
-  cutoffDate,
-  generateAnonymousId,
-  getOldCampaignIds,
-} from "@ledgerhq/live-common/braze/anonymousUsers";
+import { generateAnonymousId } from "@ledgerhq/live-common/braze/anonymousUsers";
 import { getEnv } from "@ledgerhq/live-env";
 import { useCallback, useEffect, useRef } from "react";
 import { useDispatch, useSelector } from "react-redux";
@@ -26,7 +22,7 @@ import {
 } from "../actions/dynamicContent";
 import {
   clearDismissedContentCards,
-  purgeAnonymousUserNotifications,
+  purgeExpiredAnonymousUserNotifications,
   setAnonymousBrazeId,
 } from "../actions/settings";
 import {
@@ -95,6 +91,9 @@ export const mapAsNotificationContentCard = (card: ClassicCard): NotificationCon
   viewed: card.viewed,
 });
 
+/**
+ * TODO put this effectful logic into a provider instead
+ */
 export async function useBraze() {
   const dispatch = useDispatch();
   const devMode = useSelector(developerModeSelector);
@@ -106,7 +105,6 @@ export async function useBraze() {
     const user = await getUser();
     const brazeConfig = getBrazeConfig();
     const isPlaywright = !!getEnv("PLAYWRIGHT_RUN");
-    dispatch(clearDismissedContentCards(getOldCampaignIds(contentCardsDissmissed)));
 
     if (!anonymousBrazeId.current) {
       anonymousBrazeId.current = generateAnonymousId();
@@ -175,15 +173,16 @@ export async function useBraze() {
     initBraze();
   }, [initBraze]);
 
+  // TODO should there be an interval to periodically purge dismissed cards?
+  useEffect(() => {
+    dispatch(clearDismissedContentCards({ now: new Date() }));
+  }, [dispatch]);
+
   // TODO should there be an interval to periodically purge old notifications?
   useEffect(() => {
     // If the user is opt-out from analytics, we need to purge expired notifications persisted in the store/offline storage
     if (!isTrackedUser) {
-      dispatch(
-        purgeAnonymousUserNotifications({
-          cutoff: cutoffDate(),
-        }),
-      );
+      dispatch(purgeExpiredAnonymousUserNotifications({ now: new Date() }));
     }
   }, [dispatch, isTrackedUser]);
 }

apps/ledger-live-desktop/src/renderer/reducers/settings.test.ts

@@ -2,15 +2,17 @@
  * @jest-environment jsdom
  */
 
+import { aDeviceInfoBuilder } from "@ledgerhq/live-common/mock/fixtures/aDeviceInfo";
 import { DeviceModelId } from "@ledgerhq/types-devices";
+import { State } from ".";
+import { purgeExpiredAnonymousUserNotifications } from "../actions/settings";
 import reducer, {
   lastSeenDeviceSelector,
-  INITIAL_STATE as SETTINGS_INITIAL_STATE,
   localeSelector,
+  INITIAL_STATE as SETTINGS_INITIAL_STATE,
+  SettingsState,
 } from "./settings";
-import { State } from ".";
-import { aDeviceInfoBuilder } from "@ledgerhq/live-common/mock/fixtures/aDeviceInfo";
-import { PURGE_ANONYMOUS_USER_NOTIFICATIONS } from "../actions/constants";
+import { getBrazeCampaignCutoff } from "@ledgerhq/live-common/lib-es/braze/anonymousUsers";
 
 const invalidDeviceModelIds = ["nanoFTS", undefined, "whatever"];
 const validDeviceModelIds: DeviceModelId[] = Object.values(DeviceModelId);
@@ -94,23 +96,22 @@ describe("lastSeenDeviceSelector", () => {
 
 describe("action: purgeAnonymousUserNotifications", () => {
   it("should remove notifications older than cutoff but keep newer ones", () => {
-    const oldTimestamp = Date.now() - 100000; // old enough to purge
-    const newTimestamp = Date.now() + 100000; // keep
-    const cutoff = Date.now();
+    const now = new Date();
+    const cutoff = getBrazeCampaignCutoff(now);
 
-    const state = {
+    const oldTimestamp = cutoff - 1;
+    const newTimestamp = cutoff + 1;
+
+    const state: SettingsState = {
       ...SETTINGS_INITIAL_STATE,
       anonymousUserNotifications: {
         a: oldTimestamp,
         b: newTimestamp,
-        LNSUpsell: oldTimestamp, // should always be kept
+        LNSUpsell: oldTimestamp,
       },
     };
 
-    const newState = reducer(state, {
-      type: PURGE_ANONYMOUS_USER_NOTIFICATIONS,
-      payload: { cutoff },
-    });
+    const newState = reducer(state, purgeExpiredAnonymousUserNotifications({ now }));
 
     expect(newState.anonymousUserNotifications).toEqual({
       b: newTimestamp,
@@ -119,10 +120,10 @@ describe("action: purgeAnonymousUserNotifications", () => {
   });
 
   it("should keep all notifications if none are expired", () => {
-    const ts = Date.now();
-    const cutoff = ts - 1000;
+    const now = new Date();
+    const ts = now.getTime() - 1000;
 
-    const state = {
+    const state: SettingsState = {
       ...SETTINGS_INITIAL_STATE,
       anonymousUserNotifications: {
         a: ts,
@@ -131,47 +132,39 @@ describe("action: purgeAnonymousUserNotifications", () => {
       },
     };
 
-    const newState = reducer(state, {
-      type: PURGE_ANONYMOUS_USER_NOTIFICATIONS,
-      payload: { cutoff },
-    });
+    const newState = reducer(state, purgeExpiredAnonymousUserNotifications({ now }));
 
     expect(newState).toBe(state);
   });
 
   it("should keep LNSUpsell even if expired", () => {
-    const oldTimestamp = Date.now() - 100000;
-    const cutoff = Date.now();
+    const now = new Date();
+    const cutoff = getBrazeCampaignCutoff(now);
+    const expired = cutoff - 1;
 
-    const state = {
+    const state: SettingsState = {
       ...SETTINGS_INITIAL_STATE,
       anonymousUserNotifications: {
-        x: oldTimestamp,
-        LNSUpsell: oldTimestamp,
+        x: expired,
+        LNSUpsell: expired,
       },
     };
 
-    const newState = reducer(state, {
-      type: PURGE_ANONYMOUS_USER_NOTIFICATIONS,
-      payload: { cutoff },
-    });
+    const newState = reducer(state, purgeExpiredAnonymousUserNotifications({ now }));
 
     expect(newState.anonymousUserNotifications).toEqual({
-      LNSUpsell: oldTimestamp,
+      LNSUpsell: expired,
     });
   });
 
   it("should return original state if anonymousUserNotifications is empty", () => {
-    const cutoff = Date.now();
-    const state = {
+    const now = new Date();
+    const state: SettingsState = {
       ...SETTINGS_INITIAL_STATE,
       anonymousUserNotifications: {},
     };
 
-    const newState = reducer(state, {
-      type: PURGE_ANONYMOUS_USER_NOTIFICATIONS,
-      payload: { cutoff },
-    });
+    const newState = reducer(state, purgeExpiredAnonymousUserNotifications({ now }));
 
     expect(newState).toBe(state);
   });

apps/ledger-live-desktop/src/renderer/reducers/settings.ts

@@ -1,49 +1,50 @@
-import { handleActions } from "redux-actions";
-import { createSelector } from "reselect";
+import { DeviceModelId } from "@ledgerhq/devices";
+import { getBrazeCampaignCutoff } from "@ledgerhq/live-common/braze/anonymousUsers";
 import {
   findCurrencyByTicker,
   getCryptoCurrencyById,
-  listSupportedFiats,
   getFiatCurrencyByTicker,
+  listSupportedFiats,
   OFAC_CURRENCIES,
 } from "@ledgerhq/live-common/currencies/index";
-import { DeviceModelId } from "@ledgerhq/devices";
+import { getEnv } from "@ledgerhq/live-env";
+import { SupportedBlockchain } from "@ledgerhq/live-nft/supported";
+import { NftStatus } from "@ledgerhq/live-nft/types";
+import { CryptoCurrency, Currency, Unit } from "@ledgerhq/types-cryptoassets";
 import {
+  AccountLike,
   DeviceModelInfo,
-  FeatureId,
   Feature,
-  PortfolioRange,
+  FeatureId,
   FirmwareUpdateContext,
-  AccountLike,
+  PortfolioRange,
 } from "@ledgerhq/types-live";
-import { CryptoCurrency, Currency, Unit } from "@ledgerhq/types-cryptoassets";
-import { getEnv } from "@ledgerhq/live-env";
+import { Layout, LayoutKey } from "LLD/features/Collectibles/types/Layouts";
+import { handleActions } from "redux-actions";
+import { createSelector } from "reselect";
 import {
+  DEFAULT_LANGUAGE,
+  Language,
   LanguageIds,
   LanguageIdsNotFeatureFlagged,
   Languages,
-  Language,
   Locale,
-  DEFAULT_LANGUAGE,
   OFAC_LOCALES,
 } from "~/config/languages";
-import { State } from ".";
-import regionsByKey from "~/renderer/screens/settings/sections/General/regions.json";
 import { getAppLocale } from "~/helpers/systemLocale";
-import { Handlers } from "./types";
-import { Layout, LayoutKey } from "LLD/features/Collectibles/types/Layouts";
-import { OnboardingUseCase } from "../components/Onboarding/OnboardingUseCase";
+import regionsByKey from "~/renderer/screens/settings/sections/General/regions.json";
+import { State } from ".";
 import {
-  TOGGLE_MEMOTAG_INFO,
+  PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS,
+  RESET_HIDDEN_NFT_COLLECTIONS,
   TOGGLE_MARKET_WIDGET,
+  TOGGLE_MEMOTAG_INFO,
   TOGGLE_MEV,
-  UPDATE_NFT_COLLECTION_STATUS,
   UPDATE_ANONYMOUS_USER_NOTIFICATIONS,
-  RESET_HIDDEN_NFT_COLLECTIONS,
-  PURGE_ANONYMOUS_USER_NOTIFICATIONS,
+  UPDATE_NFT_COLLECTION_STATUS,
 } from "../actions/constants";
-import { SupportedBlockchain } from "@ledgerhq/live-nft/supported";
-import { NftStatus } from "@ledgerhq/live-nft/types";
+import { OnboardingUseCase } from "../components/Onboarding/OnboardingUseCase";
+import { Handlers } from "./types";
 
 /* Initial state */
 
@@ -301,7 +302,7 @@ type HandlersPayloads = {
   SET_DISMISSED_CONTENT_CARDS: {
     [key: string]: number;
   };
-  CLEAR_DISMISSED_CONTENT_CARDS: never;
+  CLEAR_DISMISSED_CONTENT_CARDS: { now: Date };
   SET_ANONYMOUS_BRAZE_ID: string;
   SET_CURRENCY_SETTINGS: { key: string; value: CurrencySettings };
 
@@ -315,7 +316,7 @@ type HandlersPayloads = {
   SET_HAS_REDIRECTED_TO_POST_ONBOARDING: boolean;
   SET_LAST_ONBOARDED_DEVICE: Device | null;
 
-  [PURGE_ANONYMOUS_USER_NOTIFICATIONS]: { cutoff: number };
+  [PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS]: { now: Date };
   [TOGGLE_MEV]: boolean;
   [TOGGLE_MEMOTAG_INFO]: boolean;
   [TOGGLE_MARKET_WIDGET]: boolean;
@@ -516,14 +517,15 @@ const handlers: SettingsHandlers = {
     },
   }),
 
-  CLEAR_DISMISSED_CONTENT_CARDS: (state: SettingsState, { payload }: { payload?: string[] }) => {
-    const newState = { ...state };
-    if (payload) {
-      payload.forEach(id => {
-        delete newState.dismissedContentCards[id];
-      });
-    }
-    return newState;
+  CLEAR_DISMISSED_CONTENT_CARDS: (state: SettingsState, { payload: { now } }) => {
+    const cutoff = getBrazeCampaignCutoff(now);
+
+    const prev = state.dismissedContentCards;
+    const next = Object.fromEntries(Object.entries(prev).filter(([, ts]) => ts >= cutoff));
+
+    return Object.keys(next).length === Object.keys(prev).length
+      ? state
+      : { ...state, dismissedContentCards: next };
   },
   SET_ANONYMOUS_BRAZE_ID: (state: SettingsState, { payload }) => ({
     ...state,
@@ -563,9 +565,9 @@ const handlers: SettingsHandlers = {
     lastOnboardedDevice: payload,
   }),
 
-  [PURGE_ANONYMOUS_USER_NOTIFICATIONS]: (state, { payload: { cutoff } }) => {
+  [PURGE_EXPIRED_ANONYMOUS_USER_NOTIFICATIONS]: (state, { payload: { now } }) => {
     const { LNSUpsell, ...rest } = state.anonymousUserNotifications;
-
+    const cutoff = getBrazeCampaignCutoff(now);
     const next: typeof rest = {
       ...(LNSUpsell ? { LNSUpsell } : {}),
       ...Object.fromEntries(Object.entries(rest).filter(([_, ts]) => ts >= cutoff)),

libs/ledger-live-common/src/braze/anonymousUsers.ts

@@ -1,15 +1,16 @@
 const NUMBER_OF_MONTHS = 3;
 const MILLISECONDS_IN_A_MONTH = 30 * 24 * 60 * 60 * 1000;
 
-export const cutoffDate = () => Date.now() - NUMBER_OF_MONTHS * MILLISECONDS_IN_A_MONTH;
+export const getBrazeCampaignCutoff = (now: Date) =>
+  now.getTime() - NUMBER_OF_MONTHS * MILLISECONDS_IN_A_MONTH;
 
 export const generateAnonymousId = () => {
   return "anonymous_id_" + (Math.floor(Math.random() * 20) + 1);
 };
 
 export const getOldCampaignIds = (campaigns: Record<string, number>) => {
-  const timeAgo = cutoffDate();
+  const cutoff = getBrazeCampaignCutoff(new Date());
   return Object.entries(campaigns)
-    .filter(([_, timestamp]) => timestamp < timeAgo)
+    .filter(([_, timestamp]) => timestamp < cutoff)
     .map(([id, _]) => id);
 };