1 files changed, 7 insertions, 23 deletions

diff --git a/packages/main/src/stores/Profile.ts b/packages/main/src/stores/Profile.ts
index ec2a64b..0fd486e 100644
--- a/packages/main/src/stores/Profile.ts
+++ b/packages/main/src/stores/Profile.ts
@@ -18,19 +18,17 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import {
-  Profile as ProfileBase,
-  ProfileSettingsSnapshotIn,
-} from '@sophie/shared';
+import { Profile as ProfileBase } from '@sophie/shared';
 import { getSnapshot, Instance } from 'mobx-state-tree';
 
-import generateId from '../utils/generateId';
+import overrideProps from '../utils/overrideProps';
 
-export interface ProfileConfig extends ProfileSettingsSnapshotIn {
-  id?: string | undefined;
-}
+import ProfileSettings from './ProfileSettings';
+import type ProfileConfig from './config/ProfileConfig';
 
-const Profile = ProfileBase.views((self) => ({
+const Profile = overrideProps(ProfileBase, {
+  settings: ProfileSettings,
+}).views((self) => ({
   get config(): ProfileConfig {
     const { id, settings } = self;
     return { ...getSnapshot(settings), id };
@@ -44,17 +42,3 @@ const Profile = ProfileBase.views((self) => ({
 interface Profile extends Instance<typeof Profile> {}
 
 export default Profile;
-
-export type ProfileSettingsSnapshotWithId = [string, ProfileSettingsSnapshotIn];
-
-export function addMissingProfileIds(
-  profileConfigs: ProfileConfig[] | undefined,
-): ProfileSettingsSnapshotWithId[] {
-  return (profileConfigs ?? []).map((profileConfig) => {
-    const { id, ...settings } = profileConfig;
-    return [
-      typeof id === 'undefined' ? generateId(settings.name) : id,
-      settings,
-    ];
-  });
-}