1 files changed, 19 insertions, 15 deletions

diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index 499d1ee..c34af75 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { sharedStore as originalSharedStore } from '@sophie/shared';
+import { SharedStore as SharedStoreBase } from '@sophie/shared';
 import {
   applySnapshot,
   getSnapshot,
@@ -28,18 +28,16 @@ import {
   IReferenceType,
   IStateTreeNode,
   IType,
-  resolveIdentifier,
   types,
 } from 'mobx-state-tree';
 
 import { getLogger } from '../utils/log';
 import overrideProps from '../utils/overrideProps';
 
-import { globalSettings, GlobalSettingsSnapshotIn } from './GlobalSettings';
-import { addMissingProfileIds, profile, ProfileConfig } from './Profile';
-import {
+import GlobalSettings, { GlobalSettingsSnapshotIn } from './GlobalSettings';
+import Profile, { addMissingProfileIds, ProfileConfig } from './Profile';
+import Service, {
   addMissingServiceIdsAndProfiles,
-  service,
   ServiceConfig,
 } from './Service';
 
@@ -86,13 +84,13 @@ function applySettings<
   current.push(...toApply.map(([id]) => id));
 }
 
-export const sharedStore = overrideProps(originalSharedStore, {
-  settings: types.optional(globalSettings, {}),
-  profilesById: types.map(profile),
-  profiles: types.array(types.reference(profile)),
-  servicesById: types.map(service),
-  services: types.array(types.reference(service)),
-  selectedService: types.safeReference(service),
+const SharedStore = overrideProps(SharedStoreBase, {
+  settings: types.optional(GlobalSettings, {}),
+  profilesById: types.map(Profile),
+  profiles: types.array(types.reference(Profile)),
+  servicesById: types.map(Service),
+  services: types.array(types.reference(Service)),
+  selectedService: types.safeReference(Service),
 })
   .views((self) => ({
     get config(): Config {
@@ -142,7 +140,7 @@ export const sharedStore = overrideProps(originalSharedStore, {
       self.shouldUseDarkColors = shouldUseDarkColors;
     },
     setSelectedServiceId(serviceId: string): void {
-      const serviceInstance = resolveIdentifier(service, self, serviceId);
+      const serviceInstance = self.servicesById.get(serviceId);
       if (serviceInstance === undefined) {
         log.warn('Trying to select unknown service', serviceId);
         return;
@@ -152,7 +150,13 @@ export const sharedStore = overrideProps(originalSharedStore, {
     },
   }));
 
-export interface SharedStore extends Instance<typeof sharedStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface SharedStore extends Instance<typeof SharedStore> {}
+
+export default SharedStore;
 
 export type {
   SharedStoreSnapshotIn,