feat(message-system): load valid experiments to store also for mobile…

… app
trezor · Jan 14, 2025 · a7f35d8 · a7f35d8
1 parent 472c4ac
commit a7f35d8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/docs/features/message-system.md b/docs/features/message-system.md
@@ -275,6 +275,12 @@ Structure of config, types and optionality of specific keys can be found in the
                         "desktop": ">=24.5.1",
                         "mobile": "!",
                         "web": ">=24.5.1"
+                    },
+                    // It's very useful to define a duration for each experiment that starts the next day at the earliest,
+                    // to minimize changing the application under the hands of those who have it open at the moment.
+                    "duration": {
+                        "from": "2021-03-01T12:10:00.000Z",
+                        "to": "2022-01-31T12:10:00.000Z"
                     }
                 }
             ],

diff --git a/packages/suite/src/middlewares/suite/messageSystemMiddleware.ts b/packages/suite/src/middlewares/suite/messageSystemMiddleware.ts
@@ -38,24 +38,19 @@ const messageSystemMiddleware =
             const device = selectSelectedDevice(api.getState());
             const { enabledNetworks } = api.getState().wallet.settings;
 
-            const validMessages = getValidMessages(config, {
+            const validationParams = {
                 device,
                 transports,
                 settings: {
                     tor: getIsTorEnabled(torStatus),
                     enabledNetworks,
                 },
-            });
+            };
+
+            const validMessages = getValidMessages(config, validationParams);
             const categorizedValidMessages = categorizeMessages(validMessages);
 
-            const validExperiments = getValidExperiments(config, {
-                device,
-                transports,
-                settings: {
-                    tor: getIsTorEnabled(torStatus),
-                    enabledNetworks,
-                },
-            }).map(item => item.id);
+            const validExperiments = getValidExperiments(config, validationParams);
 
             api.dispatch(messageSystemActions.updateValidMessages(categorizedValidMessages));
             api.dispatch(messageSystemActions.updateValidExperiments(validExperiments));

diff --git a/suite-common/message-system/src/messageSystemUtils.ts b/suite-common/message-system/src/messageSystemUtils.ts
@@ -21,7 +21,6 @@ import type {
     Device,
     Environment,
     Condition,
-    ExperimentsItem,
 } from '@suite-common/suite-types';
 import type { NetworkSymbol } from '@suite-common/wallet-config';
 import type { TransportInfo } from '@trezor/connect';
@@ -289,10 +288,7 @@ export const getValidMessages = (config: MessageSystem | null, options: Options)
         .map(action => action.message);
 };
 
-export const getValidExperiments = (
-    config: MessageSystem | null,
-    options: Options,
-): ExperimentsItem[] => {
+export const getValidExperiments = (config: MessageSystem | null, options: Options): string[] => {
     if (!config?.experiments) {
         return [];
     }
@@ -303,5 +299,5 @@ export const getValidExperiments = (
                 !experiment.conditions.length ||
                 experiment.conditions.some(condition => validateConditions(condition, options)),
         )
-        .map(experiment => experiment.experiment);
+        .map(experiment => experiment?.experiment?.id);
 };
diff --git a/suite-native/message-system/src/messageSystemMiddleware.ts b/suite-native/message-system/src/messageSystemMiddleware.ts
@@ -6,6 +6,7 @@ import {
     categorizeMessages,
     getValidMessages,
     selectMessageSystemConfig,
+    getValidExperiments,
 } from '@suite-common/message-system';
 import { deviceActions, selectSelectedDevice } from '@suite-common/wallet-core';
 import {
@@ -30,17 +31,21 @@ export const messageSystemMiddleware = createMiddleware((action, { next, dispatc
         const device = selectSelectedDevice(getState());
         const enabledNetworks = selectDeviceEnabledDiscoveryNetworkSymbols(getState());
 
-        const validMessages = getValidMessages(config, {
+        const validationParams = {
             device,
             settings: {
                 tor: false, // not supported in suite-native
                 enabledNetworks,
             },
-        });
+        };
 
+        const validMessages = getValidMessages(config, validationParams);
         const categorizedValidMessages = categorizeMessages(validMessages);
 
+        const validExperiments = getValidExperiments(config, validationParams);
+
         dispatch(messageSystemActions.updateValidMessages(categorizedValidMessages));
+        dispatch(messageSystemActions.updateValidExperiments(validExperiments));
     }
 
     return action;