chore: change Relay Test

peter-sanderson · peter-sanderson · commit 37e0ed8c2883 · 2025-11-26T21:45:33.000+01:00
diff --git a/packages/suite/src/views/settings/SettingsDebug/SuiteSyncSettings.tsx b/packages/suite/src/views/settings/SettingsDebug/SuiteSyncSettings.tsx
@@ -1,8 +1,8 @@
 import { useState } from 'react';
 
+import { useServices } from '@suite-common/redux-utils';
 import {
     DEFAULT_SUITE_SYNC_RELAY_URL,
-    changeRelayUrlThunk,
     selectSuiteSyncRelayUrl,
     suiteSyncActions,
 } from '@suite-common/suite-sync';
@@ -17,6 +17,9 @@ import { useLabelingCombined } from 'src/hooks/suite/useLabelingCombined';
 export const SuiteSyncSettings = () => {
     const [isLoading, setIsLoading] = useState(false);
 
+    const dispatch = useDispatch();
+    const { suiteSync } = useServices();
+
     const {
         isSuiteSyncDebugEnabled,
         isFeatureSuiteSyncAvailable,
@@ -30,8 +33,6 @@ export const SuiteSyncSettings = () => {
 
     const [relayUrl, setRelayUrl] = useState(suiteSyncRelayUrl ?? '');
 
-    const dispatch = useDispatch();
-
     const handleToggleSuiteSyncDebug = () => {
         dispatch(
             suiteSyncActions.updateSuiteSyncDebugEnabled({
@@ -40,9 +41,10 @@ export const SuiteSyncSettings = () => {
         );
     };
 
-    const onRelayUrlSave = () => {
+    const onRelayUrlSave = async () => {
         setIsLoading(true);
-        dispatch(changeRelayUrlThunk({ relayUrl }));
+
+        await suiteSync.changeRelayUrl({ relayUrl });
 
         // Fake it, to make some UI interaction for the user
         setTimeout(() => {
diff --git a/suite-common/suite-sync-storage/src/SuiteSync.ts b/suite-common/suite-sync-storage/src/SuiteSync.ts
@@ -1,7 +1,14 @@
 import { CreateSuiteSyncOwner } from './Owner';
 import { SuiteSyncStorageRepository } from './SuiteSyncStorageRepository';
 
+export type ChangeRelayUrl = (params: { relayUrl: string | null }) => Promise<void>;
+
+export interface ChangeRelayUrlDep {
+    changeRelayUrl: ChangeRelayUrl;
+}
+
 export type SuiteSync = {
+    changeRelayUrl: ChangeRelayUrl;
     suiteSyncStorageRepository: SuiteSyncStorageRepository;
     createSuiteSyncOwner: CreateSuiteSyncOwner;
 };
diff --git a/suite-common/suite-sync-storage/src/index.ts b/suite-common/suite-sync-storage/src/index.ts
@@ -1,11 +1,12 @@
 export type {
+    SuiteSyncStorageRepository,
     CreateSuiteSyncStorageRepository,
     CreateSuiteStorage,
 } from './SuiteSyncStorageRepository';
 export { createSuiteSyncStorageRepositoryFactory } from './SuiteSyncStorageRepository';
 export type { SuiteSyncStorage } from './SuiteSyncStorage';
 export type { CreateSuiteSyncOwner } from './Owner';
-export type { SuiteSync } from './SuiteSync';
+export type { SuiteSync, ChangeRelayUrlDep, ChangeRelayUrl } from './SuiteSync';
 
 // Todo: this shared object shall be handled by Dependency Injection, this is madness
 export { subscriptionStorage } from './sharedObjects';
diff --git a/suite-common/suite-sync/src/changeRelayUrlThunk.ts b/suite-common/suite-sync/src/changeRelayUrlThunk.ts
diff --git a/suite-common/suite-sync/src/constants.ts b/suite-common/suite-sync/src/constants.ts
@@ -1,8 +1 @@
-import { isDevEnv } from '@suite-common/suite-utils';
-
 export const SUITE_SYNC_STORAGE_PREFIX = '@suite/suite-sync';
-
-// The `https://suite-sync.trezor.io/` MUST have the last `/` in the URL.
-export const DEFAULT_SUITE_SYNC_RELAY_URL = isDevEnv
-    ? 'https://evolu.suite.sldev.cz/evolu/'
-    : 'https://suite-sync.trezor.io/';
diff --git a/suite-common/suite-sync/src/createSuiteSyncCompositionRoot.ts b/suite-common/suite-sync/src/createSuiteSyncCompositionRoot.ts
@@ -0,0 +1,40 @@
+import { Dispatch } from '@reduxjs/toolkit';
+
+import {
+    CreateSuiteStorage,
+    CreateSuiteSyncOwner,
+    SuiteSync,
+    createSuiteSyncStorageRepositoryFactory,
+} from '@suite-common/suite-sync-storage';
+import { selectAllDeviceOwners } from '@suite-common/wallet-core';
+
+import { createChangeRelayUrl } from './relay/changeRelayUrl';
+import { DEFAULT_SUITE_SYNC_RELAY_URL } from './relay/relayUrl';
+import { selectSuiteSyncRelayUrl } from './suiteSyncSelectors';
+
+type CreateSuiteSyncCompositionRootDeps = {
+    createSuiteStorage: CreateSuiteStorage;
+    createSuiteSyncOwner: CreateSuiteSyncOwner;
+    getState: () => any;
+    dispatch: Dispatch;
+};
+
+export const createSuiteSyncCompositionRoot = (
+    deps: CreateSuiteSyncCompositionRootDeps,
+): SuiteSync => {
+    const suiteSyncStorageRepository = createSuiteSyncStorageRepositoryFactory({
+        createSuiteStorage: deps.createSuiteStorage,
+        defaultRelayUrl: DEFAULT_SUITE_SYNC_RELAY_URL,
+        getRelayUrl: () => selectSuiteSyncRelayUrl(deps.getState()),
+    })();
+
+    return {
+        changeRelayUrl: createChangeRelayUrl({
+            suiteSyncStorageRepository,
+            getAllDevicesOwners: () => selectAllDeviceOwners(deps.getState()),
+            dispatch: deps.dispatch,
+        }),
+        suiteSyncStorageRepository,
+        createSuiteSyncOwner: deps.createSuiteSyncOwner,
+    };
+};
diff --git a/suite-common/suite-sync/src/index.ts b/suite-common/suite-sync/src/index.ts
@@ -8,21 +8,25 @@ export {
 } from './suiteSyncSelectors';
 
 export type { WithSuiteSyncAndDeviceState } from './suiteSyncSelectors';
+export { createSuiteSyncCompositionRoot } from './createSuiteSyncCompositionRoot';
 export { useSuiteSync } from './useSuiteSync';
 export { prepareSuiteSyncReducer, initialSuiteSyncState } from './suiteSyncReducer';
 export type { SuiteSyncState, SuiteSyncSettings } from './suiteSyncReducer';
 export { suiteSyncActions } from './suiteSyncActions';
 export { subscribeSuiteSyncStorageThunk } from './subscribeSuiteSyncStorageThunk';
+export { DEFAULT_SUITE_SYNC_RELAY_URL } from './relay/relayUrl';
+
+// Todo: refactor to services, so they can be isolated & tested!
 export { unsubscribeAndDisposeSuiteSyncStorageThunk } from './unsubscribeAndDisposeSuiteSyncStorageThunk';
-export { changeRelayUrlThunk } from './changeRelayUrlThunk';
-export { DEFAULT_SUITE_SYNC_RELAY_URL } from './constants';
 export { disposeAllSuiteSyncStoragesThunk } from './disposeAllSuiteSyncStoragesThunk';
 
 // Labeling
+// Todo: refactor to services, so they can be isolated & tested!
 export { updateWalletLabelThunk } from './labeling/updateWalletLabelThunk';
 export { updateAccountLabelThunk } from './labeling/updateAccountLabelThunk';
 export { updateOutputLabelThunk } from './labeling/updateOutputLabelThunk';
 export { updateAddressLabelThunk } from './labeling/updateAddressLabelThunk';
+
 export {
     selectWalletLabel,
     selectAccountLabels,
@@ -36,5 +40,7 @@ export { findAccountLabel, findOutputLabel, findAddressLabel } from './labeling/
 export type { WithLabelingState } from './labeling/labelingSelectors';
 export { prepareLabelingReducer, initialLabelingState } from './labeling/labelingReducer';
 export type { LabelingState } from './labeling/labelingReducer';
-export { processMetadataMessageThunk } from './labeling/processMetadataMessageThunk';
 export { labelingActions } from './labeling/labelingActions';
+
+// Legacy
+export { processMetadataMessageThunk } from './labeling/processMetadataMessageThunk';
diff --git a/suite-common/suite-sync/src/relay/changeRelayUrl.ts b/suite-common/suite-sync/src/relay/changeRelayUrl.ts
@@ -0,0 +1,29 @@
+import { Dispatch } from '@reduxjs/toolkit';
+
+import { ChangeRelayUrl, SuiteSyncStorageRepository } from '@suite-common/suite-sync-storage';
+import { SuiteSyncOwner } from '@suite-common/suite-types';
+
+import { setSuiteSyncRelayUrl } from '../suiteSyncActions';
+import { DEFAULT_SUITE_SYNC_RELAY_URL } from './relayUrl';
+
+export type ChangeRelayUrlDeps = {
+    getAllDevicesOwners: () => SuiteSyncOwner[];
+    dispatch: Dispatch;
+    suiteSyncStorageRepository: SuiteSyncStorageRepository;
+};
+
+export const createChangeRelayUrl =
+    (deps: ChangeRelayUrlDeps): ChangeRelayUrl =>
+    async ({ relayUrl }) => {
+        deps.dispatch(setSuiteSyncRelayUrl({ url: relayUrl }));
+
+        // We save empty, but we need to reconnect to DEFAULT in case user clears relay form to empty
+        const normalizedUrl =
+            relayUrl === null || relayUrl.trim() === '' ? DEFAULT_SUITE_SYNC_RELAY_URL : relayUrl;
+
+        const owners = deps.getAllDevicesOwners();
+
+        for (const owner of owners) {
+            await deps.suiteSyncStorageRepository.get(owner).updateRelayUrl(normalizedUrl);
+        }
+    };
diff --git a/suite-common/suite-sync/src/relay/relayUrl.ts b/suite-common/suite-sync/src/relay/relayUrl.ts
@@ -0,0 +1,7 @@
+import { isDevEnv } from '@suite-common/suite-utils';
+
+// The `https://suite-sync.trezor.io/` MUST have the last `/` in the URL.
+
+export const DEFAULT_SUITE_SYNC_RELAY_URL = isDevEnv
+    ? 'https://evolu.suite.sldev.cz/evolu/'
+    : 'https://suite-sync.trezor.io/';
diff --git a/suite-common/suite-sync/tests/relay/changeRelayUrl.test.ts b/suite-common/suite-sync/tests/relay/changeRelayUrl.test.ts
@@ -0,0 +1,49 @@
+import type { UnknownAction } from '@reduxjs/toolkit';
+
+import { SuiteSyncStorage } from '@suite-common/suite-sync-storage';
+import { asSuiteSyncOwnerId, asSuiteSyncOwnerSecretHex } from '@suite-common/suite-types';
+
+import { ChangeRelayUrlDeps, createChangeRelayUrl } from '../../src/relay/changeRelayUrl';
+import { mockNotExpected } from '../utils';
+
+const owner1 = {
+    ownerId: asSuiteSyncOwnerId('OwnerId_1'),
+    ownerSecret: asSuiteSyncOwnerSecretHex('OwnerSecret_2'),
+};
+
+describe(createChangeRelayUrl.name, () => {
+    it('changes url', () => {
+        const actions: UnknownAction[] = [];
+
+        const mockStorage: SuiteSyncStorage = {
+            accountLabels: {} as any,
+            addressLabels: {} as any,
+            outputLabels: {} as any,
+            walletLabels: {} as any,
+            dispose: mockNotExpected('dispose'),
+            updateRelayUrl: jest.fn(),
+        };
+
+        const deps: ChangeRelayUrlDeps = {
+            getAllDevicesOwners: () => [owner1],
+            dispatch: (action: any) => actions.push(action),
+            suiteSyncStorageRepository: {
+                delete: mockNotExpected('delete'),
+                get: jest.fn(() => mockStorage),
+            },
+        };
+
+        const changeRelayUrl = createChangeRelayUrl(deps);
+        changeRelayUrl({ relayUrl: 'http://localhost:4000' });
+
+        expect(actions).toStrictEqual([
+            {
+                payload: { url: 'http://localhost:4000' },
+                type: '@suite/suite-sync/set-local-first-storage-relay-url',
+            },
+        ]);
+
+        expect(deps.suiteSyncStorageRepository.get).toHaveBeenCalledWith(owner1);
+        expect(mockStorage.updateRelayUrl).toHaveBeenCalledWith('http://localhost:4000');
+    });
+});
diff --git a/suite-common/suite-sync/tests/utils.ts b/suite-common/suite-sync/tests/utils.ts
@@ -0,0 +1,3 @@
+export const mockNotExpected = (key: string) => () => {
+    throw new Error(`Method ${key} was not expected to be called`);
+};
diff --git a/suite-common/test-utils/src/extraDependenciesMock.ts b/suite-common/test-utils/src/extraDependenciesMock.ts
@@ -91,6 +91,7 @@ const suiteSyncMock: SuiteSync = {
             ownerId: asSuiteSyncOwnerId('test-1'),
             ownerSecret: asSuiteSyncOwnerSecretHex('test-2'),
         }),
+    changeRelayUrl: () => Promise.resolve(),
 };
 
 export const extraDependenciesMock: ExtraDependencies = {
diff --git a/suite-common/wallet-core/src/device/deviceSelectors.ts b/suite-common/wallet-core/src/device/deviceSelectors.ts
@@ -1,7 +1,7 @@
 import { A, pipe } from '@mobily/ts-belt';
 
 import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
-import { BackupType, TrezorDevice } from '@suite-common/suite-types';
+import { BackupType, SuiteSyncOwner, TrezorDevice } from '@suite-common/suite-types';
 import * as deviceUtils from '@suite-common/suite-utils';
 import {
     getDeviceInstances,
@@ -611,3 +611,12 @@ export const selectIsDevicePinLocked = createMemoizedSelector(
     [selectSelectedDevice],
     selectedDevice => selectedDevice && getStatus(selectedDevice) === 'device-pin-locked',
 );
+
+export const selectAllDeviceOwners = (state: DeviceRootState) =>
+    selectDevices(state).reduce((acc, it) => {
+        if (it.suiteSyncOwner !== undefined) {
+            acc.push(it.suiteSyncOwner);
+        }
+
+        return acc;
+    }, [] as SuiteSyncOwner[]);
diff --git a/suite-native/module-dev-utils/package.json b/suite-native/module-dev-utils/package.json
@@ -16,6 +16,7 @@
         "@reduxjs/toolkit": "2.10.1",
         "@suite-common/firmware": "workspace:*",
         "@suite-common/message-system": "workspace:*",
+        "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-sync": "workspace:*",
         "@suite-common/trading": "workspace:*",
         "@suite-common/validators": "workspace:*",
@@ -33,7 +34,6 @@
         "@suite-native/sentry": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@suite-native/storage": "workspace:*",
-        "@suite-native/suite-sync": "workspace:*",
         "@suite-native/toasts": "workspace:*",
         "@suite-native/trading-state": "workspace:*",
         "@trezor/connect": "workspace:*",
diff --git a/suite-native/module-dev-utils/src/components/SuiteSyncRelaySettings.tsx b/suite-native/module-dev-utils/src/components/SuiteSyncRelaySettings.tsx
@@ -1,8 +1,8 @@
 import { useDispatch, useSelector } from 'react-redux';
 
+import { useServices } from '@suite-common/redux-utils';
 import {
     DEFAULT_SUITE_SYNC_RELAY_URL,
-    changeRelayUrlThunk,
     disposeAllSuiteSyncStoragesThunk,
     selectIsFeatureSuiteSyncAvailable,
     selectSuiteSyncRelayUrl,
@@ -11,7 +11,6 @@ import {
 import { yup } from '@suite-common/validators';
 import { Button, Card, CheckBox, HStack, Text, VStack } from '@suite-native/atoms';
 import { Form, TextInputField, useForm } from '@suite-native/forms';
-import { initSuiteSyncNative } from '@suite-native/suite-sync';
 import { useToast } from '@suite-native/toasts';
 
 const DEFAULT_CUSTOM_RELAY_URL = '';
@@ -20,6 +19,7 @@ export const SuiteSyncRelaySettings = () => {
     const suiteSyncRelayUrl = useSelector(selectSuiteSyncRelayUrl);
     const isFeatureSuiteSyncEnabled = useSelector(selectIsFeatureSuiteSyncAvailable);
     const dispatch = useDispatch();
+    const { suiteSync } = useServices();
     const { showToast } = useToast();
 
     const form = useForm<{ suiteSyncRelayUrl: string }>({
@@ -31,8 +31,8 @@ export const SuiteSyncRelaySettings = () => {
         }),
     });
 
-    const onSubmit = form.handleSubmit(values => {
-        dispatch(changeRelayUrlThunk({ relayUrl: values.suiteSyncRelayUrl }));
+    const onSubmit = form.handleSubmit(async values => {
+        await suiteSync.changeRelayUrl({ relayUrl: values.suiteSyncRelayUrl });
         showToast({
             message: 'Local First Storage relay URL updated',
             variant: 'success',
@@ -54,15 +54,13 @@ export const SuiteSyncRelaySettings = () => {
             }),
         );
 
-        if (!originalIsSuiteSyncEnabled) {
-            dispatch((_, getState) => initSuiteSyncNative({ getState }));
-        } else {
+        if (originalIsSuiteSyncEnabled) {
             dispatch(disposeAllSuiteSyncStoragesThunk());
         }
     };
 
-    const handleResetToDefault = () => {
-        dispatch(changeRelayUrlThunk({ relayUrl: DEFAULT_SUITE_SYNC_RELAY_URL }));
+    const handleResetToDefault = async () => {
+        await suiteSync.changeRelayUrl({ relayUrl: DEFAULT_SUITE_SYNC_RELAY_URL });
         form.reset({ suiteSyncRelayUrl: DEFAULT_SUITE_SYNC_RELAY_URL });
         showToast({
             message: 'Local First Storage relay URL reset to default',
diff --git a/suite-native/module-dev-utils/tsconfig.json b/suite-native/module-dev-utils/tsconfig.json
diff --git a/suite-native/suite-sync/package.json b/suite-native/suite-sync/package.json
diff --git a/suite-native/suite-sync/src/index.ts b/suite-native/suite-sync/src/index.ts
diff --git a/suite/suite-sync/package.json b/suite/suite-sync/package.json
diff --git a/suite/suite-sync/src/index.ts b/suite/suite-sync/src/index.ts
diff --git a/yarn.lock b/yarn.lock
