trezor · peter-sanderson · Dec 5, 2025 · Dec 5, 2025 · Dec 6, 2025 · Dec 6, 2025
diff --git a/packages/suite/src/actions/suite/__tests__/suiteActions.test.ts b/packages/suite/src/actions/suite/__tests__/suiteActions.test.ts
@@ -2,7 +2,7 @@
 // data provided by TrezorConnect are mocked
 import { connectInitThunk } from '@suite-common/connect-init';
 import { prepareFirmwareReducer } from '@suite-common/firmware';
-import { prepareLabelingReducer, prepareSuiteSyncReducer } from '@suite-common/suite-sync';
+import { labelingReducer, suiteSyncReducer } from '@suite-common/suite-sync';
 import { testMocks } from '@suite-common/test-utils';
 import {
     acquireDevice,
@@ -32,8 +32,6 @@ const { getSuiteDevice } = testMocks;
 
 const firmwareReducer = prepareFirmwareReducer(extraDependencies);
 const deviceReducer = prepareDeviceReducer(extraDependencies);
-const labelingReducer = prepareLabelingReducer(extraDependencies);
-const suiteSyncReducer = prepareSuiteSyncReducer(extraDependencies);
 
 const TrezorConnect = testMocks.getTrezorConnectMock();
 

diff --git a/packages/suite/src/actions/suiteSync/suiteSyncSlice.ts b/packages/suite/src/actions/suiteSync/suiteSyncSlice.ts
@@ -2,7 +2,7 @@ import { AnyAction, createSliceWithExtraDeps } from '@suite-common/redux-utils';
 import {
     SuiteSyncState,
     initialSuiteSyncState as commonInitialState,
-    prepareSuiteSyncReducer,
+    suiteSyncReducer,
 } from '@suite-common/suite-sync';
 
 import { Action } from 'src/types/suite';
@@ -30,9 +30,7 @@ export const suiteSyncSlice = createSliceWithExtraDeps({
             state.showEnableSuiteSyncModal = action.payload.show;
         },
     },
-    extraReducers: (builder, extra) => {
-        const commonReducer = prepareSuiteSyncReducer(extra);
-
+    extraReducers: builder => {
         builder
             .addCase(STORAGE.LOAD, (state, action) => {
                 const actionWithPayload = action as Action;
@@ -51,7 +49,7 @@ export const suiteSyncSlice = createSliceWithExtraDeps({
                 }
             })
             .addDefaultCase((state, action) => {
-                commonReducer(state, action as AnyAction);
+                suiteSyncReducer(state, action as AnyAction);
             });
     },
 });

diff --git a/packages/suite/src/actions/wallet/processLegacyMetadataIntoSuiteSyncThunk.ts b/packages/suite/src/actions/wallet/processLegacyMetadataIntoSuiteSyncThunk.ts
@@ -0,0 +1,69 @@
+import { MetadataAddPayload } from '@suite-common/metadata-types';
+import { createThunk } from '@suite-common/redux-utils';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import type { StaticSessionId } from '@trezor/connect';
+import { exhaustive } from '@trezor/type-utils';
+
+type ProcessMetadataMessageThunkParams = {
+    deviceStaticSessionId: StaticSessionId;
+    payload: MetadataAddPayload;
+    value: string | undefined;
+};
+
+/**
+ * This is a compatibility thunk to map the old Metadata code to a new Evolu storage.
+ *
+ * @deprecated This shall be removed, once we phase out the old Metadata code.
+ */
+export const processLegacyMetadataIntoSuiteSyncThunk = createThunk<
+    void,
+    ProcessMetadataMessageThunkParams,
+    void
+>(
+    '@suite/labeling/processMetadataMessageThunk',
+    ({ payload, deviceStaticSessionId, value }, { extra: { services } }) => {
+        const labelType = payload.type;
+
+        switch (labelType) {
+            case 'walletLabel':
+                services.suiteSync.labeling.updateWalletLabel({
+                    deviceStaticSessionId,
+                    label: value ?? null,
+                });
+                break;
+
+            case 'accountLabel':
+                services.suiteSync.labeling.updateAccountLabel({
+                    deviceStaticSessionId,
+                    accountKey: payload.entityKey,
+                    label: value ?? null,
+                });
+                break;
+
+            case 'addressLabel':
+                services.suiteSync.labeling.updateAddressLabel({
+                    deviceStaticSessionId,
+                    address: payload.defaultValue, // WTF, but this is the address. For example: `"bc1q9mnl3ae6dra54uu2n9hp3d4jwkt0c2ux5l79ja"`
+                    // entityKey is for example `zpub6rY6av7j6m7Lnd6rgqw5jffjX2rgeirDWWivEmFDMCKxt7FkWD5XQSrXCSW2Vsh3vnqUo1r9XjoGZiW41jqfEBkrxxdPnS15QhwJFjwfZ1U-btc-momP8m1p6w1nteR3hNREZjNc48buvpPv8K@BCCD2503E021276E78A8EBB2:2`
+                    label: value ?? null,
+                    accountDescriptor: payload.accountDescriptor,
+                    networkSymbol: payload.networkSymbol as NetworkSymbol,
+                });
+                break;
+
+            case 'outputLabel':
+                services.suiteSync.labeling.updateOutputLabel({
+                    deviceStaticSessionId,
+                    txId: payload.txid,
+                    outputIndex: Number(payload.outputIndex),
+                    label: value ?? null,
+                    accountDescriptor: payload.accountDescriptor,
+                    networkSymbol: payload.networkSymbol as NetworkSymbol,
+                });
+                break;
+
+            default:
+                exhaustive(labelType);
+        }
+    },
+);
diff --git a/packages/suite/src/actions/wallet/send/sendFormThunks.ts b/packages/suite/src/actions/wallet/send/sendFormThunks.ts
@@ -3,7 +3,7 @@ import { isRejected } from '@reduxjs/toolkit';
 
 import { MetadataAddPayload } from '@suite-common/metadata-types';
 import { createThunk } from '@suite-common/redux-utils';
-import { processMetadataMessageThunk, selectIsSuiteSyncEnabled } from '@suite-common/suite-sync';
+import { selectIsSuiteSyncEnabled } from '@suite-common/suite-sync';
 import {
     cancelSignSendFormTransactionThunk,
     enhancePrecomposedTransactionThunk,
@@ -39,6 +39,7 @@ import { RBF_ERROR_ALREADY_MINED } from './replaceByFeeErrorThunk';
 import { MODULE_PREFIX } from './sendThunksConsts';
 import { findLabelsToBeMovedOrDeletedThunk } from '../moveLabelsForRbf/findLabelsToBeMovedOrDeletedThunk';
 import { moveLabelsForRbfThunk } from '../moveLabelsForRbf/moveLabelsForRbfThunk';
+import { processLegacyMetadataIntoSuiteSyncThunk } from '../processLegacyMetadataIntoSuiteSyncThunk';
 
 export const saveSendFormDraftThunk = createThunk(
     `${MODULE_PREFIX}/saveSendFormDraftThunk`,
@@ -166,7 +167,7 @@ const applySendFormMetadataLabelsThunk = createThunk<
                 synchronize(() => {
                     if (isSuiteSyncEnabled) {
                         return dispatch(
-                            processMetadataMessageThunk({
+                            processLegacyMetadataIntoSuiteSyncThunk({
                                 payload: output,
                                 deviceStaticSessionId: selectedAccount.deviceState,
                                 value: output.value,

diff --git a/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx b/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 
 import styled from 'styled-components';
 
-import { processMetadataMessageThunk, selectShouldOfferSecureSync } from '@suite-common/suite-sync';
+import { selectShouldOfferSecureSync } from '@suite-common/suite-sync';
 import { Button, DropdownMenuItemProps, Row, Text, Tooltip } from '@trezor/components';
 import { StaticSessionId } from '@trezor/connect';
 import { spacingsPx } from '@trezor/theme';
@@ -21,6 +21,7 @@ import { MetadataAddPayload } from 'src/types/suite/metadata';
 import { LabelContentProps, LabelingVariant, MetadataProps, PrimitiveProps } from './definitions';
 import { withDropdown } from './withDropdown';
 import { withEditable } from './withEditable';
+import { processLegacyMetadataIntoSuiteSyncThunk } from '../../../../actions/wallet/processLegacyMetadataIntoSuiteSyncThunk';
 import { useLabelingCombined } from '../../../../hooks/suite/useLabelingCombined';
 import { AccountTypeBadge } from '../../AccountTypeBadge';
 import { NO_HIGHLIGHT_ATTRIBUTE } from '../../FindBar/consts';
@@ -443,7 +444,9 @@ export const MetadataLabeling = ({
         setPending(true);
 
         if (isSuiteSyncEnabled) {
-            await dispatch(processMetadataMessageThunk({ payload, deviceStaticSessionId, value }));
+            await dispatch(
+                processLegacyMetadataIntoSuiteSyncThunk({ payload, deviceStaticSessionId, value }),
+            );
 
             setShowSuccess(true);
             // Intentional pattern how to use timers with useEffect

diff --git a/packages/suite/src/hooks/suite/useLabelingCombined.ts b/packages/suite/src/hooks/suite/useLabelingCombined.ts
@@ -1,9 +1,9 @@
+import { useServices } from '@suite-common/redux-utils';
 import {
     selectIsFeatureSuiteSyncAvailable,
     selectIsSuiteSyncDebugEnabled,
     selectIsSuiteSyncEnabled,
     suiteSyncActions,
-    useToggleSuiteSyncMethods,
 } from '@suite-common/suite-sync';
 import { selectDeviceByStaticSessionId } from '@suite-common/wallet-core';
 import type { StaticSessionId } from '@trezor/connect';
@@ -27,16 +27,14 @@ type UseLabelingCombinedParams = {
  */
 export const useLabelingCombined = ({ deviceStaticSessionId }: UseLabelingCombinedParams) => {
     const dispatch = useDispatch();
+    const { suiteSync } = useServices();
 
     const device = useSelector(state =>
         deviceStaticSessionId !== undefined
             ? selectDeviceByStaticSessionId(state, deviceStaticSessionId)
             : undefined,
     );
 
-    const { disableSuiteSyncIfNeeded, enableSuiteSyncIfNeeded: enableSuiteSyncIfNeededCommon } =
-        useToggleSuiteSyncMethods();
-
     const isSuiteSyncDebugEnabled = useSelector(selectIsSuiteSyncDebugEnabled);
     const isFeatureSuiteSyncAvailable = useSelector(selectIsFeatureSuiteSyncAvailable);
     const isSuiteSyncEnabled = useSelector(selectIsSuiteSyncEnabled);
@@ -65,12 +63,12 @@ export const useLabelingCombined = ({ deviceStaticSessionId }: UseLabelingCombin
                 provider: 'evolu',
             },
         });
-        enableSuiteSyncIfNeededCommon();
+        suiteSync.turnOnSuiteSync();
     };
 
     const legacyEnableIfNeeded = () => {
         if (!legacyMetadataState.enabled) {
-            disableSuiteSyncIfNeeded(); // Enabling Legacy Labeling implicitly disables Evolu
+            suiteSync.turnOffSuiteSync(); // Enabling Legacy Labeling implicitly disables Evolu
             dispatch(metadataLabelingActions.init(true));
         }
     };
@@ -88,7 +86,6 @@ export const useLabelingCombined = ({ deviceStaticSessionId }: UseLabelingCombin
         isSuiteSyncDebugEnabled,
         hasDeviceSuiteSyncOwner,
         enableSuiteSyncIfNeeded,
-        disableSuiteSyncIfNeeded,
 
         /** Legacy Labeling */
         isMetadataEnabled: legacyMetadataState.enabled,

diff --git a/packages/suite/src/middlewares/suite/suiteMiddleware.ts b/packages/suite/src/middlewares/suite/suiteMiddleware.ts
@@ -93,7 +93,7 @@ export const prepareSuiteMiddleware = createMiddlewareWithExtraDeps(
 
             dispatch(handleDeviceDisconnect(device));
             if (isTrezorDeviceWithState(device)) {
-                extra.services.suiteSync.unsubscribeSuiteSyncStorage({ device });
+                extra.services.suiteSync.turnOffSuiteSyncForWallet({ device });
             }
         }
 

diff --git a/packages/suite/src/reducers/store.ts b/packages/suite/src/reducers/store.ts
@@ -37,7 +37,7 @@ import walletReducers from 'src/reducers/wallet';
 // toastMiddleware can be used only in suite-desktop and suite-web
 // it's not included into `@suite-middlewares` index
 import { geolocationReducer } from '@suite-common/geolocation';
-import { prepareLabelingReducer } from '@suite-common/suite-sync';
+import { labelingReducer } from '@suite-common/suite-sync';
 import { OPEN_USER_CONTEXT } from 'src/actions/suite/constants/modalConstants';
 import toastMiddleware from 'src/middlewares/suite/toastMiddleware';
 import { globalSendReceiveFilters } from 'src/slices/wallet/globalSendReceiveFilters';
@@ -51,7 +51,6 @@ const firmwareReducer = prepareFirmwareReducer(extraDependencies);
 const tokenDefinitionsReducer = prepareTokenDefinitionsReducer(extraDependencies);
 const bluetoothReducer = bluetoothSlice.prepareReducer(extraDependencies);
 const thpReducer = prepareThpReducer(extraDependencies);
-const labelingReducer = prepareLabelingReducer(extraDependencies);
 const suiteSyncReducer = suiteSyncSlice.prepareReducer(extraDependencies);
 
 const rootReducer = combineReducers({

diff --git a/packages/suite/src/support/extraDependencies.ts b/packages/suite/src/support/extraDependencies.ts
@@ -4,7 +4,7 @@ import { type History, createMemoryHistory } from 'history';
 
 import { createElectronSecureStorage } from '@suite/secure-storage-electron';
 import { createWebauthnSecureStorage } from '@suite/secure-storage-webauthn';
-import { createSuiteSyncDesktop } from '@suite/suite-sync';
+import { createSuiteSyncDesktopCompositionRoot } from '@suite/suite-sync';
 import { FW_HASH_CHECK_DEFAULT_TIMEOUTS } from '@suite-common/firmware-authenticity';
 import {
     ExtraDependenciesStatic,
@@ -25,6 +25,7 @@ import {
     SendState,
     TransactionsState,
     WalletSettingsState,
+    delegatedIdentityKeyCompositionRoot,
 } from '@suite-common/wallet-core';
 import { buildHistoricRatesFromStorage, getAccountKey } from '@suite-common/wallet-utils';
 import TrezorConnect, { StaticSessionId } from '@trezor/connect';
@@ -69,20 +70,29 @@ export const createRouterServices = (history: History) => ({
     navigate: (to: To, state?: LocationPushState) => history.push(to, state),
 });
 
-const secureStorage = isDesktop()
-    ? createElectronSecureStorage({ desktopApi })
-    : createWebauthnSecureStorage();
+export const suiteExtraFactory: ExtraWithStoreFactory = store => {
+    const secureStorage = isDesktop()
+        ? createElectronSecureStorage({ desktopApi })
+        : createWebauthnSecureStorage();
 
-export const suiteExtraFactory: ExtraWithStoreFactory = store => ({
-    services: {
-        suiteSync: createSuiteSyncDesktop({
-            ...store,
-            secureStorage,
-            trezorConnect: TrezorConnect,
-        }),
+    const { ensureDelegatedIdentityKey } = delegatedIdentityKeyCompositionRoot({
+        ...store,
         secureStorage,
-    },
-});
+        trezorConnect: TrezorConnect,
+    });
+
+    return {
+        services: {
+            suiteSync: createSuiteSyncDesktopCompositionRoot({
+                ...store,
+                secureStorage,
+                trezorConnect: TrezorConnect,
+                ensureDelegatedIdentityKey,
+            }),
+            secureStorage,
+        },
+    };
+};
 
 export const extraDependencies: ExtraDependenciesStatic = {
     thunks: {

diff --git a/packages/suite/src/views/settings/SettingsGeneral/Labeling.tsx b/packages/suite/src/views/settings/SettingsGeneral/Labeling.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react';
 
+import { useServices } from '@suite-common/redux-utils';
 import { selectIsFeatureSuiteSyncAvailable } from '@suite-common/suite-sync';
 import { LoadingContent } from '@trezor/components';
 import { EventType, analytics } from '@trezor/suite-analytics';
@@ -25,6 +26,7 @@ import { LabelingSwitchToLegacyModal } from '../../../components/suite/labeling/
 
 export const Labeling = () => {
     const { translationString } = useTranslation();
+    const { suiteSync } = useServices();
 
     const [legacyModalWarningVisible, setLegacyModalWarningVisible] = useState(false);
     const { device } = useDevice();
@@ -36,7 +38,6 @@ export const Labeling = () => {
         legacyMetadataState,
         legacyEnableIfNeeded,
         legacyDisableIfNeeded,
-        disableSuiteSyncIfNeeded,
         enableSuiteSyncIfNeeded,
         isEvoluSupportedByDevice,
         isSuiteSyncEnabled,
@@ -65,15 +66,15 @@ export const Labeling = () => {
         switch (value) {
             case 'off':
                 legacyDisableIfNeeded();
-                disableSuiteSyncIfNeeded();
+                suiteSync.turnOffSuiteSync();
                 break;
 
             case 'secure-sync':
                 enableSuiteSyncIfNeeded();
                 break;
 
             case 'legacy':
-                disableSuiteSyncIfNeeded();
+                suiteSync.turnOffSuiteSync();
                 legacyEnableIfNeeded();
                 break;
 
@@ -120,7 +121,7 @@ export const Labeling = () => {
                 <LabelingSwitchToLegacyModal
                     onClose={() => setLegacyModalWarningVisible(false)}
                     onSwitch={() => {
-                        disableSuiteSyncIfNeeded();
+                        suiteSync.turnOffSuiteSync();
                         legacyEnableIfNeeded();
                         setLegacyModalWarningVisible(false);
                     }}

diff --git a/suite-common/redux-utils/src/extraDependenciesType.ts b/suite-common/redux-utils/src/extraDependenciesType.ts
@@ -6,7 +6,7 @@ import {
 
 import { MetadataAddPayload } from '@suite-common/metadata-types';
 import { SecureStorage } from '@suite-common/secure-storage';
-import { SuiteSync } from '@suite-common/suite-sync-storage';
+import { SuiteSync } from '@suite-common/suite-sync';
 import {
     ReportSecurityCheckProps,
     Route,

diff --git a/suite-common/suite-sync-storage/src/SuiteSync.ts b/suite-common/suite-sync-storage/src/SuiteSync.ts