From e9cece5277a30dd9992ecdd4e3748d7f33251a5c Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Mon, 2 Sep 2024 11:31:09 +0200
Subject: [PATCH 01/64] [CP-3095] 2.3.1-mockdev.70 requests not existing app
 update (#2045)

---
 .../settings/actions/load-settings.action.ts    |  5 ++++-
 libs/core/utils/get-base-bersion.ts             | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 libs/core/utils/get-base-bersion.ts

diff --git a/libs/core/settings/actions/load-settings.action.ts b/libs/core/settings/actions/load-settings.action.ts
index e31a1467bc..f8f4e9287b 100644
--- a/libs/core/settings/actions/load-settings.action.ts
+++ b/libs/core/settings/actions/load-settings.action.ts
@@ -12,6 +12,7 @@ import logger from "Core/__deprecated__/main/utils/logger"
 import { getConfiguration } from "Core/settings/requests"
 import packageInfo from "../../../../apps/mudita-center/package.json"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import getBaseVersion from "Core/utils/get-base-bersion"
 
 export const loadSettings = createAsyncThunk<
   void,
@@ -23,9 +24,11 @@ export const loadSettings = createAsyncThunk<
   const configuration = await getConfiguration()
 
   try {
+    const packageInfoBaseVersion = getBaseVersion(packageInfo.version) as string
+
     updateRequired = isVersionGreater(
       configuration.centerVersion,
-      packageInfo.version
+      packageInfoBaseVersion
     )
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/libs/core/utils/get-base-bersion.ts b/libs/core/utils/get-base-bersion.ts
new file mode 100644
index 0000000000..b6ff64af6d
--- /dev/null
+++ b/libs/core/utils/get-base-bersion.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import semver from "semver/preload"
+
+const getBaseVersion = (version = "") => {
+  const baseVersion = semver.parse(version);
+  if (baseVersion) {
+    return `${baseVersion.major}.${baseVersion.minor}.${baseVersion.patch}`;
+  }
+
+  return null;
+};
+
+export default getBaseVersion

From 3e7f5554679c43a368204db38837d957d8b1dc7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Thu, 5 Sep 2024 13:02:03 +0200
Subject: [PATCH 02/64] [CP-3037] Implemented APIEntitiesService (#2047)

---
 libs/device/feature/src/index.ts              |   1 +
 .../lib/api-entities/api-entities.service.ts  |  76 ++++++++
 .../get-api-entities-config.request.ts        |  16 ++
 .../feature/src/lib/api-entities/index.ts     |   7 +
 libs/device/feature/src/lib/api-module.ts     |   4 +
 libs/device/models/src/index.ts               |   1 +
 .../src/lib/api-config/api-config.test.ts     |   6 +
 .../models/src/lib/api-config/api-config.ts   |   1 +
 .../models/src/lib/api-request.model.ts       |   2 +
 .../entities/entity-config.validator.test.ts  |  76 ++++++++
 .../lib/entities/entity-config.validator.ts   | 164 +++++++++++++++++
 .../flatten-entity-configuration.test.ts      | 170 ++++++++++++++++++
 .../helpers/flatten-entity-configuration.ts   |  44 +++++
 libs/device/models/src/lib/entities/index.ts  |   6 +
 libs/device/models/src/lib/general-error.ts   |   4 +
 .../api-entities-service-events.ts            |   8 +
 .../src/lib/renderer-to-main-events/index.ts  |   1 +
 17 files changed, 587 insertions(+)
 create mode 100644 libs/device/feature/src/lib/api-entities/api-entities.service.ts
 create mode 100644 libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts
 create mode 100644 libs/device/feature/src/lib/api-entities/index.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-config.validator.test.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-config.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
 create mode 100644 libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.ts
 create mode 100644 libs/device/models/src/lib/entities/index.ts
 create mode 100644 libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts

diff --git a/libs/device/feature/src/index.ts b/libs/device/feature/src/index.ts
index d91fba1db0..5a3ad9f197 100644
--- a/libs/device/feature/src/index.ts
+++ b/libs/device/feature/src/index.ts
@@ -7,6 +7,7 @@ export * from "./lib/api-config"
 export * from "./lib/api-device"
 export * from "./lib/api-module"
 export * from "./lib/api-features"
+export * from "./lib/api-entities"
 export * from "./lib/outbox"
 export * from "./lib/menu"
 export * from "./lib/server"
diff --git a/libs/device/feature/src/lib/api-entities/api-entities.service.ts b/libs/device/feature/src/lib/api-entities/api-entities.service.ts
new file mode 100644
index 0000000000..714d9ac1d9
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/api-entities.service.ts
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DeviceProtocol } from "device-protocol/feature"
+import { DeviceId } from "Core/device/constants/device-id"
+import { Result, ResultObject } from "Core/core/builder"
+import { AppError, AppErrorType } from "Core/core/errors"
+import {
+  entityConfigValidator,
+  EntitiesError,
+  EntityConfig,
+  GeneralError,
+  APIEntitiesServiceEvents,
+} from "device/models"
+import { SafeParseSuccess } from "zod"
+import { IpcEvent } from "Core/core/decorators"
+
+export class APIEntitiesService {
+  constructor(private deviceProtocol: DeviceProtocol) {}
+
+  private getDevice = (deviceId?: DeviceId) => {
+    return deviceId
+      ? this.deviceProtocol.getAPIDeviceById(deviceId)
+      : this.deviceProtocol.apiDevice
+  }
+
+  private handleError(responseStatus: AppErrorType) {
+    if (EntitiesError[responseStatus as EntitiesError]) {
+      return Result.failed<unknown, AppErrorType>(
+        new AppError(
+          responseStatus,
+          EntitiesError[responseStatus as EntitiesError]
+        )
+      )
+    } else {
+      return Result.failed(new AppError(GeneralError.IncorrectResponse, ""))
+    }
+  }
+
+  private handleSuccess<Data>(response: SafeParseSuccess<Data>) {
+    return Result.success(response.data)
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntityConfig)
+  public async getEntityConfiguration({
+    entityType,
+    deviceId,
+  }: {
+    entityType: string
+    deviceId?: DeviceId
+  }): Promise<ResultObject<EntityConfig>> {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITY_CONFIGURATION",
+      method: "GET",
+      body: {
+        type: entityType,
+      },
+    })
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+
+    const apiConfig = entityConfigValidator.safeParse(response.data.body)
+    if (!apiConfig.success) {
+      return this.handleError(response.data.status)
+    }
+    return this.handleSuccess(apiConfig)
+  }
+}
diff --git a/libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts b/libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts
new file mode 100644
index 0000000000..8c18dedf7f
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+import { APIEntitiesServiceEvents, EntityConfig } from "device/models"
+
+export const getAPIEntitiesConfigRequest = (data: {
+  entityType: string
+  deviceId?: DeviceId
+}): Promise<ResultObject<EntityConfig>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntityConfig, data)
+}
diff --git a/libs/device/feature/src/lib/api-entities/index.ts b/libs/device/feature/src/lib/api-entities/index.ts
new file mode 100644
index 0000000000..743f3ba553
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./api-entities.service"
+export * from "./get-api-entities-config.request"
diff --git a/libs/device/feature/src/lib/api-module.ts b/libs/device/feature/src/lib/api-module.ts
index 4341dfe354..1bb94ca5ec 100644
--- a/libs/device/feature/src/lib/api-module.ts
+++ b/libs/device/feature/src/lib/api-module.ts
@@ -17,6 +17,7 @@ import { SystemUtilsModule } from "system-utils/feature"
 import { APIRestoreService } from "./restore"
 import { DeviceSystemActionsService } from "./device-system-actions/device-system-actions.service"
 import { APIDataTransferService } from "./data-transfer"
+import { APIEntitiesService } from "./api-entities"
 import { ISettingsService } from "shared/utils"
 
 export class APIModule {
@@ -24,6 +25,7 @@ export class APIModule {
   private apiFeaturesService: APIFeaturesService
   private apiOutboxService: APIOutboxService
   private apiMenuService: APIMenuService
+  private apiEntitiesService: APIEntitiesService
   private serverService: ServerService
   private backupService: APIBackupService
   private restoreService: APIRestoreService
@@ -43,6 +45,7 @@ export class APIModule {
     this.apiFeaturesService = new APIFeaturesService(deviceProtocol)
     this.apiOutboxService = new APIOutboxService(deviceProtocol)
     this.apiMenuService = new APIMenuService(deviceProtocol)
+    this.apiEntitiesService = new APIEntitiesService(deviceProtocol)
     this.serverService = new ServerService()
     this.backupService = new APIBackupService(deviceProtocol)
     this.apiDataTransferService = new APIDataTransferService(deviceProtocol)
@@ -72,6 +75,7 @@ export class APIModule {
       this.apiFeaturesService,
       this.apiOutboxService,
       this.apiMenuService,
+      this.apiEntitiesService,
       this.serverService,
       this.backupService,
       this.restoreService,
diff --git a/libs/device/models/src/index.ts b/libs/device/models/src/index.ts
index f808d8a139..eb55aff648 100644
--- a/libs/device/models/src/index.ts
+++ b/libs/device/models/src/index.ts
@@ -18,3 +18,4 @@ export * from "./lib/restore"
 export * from "./lib/feature"
 export * from "./lib/import-contacts"
 export * from "./lib/data-transfer"
+export * from "./lib/entities"
diff --git a/libs/device/models/src/lib/api-config/api-config.test.ts b/libs/device/models/src/lib/api-config/api-config.test.ts
index b676fc5732..68ea8bfb0f 100644
--- a/libs/device/models/src/lib/api-config/api-config.test.ts
+++ b/libs/device/models/src/lib/api-config/api-config.test.ts
@@ -35,6 +35,12 @@ describe("APIConfigValidator", () => {
     const result = ApiConfigValidator.safeParse(apiConfig)
     expect(result.success).toBeFalsy()
   })
+  it("should return fail when entityTypes array is empty", () => {
+    const apiConfig = { ...minimumApiConfig, entityTypes: [] }
+
+    const result = ApiConfigValidator.safeParse(apiConfig)
+    expect(result.success).toBeFalsy()
+  })
   it.each(["apiVersion", "productId", "vendorId"])(
     "should return fail when %s is missing",
     (fieldName) => {
diff --git a/libs/device/models/src/lib/api-config/api-config.ts b/libs/device/models/src/lib/api-config/api-config.ts
index e4d990a1b7..95f134ee64 100644
--- a/libs/device/models/src/lib/api-config/api-config.ts
+++ b/libs/device/models/src/lib/api-config/api-config.ts
@@ -17,6 +17,7 @@ export const ApiConfigValidator = z.object({
   vendorId: z.string(),
   serialNumber: z.string().optional(),
   features: z.array(z.string()).min(1),
+  entityTypes: z.array(z.string()).min(1).optional(),
 })
 
 export type ApiConfig = z.infer<typeof ApiConfigValidator>
diff --git a/libs/device/models/src/lib/api-request.model.ts b/libs/device/models/src/lib/api-request.model.ts
index 9bca8acd77..b7e7826c5f 100644
--- a/libs/device/models/src/lib/api-request.model.ts
+++ b/libs/device/models/src/lib/api-request.model.ts
@@ -19,6 +19,7 @@ export const APIEndpoints = [
   "SYSTEM",
   "PRE_DATA_TRANSFER",
   "DATA_TRANSFER",
+  "ENTITY_CONFIGURATION",
 ] as const
 
 export type APIEndpointType = (typeof APIEndpoints)[number]
@@ -43,6 +44,7 @@ const APIRequests = {
   SYSTEM: ["POST"],
   PRE_DATA_TRANSFER: ["POST"],
   DATA_TRANSFER: ["POST", "GET", "DELETE"],
+  ENTITY_CONFIGURATION: ["GET"],
 } as const
 
 interface APIRequestConfig<
diff --git a/libs/device/models/src/lib/entities/entity-config.validator.test.ts b/libs/device/models/src/lib/entities/entity-config.validator.test.ts
new file mode 100644
index 0000000000..654094c580
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-config.validator.test.ts
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntityConfig, entityConfigValidator } from "./entity-config.validator"
+import { ZodError } from "zod"
+
+describe("entityConfigValidator", () => {
+  it("validates a correct entity configuration", () => {
+    const validConfig: EntityConfig = {
+      globalValidators: {
+        requiredFieldsCombinations: [
+          {
+            fields: ["field1", "field2", "field3.field3a", "field4[]"],
+            countLogic: "gt",
+            fieldsCount: 1,
+          },
+        ],
+      },
+      fields: {
+        field1: { type: "id" },
+        field2: { type: "string", validators: [{ pattern: "/abc/" }] },
+        field3: { type: "object", fields: { field3a: { type: "string" } } },
+        field4: { type: "array", items: { type: "string" } },
+      },
+    }
+    expect(() => entityConfigValidator.parse(validConfig)).not.toThrow()
+  })
+
+  it("throws an error when 'requiredFieldsCombinations' uses wrong fields", () => {
+    const invalidConfig: EntityConfig = {
+      globalValidators: {
+        requiredFieldsCombinations: [
+          {
+            fields: ["field1", "field2.field3a", "field3"],
+            countLogic: "gt",
+            fieldsCount: 1,
+          },
+        ],
+      },
+      fields: {
+        field1: { type: "id" },
+        field2: {
+          type: "array",
+          items: {
+            type: "object",
+            fields: {
+              field3a: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+    const result = () => entityConfigValidator.parse(invalidConfig)
+    expect(result).toThrow()
+
+    try {
+      result()
+    } catch (error) {
+      expect((error as ZodError).errors).toEqual([
+        {
+          code: "custom",
+          message:
+            "global validators are mentioning fields not defined in the 'fields' object",
+          path: [
+            "globalValidators",
+            "requiredFieldsCombinations[0]",
+            "fields",
+            "[field2.field3a, field3]",
+          ],
+        },
+      ])
+    }
+  })
+})
diff --git a/libs/device/models/src/lib/entities/entity-config.validator.ts b/libs/device/models/src/lib/entities/entity-config.validator.ts
new file mode 100644
index 0000000000..90a78b6aae
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-config.validator.ts
@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+import { flattenEntityConfiguration } from "./helpers/flatten-entity-configuration"
+import { difference } from "lodash"
+
+// FIELDS SCHEMA
+const validatorErrorSchema = z.string().optional()
+
+const patternValidatorSchema = z.object({
+  pattern: z
+    .string()
+    .regex(
+      /^\/.+\/[gmiyuvsd]*$/m,
+      "Regex must be in format /regex/ or /regex/flags"
+    ),
+  negatePattern: z.boolean().optional(),
+  error: validatorErrorSchema,
+})
+
+const uniqueValidatorSchema = z.object({
+  unique: z.boolean(),
+  error: validatorErrorSchema,
+})
+
+const requiredValidatorSchema = z.object({
+  required: z.boolean(),
+  error: validatorErrorSchema,
+})
+
+const fieldValidatorsSchema = z
+  .array(
+    z.union([
+      patternValidatorSchema,
+      uniqueValidatorSchema,
+      requiredValidatorSchema,
+    ])
+  )
+  .optional()
+
+const idFieldSchema = z.object({
+  type: z.literal("id"),
+})
+
+const primitiveFieldSchema = z.object({
+  type: z.enum(["string", "number", "boolean"]),
+  validators: fieldValidatorsSchema,
+})
+
+const basicFieldSchema = z.discriminatedUnion("type", [
+  idFieldSchema,
+  primitiveFieldSchema,
+])
+
+const nestedArrayFieldSchema = z.object({
+  type: z.literal("array"),
+  items: basicFieldSchema,
+  validators: fieldValidatorsSchema,
+})
+
+const nestedObjectFieldSchema = z.object({
+  type: z.literal("object"),
+  fields: z.record(z.string(), basicFieldSchema),
+  validators: fieldValidatorsSchema,
+})
+
+const arrayFieldSchema = z.object({
+  type: z.literal("array"),
+  items: z.union([
+    basicFieldSchema,
+    nestedArrayFieldSchema,
+    nestedObjectFieldSchema,
+  ]),
+  validators: fieldValidatorsSchema,
+})
+
+const objectFieldSchema = z.object({
+  type: z.literal("object"),
+  fields: z.record(
+    z.string(),
+    z.union([basicFieldSchema, nestedArrayFieldSchema, nestedObjectFieldSchema])
+  ),
+  validators: fieldValidatorsSchema,
+})
+
+const fieldSchema = z.union([
+  idFieldSchema,
+  primitiveFieldSchema,
+  arrayFieldSchema,
+  objectFieldSchema,
+  arrayFieldSchema,
+])
+
+// GLOBAL VALIDATORS SCHEMA
+const requiredFieldsCombinationsSchema = z.object({
+  fields: z.array(z.string()).min(1),
+  countLogic: z.enum(["gt", "lt", "eq"]),
+  fieldsCount: z.number().nonnegative(),
+  error: z.string().optional(),
+})
+
+const globalValidatorSchema = z
+  .object({
+    requiredFieldsCombinations: z
+      .array(requiredFieldsCombinationsSchema)
+      .optional(),
+  })
+  .optional()
+
+export const entityConfigValidator = z
+  .object({
+    fields: z.record(z.string(), fieldSchema),
+    globalValidators: globalValidatorSchema,
+    metadata: z.unknown().optional(),
+  })
+  .refine(
+    (data) => {
+      const requiredFieldsCombinations =
+        data.globalValidators?.requiredFieldsCombinations
+      if (!requiredFieldsCombinations) return true
+
+      const availableKeys = flattenEntityConfiguration(data.fields)
+
+      return Object.values(data.globalValidators || {}).every((validator) => {
+        return validator.every((combination) => {
+          return combination.fields.every((field) => field in availableKeys)
+        })
+      })
+    },
+    (data) => {
+      let failedValidator: string[] = []
+      const availableFields = flattenEntityConfiguration(data.fields)
+
+      for (const [validatorKey, validators] of Object.entries(
+        data.globalValidators || {}
+      )) {
+        if (failedValidator.length) break
+        for (const [validatorIndex, validator] of validators.entries()) {
+          if (failedValidator.length) break
+          if (!validator.fields.every((field) => field in availableFields)) {
+            failedValidator = [
+              "globalValidators",
+              `${validatorKey}[${validatorIndex}]`,
+              `fields`,
+              `[${difference(
+                validator.fields,
+                Object.keys(availableFields)
+              ).join(", ")}]`,
+            ]
+            break
+          }
+        }
+      }
+      return {
+        message: `global validators are mentioning fields not defined in the 'fields' object`,
+        path: failedValidator,
+      }
+    }
+  )
+
+export type EntityConfig = z.infer<typeof entityConfigValidator>
diff --git a/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
new file mode 100644
index 0000000000..6a3853dfc9
--- /dev/null
+++ b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { flattenEntityConfiguration } from "./flatten-entity-configuration"
+import { EntityConfig } from "device/models"
+
+describe("flattenEntityConfiguration", () => {
+  it("handles objects with non-object values correctly", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "id",
+      },
+      b: {
+        type: "string",
+      },
+      c: {
+        type: "number",
+      },
+      d: {
+        type: "boolean",
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "id",
+      b: "string",
+      c: "number",
+      d: "boolean",
+    })
+  })
+
+  it("converts a simple nested object to dot notation correctly", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "object",
+        fields: {
+          b: {
+            type: "object",
+            fields: {
+              c: {
+                type: "string",
+              },
+            },
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "object",
+      "a.b": "object",
+      "a.b.c": "string",
+    })
+  })
+
+  it("handles objects with nested arrays correctly", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "object",
+        fields: {
+          b: {
+            type: "array",
+            items: {
+              type: "string",
+            },
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "object",
+      "a.b": "array",
+      "a.b[]": "string",
+    })
+  })
+
+  it("handles arrays with nested arrays correctly", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "array",
+        items: {
+          type: "array",
+          items: {
+            type: "string",
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "array",
+      "a[]": "array",
+      "a[][]": "string",
+    })
+  })
+
+  it("handles arrays with nested objects correctly", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "array",
+        items: {
+          type: "object",
+          fields: {
+            b: {
+              type: "string",
+            },
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "array",
+      "a[]": "object",
+      "a[].b": "string",
+    })
+  })
+
+  it("excludes 'validators' key", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "string",
+        validators: [],
+      },
+      b: {
+        type: "object",
+        validators: [],
+        fields: {
+          c: {
+            type: "string",
+            validators: [],
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input, "")).toEqual({
+      a: "string",
+      b: "object",
+      "b.c": "string",
+    })
+  })
+
+  it("handles empty objects correctly", () => {
+    const input: EntityConfig["fields"] = {}
+    expect(flattenEntityConfiguration(input)).toEqual({})
+  })
+
+  it("handles nested objects with mixed types", () => {
+    const input: EntityConfig["fields"] = {
+      a: {
+        type: "object",
+        fields: {
+          b: {
+            type: "string",
+          },
+          c: {
+            type: "number",
+          },
+          d: {
+            type: "boolean",
+          },
+        },
+      },
+    }
+    expect(flattenEntityConfiguration(input)).toEqual({
+      a: "object",
+      "a.b": "string",
+      "a.c": "number",
+      "a.d": "boolean",
+    })
+  })
+})
diff --git a/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.ts b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.ts
new file mode 100644
index 0000000000..fa0aadbc59
--- /dev/null
+++ b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export const flattenEntityConfiguration = (
+  obj: Record<string, unknown>,
+  prefix: string = ""
+): Record<string, unknown> => {
+  const result: Record<string, unknown> = {}
+
+  for (const key in obj) {
+    if (
+      !Object.prototype.hasOwnProperty.call(obj, key) ||
+      ["validators"].includes(key)
+    ) {
+      continue
+    }
+    let currentKey = key
+    switch (key) {
+      case "items":
+        currentKey = "[]"
+        break
+      case "fields":
+        currentKey = "."
+        break
+      case "type":
+        currentKey = ""
+    }
+    const value = obj[key]
+    const newKey = prefix ? `${prefix}${currentKey}` : currentKey
+
+    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+      Object.assign(
+        result,
+        flattenEntityConfiguration(value as Record<string, unknown>, newKey)
+      )
+    } else {
+      result[newKey] = value
+    }
+  }
+
+  return result
+}
diff --git a/libs/device/models/src/lib/entities/index.ts b/libs/device/models/src/lib/entities/index.ts
new file mode 100644
index 0000000000..22b0994766
--- /dev/null
+++ b/libs/device/models/src/lib/entities/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./entity-config.validator"
diff --git a/libs/device/models/src/lib/general-error.ts b/libs/device/models/src/lib/general-error.ts
index 608722f08f..0c8ea12b6c 100644
--- a/libs/device/models/src/lib/general-error.ts
+++ b/libs/device/models/src/lib/general-error.ts
@@ -22,3 +22,7 @@ export enum ApiFileTransferError {
   Unknown = 500,
   NotEnoughSpace = 507,
 }
+
+export enum EntitiesError {
+  EntityTypeNotSupported = 406
+}
diff --git a/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts b/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts
new file mode 100644
index 0000000000..e513bdc23e
--- /dev/null
+++ b/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum APIEntitiesServiceEvents {
+  EntityConfig = "apiservice_entity-config",
+}
diff --git a/libs/device/models/src/lib/renderer-to-main-events/index.ts b/libs/device/models/src/lib/renderer-to-main-events/index.ts
index 9cae09872d..f39c013746 100644
--- a/libs/device/models/src/lib/renderer-to-main-events/index.ts
+++ b/libs/device/models/src/lib/renderer-to-main-events/index.ts
@@ -14,3 +14,4 @@ export * from "./api-file-transfer-service-events"
 export * from "./file-manager-service-events"
 export * from "./device-system-actions-service-events"
 export * from "./api-data-transfer-service-events"
+export * from "./api-entities-service-events"

From bb41f8c7a97fb78ef7aa2a5a09780af28e2f2be3 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 17 Sep 2024 10:30:32 +0200
Subject: [PATCH 03/64] [CP-3093] Add data-testid to Success modal for Contact
 Support Form sending (#2054)

---
 ...ontact-support-modal-success.component.tsx | 14 +++++++----
 libs/e2e-test-ids/.eslintrc.json              | 18 +++++++++++++++
 libs/e2e-test-ids/README.md                   |  7 ++++++
 libs/e2e-test-ids/project.json                | 23 +++++++++++++++++++
 libs/e2e-test-ids/src/e2e-test-ids.ts         | 14 +++++++++++
 libs/e2e-test-ids/src/index.ts                |  6 +++++
 libs/e2e-test-ids/tsconfig.json               | 16 +++++++++++++
 libs/e2e-test-ids/tsconfig.lib.json           |  9 ++++++++
 .../theme/src/lib/generic-theme-provider.tsx  |  2 +-
 .../modal/helpers/modal-close-button.tsx      |  9 ++++----
 nx.json                                       |  5 ++++
 tsconfig.base.json                            |  1 +
 12 files changed, 115 insertions(+), 9 deletions(-)
 create mode 100644 libs/e2e-test-ids/.eslintrc.json
 create mode 100644 libs/e2e-test-ids/README.md
 create mode 100644 libs/e2e-test-ids/project.json
 create mode 100644 libs/e2e-test-ids/src/e2e-test-ids.ts
 create mode 100644 libs/e2e-test-ids/src/index.ts
 create mode 100644 libs/e2e-test-ids/tsconfig.json
 create mode 100644 libs/e2e-test-ids/tsconfig.lib.json

diff --git a/libs/core/contact-support/components/contact-support-modal-success.component.tsx b/libs/core/contact-support/components/contact-support-modal-success.component.tsx
index f51cd23ee1..911630a3e1 100644
--- a/libs/core/contact-support/components/contact-support-modal-success.component.tsx
+++ b/libs/core/contact-support/components/contact-support-modal-success.component.tsx
@@ -5,11 +5,12 @@
 
 import React from "react"
 import { defineMessages } from "react-intl"
-import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { ContactSupportModalTestIds } from "e2e-test-ids"
 import { Modal } from "generic-view/ui"
+import { IconType } from "generic-view/utils"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { ButtonSecondary } from "../../../generic-view/ui/src/lib/buttons/button-secondary"
-import { IconType } from "generic-view/utils"
 
 const messages = defineMessages({
   title: { id: "component.supportModalSuccessTitle" },
@@ -26,10 +27,15 @@ export const ContactSupportModalSuccess: FunctionComponent<Props> = ({
 }) => (
   <>
     <Modal.TitleIcon config={{ type: IconType.Success }} />
-    <Modal.Title>{intl.formatMessage(messages.title)}</Modal.Title>
-    <p>{intl.formatMessage(messages.body)}</p>
+    <Modal.Title data-testid={ContactSupportModalTestIds.Title}>
+      {intl.formatMessage(messages.title)}
+    </Modal.Title>
+    <p data-testid={ContactSupportModalTestIds.Description}>
+      {intl.formatMessage(messages.body)}
+    </p>
     <Modal.Buttons config={{ vertical: true }}>
       <ButtonSecondary
+        data-testid={ContactSupportModalTestIds.CloseButton}
         config={{
           text: intl.formatMessage(messages.closeButtonLabel),
           action: {
diff --git a/libs/e2e-test-ids/.eslintrc.json b/libs/e2e-test-ids/.eslintrc.json
new file mode 100644
index 0000000000..d3e61a2ea8
--- /dev/null
+++ b/libs/e2e-test-ids/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.js"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/e2e-test-ids/README.md b/libs/e2e-test-ids/README.md
new file mode 100644
index 0000000000..c0c48b28af
--- /dev/null
+++ b/libs/e2e-test-ids/README.md
@@ -0,0 +1,7 @@
+# e2e-test-ids
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build e2e-test-ids` to build the library.
diff --git a/libs/e2e-test-ids/project.json b/libs/e2e-test-ids/project.json
new file mode 100644
index 0000000000..f29b700ea1
--- /dev/null
+++ b/libs/e2e-test-ids/project.json
@@ -0,0 +1,23 @@
+{
+  "name": "e2e-test-ids",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/e2e-test-ids/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/e2e-test-ids",
+        "main": "libs/e2e-test-ids/src/index.ts",
+        "tsConfig": "libs/e2e-test-ids/tsconfig.lib.json",
+        "assets": ["libs/e2e-test-ids/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": []
+}
diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
new file mode 100644
index 0000000000..3d7bc89b59
--- /dev/null
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum ModalCloseButtonTestIds {
+  IconButton = "modal-close-button-icon-button",
+}
+
+export enum ContactSupportModalTestIds {
+  Title = "contact-support-modal-success-title",
+  Description = "contact-support-modal-success-description",
+  CloseButton = "contact-support-modal-success-close-button",
+}
diff --git a/libs/e2e-test-ids/src/index.ts b/libs/e2e-test-ids/src/index.ts
new file mode 100644
index 0000000000..5d40bd2492
--- /dev/null
+++ b/libs/e2e-test-ids/src/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./e2e-test-ids"
diff --git a/libs/e2e-test-ids/tsconfig.json b/libs/e2e-test-ids/tsconfig.json
new file mode 100644
index 0000000000..1bc836d424
--- /dev/null
+++ b/libs/e2e-test-ids/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "allowJs": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/libs/e2e-test-ids/tsconfig.lib.json b/libs/e2e-test-ids/tsconfig.lib.json
new file mode 100644
index 0000000000..3f4fda4aa0
--- /dev/null
+++ b/libs/e2e-test-ids/tsconfig.lib.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/generic-view/theme/src/lib/generic-theme-provider.tsx b/libs/generic-view/theme/src/lib/generic-theme-provider.tsx
index cf2fdd8de2..cea0d3d7b2 100644
--- a/libs/generic-view/theme/src/lib/generic-theme-provider.tsx
+++ b/libs/generic-view/theme/src/lib/generic-theme-provider.tsx
@@ -78,7 +78,7 @@ const GlobalStyle = createGlobalStyle<{ theme: Theme }>`
       box-shadow: 0 2rem 10rem 0 ${({ theme }) => theme.color.black + "26"};
     }
 
-    .modal-close-button:nth-child(2) {
+    .modal-close-icon-button:nth-child(2) {
       display: none;
     }
     * {
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
index 3bd02fa7d7..590d9493df 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
@@ -5,24 +5,25 @@
 
 import React from "react"
 import styled, { css } from "styled-components"
+import { ModalCloseButtonTestIds } from "e2e-test-ids"
 import { APIFC, IconType } from "generic-view/utils"
+import { ModalCloseButtonConfig } from "generic-view/models"
 import { ButtonBase } from "../../../buttons/button-base/button-base"
 import { iconButtonStyles } from "../../../shared/button"
 import { Icon } from "../../../icon/icon"
-import { ModalCloseButtonConfig } from "generic-view/models"
 
 export const ModalCloseButton: APIFC<undefined, ModalCloseButtonConfig> = ({
   data,
   config,
-  className,
+  className = "",
   ...rest
 }) => {
   if (!config?.action) return null
   return (
     <ModalClose
       action={config.action}
-      test-id={"modal-close-button"}
-      className={"modal-close-button " + className}
+      data-testid={ModalCloseButtonTestIds.IconButton}
+      className={"modal-close-icon-button " + className}
       {...rest}
     >
       <ModalCloseIcon />
diff --git a/nx.json b/nx.json
index 1ee96c524d..4267796381 100644
--- a/nx.json
+++ b/nx.json
@@ -39,5 +39,10 @@
         }
       }
     }
+  },
+  "pluginsConfig": {
+    "@nx/js": {
+      "analyzeSourceFiles": true
+    }
   }
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 8cb30bec95..1a11ab9e48 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -46,6 +46,7 @@
       "e2e-mock-client": ["libs/e2e-mock/client/src/index.ts"],
       "e2e-mock-responses": ["libs/e2e-mock/responses/src/index.ts"],
       "e2e-mock-server": ["libs/e2e-mock/server/src/index.ts"],
+      "e2e-test-ids": ["libs/e2e-test-ids/src/index.ts"],
       "electron/application-updater": [
         "libs/electron/application-updater/src/index.ts"
       ],

From 58709c8790d3b569be90632275854dc427cc948b Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 17 Sep 2024 15:14:12 +0200
Subject: [PATCH 04/64] [CP-3108] Add data-testid to Backup modals (#2055)

---
 libs/e2e-test-ids/src/e2e-test-ids.ts         | 16 +++++++++++++
 .../lib/interactive/form/input/text-input.tsx | 24 ++++++++++++++-----
 .../lib/predefined/backup/backup-password.tsx |  9 +++++--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
index 3d7bc89b59..fa38cbdbf6 100644
--- a/libs/e2e-test-ids/src/e2e-test-ids.ts
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -7,6 +7,22 @@ export enum ModalCloseButtonTestIds {
   IconButton = "modal-close-button-icon-button",
 }
 
+export enum InteractiveTextInputTestIds {
+  Text = "interactive-text-input-text",
+  Input = "interactive-text-input-input",
+  IconButton = "interactive-text-input-icon-button",
+  ErrorText = "interactive-text-input-error-text",
+}
+
+export enum PredefinedBackupPasswordTestIds {
+  Title = "predefined-backup-password-title",
+  Description = "predefined-backup-password-description",
+  PasswordPlaceholder = "predefined-backup-password-placeholder",
+  PasswordRepeatPlaceholder = "predefined-backup-password-repeat-placeholder",
+  ConfirmButton = "predefined-backup-password-confirm-button",
+  SkipButton = "predefined-backup-password-skip-button",
+}
+
 export enum ContactSupportModalTestIds {
   Title = "contact-support-modal-success-title",
   Description = "contact-support-modal-success-description",
diff --git a/libs/generic-view/ui/src/lib/interactive/form/input/text-input.tsx b/libs/generic-view/ui/src/lib/interactive/form/input/text-input.tsx
index 3ec4d5ac2d..06025e14cb 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/input/text-input.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/input/text-input.tsx
@@ -4,16 +4,18 @@
  */
 
 import React, { useEffect, useId, useState } from "react"
-import { APIFC, IconType } from "generic-view/utils"
 import styled, { css } from "styled-components"
-import { IconButton } from "../../../shared/button"
-import { Icon } from "../../../icon/icon"
 import { useFormContext } from "react-hook-form"
+import { InteractiveTextInputTestIds } from "e2e-test-ids"
+import { APIFC, IconType } from "generic-view/utils"
 import { FormTextInputConfig, FormTextInputData } from "generic-view/models"
+import { IconButton } from "../../../shared/button"
+import { Icon } from "../../../icon/icon"
 
 export const TextInput: APIFC<FormTextInputData, FormTextInputConfig> = ({
   data,
   config,
+  ...props
 }) => {
   const id = useId()
   const {
@@ -40,8 +42,9 @@ export const TextInput: APIFC<FormTextInputData, FormTextInputConfig> = ({
   }, [config.name, data?.value, setValue])
 
   return (
-    <Wrapper>
+    <Wrapper {...props}>
       <Label
+        data-testid={InteractiveTextInputTestIds.Text}
         htmlFor={"input-" + id}
         $inactive={value.length === 0}
         $withError={!!error}
@@ -50,13 +53,18 @@ export const TextInput: APIFC<FormTextInputData, FormTextInputConfig> = ({
       </Label>
       <InputWrapper>
         <Input
+          data-testid={InteractiveTextInputTestIds.Input}
           id={"input-" + id}
           type={inputType}
           $withError={!!error}
           {...register(config.name, { ...config.validation })}
         />
         {config.type === "password" && value.length > 0 && (
-          <IconButton type={"button"} onClick={togglePasswordVisibility}>
+          <IconButton
+            data-testid={InteractiveTextInputTestIds.IconButton}
+            type={"button"}
+            onClick={togglePasswordVisibility}
+          >
             <Icon
               data={{
                 type: passwordVisible
@@ -67,7 +75,11 @@ export const TextInput: APIFC<FormTextInputData, FormTextInputConfig> = ({
           </IconButton>
         )}
       </InputWrapper>
-      {error && <Error>{error?.message?.toString()}</Error>}
+      {error && (
+        <Error data-testid={InteractiveTextInputTestIds.ErrorText}>
+          {error?.message?.toString()}
+        </Error>
+      )}
     </Wrapper>
   )
 }
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
index f23d4615eb..15062b83ba 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
@@ -13,6 +13,7 @@ import { Modal } from "../../interactive/modal"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { Form } from "../../interactive/form/form"
+import { PredefinedBackupPasswordTestIds } from "e2e-test-ids"
 
 const messages = defineMessages({
   title: {
@@ -66,17 +67,18 @@ export const BackupPassword: FunctionComponent<Props> = ({
           type: IconType.Settings,
         }}
       />
-      <Modal.Title>
+      <Modal.Title data-testid={PredefinedBackupPasswordTestIds.Title}>
         {intl.formatMessage(messages.title)}
         <HeadlineOptional>
           {intl.formatMessage(messages.subtitle)}
         </HeadlineOptional>
       </Modal.Title>
-      <Text>
+      <Text data-testid={PredefinedBackupPasswordTestIds.Description}>
         {intl.formatMessage(messages.description)}
         <span>{intl.formatMessage(messages.description2)}</span>
       </Text>
       <Form.TextInput
+        data-testid={PredefinedBackupPasswordTestIds.PasswordPlaceholder}
         config={{
           name: "password",
           label: intl.formatMessage(messages.passwordPlaceholder),
@@ -84,6 +86,7 @@ export const BackupPassword: FunctionComponent<Props> = ({
         }}
       />
       <Form.TextInput
+        data-testid={PredefinedBackupPasswordTestIds.PasswordRepeatPlaceholder}
         config={{
           name: "passwordRepeat",
           label: intl.formatMessage(messages.passwordRepeatPlaceholder),
@@ -101,6 +104,7 @@ export const BackupPassword: FunctionComponent<Props> = ({
       />
       <Modal.Buttons config={{ vertical: true }}>
         <ButtonPrimary
+          data-testid={PredefinedBackupPasswordTestIds.ConfirmButton}
           config={{
             text: intl.formatMessage(messages.confirmButtonLabel),
             action: nextAction,
@@ -108,6 +112,7 @@ export const BackupPassword: FunctionComponent<Props> = ({
           }}
         />
         <ButtonText
+          data-testid={PredefinedBackupPasswordTestIds.SkipButton}
           config={{
             text: intl.formatMessage(messages.skipButtonLabel),
             action: skipAction,

From eb7516ff6ee856cea58c319ac42919ce52b12a4f Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 17 Sep 2024 16:30:10 +0200
Subject: [PATCH 05/64] [CP-2870] Improper handling of an incorrectly entered
 passcode (#2056)

---
 .../components/passcode-modal/passcode-modal.component.tsx   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/core/device-initialization/components/passcode-modal/passcode-modal.component.tsx b/libs/core/device-initialization/components/passcode-modal/passcode-modal.component.tsx
index b6a64af321..a711cadaa8 100644
--- a/libs/core/device-initialization/components/passcode-modal/passcode-modal.component.tsx
+++ b/libs/core/device-initialization/components/passcode-modal/passcode-modal.component.tsx
@@ -11,9 +11,10 @@ import { AppError } from "Core/core/errors"
 import { ModalDialogProps } from "Core/ui"
 import { ModalLayers } from "Core/modals-manager/constants/modal-layers.enum"
 import { useHelpShortcut } from "help/store"
+import { UnlockStatus } from "Core/device"
 
 export type UnlockDeviceReturnType = Promise<
-  PayloadAction<boolean, string, unknown, AppError>
+  PayloadAction<UnlockStatus, string, unknown, AppError>
 >
 
 interface Props extends Omit<ModalDialogProps, "close" | "open"> {
@@ -79,7 +80,7 @@ const PasscodeModal: FunctionComponent<Props> = ({
         return
       }
 
-      if (!unlockDeviceStatus.payload) {
+      if (unlockDeviceStatus.payload !== "UNLOCKED") {
         setErrorState(ErrorState.BadPasscode)
         return
       }

From 59f288e564c2995c86b04ed9ccb2790dbd57de9f Mon Sep 17 00:00:00 2001
From: robertmudi <158469469+robertmudi@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:04:15 +0200
Subject: [PATCH 06/64] CP-2919-pause-fix added loop and pause (#2065)

---
 .../specs/stress-tests/device-drawer-stress-test.ts    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/mudita-center-e2e/src/specs/stress-tests/device-drawer-stress-test.ts b/apps/mudita-center-e2e/src/specs/stress-tests/device-drawer-stress-test.ts
index 0c6c5a17cb..c688cd46b1 100644
--- a/apps/mudita-center-e2e/src/specs/stress-tests/device-drawer-stress-test.ts
+++ b/apps/mudita-center-e2e/src/specs/stress-tests/device-drawer-stress-test.ts
@@ -46,7 +46,8 @@ describe("Kompakt switching devices", () => {
       },
     ]
 
-    for (const device of devices) {
+    for (let i = 0; i < devices.length; i++) {
+      const device = devices[i]
       E2EMockClient.mockResponse({
         path: device.path,
         body: device.body,
@@ -59,7 +60,12 @@ describe("Kompakt switching devices", () => {
         serialNumber: device.serialNumber,
       })
 
-      await browser.pause(6000)
+      // Add a 4-second wait after adding the first device
+      if (i === 0) {
+        await browser.pause(10000)
+      } else {
+        await browser.pause(6000)
+      }
     }
   })
 

From 567d58fac88284a84ec9d48c72e707b38e8e4553 Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Wed, 18 Sep 2024 14:58:58 +0200
Subject: [PATCH 07/64] Added data-testid to Backup Modal

---
 libs/e2e-test-ids/src/e2e-test-ids.ts         | 11 ++++++++++
 .../ui/src/lib/interactive/modal/modal.tsx    |  8 ++++++-
 .../lib/predefined/backup/backup-features.tsx | 21 +++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
index fa38cbdbf6..e59041910c 100644
--- a/libs/e2e-test-ids/src/e2e-test-ids.ts
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -28,3 +28,14 @@ export enum ContactSupportModalTestIds {
   Description = "contact-support-modal-success-description",
   CloseButton = "contact-support-modal-success-close-button",
 }
+
+export enum BackupModalTestIds {
+  Title = "backup-features-modal-title",
+  Description = "backup-features-modal-description",
+  FeatureElementActive = "backup-features-modal-element-active",
+  FeatureElementInactive = "backup-features-modal-element-inactive",
+}
+
+export enum ModalTestIds {
+  Modal = "modal-content",
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx b/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
index 016dad7869..28dbef35cc 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
@@ -16,6 +16,7 @@ import { ModalScrollableContent } from "./helpers/modal-scrollable-content"
 import { ModalContent } from "./helpers/modal-content"
 import { ModalConfig } from "generic-view/models"
 import { ModalVisibilityController } from "./helpers/modal-visibility-controller"
+import { ModalTestIds } from "e2e-test-ids"
 
 export const Modal: BaseGenericComponent<
   undefined,
@@ -48,7 +49,12 @@ export const Modal: BaseGenericComponent<
       {config.closeButtonAction && (
         <ModalCloseButton config={{ action: config.closeButtonAction }} />
       )}
-      <ModalContent className={"modal-content"}>{children}</ModalContent>
+      <ModalContent
+        className={"modal-content"}
+        data-testid={`${ModalTestIds.Modal}-${componentKey}`}
+      >
+        {children}
+      </ModalContent>
     </ModalBase>
   )
 }
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
index a5c18dbb90..1d06819449 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
@@ -12,6 +12,7 @@ import { Modal } from "../../interactive/modal"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { BackupFeature } from "generic-view/models"
+import { BackupModalTestIds } from "e2e-test-ids"
 
 const messages = defineMessages({
   title: {
@@ -57,17 +58,29 @@ export const BackupFeatures: FunctionComponent<Props> = ({
   return (
     <>
       <Modal.TitleIcon config={{ type: IconType.Backup }} />
-      <Modal.Title>{intl.formatMessage(messages.title)}</Modal.Title>
+      <Modal.Title data-testid={BackupModalTestIds.Title}>
+        {intl.formatMessage(messages.title)}
+      </Modal.Title>
       <Article>
-        <p>{intl.formatMessage(messages.description)}</p>
+        <p data-testid={BackupModalTestIds.Description}>
+          {intl.formatMessage(messages.description)}
+        </p>
         <Modal.ScrollableContent>
           <ul>
             {features.map((feature, index) => (
-              <li key={feature.key + index}>{feature.label}</li>
+              <li
+                key={feature.key + index}
+                data-testid={BackupModalTestIds.FeatureElementActive}
+              >
+                {feature.label}
+              </li>
             ))}
             {Object.entries(comingSoonMessages).map(([key, message], index) => {
               return (
-                <ComingSoonListItem key={key + index}>
+                <ComingSoonListItem
+                  key={key + index}
+                  data-testid={BackupModalTestIds.FeatureElementInactive}
+                >
                   {intl.formatMessage(message)}
                 </ComingSoonListItem>
               )

From fdb8b3ff1f30a5d283b2c821bc5bec5bd36bb16f Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Wed, 18 Sep 2024 15:55:11 +0200
Subject: [PATCH 08/64] Fixed test

---
 .../containers/contact-support-flow.container.test.tsx    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libs/core/contact-support/containers/contact-support-flow.container.test.tsx b/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
index 4b2412b54a..5eb53540ae 100644
--- a/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
+++ b/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
@@ -15,6 +15,14 @@ jest.mock("Core/settings/store/schemas/generate-application-id", () => ({
   generateApplicationId: () => "123",
 }))
 
+jest.mock("e2e-test-ids", () => {
+  return {
+    ModalTestIds: {
+      Modal: "modal-content",
+    },
+  }
+})
+
 type Props = ComponentProps<typeof ModalsManager>
 
 const defaultProps: Props = {}

From b6606038a2527069fdc4995c76252a7bc2f5b793 Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Thu, 19 Sep 2024 11:15:32 +0200
Subject: [PATCH 09/64] Added data testid to Create Backup Action

---
 libs/e2e-test-ids/src/e2e-test-ids.ts                            | 1 +
 .../ui/src/lib/predefined/backup/backup-features.tsx             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
index e59041910c..b281207187 100644
--- a/libs/e2e-test-ids/src/e2e-test-ids.ts
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -34,6 +34,7 @@ export enum BackupModalTestIds {
   Description = "backup-features-modal-description",
   FeatureElementActive = "backup-features-modal-element-active",
   FeatureElementInactive = "backup-features-modal-element-inactive",
+  CreateBackupAction = "backup-features-modal-create-action",
 }
 
 export enum ModalTestIds {
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
index 1d06819449..3d2b09cf69 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
@@ -100,6 +100,7 @@ export const BackupFeatures: FunctionComponent<Props> = ({
             text: intl.formatMessage(messages.createButtonLabel),
             action: nextAction,
           }}
+          data-testid={BackupModalTestIds.CreateBackupAction}
         />
       </Modal.Buttons>
     </>

From a3483822b82e8a45a93e46df559151e2b9a30f7e Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Fri, 20 Sep 2024 09:15:07 +0200
Subject: [PATCH 10/64] [CP-2634] Update webdriverIO from 7.16 to 8.6+ (#2057)

---
 .../src/page-objects/contacts.page.ts         |  153 +-
 .../src/page-objects/help-modal.page.ts       |   37 +-
 .../src/page-objects/help.page.ts             |    1 -
 .../messages-browse-contacts-modal.page.ts    |   21 +-
 .../messages-conversation.page.ts             |   89 +-
 .../page-objects/messages-templates.page.ts   |   21 +-
 .../src/page-objects/messages.page.ts         |   85 +-
 .../page-objects/modal-backup-restore.page.ts |   37 +-
 .../src/page-objects/modal-contacts.page.ts   |   35 +-
 .../src/page-objects/modal-general.page.ts    |   25 +-
 .../src/page-objects/modal-messages.page.ts   |    9 +-
 .../src/page-objects/news.page.ts             |    1 -
 .../src/page-objects/tabs.page.ts             |    1 -
 .../connected-devices-stress-test.ts          |    7 +-
 apps/mudita-center-e2e/tsconfig.json          |    7 +-
 apps/mudita-center-e2e/wdio.conf.ts           |    4 +
 package-lock.json                             | 7797 +++++++++++++----
 package.json                                  |   18 +-
 18 files changed, 6081 insertions(+), 2267 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/contacts.page.ts b/apps/mudita-center-e2e/src/page-objects/contacts.page.ts
index a92ed4d1c5..80b5027262 100644
--- a/apps/mudita-center-e2e/src/page-objects/contacts.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/contacts.page.ts
@@ -3,14 +3,11 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class ContactsPage extends Page {
   /**[Selector] New contact button on Contacts screen */
-  public get newContactButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get newContactButton() {
     return $('[data-testid="new-contact-button"]')
   }
 
@@ -21,23 +18,17 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Import button on Contacts screen*/
-  public get importButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get importButton() {
     return $('[data-testid="import-button"]')
   }
 
   /**[Selector] Search contacts input*/
-  public get searchContactsInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchContactsInput() {
     return $('[data-testid="contact-input-select-input"]')
   }
 
   /**[Selector] First name input*/
-  public get firstNameInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get firstNameInput() {
     return $('[data-testid="first-name"]')
   }
   /**Insert provided text to First Name input field*/
@@ -47,9 +38,7 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Last name input*/
-  public get lastNameInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get lastNameInput() {
     return $('[data-testid="second-name"]')
   }
 
@@ -60,9 +49,7 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Primary phone number input*/
-  public get primaryPhoneNumberInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get primaryPhoneNumberInput() {
     return $('[data-testid="primary-number"]')
   }
 
@@ -73,9 +60,7 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Secondary phone number input*/
-  public get secondaryPhoneNumberInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get secondaryPhoneNumberInput() {
     return $('[data-testid="secondary-number"]')
   }
 
@@ -85,9 +70,7 @@ class ContactsPage extends Page {
     await this.secondaryPhoneNumberInput.setValue(textValue)
   }
   /**[Selector] Adress first line input*/
-  public get addressFirstLineInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get addressFirstLineInput() {
     return $('[data-testid="first-address-line"]')
   }
 
@@ -98,9 +81,7 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Adress second line input*/
-  public get addressSecondLineInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get addressSecondLineInput() {
     return $('[data-testid="second-address-line"]')
   }
 
@@ -111,9 +92,7 @@ class ContactsPage extends Page {
   }
 
   /**[Selector] Close button on contact detail screen*/
-  public get closeButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeButton() {
     return $('[data-testid="icon-Close"]')
   }
 
@@ -123,22 +102,16 @@ class ContactsPage extends Page {
     await this.closeButton.click()
   }
   /**[Selector] add to favourites checkbox*/
-  public get addToFavouritessCheckbox(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get addToFavouritessCheckbox() {
     return $('[name*="favourite"]')
   }
   /**[Selector] Cancel button on add/edit contact screen*/
-  public get cancelButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get cancelButton() {
     return $("p*=Cancel")
   }
 
   /** [Selector] Save contact button*/
-  public get saveContactButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get saveContactButton() {
     return $('[data-testid="save-button"]')
   }
   /** Click on Save contact button */
@@ -147,9 +120,7 @@ class ContactsPage extends Page {
     await this.saveContactButton.click()
   }
 
-  public get noContactsTextLabel(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get noContactsTextLabel() {
     return $('[data-testid="contact-list-no-result"]')
   }
 
@@ -157,21 +128,15 @@ class ContactsPage extends Page {
     return $$('[data-testid="virtualized-contact-list-item-contact-row"]')
   }
 
-  public get singleContactRow(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get singleContactRow() {
     return $('[data-testid="virtualized-contact-list-item-contact-row"]')
   }
 
-  public get phoneNumberOnContactList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get phoneNumberOnContactList() {
     return $('[data-testid="virtualized-contact-phone-number"]')
   }
 
-  public get optionsButtonOnContactList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get optionsButtonOnContactList() {
     return $('[data-testid="icon-More"]')
   }
   async optionsButtonOnContactListClick() {
@@ -179,69 +144,47 @@ class ContactsPage extends Page {
     await this.optionsButtonOnContactList.click()
   }
 
-  public get editContactOptionMenu(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get editContactOptionMenu() {
     return $('[data-testid="icon-Edit"]')
   }
 
-  public get exportAsVCardOptionMenu(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get exportAsVCardOptionMenu() {
     return $('[data-testid="icon-UploadDark"]')
   }
 
-  public get deleteContactOptionMenu(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get deleteContactOptionMenu() {
     return $('[data-testid="icon-Delete"]')
   }
 
-  public get nameOnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get nameOnContactDetailScreen() {
     return $('[data-testid="name"]')
   }
 
-  public get phoneNumber1OnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get phoneNumber1OnContactDetailScreen() {
     return $('[data-testid="primary-phone-input"]')
   }
 
-  public get phoneNumber2OnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get phoneNumber2OnContactDetailScreen() {
     return $('[data-testid="secondary-phone-input"]')
   }
 
-  public get addressOnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get addressOnContactDetailScreen() {
     return $('[data-testid="address-details"]')
   }
 
-  public get buttonDeleteOnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonDeleteOnContactDetailScreen() {
     return $('[data-testid="icon-Delete"]')
   }
 
-  public get buttonExportOnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonExportOnContactDetailScreen() {
     return $('[data-testid="icon-UploadDark"]')
   }
 
-  public get editButtonOnContactDetailScreen(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get editButtonOnContactDetailScreen() {
     return $('[data-testid="icon-Edit"]')
   }
 
-  public get checkboxSingleContact(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get checkboxSingleContact() {
     return $('[type="checkbox"]')
   }
 
@@ -249,57 +192,39 @@ class ContactsPage extends Page {
     return $$('[type="checkbox"]')
   }
 
-  public get checkboxSelectAll(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get checkboxSelectAll() {
     return $('[data-testid="selection-manager"]').$('[type="checkbox"]')
   }
 
-  public get textSummaryOfContactsSelected(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get textSummaryOfContactsSelected() {
     return $('[data-testid="info"]')
   }
 
-  public get buttonDeleteSelectionManager(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonDeleteSelectionManager() {
     return $("p*=Delete")
   }
 
-  public get inputHiddenVcfFile(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get inputHiddenVcfFile() {
     return $('[data-testid="file-input"]')
   }
 
-  public get buttonContinueWithGoogle(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonContinueWithGoogle() {
     return $('[data-testid="google-button"]')
   }
 
-  public get buttonOutlookImport(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonOutlookImport() {
     return $('[data-testid="outlook-button"]')
   }
 
-  public get buttonImportFromVCFFileImport(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonImportFromVCFFileImport() {
     return $('[data-testid="icon-Upload"]')
   }
 
-  public get inputSearch(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get inputSearch() {
     return $('[data-testid="contact-input-select-input"]')
   }
 
-  public get dropDownSearchResultList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get dropDownSearchResultList() {
     return $('[data-testid="input-select-list"]')
   }
 
@@ -310,9 +235,7 @@ class ContactsPage extends Page {
     )
   }
 
-  public get contactDetailsFavouritesIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get contactDetailsFavouritesIcon() {
     return $('[data-testid="icon-Favourites"]')
   }
 }
diff --git a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
index ff1d6d1529..9dcfb00b17 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
@@ -3,38 +3,27 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class HelpModalPage extends Page {
   /**[Selector]  Modal close button  */
-  public get closeModalButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeModalButton() {
     return $('[data-testid="close-modal-button"]')
   }
   /**[Selector]  Modal title  */
-  public get modalHeader(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalHeader() {
     return $('[data-testid="modal-header"]')
   }
   /**[Selector]  Contact support email input  */
-  public get emailInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get emailInput() {
     return $('[data-testid="email-input"]')
   }
   /**[Selector]  Contact support message input  */
-  public get descriptionInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get descriptionInput() {
     return $('[data-testid="description-input"]')
   }
   /**[Selector]  Send button */
-  public get sendButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get sendButton() {
     return $('[data-testid="submit-button"]')
   }
 
@@ -43,26 +32,18 @@ class HelpModalPage extends Page {
     return $('[data-testid="file-list"]').$$('[data-testid="file-list-file"]')
   }
   /**[Selector]  single attachment element */
-  public get singleAttachment(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get singleAttachment() {
     return $('[data-testid="file-list-file"]')
   }
   /**[Selector] Success sent message modal */
-  public get sentSuccessModal(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get sentSuccessModal() {
     return $('[data-testid="contact-support-modal-success"]')
   }
   /**[Selector] Close bottom button */
-  public get closeBottomButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeBottomButton() {
     return $('[data-testid="close-bottom-button"]')
   }
-  public get invalidEmailTextElement(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get invalidEmailTextElement() {
     return $('//input[@data-testid="email-input"]/following-sibling::*[1]')
   }
 }
diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index 38b7fdaf70..59106add62 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -3,7 +3,6 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class HelpPage extends Page {
diff --git a/apps/mudita-center-e2e/src/page-objects/messages-browse-contacts-modal.page.ts b/apps/mudita-center-e2e/src/page-objects/messages-browse-contacts-modal.page.ts
index 831ca34c8d..ec28d22c17 100644
--- a/apps/mudita-center-e2e/src/page-objects/messages-browse-contacts-modal.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/messages-browse-contacts-modal.page.ts
@@ -3,39 +3,28 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import ModalPage from "./modal.page"
 
 class BrowseContactsModal extends ModalPage {
-  public get emptyContactList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get emptyContactList() {
     return $('[data-testid="empty-content"]')
   }
-  public get searchInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchInput() {
     return $('[data-testid="contact-input-select-input"]')
   }
-  public get modalContactNameText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalContactNameText() {
     return $(
       '[data-testid="contact-simple-list-phone-selection-item-avatar-column"]'
     )
   }
 
-  public get modalContactPrimaryNumberText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalContactPrimaryNumberText() {
     return $(
       '[data-testid="contact-simple-list-phone-selection-item-primary-phone-field"]'
     )
   }
 
-  public get modalContactSecondaryNumberText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalContactSecondaryNumberText() {
     return $(
       '[data-testid="contact-simple-list-phone-selection-item-secondary-phone-field"]'
     )
diff --git a/apps/mudita-center-e2e/src/page-objects/messages-conversation.page.ts b/apps/mudita-center-e2e/src/page-objects/messages-conversation.page.ts
index 50bb470e9c..ca9852fdf3 100644
--- a/apps/mudita-center-e2e/src/page-objects/messages-conversation.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/messages-conversation.page.ts
@@ -3,90 +3,65 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class MessagesConversationPage extends Page {
   /** [Selector] NEW MESSAGE button selector */
-  public get newMessageButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get newMessageButton() {
     return $('[data-testid="message-panel-new-message-button"]')
   }
 
   /** [Selector] Search Contacts input field (visible after NEW MESSAGE button is clicked) */
-  public get searchContactsInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchContactsInput() {
     return $('[data-testid="receiver-input-select-input"]')
   }
 
   /** [Selector] Input field for message text */
-  public get messageTextInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageTextInput() {
     return $('[data-testid="thread-details-text-area-input"]')
   }
 
   /** [Selector] Send message button (visible after message text is entered) */
-  public get sendMessageButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get sendMessageButton() {
     return $('[data-testid="thread-details-text-area-send-button"]')
   }
 
   /** [Selector] Message not sent icon displayed next to the message */
-  public get messageNotSentIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageNotSentIcon() {
     return $('[data-testid="message-bubble-not-send-icon"]')
   }
 
   /** [Selector] Delete button visible on open thread (thread details) screen*/
-  public get threadDetailScreenDeleteButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailScreenDeleteButton() {
     return $('[data-testid="right-sidebar-delete-button"]')
   }
 
   /** [Selector] Add contact button visible on open thread (thread details) screen*/
-  public get threadDetailScreenAddContactButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailScreenAddContactButton() {
     return $('[data-testid="right-sidebar-contact-button"]')
   }
 
   /** [Selector] Close button visible on open thread (thread details) screen*/
-  public get threadDetailScreenCloseButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailScreenCloseButton() {
     return $('[data-testid="table-sidebar-close"]')
   }
 
   /** [Selector] Mark as unread button visible on open thread (thread details) screen*/
-  public get threadDetailScreenMarkAsUnreadButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailScreenMarkAsUnreadButton() {
     return $('[data-testid="right-sidebar-mark-as-unread-button"]')
   }
 
   /** [Selector] Single sending status   */
-  public get sendingStatusIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get sendingStatusIcon() {
     return $('[data-testid="dot"]')
   }
 
   /** [Selector] Single message container */
-  public get messageContainer(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageContainer() {
     return $('[data-testid="message-bubble-container"]')
   }
   /** [Selector] Single message content element*/
-  public get messageContent(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageContent() {
     return $('[data-testid="message-bubble-message-content"]')
   }
   /** Hover over Message content element to display options button*/
@@ -96,18 +71,14 @@ class MessagesConversationPage extends Page {
   }
 
   /** [Selector] Single message options button (...) visible on hover over message. Same purpose as messageDropdownIcon */
-  public get messageDropdownButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageDropdownButton() {
     return this.messageContainer.$(
       '[data-testid="message-bubble-dropdown-action-button"]'
     )
   }
 
   /** [Selector] Single message options icon (...) visible on hover over message*/
-  public get messageDropdownIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageDropdownIcon() {
     return this.messageContainer.$('[data-testid="icon-More"]')
   }
 
@@ -118,16 +89,12 @@ class MessagesConversationPage extends Page {
   }
 
   /** Dropdown element displayed after message options button/icon is clicked*/
-  public get messageDropdown(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageDropdown() {
     return $('[data-testid="dropdown"]')
   }
 
   /** [Selector] Delete message button on message dropodown list */
-  public get messageDropdownDeleteButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageDropdownDeleteButton() {
     return this.messageDropdown.$(
       '[data-testid="message-bubble-delete-message-button"]'
     )
@@ -182,37 +149,27 @@ class MessagesConversationPage extends Page {
   }
 
   /** [Selector] Thread details top level element*/
-  public get threadDetailsContainer(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailsContainer() {
     return $('[data-testid="messages-thread-details"]')
   }
 
   /** [Selector] Browse contacts button*/
-  public get browseContactsButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get browseContactsButton() {
     return $('[data-testid="new-message-form-browse-contacts"]')
   }
 
   /** [Selector] Conversation recipient name text*/
-  public get conversationRecipientNameText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get conversationRecipientNameText() {
     return $('[data-testid="sidebar-fullname"]')
   }
 
   /** [Selector] Conversation recipient number text*/
-  public get conversationRecipientPhoneText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get conversationRecipientPhoneText() {
     return $('[data-testid="sidebar-phone-number"]')
   }
 
   /** [Selector] Contact search result item*/
-  public get contactSearchResultItem(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get contactSearchResultItem() {
     return $('[data-testid="input-select-list-item"]')
   }
   /** [Selector] Returns list of multiple elements - contact icon for threads with matching contact in phonebok */
@@ -220,9 +177,7 @@ class MessagesConversationPage extends Page {
     return this.messageContent.$(`strong*=${text}`)
   }
   /** [Selector] Delete message button on message dropodown list */
-  public get messageDropdownResendButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageDropdownResendButton() {
     return this.messageDropdown.$(
       '[data-testid="message-bubble-resend-message-button"]'
     )
diff --git a/apps/mudita-center-e2e/src/page-objects/messages-templates.page.ts b/apps/mudita-center-e2e/src/page-objects/messages-templates.page.ts
index e07ea5ff4f..ce3fe5c377 100644
--- a/apps/mudita-center-e2e/src/page-objects/messages-templates.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/messages-templates.page.ts
@@ -3,25 +3,18 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import ModalPage from "./modal.page"
 
 class TemplatesPage extends ModalPage {
-  public get newTemplateButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get newTemplateButton() {
     return $('[data-testid="templates-panel-button"]')
   }
 
-  public get templateTextInputForm(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get templateTextInputForm() {
     return $('[data-testid="template-form-text-filed"]')
   }
 
-  public get saveButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get saveButton() {
     return $('[data-testid="template-form-save-button"]')
   }
 
@@ -31,15 +24,11 @@ class TemplatesPage extends ModalPage {
     await this.templateTextInputForm.setValue(inputText)
   }
 
-  public get templateCheckbox(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get templateCheckbox() {
     return $('[data-testid="template-checkbox"]')
   }
 
-  public get selectAllTemplatesCheckbox(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get selectAllTemplatesCheckbox() {
     return $('[data-testid="checkbox"]')
   }
 
diff --git a/apps/mudita-center-e2e/src/page-objects/messages.page.ts b/apps/mudita-center-e2e/src/page-objects/messages.page.ts
index b35a16aa9a..1131afbf6d 100644
--- a/apps/mudita-center-e2e/src/page-objects/messages.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/messages.page.ts
@@ -3,46 +3,35 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 const backspaceKey = "\ue003"
 
 class MessagesPage extends Page {
   /** [Selector] NEW MESSAGE button selector */
-  public get newMessageButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get newMessageButton() {
     return $('[data-testid="message-panel-new-message-button"]')
   }
 
   /** [Selector] Message not sent icon displayed on the thread list */
-  public get messageNotSentThreadIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get messageNotSentThreadIcon() {
     return $('[data-testid="thread-not-send-message-icon"]')
   }
 
   /** Empty thread list screen:
    * You don't have any messages yet
    * Don’t hesitate - let your friends know you’re thinking about them */
-  public get threadScreenEmptyList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadScreenEmptyList() {
     return $('[data-testid="messages-empty-thread-list-state"]')
   }
 
   /** [Selector] Thread options icon (...) */
-  public get threadDropdownIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDropdownIcon() {
     return $('[data-testid="icon-More"]')
   }
 
   /** [Selector] Thread options icon (...) */
-  public get threadDropdownButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDropdownButton() {
     return $('[data-testid="thread-row-toggler"]')
   }
   /** Click Thread options button*/
@@ -52,9 +41,7 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Delete conversation button on therad dropodown list */
-  public get threadDropdownDeleteButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDropdownDeleteButton() {
     return $('[data-testid="dropdown-delete"]')
   }
 
@@ -77,9 +64,7 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Thread row element */
-  public get threadRow(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadRow() {
     return $('[data-testid="message-row"]')
   }
 
@@ -90,9 +75,7 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Thread checkbox*/
-  public get threadCheckbox(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadCheckbox() {
     return $('[data-testid="checkbox"]')
   }
 
@@ -103,9 +86,7 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Delete button available when selection manager is active */
-  public get selectionManagerIconDelete(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get selectionManagerIconDelete() {
     return $('[data-testid="icon-Delete"]')
   }
 
@@ -116,16 +97,12 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Thread details top level element*/
-  public get threadDetailsContainer(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDetailsContainer() {
     return $('[data-testid="messages-thread-details"]')
   }
 
   /** [Selector] Mark as read on thread dropdown */
-  public get threadDropdownMarkAsReadButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get threadDropdownMarkAsReadButton() {
     return $('[data-testid="dropdown-mark-as-read"]')
   }
 
@@ -138,9 +115,7 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Text of dropdownMarkAsReadButton, depending on the message status can be 'Mark as read' or 'Mark as unread' */
-  public get textOptionMarkAsReadDropdown(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get textOptionMarkAsReadDropdown() {
     return this.threadDropdownMarkAsReadButton.$("p")
   }
   /** Returns list of last message text displayed on the conversation list and true/false depending on message unread/read status*/
@@ -172,9 +147,7 @@ class MessagesPage extends Page {
     return result
   }
   /** [Selector] Messages search input  */
-  public get searchInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchInput() {
     return $('[data-testid="input-search"]')
   }
 
@@ -190,21 +163,15 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Search result overlay list  */
-  public get searchResultsOverlayList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchResultsOverlayList() {
     return $('[data-testid="input-select-list"]')
   }
   /** [Selector] empty search results overlay list   */
-  public get emptySearchResultsOverlayList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get emptySearchResultsOverlayList() {
     return this.searchResultsOverlayList.$("li*=No results found")
   }
   /** [Selector] See all button on search results overlay  */
-  public get seeAllSearchResultsButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get seeAllSearchResultsButton() {
     return $("button*=See all")
   }
 
@@ -218,24 +185,18 @@ class MessagesPage extends Page {
     return $$('[data-testid="avatar-text"]')
   }
   /** [Selector] Selection manager- select all checkbox */
-  public get selectAllCheckbox(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get selectAllCheckbox() {
     return $('[data-testid="message-panel-selection-manager"]').$(
       '[type="checkbox"]'
     )
   }
   /** [Selector] Selection manager- select all checkbox */
-  public get selectionManagerDeleteButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get selectionManagerDeleteButton() {
     return $('[data-testid="message-panel-selection-manager"]').$("p*=Delete")
   }
 
   /** [Selector] Search results for ' ' text displayed above the thread list*/
-  public get searchResultsForText(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get searchResultsForText() {
     return $("h4*=Search results")
   }
 
@@ -268,16 +229,12 @@ class MessagesPage extends Page {
   }
 
   /** [Selector] Element containing contact number/name displayed on Search results for '' list  */
-  public get nameFieldOnSearchResultsConversationList(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get nameFieldOnSearchResultsConversationList() {
     return $('[data-testid="name-field"]')
   }
 
   /** [Selector] Templates tab   */
-  public get templatesTab(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get templatesTab() {
     return $("p*=Templates")
   }
 }
diff --git a/apps/mudita-center-e2e/src/page-objects/modal-backup-restore.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-backup-restore.page.ts
index 24da798641..eb729c8b94 100644
--- a/apps/mudita-center-e2e/src/page-objects/modal-backup-restore.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/modal-backup-restore.page.ts
@@ -3,19 +3,14 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class ModalBackupRestorePage extends Page {
-  public get failModalIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get failModalIcon() {
     return $('[data-testid="icon-Fail"]')
   }
 
-  public get checkCircleIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get checkCircleIcon() {
     return $('[data-testid="icon-CheckCircle"]')
   }
 
@@ -23,45 +18,31 @@ class ModalBackupRestorePage extends Page {
     return $$('[data-testid="restore-available-backup-modal-body-row"]')
   }
 
-  public get restoreButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get restoreButton() {
     return $('[data-testid="modal-action-button"]*=Restore')
   }
 
-  public get restorePasswordInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get restorePasswordInput() {
     return $('[name="secretKey"]')
   }
 
-  public get restoreSubmitButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get restoreSubmitButton() {
     return $('[type="submit"]*=Confirm')
   }
   //BACKUP modal objects
-  public get createBackupModalButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get createBackupModalButton() {
     return $('[data-testid="modal-action-button"]')
   }
 
-  public get backupPasswordFirstInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get backupPasswordFirstInput() {
     return $('[data-testid="backup-first-input"]')
   }
 
-  public get backupPasswordSecondInput(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get backupPasswordSecondInput() {
     return $('[data-testid="backup-second-input"]')
   }
 
-  public get backupSubmitButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get backupSubmitButton() {
     return $('[data-testid="backup-submit-button"]')
   }
 }
diff --git a/apps/mudita-center-e2e/src/page-objects/modal-contacts.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-contacts.page.ts
index 0883164726..4e3a30733a 100644
--- a/apps/mudita-center-e2e/src/page-objects/modal-contacts.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/modal-contacts.page.ts
@@ -3,13 +3,10 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class ModalContacts extends Page {
-  public get iconClose(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get iconClose() {
     return $('[data-testid="icon-Close"]')
   }
   async buttonCloseClick() {
@@ -21,27 +18,19 @@ class ModalContacts extends Page {
     }
   }
 
-  public get modalContent(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalContent() {
     return $('[data-testid="delete-modal-content"]')
   }
 
-  public get textOnModal(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get textOnModal() {
     return $('[data-testid="delete-modal-content"]').$("p")
   }
 
-  public get iconDelete(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get iconDelete() {
     return $('[data-testid="icon-DeleteBig"]')
   }
 
-  public get buttonConfirmDelete(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonConfirmDelete() {
     return $('[data-testid="modal-action-button"]*=Delete')
   }
   async buttonConfirmDeleteClick() {
@@ -49,28 +38,22 @@ class ModalContacts extends Page {
     await this.buttonConfirmDelete.click()
   }
 
-  public get buttonCancel(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonCancel() {
     return $('[data-testid="close-bottom-button"]')
   }
   async cancelModalButtonClick() {
     await this.buttonCancel.click()
   }
 
-  public get buttonImport(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get buttonImport() {
     return $('[data-testid="modal-action-button"]*=Import')
   }
 
-  public get textSavingCompleted(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get textSavingCompleted() {
     return $("h4*=Saving completed")
   }
 
-  public get buttonOK(): ChainablePromiseElement<Promise<WebdriverIO.Element>> {
+  public get buttonOK() {
     return $('[data-testid="modal-action-button"]*=OK')
   }
 }
diff --git a/apps/mudita-center-e2e/src/page-objects/modal-general.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-general.page.ts
index b51f2a4494..35a106955a 100644
--- a/apps/mudita-center-e2e/src/page-objects/modal-general.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/modal-general.page.ts
@@ -3,13 +3,10 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class ModalGeneralPage extends Page {
-  public get closeIcon(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeIcon() {
     return $('[data-testid="icon-Close"]')
   }
   async closeModalButtonClick() {
@@ -20,15 +17,11 @@ class ModalGeneralPage extends Page {
       console.log(error)
     }
   }
-  public get modalHeader(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get modalHeader() {
     return $('[data-testid="modal-header"]')
   }
 
-  public get updateAvailableModalCloseButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get updateAvailableModalCloseButton() {
     return this.modalHeader.$('[data-testid="icon-Close"]')
   }
 
@@ -42,9 +35,7 @@ class ModalGeneralPage extends Page {
       console.log(error)
     }
   }
-  public get closeModalBackgroundUpdateAvailableFailed(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeModalBackgroundUpdateAvailableFailed() {
     return $('[data-testid="update-os-flow-check-for-update-failed-modal"]').$(
       '[data-testid="icon-Close"]'
     )
@@ -61,15 +52,11 @@ class ModalGeneralPage extends Page {
     }
   }
 
-  public get updateNotAvailableModal(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get updateNotAvailableModal() {
     return $('[data-testid="update-os-flow-update-not-available-modal"]')
   }
 
-  public get closeModalButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get closeModalButton() {
     return $('[data-testid="close-modal-button"]')
   }
 
diff --git a/apps/mudita-center-e2e/src/page-objects/modal-messages.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-messages.page.ts
index 47b912ea56..559ee6de6a 100644
--- a/apps/mudita-center-e2e/src/page-objects/modal-messages.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/modal-messages.page.ts
@@ -3,13 +3,10 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class ModalMessages extends Page {
-  public get iconClose(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get iconClose() {
     return $('[data-testid="icon-Close"]')
   }
   async buttonCloseClick() {
@@ -21,9 +18,7 @@ class ModalMessages extends Page {
     }
   }
 
-  public get confirmDeleteButton(): ChainablePromiseElement<
-    Promise<WebdriverIO.Element>
-  > {
+  public get confirmDeleteButton() {
     return $('[data-testid="modal-action-button"]*=Delete')
   }
   async clickConfirmDeleteButton() {
diff --git a/apps/mudita-center-e2e/src/page-objects/news.page.ts b/apps/mudita-center-e2e/src/page-objects/news.page.ts
index 5b91e12e42..a85e660248 100644
--- a/apps/mudita-center-e2e/src/page-objects/news.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/news.page.ts
@@ -3,7 +3,6 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class NewsPage extends Page {
diff --git a/apps/mudita-center-e2e/src/page-objects/tabs.page.ts b/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
index 795cb7a1d1..1bdd187478 100644
--- a/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
@@ -3,7 +3,6 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class NavigationTabs extends Page {
diff --git a/apps/mudita-center-e2e/src/specs/stress-tests/connected-devices-stress-test.ts b/apps/mudita-center-e2e/src/specs/stress-tests/connected-devices-stress-test.ts
index 8fdb23453c..4d2c6b8e90 100644
--- a/apps/mudita-center-e2e/src/specs/stress-tests/connected-devices-stress-test.ts
+++ b/apps/mudita-center-e2e/src/specs/stress-tests/connected-devices-stress-test.ts
@@ -70,8 +70,11 @@ describe("Kompakt switching devices", () => {
       "Select a device to continue"
     )
 
-    const availableDevices = selectDevicePage.availableDevices
-    await expect(availableDevices).toBeDisplayed()
+    const availableDevices = await selectDevicePage.availableDevices
+
+    for (const device of availableDevices) {
+      await expect(device).toBeDisplayed();
+    }
 
     const firstDeviceOnSelectModal =
       await selectDevicePage.getDeviceOnSelectModal(1)
diff --git a/apps/mudita-center-e2e/tsconfig.json b/apps/mudita-center-e2e/tsconfig.json
index aae4540887..865837d96d 100644
--- a/apps/mudita-center-e2e/tsconfig.json
+++ b/apps/mudita-center-e2e/tsconfig.json
@@ -3,15 +3,16 @@
   "compilerOptions": {
     "types": [
       "node",
-      "webdriverio/async",
+      "@wdio/globals/types",
       "@wdio/mocha-framework",
       "expect-webdriverio"
     ],
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "target": "es5",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "typeRoots": ["./node_modules/@types", "./typings"]
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "./wdio.conf.ts"],
   "exclude": ["node_modules"]
 }
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 2da0d93030..2c8ab5a6c3 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -4,6 +4,7 @@
  */
 
 import type { Options } from "@wdio/types"
+import path from "path"
 import * as dotenv from "dotenv"
 import { TestFilesPaths, toRelativePath } from "./src/test-filenames"
 
@@ -173,6 +174,9 @@ export const config: Options.Testrunner = {
         binary: process.env.TEST_BINARY_PATH,
         args: [],
       },
+      'wdio:chromedriverOptions': {
+        binary: path.resolve(__dirname, '..', '..', 'node_modules', 'chromedriver', 'bin', 'chromedriver')
+      }
       // If outputDir is provided WebdriverIO can capture driver session logs
       // it is possible to configure which logTypes to include/exclude.
       // excludeDriverLogs: ['*'], // pass '*' to exclude all driver session logs
diff --git a/package-lock.json b/package-lock.json
index 8f6bcf7342..10ca251a71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
         "@contentful/rich-text-plain-text-renderer": "^16.2.6",
         "@orama/orama": "^2.0.22",
         "@vscode/sudo-prompt": "^9.3.1",
+        "@wdio/json-reporter": "^8.40.3",
         "crypto-js": "^4.2.0",
         "js-crc": "^0.2.0",
         "jschardet": "^3.1.2",
@@ -69,6 +70,7 @@
         "@types/elasticlunr": "^0.9.5",
         "@types/electron-devtools-installer": "^2.2.2",
         "@types/electron-localshortcut": "^3.1.0",
+        "@types/fs-extra": "^11.0.4",
         "@types/history": "^4.7.9",
         "@types/jest": "^29.5.6",
         "@types/js-crc": "^0.2.3",
@@ -107,12 +109,12 @@
         "@types/webpack-env": "^1.17.0",
         "@typescript-eslint/eslint-plugin": "^ 6.7.4",
         "@typescript-eslint/parser": "^ 6.7.4",
-        "@wdio/cli": "^7.16.13",
-        "@wdio/local-runner": "^7.16.13",
-        "@wdio/mocha-framework": "^7.16.13",
-        "@wdio/reporter": "^7.16.14",
-        "@wdio/spec-reporter": "^7.16.14",
-        "@wdio/types": "^8.31.0",
+        "@wdio/cli": "^8.40.5",
+        "@wdio/local-runner": "^8.40.5",
+        "@wdio/mocha-framework": "^8.40.3",
+        "@wdio/reporter": "^8.40.3",
+        "@wdio/spec-reporter": "^8.40.3",
+        "@wdio/types": "^8.40.3",
         "archiver": "^5.3.1",
         "async-mutex": "^0.4.0",
         "axios": "^0.27.2",
@@ -230,7 +232,6 @@
         "uuid": "^9.0.1",
         "vcf": "^2.1.2",
         "wdio-chromedriver-service": "^8.1.1",
-        "wdio-json-reporter": "^3.0.0",
         "wdio-wait-for": "^2.2.1",
         "webpack": "^5.74.0",
         "webpack-cli": "^4.10.0",
@@ -4558,9 +4559,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -4585,6 +4586,18 @@
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
       "dev": true
     },
+    "node_modules/@ljharb/through": {
+      "version": "2.3.13",
+      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
+      "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/@malept/cross-spawn-promise": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
@@ -5708,6 +5721,68 @@
         }
       }
     },
+    "node_modules/@promptbook/utils": {
+      "version": "0.70.0-1",
+      "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.70.0-1.tgz",
+      "integrity": "sha512-qd2lLRRN+sE6UuNMi2tEeUUeb4zmXnxY5EMdfHVXNE+bqBDpUC7/aEfXgA3jnUXEr+xFjQ8PTFQgWvBMaKvw0g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/webgptorg/promptbook/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ],
+      "dependencies": {
+        "spacetrim": "0.11.39"
+      }
+    },
+    "node_modules/@puppeteer/browsers": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+      "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "progress": "2.0.3",
+        "proxy-agent": "6.3.1",
+        "tar-fs": "3.0.4",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=16.3.0"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/tar-fs": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
     "node_modules/@radix-ui/number": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.0.1.tgz",
@@ -9432,6 +9507,12 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -9606,28 +9687,12 @@
       "integrity": "sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA==",
       "dev": true
     },
-    "node_modules/@types/diff": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.9.tgz",
-      "integrity": "sha512-RWVEhh/zGXpAVF/ZChwNnv7r4rvqzJ7lYNSmZSVTxjV0PBLf6Qu7RNg+SUtkpzxmiNkjCx0Xn2tPp7FIkshJwQ==",
-      "dev": true
-    },
     "node_modules/@types/doctrine": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
       "integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==",
       "dev": true
     },
-    "node_modules/@types/easy-table": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-1.2.0.tgz",
-      "integrity": "sha512-gVQkR2G/q6UK3wQT+waY9tCrbFauzMoBfJpMxHSuemHLQ8HpHdUIQ9YyRwYMfNX4CfoAoj/eJATyECGkFr65Pg==",
-      "deprecated": "This is a stub types definition. easy-table provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "dependencies": {
-        "easy-table": "*"
-      }
-    },
     "node_modules/@types/ejs": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
@@ -9811,16 +9876,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/inquirer": {
-      "version": "8.2.10",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz",
-      "integrity": "sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==",
-      "dev": true,
-      "dependencies": {
-        "@types/through": "*",
-        "rxjs": "^7.2.0"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -9934,33 +9989,6 @@
       "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
       "dev": true
     },
-    "node_modules/@types/lodash.flattendeep": {
-      "version": "4.4.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.9.tgz",
-      "integrity": "sha512-Oacs/ZMuMvVWkhMqvj+Spad457Beln5pnkauif+6s65fE2cSL7J7NoMfwkxjuQsOsr4DUCDH/iDbmuZo81Nypw==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.pickby": {
-      "version": "4.6.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.9.tgz",
-      "integrity": "sha512-SPI248FYnyd3jOxDeJq2vX2UKQnDzqacuqdeOVqwE1MPSk8gN8TA3FcHSMQWLlpBnuHgXvgKInvywbOFbidpJA==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.union": {
-      "version": "4.6.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.9.tgz",
-      "integrity": "sha512-l/GEj9Xp2DptsfFYZ1JUczg6W/6JGbbDi0mVK8urg8XLUMguNJ2L1ya0QJzMctrtlP9+t5lfyL4QLF6P9/6ssQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
     "node_modules/@types/mdast": {
       "version": "3.0.15",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
@@ -10060,12 +10088,6 @@
       "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "dev": true
     },
-    "node_modules/@types/object-inspect": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.4.tgz",
-      "integrity": "sha512-2yh72JxmDney1h7LQvkyO8p8FOmNMQXGs8HjuXS3SXvE/dLydLLjBqKCdHqcTUo66CQVHfn7yFR680bvi9jlVw==",
-      "dev": true
-    },
     "node_modules/@types/papaparse": {
       "version": "5.3.14",
       "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.14.tgz",
@@ -10257,15 +10279,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/recursive-readdir": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.4.tgz",
-      "integrity": "sha512-84REEGT3lcgopvpkmGApzmU5UEG0valme5rQS/KGiguTkJ70/Au8UYZTyrzoZnY9svuX9351+1uvrRPzWDD/uw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/redux-logger": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/@types/redux-logger/-/redux-logger-3.0.11.tgz",
@@ -10390,15 +10403,6 @@
       "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
       "dev": true
     },
-    "node_modules/@types/stream-buffers": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.7.tgz",
-      "integrity": "sha512-azOCy05sXVXrO+qklf0c/B07H/oHaIuDDAiHPVwlk3A9Ek+ksHyTeMajLZl3r76FxpPpxem//4Te61G1iW3Giw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/styled-components": {
       "version": "5.1.34",
       "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.34.tgz",
@@ -10410,12 +10414,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/supports-color": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz",
-      "integrity": "sha512-Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg==",
-      "dev": true
-    },
     "node_modules/@types/tar-stream": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@types/tar-stream/-/tar-stream-2.2.3.tgz",
@@ -10431,21 +10429,6 @@
       "integrity": "sha512-0vQ4fz9TTM4bCdllYWEJ2JHBUXR9xqPtc70dJ7BMRDVfvZyYdrgey3nP5RRcVj+qAgnHJM8r9fvgrfnPMxdnhA==",
       "dev": true
     },
-    "node_modules/@types/through": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
-      "integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
-      "dev": true
-    },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
@@ -10763,185 +10746,252 @@
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
       "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.0.tgz",
+      "integrity": "sha512-7sxf2F3DNYatgmzXXcTh6cq+/fxwB47RIQqZJFoSH883wnVAoccSRT6g+dTKemUBo8Q5N4OYYj1EBXLuRKvp3Q==",
+      "dev": true,
+      "dependencies": {
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.0.tgz",
+      "integrity": "sha512-x69CygGMzt9VCO283K2/FYQ+nBrOj66OTKpsPykjCR4Ac3lLV+m85hj9reaIGmjBSsKzVvbxWmjWE3kF5ha3uQ==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.0",
+        "magic-string": "^0.30.11",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/@vscode/sudo-prompt": {
       "version": "9.3.1",
       "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz",
       "integrity": "sha512-9ORTwwS74VaTn38tNbQhsA5U44zkJfcb0BdTSyyG6frP4e8KMtHuTXYmwefe5dpL8XB1aGSIVTaLjD3BbWb5iA=="
     },
     "node_modules/@wdio/cli": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.33.0.tgz",
-      "integrity": "sha512-S5Iy4AVcbcJDMhAP4k/Yf18mKma9NGFM8A5bafcGRpFlIj97rpnb0/cpmJVVEr4v/wr3XCu0k38ooJw0B/D3nw==",
-      "dev": true,
-      "dependencies": {
-        "@types/ejs": "^3.0.5",
-        "@types/fs-extra": "^11.0.1",
-        "@types/inquirer": "^8.1.2",
-        "@types/lodash.flattendeep": "^4.4.6",
-        "@types/lodash.pickby": "^4.6.6",
-        "@types/lodash.union": "^4.6.6",
-        "@types/node": "^18.0.0",
-        "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.33.0",
-        "@wdio/logger": "7.26.0",
-        "@wdio/protocols": "7.27.0",
-        "@wdio/types": "7.33.0",
-        "@wdio/utils": "7.33.0",
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-8.40.5.tgz",
+      "integrity": "sha512-DtWbZnC6q5tv7TZpXD+lRno5eRa3LIysfvofnEwatMI6fibdLMnh6xJmTwzcDXhET965n+RUEQ1vnXcEscJ3jA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@vitest/snapshot": "^2.0.4",
+        "@wdio/config": "8.40.3",
+        "@wdio/globals": "8.40.5",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
         "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^11.1.1",
-        "inquirer": "8.2.4",
+        "chalk": "^5.2.0",
+        "chokidar": "^3.5.3",
+        "cli-spinners": "^2.9.0",
+        "dotenv": "^16.3.1",
+        "ejs": "^3.1.9",
+        "execa": "^8.0.1",
+        "import-meta-resolve": "^4.0.0",
+        "inquirer": "9.2.12",
         "lodash.flattendeep": "^4.4.0",
         "lodash.pickby": "^4.6.0",
         "lodash.union": "^4.6.0",
-        "mkdirp": "^3.0.0",
-        "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.33.0",
-        "yargs": "^17.0.0",
-        "yarn-install": "^1.0.0"
+        "read-pkg-up": "10.0.0",
+        "recursive-readdir": "^2.2.3",
+        "webdriverio": "8.40.5",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "wdio": "bin/wdio.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/cli/node_modules/@sindresorhus/is": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
-      },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+        "node": ">=14.16"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@wdio/cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/cli/node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "defer-to-connect": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=14.16"
       }
     },
-    "node_modules/@wdio/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/cli/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/@types/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@wdio/cli/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/cli/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/repl": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.40.3.tgz",
+      "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/node": "^22.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/cli/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/cli/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
       "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/config": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.33.0.tgz",
-      "integrity": "sha512-SaCZNKrDtBghf7ujyaxTiU4pBW+1Kms32shSoXpJ/wFop6/MiA7nb19qpUPoJtEDw5/NOKevUKz8nBMBXphiew==",
+    "node_modules/@wdio/cli/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
       "dev": true,
       "dependencies": {
-        "@types/glob": "^8.1.0",
-        "@wdio/logger": "7.26.0",
-        "@wdio/types": "7.33.0",
-        "@wdio/utils": "7.33.0",
-        "deepmerge": "^4.0.0",
-        "glob": "^8.0.3"
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/config/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/cli/node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/archiver-utils/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/config/node_modules/brace-expansion": {
+    "node_modules/@wdio/cli/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
@@ -10950,486 +11000,3448 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@wdio/config/node_modules/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+    "node_modules/@wdio/cli/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
-    "node_modules/@wdio/config/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+    "node_modules/@wdio/cli/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/@wdio/config/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/cli/node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/@wdio/local-runner": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.33.0.tgz",
-      "integrity": "sha512-oZLLyOizlX2mV3FIxRLWgN0J2sDL+6LhC71CwFxcV8iVjXvp16my9jbKrgtkIgdo1BsaWIqq+tZlCr9e9NUUjA==",
+    "node_modules/@wdio/cli/node_modules/cacheable-request": {
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
       "dev": true,
       "dependencies": {
-        "@types/stream-buffers": "^3.0.3",
-        "@wdio/logger": "7.26.0",
-        "@wdio/repl": "7.33.0",
-        "@wdio/runner": "7.33.0",
-        "@wdio/types": "7.33.0",
-        "async-exit-hook": "^2.0.1",
-        "split2": "^4.0.0",
-        "stream-buffers": "^3.0.2"
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/cli/node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
-      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/local-runner/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/cli/node_modules/chrome-launcher": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
+      "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
       "dev": true,
       "optional": true,
       "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^2.0.1"
+      },
       "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+        "print-chrome-path": "bin/print-chrome-path.js"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=12.13.0"
       }
     },
-    "node_modules/@wdio/logger": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.26.0.tgz",
-      "integrity": "sha512-kQj9s5JudAG9qB+zAAcYGPHVfATl2oqKgqj47yjehOQ1zzG33xmtL1ArFbQKWhDG32y1A8sN6b0pIqBEIwgg8Q==",
+    "node_modules/@wdio/cli/node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/cli/node_modules/compress-commons/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/cli/node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/cli/node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/mocha-framework": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.33.0.tgz",
-      "integrity": "sha512-y6+iBF+QrqeiXC+mNwW/o0vRsB+qaRznxoh+ds6Xz9V0tui55cn4kl2gYkBu3oHX8h+9R52ykLyaY9wv+r2aeg==",
+    "node_modules/@wdio/cli/node_modules/devtools": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-8.40.2.tgz",
+      "integrity": "sha512-DR/P5LEdxTJO5tVGW4UtjMKKpZbg3g8+VmLQWwq5Lz7pMP1I83G2PlQ3JrRJGDTx9ur52/1QLYHuDrhxYjCMCA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/mocha": "^10.0.0",
-        "@wdio/logger": "7.26.0",
-        "@wdio/types": "7.33.0",
-        "@wdio/utils": "7.33.0",
-        "expect-webdriverio": "^3.0.0",
-        "mocha": "^10.0.0"
+        "@types/node": "^20.1.0",
+        "@wdio/config": "8.40.2",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "chrome-launcher": "^1.0.0",
+        "edge-paths": "^3.0.5",
+        "import-meta-resolve": "^4.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.37",
+        "uuid": "^10.0.0",
+        "which": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/cli/node_modules/devtools-protocol": {
+      "version": "0.0.1232444",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+      "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/@types/node": {
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "undici-types": "~6.19.2"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/@wdio/config": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.2.tgz",
+      "integrity": "sha512-RED2vcdX5Zdd6r+K+aWcjK4douxjJY4LP/8YvvavgqM0TURd5PDI0Y7IEz7+BIJOT4Uh+3atZawIN9/3yWFeag==",
       "dev": true,
       "optional": true,
       "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/protocols": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.27.0.tgz",
-      "integrity": "sha512-hT/U22R5i3HhwPjkaKAG0yd59eaOaZB0eibRj2+esCImkb5Y6rg8FirrlYRxIGFVBl0+xZV0jKHzR5+o097nvg==",
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/@wdio/protocols": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.38.0.tgz",
+      "integrity": "sha512-7BPi7aXwUtnXZPeWJRmnCNFjyDvGrXlBmN9D4Pi58nILkyjVRQKEY9/qv/pcdyB0cvmIvw++Kl/1Lg+RxG++UA==",
       "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
+      "optional": true,
+      "peer": true
     },
-    "node_modules/@wdio/repl": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.33.0.tgz",
-      "integrity": "sha512-17KM9NCg+UVpZNbS8koT/917vklF5M8IQnw0kGwmJEo444ifTMxmLwQymbS2ovQKAKAQxlfdM7bpqMeI15kzsQ==",
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@wdio/utils": "7.33.0"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/reporter": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.33.0.tgz",
-      "integrity": "sha512-iL3SwP+hVmu1qj54YPwRCK+ZpVN75xpltYihjpuZCWZKJ0qpQuE2oBlNauFQWgrrd74ta20EDV4mSIhXm9lX6g==",
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/@wdio/utils": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.2.tgz",
+      "integrity": "sha512-leYcCUSaAdLUCVKqRKNgMCASPOUo/VvOTKETiZ/qpdY2azCBt/KnLugtiycCzakeYg6Kp+VIjx5fkm0M7y4qhA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/diff": "^5.0.0",
-        "@types/node": "^18.0.0",
-        "@types/object-inspect": "^1.8.0",
-        "@types/supports-color": "^8.1.0",
-        "@types/tmp": "^0.2.0",
-        "@wdio/types": "7.33.0",
-        "diff": "^5.0.0",
-        "fs-extra": "^11.1.1",
-        "object-inspect": "^1.10.3",
-        "supports-color": "8.1.1"
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/reporter/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/cli/node_modules/devtools/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
-      "dependencies": {
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/edge-paths": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/which": "^2.0.1",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/execa": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/get-port": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/get-stream": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/got": {
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/got/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/human-signals": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/json-parse-even-better-errors": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/ky": {
+      "version": "0.33.3",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.33.3.tgz",
+      "integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/lighthouse-logger": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
+      "integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/cli/node_modules/normalize-package-data": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
+      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/normalize-url": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/parse-json": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz",
+      "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.21.4",
+        "error-ex": "^1.3.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "lines-and-columns": "^2.0.3",
+        "type-fest": "^3.8.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/puppeteer-core": {
+      "version": "21.11.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+      "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "1.9.1",
+        "chromium-bidi": "0.5.8",
+        "cross-fetch": "4.0.0",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1232444",
+        "ws": "8.16.0"
+      },
+      "engines": {
+        "node": ">=16.13.2"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/read-pkg": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
+      "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^7.0.0",
+        "type-fest": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/read-pkg-up": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.0.0.tgz",
+      "integrity": "sha512-jgmKiS//w2Zs+YbX039CorlkOp8FIVbSAN8r8GJHDsGlmNPXo+VeHkqAwCiQVTTx5/LwLZTcEw59z3DvcLbr0g==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^6.3.0",
+        "read-pkg": "^8.0.0",
+        "type-fest": "^3.12.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/read-pkg/node_modules/type-fest": {
+      "version": "4.26.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+      "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dev": true,
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/serialize-error": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^2.12.2"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/serialize-error/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/type-fest": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/webdriver": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.40.3.tgz",
+      "integrity": "sha512-mc/pxLpgAQphnIaWvix/QXzp9CJpEvIA3YeF9t5plPaTbvbEaCAYYWkTP6e3vYPYWvx57krjGaYkNUnDCBNolA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "deepmerge-ts": "^5.1.0",
+        "got": "^12.6.1",
+        "ky": "^0.33.0",
+        "ws": "^8.8.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/webdriverio": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-8.40.5.tgz",
+      "integrity": "sha512-fKzaAF8lbgVFWIP8i0eGk22MpjactVVTWP8qtUXDob5Kdo8ffrg1lCKP8mcyrz6fiZM1OY1m6dvkbFelf23Nxw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/repl": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "archiver": "^7.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools-protocol": "^0.0.1342118",
+        "grapheme-splitter": "^1.0.2",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^9.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^11.0.1",
+        "webdriver": "8.40.3"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      },
+      "peerDependencies": {
+        "devtools": "^8.14.0"
+      },
+      "peerDependenciesMeta": {
+        "devtools": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/webdriverio/node_modules/devtools-protocol": {
+      "version": "0.0.1342118",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz",
+      "integrity": "sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/yocto-queue": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+      "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
+      "dev": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/config": {
+      "version": "7.33.0",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.33.0.tgz",
+      "integrity": "sha512-SaCZNKrDtBghf7ujyaxTiU4pBW+1Kms32shSoXpJ/wFop6/MiA7nb19qpUPoJtEDw5/NOKevUKz8nBMBXphiew==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^8.1.0",
+        "@wdio/logger": "7.26.0",
+        "@wdio/types": "7.33.0",
+        "@wdio/utils": "7.33.0",
+        "deepmerge": "^4.0.0",
+        "glob": "^8.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/@wdio/types": {
+      "version": "7.33.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
+      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+      "dev": true,
+      "dependencies": {
         "@types/node": "^18.0.0",
         "got": "^11.8.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/config/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/@wdio/globals": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-8.40.5.tgz",
+      "integrity": "sha512-pHWNDhAO25BqfuxXmEwBceUeGzfEjkym9I4EzfUlPpoi39BRasDXbWSpX3us/5snUv5Xk+NWMDv4aTpTxfDQrA==",
+      "dev": true,
+      "engines": {
+        "node": "^16.13 || >=18"
+      },
+      "optionalDependencies": {
+        "expect-webdriverio": "^4.11.2",
+        "webdriverio": "8.40.5"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@sindresorhus/is": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@types/node": {
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@types/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/config": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.2.tgz",
+      "integrity": "sha512-RED2vcdX5Zdd6r+K+aWcjK4douxjJY4LP/8YvvavgqM0TURd5PDI0Y7IEz7+BIJOT4Uh+3atZawIN9/3yWFeag==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/config/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/protocols": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.38.0.tgz",
+      "integrity": "sha512-7BPi7aXwUtnXZPeWJRmnCNFjyDvGrXlBmN9D4Pi58nILkyjVRQKEY9/qv/pcdyB0cvmIvw++Kl/1Lg+RxG++UA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/repl": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.40.3.tgz",
+      "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^22.2.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/repl/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/utils": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.2.tgz",
+      "integrity": "sha512-leYcCUSaAdLUCVKqRKNgMCASPOUo/VvOTKETiZ/qpdY2azCBt/KnLugtiycCzakeYg6Kp+VIjx5fkm0M7y4qhA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/@wdio/utils/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/cacheable-request": {
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/chrome-launcher": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
+      "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^2.0.1"
+      },
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.js"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/devtools": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-8.40.2.tgz",
+      "integrity": "sha512-DR/P5LEdxTJO5tVGW4UtjMKKpZbg3g8+VmLQWwq5Lz7pMP1I83G2PlQ3JrRJGDTx9ur52/1QLYHuDrhxYjCMCA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0",
+        "@wdio/config": "8.40.2",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "chrome-launcher": "^1.0.0",
+        "edge-paths": "^3.0.5",
+        "import-meta-resolve": "^4.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.37",
+        "uuid": "^10.0.0",
+        "which": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/devtools-protocol": {
+      "version": "0.0.1232444",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+      "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@wdio/globals/node_modules/devtools/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/devtools/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/edge-paths": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/which": "^2.0.1",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/get-port": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/got": {
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/ky": {
+      "version": "0.33.3",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.33.3.tgz",
+      "integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/lighthouse-logger": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
+      "integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/globals/node_modules/normalize-url": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/puppeteer-core": {
+      "version": "21.11.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+      "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@puppeteer/browsers": "1.9.1",
+        "chromium-bidi": "0.5.8",
+        "cross-fetch": "4.0.0",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1232444",
+        "ws": "8.16.0"
+      },
+      "engines": {
+        "node": ">=16.13.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/serialize-error": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "type-fest": "^2.12.2"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriver": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.40.3.tgz",
+      "integrity": "sha512-mc/pxLpgAQphnIaWvix/QXzp9CJpEvIA3YeF9t5plPaTbvbEaCAYYWkTP6e3vYPYWvx57krjGaYkNUnDCBNolA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "deepmerge-ts": "^5.1.0",
+        "got": "^12.6.1",
+        "ky": "^0.33.0",
+        "ws": "^8.8.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriver/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriver/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriver/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@wdio/globals/node_modules/webdriver/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-8.40.5.tgz",
+      "integrity": "sha512-fKzaAF8lbgVFWIP8i0eGk22MpjactVVTWP8qtUXDob5Kdo8ffrg1lCKP8mcyrz6fiZM1OY1m6dvkbFelf23Nxw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/repl": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "archiver": "^7.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools-protocol": "^0.0.1342118",
+        "grapheme-splitter": "^1.0.2",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^9.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^11.0.1",
+        "webdriver": "8.40.3"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      },
+      "peerDependencies": {
+        "devtools": "^8.14.0"
+      },
+      "peerDependenciesMeta": {
+        "devtools": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/globals/node_modules/webdriverio/node_modules/devtools-protocol": {
+      "version": "0.0.1342118",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz",
+      "integrity": "sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@wdio/globals/node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/json-reporter": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/json-reporter/-/json-reporter-8.40.3.tgz",
+      "integrity": "sha512-Guu8zGFohJj2q6FUHsGJw1qZ1/T/gDu6v10DaqvmviRon4GXTg5nibtnK3uAGnkhGgzHjYKosq/jWoOsFmhEZg==",
+      "dependencies": {
+        "@wdio/reporter": "8.40.3",
+        "@wdio/types": "8.40.3"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/local-runner": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-8.40.5.tgz",
+      "integrity": "sha512-/0RXdFU4OH/FZgRGgVYpYWfJIk5ht6VqF2hwuVtS8URBv2riDUKa+Hl+fu5Y8GUQzAs2reNPG0ES2OyNjXxugw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/repl": "8.40.3",
+        "@wdio/runner": "8.40.5",
+        "@wdio/types": "8.40.3",
+        "async-exit-hook": "^2.0.1",
+        "split2": "^4.1.0",
+        "stream-buffers": "^3.0.2"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/repl": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.40.3.tgz",
+      "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/logger": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.26.0.tgz",
+      "integrity": "sha512-kQj9s5JudAG9qB+zAAcYGPHVfATl2oqKgqj47yjehOQ1zzG33xmtL1ArFbQKWhDG32y1A8sN6b0pIqBEIwgg8Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/mocha-framework": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-8.40.3.tgz",
+      "integrity": "sha512-u8toUYRroA5MgCQZPHiQQv88RbeLjJFXSeowXQX6hwMTLurqDLfrqKtaTweFO6QJRFROeq/M0iNJbK008EXXMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^22.2.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "mocha": "^10.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/get-port": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/protocols": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.27.0.tgz",
+      "integrity": "sha512-hT/U22R5i3HhwPjkaKAG0yd59eaOaZB0eibRj2+esCImkb5Y6rg8FirrlYRxIGFVBl0+xZV0jKHzR5+o097nvg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/repl": {
+      "version": "7.33.0",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.33.0.tgz",
+      "integrity": "sha512-17KM9NCg+UVpZNbS8koT/917vklF5M8IQnw0kGwmJEo444ifTMxmLwQymbS2ovQKAKAQxlfdM7bpqMeI15kzsQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/utils": "7.33.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/reporter": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-8.40.3.tgz",
+      "integrity": "sha512-icoUnlyIqLKgxB215OPdDTHG+hlu+U+t/sO6S9eI0ZTYBYaDIQBWVCilkUWRvgfcNSiXYo+1VlVt6waIgIHKwQ==",
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "diff": "^5.0.0",
+        "object-inspect": "^1.12.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-8.40.5.tgz",
+      "integrity": "sha512-5sKORwwps0fvuPDfBbBz+jm8RV2xBV4xBGOLHiad6Mpruzc7+uDwxz6ILkE+CErQhJoNdB99YOOm2foh+aO4Ww==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@wdio/config": "8.40.3",
+        "@wdio/globals": "8.40.5",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "deepmerge-ts": "^5.1.0",
+        "expect-webdriverio": "^4.12.0",
+        "gaze": "^1.1.3",
+        "webdriver": "8.40.3",
+        "webdriverio": "8.40.5"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@sindresorhus/is": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@types/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/protocols": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.38.0.tgz",
+      "integrity": "sha512-7BPi7aXwUtnXZPeWJRmnCNFjyDvGrXlBmN9D4Pi58nILkyjVRQKEY9/qv/pcdyB0cvmIvw++Kl/1Lg+RxG++UA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/repl": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.40.3.tgz",
+      "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+      "dev": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/cacheable-request": {
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chrome-launcher": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
+      "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^2.0.1"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.js"
+      },
+      "engines": {
+        "node": ">=12.13.0"
       }
     },
-    "node_modules/@wdio/reporter/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@wdio/runner/node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">= 14"
       }
     },
-    "node_modules/@wdio/reporter/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/runner/node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+      "dev": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/devtools": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-8.40.2.tgz",
+      "integrity": "sha512-DR/P5LEdxTJO5tVGW4UtjMKKpZbg3g8+VmLQWwq5Lz7pMP1I83G2PlQ3JrRJGDTx9ur52/1QLYHuDrhxYjCMCA==",
       "dev": true,
       "optional": true,
       "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+      "dependencies": {
+        "@types/node": "^20.1.0",
+        "@wdio/config": "8.40.2",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "chrome-launcher": "^1.0.0",
+        "edge-paths": "^3.0.5",
+        "import-meta-resolve": "^4.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.37",
+        "uuid": "^10.0.0",
+        "which": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/runner": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.33.0.tgz",
-      "integrity": "sha512-3B+29EanAdRFh4vT3E4XnHQga/apdLIDZq5pGEbqnDA5LarbIvsNWbJjeJzWM6XaZmEwrPfjOunjOevJt5yvdg==",
+    "node_modules/@wdio/runner/node_modules/devtools-protocol": {
+      "version": "0.0.1232444",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+      "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/devtools/node_modules/@types/node": {
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@wdio/config": "7.33.0",
-        "@wdio/logger": "7.26.0",
-        "@wdio/types": "7.33.0",
-        "@wdio/utils": "7.33.0",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "7.33.0",
-        "webdriverio": "7.33.0"
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/devtools/node_modules/@wdio/config": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.2.tgz",
+      "integrity": "sha512-RED2vcdX5Zdd6r+K+aWcjK4douxjJY4LP/8YvvavgqM0TURd5PDI0Y7IEz7+BIJOT4Uh+3atZawIN9/3yWFeag==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/runner/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/runner/node_modules/devtools/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/devtools/node_modules/@wdio/utils": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.2.tgz",
+      "integrity": "sha512-leYcCUSaAdLUCVKqRKNgMCASPOUo/VvOTKETiZ/qpdY2azCBt/KnLugtiycCzakeYg6Kp+VIjx5fkm0M7y4qhA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/runner/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/runner/node_modules/devtools/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "optional": true,
       "peer": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
       "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/@wdio/spec-reporter": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.33.0.tgz",
-      "integrity": "sha512-+BTJE6p82EaQMK+2t3lmXlpxF0Q72EJwUSEqY6RPyPUZL7fB+AZdHKQcxcmCR8bYyOUp68H45Yj4PuCKRS6hAg==",
+    "node_modules/@wdio/runner/node_modules/edge-paths": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@types/easy-table": "^1.2.0",
-        "@wdio/reporter": "7.33.0",
-        "@wdio/types": "7.33.0",
-        "chalk": "^4.0.0",
-        "easy-table": "^1.1.1",
-        "pretty-ms": "^7.0.0"
+        "@types/which": "^2.0.1",
+        "which": "^2.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
       },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.33.0.tgz",
-      "integrity": "sha512-tNcuN5Kl+i5CffaeTYV1omzAo4rVjiI1m9raIA8ph6iVteWdCzYv2/ImpGgFiBPb7Mf6VokU3+q9Slh5Jitaww==",
+    "node_modules/@wdio/runner/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/get-port": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/got": {
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^18.0.0",
-        "got": "^11.8.1"
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.16"
       },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=10.19.0"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@wdio/runner/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ky": {
+      "version": "0.33.3",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.33.3.tgz",
+      "integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/lighthouse-logger": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
+      "integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@wdio/runner/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/runner/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@wdio/runner/node_modules/normalize-url": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/puppeteer-core": {
+      "version": "21.11.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+      "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@puppeteer/browsers": "1.9.1",
+        "chromium-bidi": "0.5.8",
+        "cross-fetch": "4.0.0",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1232444",
+        "ws": "8.16.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.13.2"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+    "node_modules/@wdio/runner/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dev": true,
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/serialize-error": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^2.12.2"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "optional": true,
       "peer": true,
       "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/webdriver": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.40.3.tgz",
+      "integrity": "sha512-mc/pxLpgAQphnIaWvix/QXzp9CJpEvIA3YeF9t5plPaTbvbEaCAYYWkTP6e3vYPYWvx57krjGaYkNUnDCBNolA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^22.2.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "deepmerge-ts": "^5.1.0",
+        "got": "^12.6.1",
+        "ky": "^0.33.0",
+        "ws": "^8.8.0"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/@wdio/types": {
-      "version": "8.31.0",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.31.0.tgz",
-      "integrity": "sha512-uHAeJ5JMHCOkLXdwht+uS4QC7Pz3piEcEKGzsz6TJzvTgZLhxRlUfYkkxogbae05DZBHnRKfZD+XWH92cjgsIg==",
+    "node_modules/@wdio/runner/node_modules/webdriver/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/webdriverio": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-8.40.5.tgz",
+      "integrity": "sha512-fKzaAF8lbgVFWIP8i0eGk22MpjactVVTWP8qtUXDob5Kdo8ffrg1lCKP8mcyrz6fiZM1OY1m6dvkbFelf23Nxw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^20.1.0"
+        "@types/node": "^22.2.0",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/repl": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "archiver": "^7.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools-protocol": "^0.0.1342118",
+        "grapheme-splitter": "^1.0.2",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^9.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^11.0.1",
+        "webdriver": "8.40.3"
       },
       "engines": {
         "node": "^16.13 || >=18"
+      },
+      "peerDependencies": {
+        "devtools": "^8.14.0"
+      },
+      "peerDependenciesMeta": {
+        "devtools": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@wdio/types/node_modules/@types/node": {
-      "version": "20.11.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
-      "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
+    "node_modules/@wdio/runner/node_modules/webdriverio/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/webdriverio/node_modules/devtools-protocol": {
+      "version": "0.0.1342118",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz",
+      "integrity": "sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
+      "dev": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@wdio/spec-reporter": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-8.40.3.tgz",
+      "integrity": "sha512-Qp8hI4ZqxOLQAeqpt1wmOzR0QgarsoT35NOVfEA7gSy8FcF+H/axrPwEToOLRSQIU4bKEh5/khJ7j81GaVqtVg==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/reporter": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "chalk": "^5.1.2",
+        "easy-table": "^1.2.0",
+        "pretty-ms": "^7.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/types": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.40.3.tgz",
+      "integrity": "sha512-zK17uyON3Ise3m+XwiF5VrrdZcXXmvqB8AWXoKe88DiksFUPMVoCOuVL2SSX1KnA2YLlZBA55qcFZT99GORVKQ==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "@types/node": "^22.2.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/@wdio/types/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dependencies": {
+        "undici-types": "~6.19.2"
       }
     },
     "node_modules/@wdio/utils": {
@@ -11779,6 +14791,17 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@zip.js/zip.js": {
+      "version": "2.7.52",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.52.tgz",
+      "integrity": "sha512-+5g7FQswvrCHwYKNMd/KFxZSObctLSsQOgqBSi0LzwHo3li9Eh1w5cF5ndjQw9Zbr3ajVnd2+XyiX85gAetx1Q==",
+      "dev": true,
+      "engines": {
+        "bun": ">=0.7.0",
+        "deno": ">=1.0.0",
+        "node": ">=16.5.0"
+      }
+    },
     "node_modules/@zkochan/js-yaml": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
@@ -12330,23 +15353,13 @@
         "deep-equal": "^2.0.5"
       }
     },
-    "node_modules/arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12409,15 +15422,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
@@ -12749,6 +15753,12 @@
         "dequal": "^2.0.3"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
+      "dev": true
+    },
     "node_modules/babel-core": {
       "version": "7.0.0-bridge.0",
       "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
@@ -14913,6 +17923,53 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.4.tgz",
+      "integrity": "sha512-7YyxitZEq0ey5loOF5gdo1fZQFF7290GziT+VbAJ+JbYTJYaPZwuEz2r/Nq23sm4fjyTgUf2uJI2gkT3xAuSYA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.3.tgz",
+      "integrity": "sha512-FjkNiU3AwTQNQkcxFOmDcCfoN1LjjtU+ofGJh5DymZZLTqdw2i/CzV7G0h3snvh6G8jrWtdmNSgZPH4L2VOAsQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz",
+      "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "b4a": "^1.6.6",
+        "streamx": "^2.20.0"
+      }
+    },
     "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
@@ -14985,6 +18042,15 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -15021,6 +18087,19 @@
         "node": "*"
       }
     },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "dev": true,
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -15417,12 +18496,30 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
       "dev": true
     },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
     "node_modules/builder-util": {
       "version": "24.9.4",
       "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.9.4.tgz",
@@ -15527,194 +18624,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cac/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/cacache": {
       "version": "18.0.1",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.1.tgz",
@@ -15812,14 +18721,19 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -15940,6 +18854,27 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "dev": true,
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chainsaw/node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -16137,6 +19072,19 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/chromium-bidi": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.8.tgz",
+      "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
+      "dev": true,
+      "dependencies": {
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
     "node_modules/chromium-pickle-js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
@@ -16319,12 +19267,12 @@
       }
     },
     "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true,
       "engines": {
-        "node": ">= 10"
+        "node": ">= 12"
       }
     },
     "node_modules/cliui": {
@@ -17650,6 +20598,15 @@
       "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
       "dev": true
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
@@ -17873,6 +20830,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/deepmerge-ts": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-5.1.0.tgz",
+      "integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/default-browser-id": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
@@ -17923,17 +20889,20 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
@@ -17983,6 +20952,32 @@
       "integrity": "sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==",
       "dev": true
     },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/degenerator/node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/del": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
@@ -18375,7 +21370,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
       "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
-      "dev": true,
       "engines": {
         "node": ">=0.3.1"
       }
@@ -18673,6 +21667,51 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -18757,6 +21796,179 @@
         "which": "^2.0.2"
       }
     },
+    "node_modules/edgedriver": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-5.6.1.tgz",
+      "integrity": "sha512-3Ve9cd5ziLByUdigw6zovVeWJjVs8QHVmqOB0sJ0WNeVPcwf4p18GnxMmVvlFmYRloUwf5suNuorea4QzwBIOA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@wdio/logger": "^8.38.0",
+        "@zip.js/zip.js": "^2.7.48",
+        "decamelize": "^6.0.0",
+        "edge-paths": "^3.0.5",
+        "fast-xml-parser": "^4.4.1",
+        "node-fetch": "^3.3.2",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "edgedriver": "bin/edgedriver.js"
+      }
+    },
+    "node_modules/edgedriver/node_modules/@types/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true
+    },
+    "node_modules/edgedriver/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/edgedriver/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/edgedriver/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/edgedriver/node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/edgedriver/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/edgedriver/node_modules/edge-paths": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
+      "dev": true,
+      "dependencies": {
+        "@types/which": "^2.0.1",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
+      }
+    },
+    "node_modules/edgedriver/node_modules/edge-paths/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/edgedriver/node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dev": true,
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "node_modules/edgedriver/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/edgedriver/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/edgedriver/node_modules/which/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -19268,6 +22480,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-get-iterator": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
@@ -20312,490 +23545,1177 @@
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-util-is-identifier-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
+      "integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/event-pubsub": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-5.0.3.tgz",
+      "integrity": "sha512-2QiHxshejKgJrYMzSI9MEHrvhmzxBL+eLyiM5IiyjDBySkgwS2+tdtnO3gbx8pEisu/yOFCIhfCb63gCEu0yBQ==",
+      "dependencies": {
+        "copyfiles": "^2.4.0",
+        "strong-type": "^0.1.3"
+      },
+      "engines": {
+        "node": ">=13.0.0"
+      }
+    },
+    "node_modules/event-pubsub/node_modules/strong-type": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/strong-type/-/strong-type-0.1.6.tgz",
+      "integrity": "sha512-eJe5caH6Pi5oMMeQtIoBPpvNu/s4jiyb63u5tkHNnQXomK+puyQ5i+Z5iTLBr/xUz/pIcps0NSfzzFI34+gAXg==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dev": true,
+      "dependencies": {
+        "clone-regexp": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==",
+      "dev": true
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/expect-webdriverio": {
+      "version": "4.15.4",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-4.15.4.tgz",
+      "integrity": "sha512-Op1xZoevlv1pohCq7g2Og5Gr3xP2NhY7MQueOApmopVxgweoJ/BqJxyvMNP0A//QsMg8v0WsN/1j81Sx2er9Wg==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/snapshot": "^2.0.3",
+        "expect": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "lodash.isequal": "^4.5.0"
+      },
+      "engines": {
+        "node": ">=16 || >=18 || >=20"
+      },
+      "optionalDependencies": {
+        "@wdio/globals": "^8.29.3",
+        "@wdio/logger": "^8.28.0",
+        "webdriverio": "^8.29.3"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@sindresorhus/is": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@types/node": {
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@types/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/config": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.2.tgz",
+      "integrity": "sha512-RED2vcdX5Zdd6r+K+aWcjK4douxjJY4LP/8YvvavgqM0TURd5PDI0Y7IEz7+BIJOT4Uh+3atZawIN9/3yWFeag==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/config/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/protocols": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.38.0.tgz",
+      "integrity": "sha512-7BPi7aXwUtnXZPeWJRmnCNFjyDvGrXlBmN9D4Pi58nILkyjVRQKEY9/qv/pcdyB0cvmIvw++Kl/1Lg+RxG++UA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/repl": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.40.3.tgz",
+      "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^22.2.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/repl/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/utils": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.2.tgz",
+      "integrity": "sha512-leYcCUSaAdLUCVKqRKNgMCASPOUo/VvOTKETiZ/qpdY2azCBt/KnLugtiycCzakeYg6Kp+VIjx5fkm0M7y4qhA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/@wdio/utils/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/cacheable-request": {
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/chrome-launcher": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
+      "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^2.0.1"
+      },
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.js"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 14"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/expect-webdriverio/node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
       "dev": true,
-      "engines": {
-        "node": ">=4.0"
+      "optional": true,
+      "dependencies": {
+        "node-fetch": "^2.6.12"
       }
     },
-    "node_modules/estree-util-is-identifier-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
-      "integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
+    "node_modules/expect-webdriverio/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/expect-webdriverio/node_modules/devtools": {
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-8.40.2.tgz",
+      "integrity": "sha512-DR/P5LEdxTJO5tVGW4UtjMKKpZbg3g8+VmLQWwq5Lz7pMP1I83G2PlQ3JrRJGDTx9ur52/1QLYHuDrhxYjCMCA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "^20.1.0",
+        "@wdio/config": "8.40.2",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.38.0",
+        "@wdio/types": "8.39.0",
+        "@wdio/utils": "8.40.2",
+        "chrome-launcher": "^1.0.0",
+        "edge-paths": "^3.0.5",
+        "import-meta-resolve": "^4.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.37",
+        "uuid": "^10.0.0",
+        "which": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+    "node_modules/expect-webdriverio/node_modules/devtools-protocol": {
+      "version": "0.0.1232444",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+      "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "optional": true
     },
-    "node_modules/event-pubsub": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-5.0.3.tgz",
-      "integrity": "sha512-2QiHxshejKgJrYMzSI9MEHrvhmzxBL+eLyiM5IiyjDBySkgwS2+tdtnO3gbx8pEisu/yOFCIhfCb63gCEu0yBQ==",
+    "node_modules/expect-webdriverio/node_modules/devtools/node_modules/@wdio/types": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "copyfiles": "^2.4.0",
-        "strong-type": "^0.1.3"
+        "@types/node": "^20.1.0"
       },
       "engines": {
-        "node": ">=13.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/event-pubsub/node_modules/strong-type": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/strong-type/-/strong-type-0.1.6.tgz",
-      "integrity": "sha512-eJe5caH6Pi5oMMeQtIoBPpvNu/s4jiyb63u5tkHNnQXomK+puyQ5i+Z5iTLBr/xUz/pIcps0NSfzzFI34+gAXg==",
+    "node_modules/expect-webdriverio/node_modules/devtools/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+    "node_modules/expect-webdriverio/node_modules/edge-paths": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
+      "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/which": "^2.0.1",
+        "which": "^2.0.2"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/shirshak55"
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+    "node_modules/expect-webdriverio/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.8.x"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+    "node_modules/expect-webdriverio/node_modules/get-port": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+      "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
       "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+      "optional": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/exec-sh": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
-      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+    "node_modules/expect-webdriverio/node_modules/got": {
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
       "dev": true,
       "optional": true,
-      "peer": true
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+    "node_modules/expect-webdriverio/node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "clone-regexp": "^2.1.0"
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.19.0"
       }
     },
-    "node_modules/exenv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==",
-      "dev": true
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/expect-webdriverio/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
+      "optional": true,
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
+    "node_modules/expect-webdriverio/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "dependencies": {
-        "is-posix-bracket": "^0.1.0"
-      },
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
       }
     },
-    "node_modules/expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
+    "node_modules/expect-webdriverio/node_modules/ky": {
+      "version": "0.33.3",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.33.3.tgz",
+      "integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
       "dev": true,
-      "dependencies": {
-        "fill-range": "^2.1.0"
-      },
+      "optional": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
       }
     },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+    "node_modules/expect-webdriverio/node_modules/lighthouse-logger": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
+      "integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
       }
     },
-    "node_modules/expand-range/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+    "node_modules/expect-webdriverio/node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/expand-range/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/expand-range/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+    "node_modules/expect-webdriverio/node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
+      "optional": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expand-range/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/expect-webdriverio/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+    "node_modules/expect-webdriverio/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/expect-webdriverio/node_modules/normalize-url": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+      "dev": true,
+      "optional": true,
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expect-webdriverio": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-3.6.0.tgz",
-      "integrity": "sha512-8HuVToXDVzkKgUKIUzW/v3bP4ZoMDEwCjX9QmlRlMIvjt3HOSzSIBnRMv8lpeVTUKoR9DZNr/lSuKH4Amx4BBg==",
+    "node_modules/expect-webdriverio/node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
       "dev": true,
-      "dependencies": {
-        "expect": "^28.1.0",
-        "jest-matcher-utils": "^28.1.0"
+      "optional": true,
+      "engines": {
+        "node": ">=12.20"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/@jest/expect-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz",
-      "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==",
+    "node_modules/expect-webdriverio/node_modules/puppeteer-core": {
+      "version": "21.11.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+      "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "jest-get-type": "^28.0.2"
+        "@puppeteer/browsers": "1.9.1",
+        "chromium-bidi": "0.5.8",
+        "cross-fetch": "4.0.0",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1232444",
+        "ws": "8.16.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=16.13.2"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/@jest/schemas": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+    "node_modules/expect-webdriverio/node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@sinclair/typebox": "^0.24.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/@jest/types": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
-      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+    "node_modules/expect-webdriverio/node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "lowercase-keys": "^3.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/@sinclair/typebox": {
-      "version": "0.24.51",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==",
-      "dev": true
-    },
-    "node_modules/expect-webdriverio/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/expect-webdriverio/node_modules/serialize-error": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+      "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "type-fest": "^2.12.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/expect-webdriverio/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/diff-sequences": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==",
+    "node_modules/expect-webdriverio/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "optional": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/expect": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz",
-      "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==",
+    "node_modules/expect-webdriverio/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
       "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/jest-diff": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz",
-      "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==",
+    "node_modules/expect-webdriverio/node_modules/webdriver": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.40.3.tgz",
+      "integrity": "sha512-mc/pxLpgAQphnIaWvix/QXzp9CJpEvIA3YeF9t5plPaTbvbEaCAYYWkTP6e3vYPYWvx57krjGaYkNUnDCBNolA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
+        "@types/node": "^22.2.0",
+        "@types/ws": "^8.5.3",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "deepmerge-ts": "^5.1.0",
+        "got": "^12.6.1",
+        "ky": "^0.33.0",
+        "ws": "^8.8.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
+    "node_modules/expect-webdriverio/node_modules/webdriver/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dev": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/jest-matcher-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz",
-      "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==",
+    "node_modules/expect-webdriverio/node_modules/webdriver/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/jest-message-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
-      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
+    "node_modules/expect-webdriverio/node_modules/webdriver/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/expect-webdriverio/node_modules/webdriver/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/jest-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
-      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+    "node_modules/expect-webdriverio/node_modules/webdriverio": {
+      "version": "8.40.5",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-8.40.5.tgz",
+      "integrity": "sha512-fKzaAF8lbgVFWIP8i0eGk22MpjactVVTWP8qtUXDob5Kdo8ffrg1lCKP8mcyrz6fiZM1OY1m6dvkbFelf23Nxw==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "@types/node": "^22.2.0",
+        "@wdio/config": "8.40.3",
+        "@wdio/logger": "8.38.0",
+        "@wdio/protocols": "8.40.3",
+        "@wdio/repl": "8.40.3",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "archiver": "^7.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools-protocol": "^0.0.1342118",
+        "grapheme-splitter": "^1.0.2",
+        "import-meta-resolve": "^4.0.0",
+        "is-plain-obj": "^4.1.0",
+        "jszip": "^3.10.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^9.0.0",
+        "puppeteer-core": "^21.11.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^11.0.1",
+        "webdriver": "8.40.3"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^16.13 || >=18"
+      },
+      "peerDependencies": {
+        "devtools": "^8.14.0"
+      },
+      "peerDependenciesMeta": {
+        "devtools": {
+          "optional": true
+        }
       }
     },
-    "node_modules/expect-webdriverio/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+    "node_modules/expect-webdriverio/node_modules/webdriverio/node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/expect-webdriverio/node_modules/webdriverio/node_modules/@wdio/config": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.40.3.tgz",
+      "integrity": "sha512-HIi+JnHEDAExhzGRQuZOXw1HWIpe/bsVFHwNISJhY6wS4Nijaigmegs2p14Rv16ydOF19hGrxdKsl8k5STIP2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "@wdio/utils": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.0.0",
+        "glob": "^10.2.2",
+        "import-meta-resolve": "^4.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "node_modules/expect-webdriverio/node_modules/webdriverio/node_modules/@wdio/protocols": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.40.3.tgz",
+      "integrity": "sha512-wK7+eyrB3TAei8RwbdkcyoNk2dPu+mduMBOdPJjp8jf/mavd15nIUXLID1zA+w5m1Qt1DsT1NbvaeO9+aJQ33A==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "optional": true
+    },
+    "node_modules/expect-webdriverio/node_modules/webdriverio/node_modules/@wdio/utils": {
+      "version": "8.40.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.40.3.tgz",
+      "integrity": "sha512-pv/848KGfPN3YXU4QRfTYGkAu4/lejIfoGzGpvGNDcACiVxgZhyRZkJ2xVaSnGaXzF0R7pMozrkU5/DnEhcxMg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@puppeteer/browsers": "^1.6.0",
+        "@wdio/logger": "8.38.0",
+        "@wdio/types": "8.40.3",
+        "decamelize": "^6.0.0",
+        "deepmerge-ts": "^5.1.0",
+        "edgedriver": "^5.5.0",
+        "geckodriver": "^4.3.1",
+        "get-port": "^7.0.0",
+        "import-meta-resolve": "^4.0.0",
+        "locate-app": "^2.1.0",
+        "safaridriver": "^0.1.0",
+        "split2": "^4.2.0",
+        "wait-port": "^1.0.4"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "engines": {
+        "node": "^16.13 || >=18"
       }
     },
-    "node_modules/expect-webdriverio/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/expect-webdriverio/node_modules/webdriverio/node_modules/devtools-protocol": {
+      "version": "0.0.1342118",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz",
+      "integrity": "sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/expect-webdriverio/node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
     "node_modules/exponential-backoff": {
@@ -20950,27 +24870,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -21035,6 +24934,12 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
+    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -21069,6 +24974,28 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-xml-parser": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
+      "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
@@ -21136,6 +25063,29 @@
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
       "dev": true
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/fetch-retry": {
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
@@ -21252,15 +25202,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -21512,18 +25453,8 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -21659,6 +25590,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/form-data-encoder": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.17"
+      }
+    },
     "node_modules/format": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
@@ -21668,6 +25608,18 @@
         "node": ">=0.4.x"
       }
     },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dev": true,
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -21757,6 +25709,56 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/fstream/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fstream/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -21805,6 +25807,209 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/geckodriver": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.2.1.tgz",
+      "integrity": "sha512-4m/CRk0OI8MaANRuFIahvOxYTSjlNAO2p9JmE14zxueknq6cdtB5M9UGRQ8R9aMV0bLGNVHHDnDXmoXdOwJfWg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@wdio/logger": "^8.11.0",
+        "decamelize": "^6.0.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "node-fetch": "^3.3.1",
+        "tar-fs": "^3.0.4",
+        "unzipper": "^0.10.14",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "geckodriver": "bin/geckodriver.js"
+      },
+      "engines": {
+        "node": "^16.13 || >=18 || >=20"
+      }
+    },
+    "node_modules/geckodriver/node_modules/@wdio/logger": {
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz",
+      "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.1.2",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": "^16.13 || >=18"
+      }
+    },
+    "node_modules/geckodriver/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/geckodriver/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/geckodriver/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/geckodriver/node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/geckodriver/node_modules/decamelize": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
+      "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/geckodriver/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/geckodriver/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/geckodriver/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/geckodriver/node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dev": true,
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "node_modules/geckodriver/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/geckodriver/node_modules/tar-fs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
+      }
+    },
+    "node_modules/geckodriver/node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/geckodriver/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -21823,16 +26028,20 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -21916,6 +26125,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dev": true,
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-uri/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -22010,49 +26248,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
-      "dev": true,
-      "dependencies": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -22258,6 +26453,7 @@
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
       "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -22456,27 +26652,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -22496,12 +26671,12 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -23612,6 +27787,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/import-meta-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+      "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -23656,29 +27841,29 @@
       "integrity": "sha512-EcKzdTHVe8wFVOGEYXiW9WmJXPjqi1T+234YpJr98RiFYKHV3cdy1+3mkTE+KHTHxFFLH51SfaGOoUdW+v7ViQ=="
     },
     "node_modules/inquirer": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
-      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
+      "version": "9.2.12",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz",
+      "integrity": "sha512-mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
+        "@ljharb/through": "^2.3.11",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^5.3.0",
         "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
+        "cli-width": "^4.1.0",
+        "external-editor": "^3.1.0",
+        "figures": "^5.0.0",
         "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
+        "mute-stream": "1.0.0",
         "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.18.0"
       }
     },
     "node_modules/inquirer/node_modules/ansi-styles": {
@@ -23697,28 +27882,66 @@
       }
     },
     "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/inquirer/node_modules/figures": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
+      "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "escape-string-regexp": "^5.0.0",
+        "is-unicode-supported": "^1.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/inquirer/node_modules/is-unicode-supported": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
+      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/inquirer/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -23794,6 +28017,25 @@
       "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
       "dev": true
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/ip-regex": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
@@ -24069,38 +28311,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-electron-renderer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-electron-renderer/-/is-electron-renderer-2.0.1.tgz",
       "integrity": "sha512-pRlQnpaCFhDVPtkXkP+g9Ybv/CjbiQDjnKFQTEjpBfDKeV6dRDBczuFRDpM6DVfk2EjpMS8t5kwE5jPnqYl3zA==",
       "dev": true
     },
-    "node_modules/is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
-      "dev": true,
-      "dependencies": {
-        "is-primitive": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -24298,30 +28521,12 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
-    "node_modules/is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -24449,12 +28654,6 @@
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
       "dev": true
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
-      "dev": true
-    },
     "node_modules/is-weakmap": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
@@ -26941,229 +31140,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-matchers": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jest-matchers/-/jest-matchers-20.0.3.tgz",
-      "integrity": "sha512-aDlp50L8qPJ+Y+tifrlKewT0ZU1uC9OP7GJ5T0UKSw/wB73wf6jKEAZUqyA67BocW8BZD7qVVWHasm7u2D1CMQ==",
-      "dev": true,
-      "dependencies": {
-        "jest-diff": "^20.0.3",
-        "jest-matcher-utils": "^20.0.3",
-        "jest-message-util": "^20.0.3",
-        "jest-regex-util": "^20.0.3"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-      "dev": true,
-      "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/jest-matchers/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/jest-diff": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-20.0.3.tgz",
-      "integrity": "sha512-DITOXlTg0HDL9QKiVpf82vDu/nva60/V9xp056zjnAYpHVTZlJgfLMIHJmgPCoSu0+7n7QUAfxyFUHUGyHLFSw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "diff": "^3.2.0",
-        "jest-matcher-utils": "^20.0.3",
-        "pretty-format": "^20.0.3"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/jest-matcher-utils": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz",
-      "integrity": "sha512-eSNh2n3aXULZUbherq5+lZVdpUau8sniowi1tcc1ZueBk/97avAwwoDwBVvxI9JINVrPTsCI51SiQtrjBkVvPw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "pretty-format": "^20.0.3"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/jest-message-util": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-20.0.3.tgz",
-      "integrity": "sha512-p4UQLFjZmXw9Optr6c0aAIDN622+tdVW9XjaCODww/Y8MRGo1S60CICl0Jb4XdJWmMkmD07osWc6aElLxo0mDg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "micromatch": "^2.3.11",
-        "slash": "^1.0.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/jest-regex-util": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-20.0.3.tgz",
-      "integrity": "sha512-WVFSnROOYgYA+AyTytpZA93EEv16DfPkkR8V8okVQjirXLfRs9n451BPgiiUJSHIyJv+OQ4El0+q16hyY1dEdA==",
-      "dev": true
-    },
-    "node_modules/jest-matchers/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/pretty-format": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-20.0.3.tgz",
-      "integrity": "sha512-dSW/15bmtC3vuheyzWUveowskTAUAWKE08+x06rgYzvSoDzg6cVg/MPKgNvh87jRJvOQ/qaQZLLWml2jrukk6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.1.1",
-        "ansi-styles": "^3.0.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-matchers/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
@@ -28046,6 +32022,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jschardet": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.2.tgz",
@@ -28773,6 +32755,12 @@
         "node": ">= 14"
       }
     },
+    "node_modules/listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
+      "dev": true
+    },
     "node_modules/listr2": {
       "version": "6.6.1",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz",
@@ -28915,55 +32903,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -28987,6 +32926,39 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/locate-app": {
+      "version": "2.4.41",
+      "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.41.tgz",
+      "integrity": "sha512-viAOUsdA8QNM+p823ymlxPGXo+ePPZ8r9yhFoyFGUN6/ORE6uMZrKN8hPSKiPZMhFCeoZ5nfp4qEQvaMyPY46A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/hejny/locate-app/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ],
+      "dependencies": {
+        "@promptbook/utils": "0.70.0-1",
+        "type-fest": "2.13.0",
+        "userhome": "1.0.0"
+      }
+    },
+    "node_modules/locate-app/node_modules/type-fest": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz",
+      "integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -29377,7 +33349,6 @@
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
       "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       },
@@ -29389,8 +33360,7 @@
     "node_modules/loglevel-plugin-prefix": {
       "version": "0.8.4",
       "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
-      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
-      "dev": true
+      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="
     },
     "node_modules/longest-streak": {
       "version": "2.0.4",
@@ -29473,15 +33443,12 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-dir": {
@@ -29632,12 +33599,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
-    },
     "node_modules/mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -31508,6 +35469,12 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true
+    },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -31552,18 +35519,15 @@
       }
     },
     "node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "minimist": "^1.2.6"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
     "node_modules/mkdirp-classic": {
@@ -31790,10 +35754,13 @@
       }
     },
     "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/nanoid": {
       "version": "3.3.3",
@@ -31874,6 +35841,15 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -31917,6 +35893,25 @@
         "node": ">= 0.10.5"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -32740,7 +36735,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
       "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -32846,19 +36840,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -33247,6 +37228,76 @@
         "node": ">=6"
       }
     },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.5",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -33311,42 +37362,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
-      "dev": true,
-      "dependencies": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -33501,9 +37516,9 @@
       }
     },
     "node_modules/pathe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
     "node_modules/pbkdf2": {
@@ -33578,27 +37593,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pirates": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
@@ -33751,18 +37745,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -34191,15 +38173,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/prettier": {
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
@@ -34391,18 +38364,78 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
+      "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -34562,18 +38595,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/puppeteer-core/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/puppeteer-core/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -34673,6 +38694,12 @@
         }
       ]
     },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
+    },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -34734,29 +38761,6 @@
         "url": "https://opencollective.com/ramda"
       }
     },
-    "node_modules/randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -36004,18 +40008,6 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "node_modules/regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "dependencies": {
-        "is-equal-shallow": "^0.1.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -36295,7 +40287,9 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/renderkid": {
       "version": "3.0.0",
@@ -36315,6 +40309,8 @@
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -36652,9 +40648,9 @@
       }
     },
     "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
       "dev": true,
       "engines": {
         "node": ">=0.12.0"
@@ -36698,6 +40694,12 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safaridriver": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz",
+      "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==",
+      "dev": true
+    },
     "node_modules/safe-array-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
@@ -37639,15 +41641,17 @@
       "peer": true
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -38096,37 +42100,37 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "dev": true,
       "dependencies": {
-        "ip": "^2.0.0",
+        "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": ">= 10.0.0",
         "npm": ">= 3.0.0"
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
-      "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
       "dev": true,
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.1",
         "debug": "^4.3.4",
-        "socks": "^2.7.1"
+        "socks": "^2.8.3"
       },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.4"
@@ -38224,6 +42228,22 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/spacetrim": {
+      "version": "0.11.39",
+      "resolved": "https://registry.npmjs.org/spacetrim/-/spacetrim-0.11.39.tgz",
+      "integrity": "sha512-S/baW29azJ7py5ausQRE2S6uEDQnlxgMHOEEq4V770ooBDD1/9kZnxRcco/tjZYuDuqYXblCk/r3N13ZmvHZ2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://buymeacoffee.com/hejny"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/hejny/spacetrim/blob/main/README.md#%EF%B8%8F-contributing"
+        }
+      ]
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -38512,6 +42532,20 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "node_modules/streamx": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz",
+      "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==",
+      "dev": true,
+      "dependencies": {
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -38749,6 +42783,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "dev": true
+    },
     "node_modules/strong-log-transformer": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
@@ -39095,15 +43135,6 @@
       "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
       "dev": true
     },
-    "node_modules/suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/sugarss": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
@@ -39848,6 +43879,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/text-decoder": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz",
+      "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/text-hex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
@@ -39969,6 +44009,15 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
       "dev": true
     },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -40648,10 +44697,9 @@
       "dev": true
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -41055,16 +45103,64 @@
         "yaku": "^0.16.6"
       }
     },
-    "node_modules/unzip-crx-3/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/unzipper": {
+      "version": "0.10.14",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz",
+      "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      }
+    },
+    "node_modules/unzipper/node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+      "dev": true
+    },
+    "node_modules/unzipper/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/unzipper/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/unzipper/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/unzipper/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/update-browserslist-db": {
@@ -41172,6 +45268,12 @@
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true
     },
+    "node_modules/urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
+      "dev": true
+    },
     "node_modules/usb": {
       "version": "1.9.2",
       "resolved": "https://registry.npmjs.org/usb/-/usb-1.9.2.tgz",
@@ -41305,6 +45407,15 @@
         "react-dom": "^16.8.0  || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/userhome": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz",
+      "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/utf8": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
@@ -41517,6 +45628,75 @@
         "node": ">=14"
       }
     },
+    "node_modules/wait-port": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.1.0.tgz",
+      "integrity": "sha512-3e04qkoN3LxTMLakdqeWth8nih8usyg+sf1Bgdf9wwUkp05iuK1eSY/QpLvscT/+F/gA89+LpUmmgBtesbqI2Q==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4"
+      },
+      "bin": {
+        "wait-port": "bin/wait-port.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/wait-port/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wait-port/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/wait-port/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/wait-port/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
@@ -41665,25 +45845,21 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/wdio-json-reporter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/wdio-json-reporter/-/wdio-json-reporter-3.0.0.tgz",
-      "integrity": "sha512-j2/d1TJMa1ofUskg7OrcWkr9itW6IZdqnFL/px3xHWz7eaeqwkzc64yhcIz2CVej4ygJ9btOTiGCsCIVg4dcMw==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/reporter": "^7.16.3",
-        "jest-matchers": "^20.0.3"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.16.3"
-      }
-    },
     "node_modules/wdio-wait-for": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/wdio-wait-for/-/wdio-wait-for-2.2.6.tgz",
       "integrity": "sha512-vXSe03frnMFHMDiEUZL3dyet1Wl+cOXPMSzWNFVjlr/W853Bw+Uu1Sos0SSXtsLwopEzsGzKtFvbOcqIlJ46sw==",
       "dev": true
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/webdriver": {
       "version": "7.33.0",
       "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.33.0.tgz",
@@ -42731,9 +46907,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -42917,117 +47093,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yarn-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
-      "dev": true,
-      "dependencies": {
-        "cac": "^3.0.3",
-        "chalk": "^1.1.3",
-        "cross-spawn": "^4.0.2"
-      },
-      "bin": {
-        "yarn-install": "bin/yarn-install.js",
-        "yarn-remove": "bin/yarn-remove.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yarn-install/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/yarn-install/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/yarn-install/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/yarn-install/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
-    },
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
diff --git a/package.json b/package.json
index 2680fc2e24..c768938d4b 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "@types/elasticlunr": "^0.9.5",
     "@types/electron-devtools-installer": "^2.2.2",
     "@types/electron-localshortcut": "^3.1.0",
+    "@types/fs-extra": "^11.0.4",
     "@types/history": "^4.7.9",
     "@types/jest": "^29.5.6",
     "@types/js-crc": "^0.2.3",
@@ -137,12 +138,12 @@
     "@types/webpack-env": "^1.17.0",
     "@typescript-eslint/eslint-plugin": "^ 6.7.4",
     "@typescript-eslint/parser": "^ 6.7.4",
-    "@wdio/cli": "^7.16.13",
-    "@wdio/local-runner": "^7.16.13",
-    "@wdio/mocha-framework": "^7.16.13",
-    "@wdio/reporter": "^7.16.14",
-    "@wdio/spec-reporter": "^7.16.14",
-    "@wdio/types": "^8.31.0",
+    "@wdio/cli": "^8.40.5",
+    "@wdio/local-runner": "^8.40.5",
+    "@wdio/mocha-framework": "^8.40.3",
+    "@wdio/reporter": "^8.40.3",
+    "@wdio/spec-reporter": "^8.40.3",
+    "@wdio/types": "^8.40.3",
     "archiver": "^5.3.1",
     "async-mutex": "^0.4.0",
     "axios": "^0.27.2",
@@ -260,7 +261,6 @@
     "uuid": "^9.0.1",
     "vcf": "^2.1.2",
     "wdio-chromedriver-service": "^8.1.1",
-    "wdio-json-reporter": "^3.0.0",
     "wdio-wait-for": "^2.2.1",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
@@ -277,6 +277,7 @@
     "@contentful/rich-text-plain-text-renderer": "^16.2.6",
     "@orama/orama": "^2.0.22",
     "@vscode/sudo-prompt": "^9.3.1",
+    "@wdio/json-reporter": "^8.40.3",
     "crypto-js": "^4.2.0",
     "js-crc": "^0.2.0",
     "jschardet": "^3.1.2",
@@ -287,5 +288,8 @@
     "serialport": "10.1.0",
     "tslib": "^2.3.0",
     "zod": "^3.22.4"
+  },
+  "overrides": {
+    "geckodriver": "~4.2.0"
   }
 }

From 9f6bb00f9dc8c295aeb6ccb24f01f6f180ce31ea Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Mon, 23 Sep 2024 12:28:45 +0200
Subject: [PATCH 11/64] [CP-3132] Added data testid to Cancel Backup Action

---
 libs/e2e-test-ids/src/e2e-test-ids.ts                            | 1 +
 .../ui/src/lib/predefined/backup/backup-features.tsx             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
index b281207187..bb43215e3d 100644
--- a/libs/e2e-test-ids/src/e2e-test-ids.ts
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -35,6 +35,7 @@ export enum BackupModalTestIds {
   FeatureElementActive = "backup-features-modal-element-active",
   FeatureElementInactive = "backup-features-modal-element-inactive",
   CreateBackupAction = "backup-features-modal-create-action",
+  CancelBackupAction = "backup-features-modal-cancel-action",
 }
 
 export enum ModalTestIds {
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
index 3d2b09cf69..446a7b4ac9 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
@@ -94,6 +94,7 @@ export const BackupFeatures: FunctionComponent<Props> = ({
             text: intl.formatMessage(messages.cancelButtonLabel),
             action: closeAction,
           }}
+          data-testid={BackupModalTestIds.CancelBackupAction}
         />
         <ButtonPrimary
           config={{

From 05f0e1f2faee2cf89f8ba19c7ef33e68408acb26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Mon, 23 Sep 2024 20:10:50 +0200
Subject: [PATCH 12/64] [CP-3075] Implemented entities store (#2049)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 .env.example                                  |   3 +
 .../__deprecated__/renderer/store/reducers.ts |   2 +
 .../constants/response-status.constant.ts     |   1 +
 .../lib/api-entities/api-entities.service.ts  | 297 +++++++++++++++++-
 .../create-entity-data.request.ts             |  21 ++
 .../delete-entities-data.request.ts           |  21 ++
 ...uest.ts => get-entities-config.request.ts} |  10 +-
 .../api-entities/get-entities-data.request.ts |  56 ++++
 .../get-entities-metadata.request.ts          |  16 +
 .../feature/src/lib/api-entities/index.ts     |   7 +-
 .../update-entity-data.request.ts             |  23 ++
 libs/device/feature/src/lib/api-module.ts     |   5 +-
 .../file-transfer/file-transfer.service.ts    |   9 +-
 .../models/src/lib/api-request.model.ts       |   8 +-
 .../entities-config.validator.test.ts         | 150 +++++++++
 ...idator.ts => entities-config.validator.ts} |  30 +-
 .../entities-data-get.validator.test.ts       |  43 +++
 .../entities/entities-data-get.validator.ts   |  17 +
 .../lib/entities/entities-delete.validator.ts |  13 +
 .../entities-metadata.validator.test.ts       |  28 ++
 .../entities/entities-metadata.validator.ts   |  12 +
 .../entities/entity-config.validator.test.ts  |  76 -----
 .../entity-data-get.validator.test.ts         |  23 ++
 .../lib/entities/entity-data-get.validator.ts |  12 +
 .../entities/entity-data-patch.validator.ts   |  12 +
 .../entities/entity-data-post.validator.ts    |  12 +
 .../src/lib/entities/entity-data.validator.ts |   9 +
 .../flatten-entity-configuration.test.ts      |  18 +-
 libs/device/models/src/lib/entities/index.ts  |  14 +-
 .../lib/feature/data-provider-config.test.ts  |  71 +++++
 .../src/lib/feature/data-provider-config.ts   |  67 ++++
 .../src/lib/feature/feature-config.test.ts    |  14 +-
 .../models/src/lib/feature/feature-config.ts  |   5 +
 libs/device/models/src/lib/feature/index.ts   |   2 +
 .../src/lib/feature/layout-config.test.ts     |  94 ++++++
 .../models/src/lib/feature/layout-config.ts   | 146 +++++++++
 libs/device/models/src/lib/general-error.ts   |   3 +-
 .../api-entities-service-events.ts            |   9 +-
 .../feature/src/lib/generic-view.tsx          |   4 +
 .../feature/src/lib/recursive-layout.tsx      |  33 +-
 .../feature/src/lib/setup-component.tsx       | 146 ++++++++-
 .../feature/src/lib/use-dev-console.ts        |  97 ++++++
 .../src/lib/use-dev-views/use-dev-views.tsx   |  34 ++
 .../lib/use-dev-views/views/contacts-view.ts  | 238 ++++++++++++++
 .../src/lib/use-dev-views/views/index.ts      |  10 +
 libs/generic-view/models/src/index.ts         |  12 +
 .../models/src/lib/common-validators.ts       |  16 +
 .../models/src/lib/entities-loader.ts         |  20 ++
 .../models/src/lib/form-checkbox-input.ts     |   2 +-
 .../src/lib/form-conditional-renderer.ts      |  21 ++
 .../generic-view/models/src/lib/table-cell.ts |  22 ++
 libs/generic-view/models/src/lib/table.ts     |  27 ++
 libs/generic-view/store/src/index.ts          |  10 +
 .../store/src/lib/action-names.ts             |  13 +
 .../store/src/lib/entities/actions.ts         |  38 +++
 .../lib/entities/create-entity-data.action.ts |  58 ++++
 .../entities/delete-entities-data.action.ts   |  40 +++
 .../entities/get-entities-config.action.ts    |  48 +++
 .../lib/entities/get-entities-data.action.ts  |  69 ++++
 .../entities/get-entities-metadata.action.ts  |  31 ++
 .../lib/entities/get-entity-data.action.ts    |  88 ++++++
 .../store/src/lib/entities/reducer.ts         | 131 ++++++++
 .../lib/entities/update-entity-data.action.ts |  64 ++++
 .../features/get-generic-config.actions.ts    |   1 +
 .../src/lib/file-transfer/get-file.action.ts  |   5 +-
 .../store/src/lib/get-api-config.ts           |  14 +-
 .../hooks/use-api-serial-port-listeners.ts    |   2 +
 .../store/src/lib/selectors/component.ts      |   5 +
 .../store/src/lib/selectors/entities.ts       |  77 +++++
 .../store/src/lib/selectors/index.ts          |   1 +
 .../store/src/lib/views/actions.ts            |   6 +
 .../store/src/lib/views/reducer.ts            |  18 ++
 libs/generic-view/ui/src/index.ts             |   5 +
 .../buttons/button-base/use-button-action.ts  |  18 ++
 .../ui/src/lib/entities/entities-loader.tsx   |  55 ++++
 .../generic-view/ui/src/lib/entities/index.ts |  11 +
 .../ui/src/lib/interactive/form/form.tsx      |   3 +
 .../helpers/form-conditional-renderer.tsx     |  22 ++
 .../interactive/form/input/checkbox-input.tsx |  15 +-
 .../ui/src/lib/interactive/interactive.ts     |   2 +
 libs/generic-view/ui/src/lib/table/index.ts   |  12 +
 .../ui/src/lib/table/table-cell.tsx           |  43 +++
 libs/generic-view/ui/src/lib/table/table.tsx  | 199 ++++++++++++
 libs/generic-view/utils/src/index.ts          |   2 +-
 .../data-provider-filter.test.ts              |  82 +++++
 .../data-provider-filter.ts                   |  25 ++
 .../data-provider-sort.test.ts                | 151 +++++++++
 .../data-provider-sort.ts                     |  62 ++++
 .../src/lib/data-provider-helpers/index.ts    |   7 +
 .../string-to-regex.test.ts                   |  30 ++
 .../data-provider-helpers/string-to-regex.ts  |  13 +
 .../lib/map-layout-sizes/map-layout-sizes.ts  |   2 +-
 .../utils/src/lib/models/api-fc.types.ts      |   8 +-
 .../utils/src/lib/models/api-views.types.ts   |   4 +-
 .../utils/src/lib/models/button.types.ts      |  20 +-
 .../utils/src/lib/models/layout.types.ts      |  80 -----
 96 files changed, 3399 insertions(+), 232 deletions(-)
 create mode 100644 libs/device/feature/src/lib/api-entities/create-entity-data.request.ts
 create mode 100644 libs/device/feature/src/lib/api-entities/delete-entities-data.request.ts
 rename libs/device/feature/src/lib/api-entities/{get-api-entities-config.request.ts => get-entities-config.request.ts} (55%)
 create mode 100644 libs/device/feature/src/lib/api-entities/get-entities-data.request.ts
 create mode 100644 libs/device/feature/src/lib/api-entities/get-entities-metadata.request.ts
 create mode 100644 libs/device/feature/src/lib/api-entities/update-entity-data.request.ts
 create mode 100644 libs/device/models/src/lib/entities/entities-config.validator.test.ts
 rename libs/device/models/src/lib/entities/{entity-config.validator.ts => entities-config.validator.ts} (83%)
 create mode 100644 libs/device/models/src/lib/entities/entities-data-get.validator.test.ts
 create mode 100644 libs/device/models/src/lib/entities/entities-data-get.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/entities-delete.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/entities-metadata.validator.test.ts
 create mode 100644 libs/device/models/src/lib/entities/entities-metadata.validator.ts
 delete mode 100644 libs/device/models/src/lib/entities/entity-config.validator.test.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-data-get.validator.test.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-data-get.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-data-patch.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-data-post.validator.ts
 create mode 100644 libs/device/models/src/lib/entities/entity-data.validator.ts
 create mode 100644 libs/device/models/src/lib/feature/data-provider-config.test.ts
 create mode 100644 libs/device/models/src/lib/feature/data-provider-config.ts
 create mode 100644 libs/device/models/src/lib/feature/layout-config.test.ts
 create mode 100644 libs/device/models/src/lib/feature/layout-config.ts
 create mode 100644 libs/generic-view/feature/src/lib/use-dev-console.ts
 create mode 100644 libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
 create mode 100644 libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
 create mode 100644 libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
 create mode 100644 libs/generic-view/models/src/lib/entities-loader.ts
 create mode 100644 libs/generic-view/models/src/lib/form-conditional-renderer.ts
 create mode 100644 libs/generic-view/models/src/lib/table-cell.ts
 create mode 100644 libs/generic-view/models/src/lib/table.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/actions.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/reducer.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
 create mode 100644 libs/generic-view/store/src/lib/selectors/entities.ts
 create mode 100644 libs/generic-view/ui/src/lib/entities/entities-loader.tsx
 create mode 100644 libs/generic-view/ui/src/lib/entities/index.ts
 create mode 100644 libs/generic-view/ui/src/lib/interactive/form/helpers/form-conditional-renderer.tsx
 create mode 100644 libs/generic-view/ui/src/lib/table/index.ts
 create mode 100644 libs/generic-view/ui/src/lib/table/table-cell.tsx
 create mode 100644 libs/generic-view/ui/src/lib/table/table.tsx
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/index.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts
 delete mode 100644 libs/generic-view/utils/src/lib/models/layout.types.ts

diff --git a/.env.example b/.env.example
index afc4dc09a6..959c12302c 100644
--- a/.env.example
+++ b/.env.example
@@ -67,3 +67,6 @@ DEV_TOOLS_AUTO_OPEN_ENABLED=
 
 # [Optional] Allows to show unpublished content in Help. Disabled by default, set a secret token to enable
 DEV_HELP_PREVIEW_TOKEN=
+
+# [Optional] Enable DEV version of API configuration. Disabled by default, set "1" to enable
+DEV_API_CONFIG=
diff --git a/libs/core/__deprecated__/renderer/store/reducers.ts b/libs/core/__deprecated__/renderer/store/reducers.ts
index eed1d29773..7420ce271f 100644
--- a/libs/core/__deprecated__/renderer/store/reducers.ts
+++ b/libs/core/__deprecated__/renderer/store/reducers.ts
@@ -32,6 +32,7 @@ import {
   genericViewsReducer,
   importsReducer,
   externalProvidersReducer,
+  genericEntitiesReducer,
 } from "generic-view/store"
 import { appStateReducer } from "shared/app-state"
 import { activeDeviceRegistryReducer } from "active-device-registry/feature"
@@ -68,6 +69,7 @@ export const reducers = {
   dataMigration: dataMigrationReducer,
   genericDataTransfer: genericDataTransferReducer,
   helpV2: helpReducer,
+  genericEntities: genericEntitiesReducer,
 }
 
 export const combinedReducers = combineReducers(reducers)
diff --git a/libs/core/device/constants/response-status.constant.ts b/libs/core/device/constants/response-status.constant.ts
index c428a5c7f0..f6e62fdfee 100644
--- a/libs/core/device/constants/response-status.constant.ts
+++ b/libs/core/device/constants/response-status.constant.ts
@@ -8,6 +8,7 @@ export enum ResponseStatus {
   Accepted = 202,
   Redirect = 303,
   NoContent = 204,
+  MultiResponse = 207,
   BadRequest = 400,
   NotFound = 404,
   PhoneLocked = 403,
diff --git a/libs/device/feature/src/lib/api-entities/api-entities.service.ts b/libs/device/feature/src/lib/api-entities/api-entities.service.ts
index 714d9ac1d9..e4717731e8 100644
--- a/libs/device/feature/src/lib/api-entities/api-entities.service.ts
+++ b/libs/device/feature/src/lib/api-entities/api-entities.service.ts
@@ -8,17 +8,38 @@ import { DeviceId } from "Core/device/constants/device-id"
 import { Result, ResultObject } from "Core/core/builder"
 import { AppError, AppErrorType } from "Core/core/errors"
 import {
-  entityConfigValidator,
+  APIEntitiesServiceEvents,
+  EntitiesConfig,
+  entitiesConfigValidator,
+  entitiesDeletePartialSuccessValidator,
+  EntitiesDeleteResponse,
   EntitiesError,
-  EntityConfig,
+  EntitiesFileData,
+  entitiesFileDataValidator,
+  EntitiesJsonData,
+  entitiesJsonDataValidator,
+  EntitiesMetadata,
+  entitiesMetadataValidator,
+  EntityData,
+  EntityDataPatch,
+  entityDataPatchValidator,
+  EntityDataPost,
+  entityDataPostValidator,
+  EntityId,
+  EntityJsonData,
+  entityJsonDataValidator,
   GeneralError,
-  APIEntitiesServiceEvents,
 } from "device/models"
-import { SafeParseSuccess } from "zod"
+import { SafeParseReturnType, SafeParseSuccess } from "zod"
 import { IpcEvent } from "Core/core/decorators"
+import { ServiceBridge } from "../service-bridge"
+import logger from "Core/__deprecated__/main/utils/logger"
 
 export class APIEntitiesService {
-  constructor(private deviceProtocol: DeviceProtocol) {}
+  constructor(
+    private deviceProtocol: DeviceProtocol,
+    private serviceBridge: ServiceBridge
+  ) {}
 
   private getDevice = (deviceId?: DeviceId) => {
     return deviceId
@@ -43,34 +64,284 @@ export class APIEntitiesService {
     return Result.success(response.data)
   }
 
-  @IpcEvent(APIEntitiesServiceEvents.EntityConfig)
-  public async getEntityConfiguration({
-    entityType,
+  @IpcEvent(APIEntitiesServiceEvents.EntitiesConfig)
+  public async getEntitiesConfiguration({
+    entitiesType,
     deviceId,
   }: {
-    entityType: string
+    entitiesType: string
     deviceId?: DeviceId
-  }): Promise<ResultObject<EntityConfig>> {
+  }): Promise<ResultObject<EntitiesConfig>> {
     const device = this.getDevice(deviceId)
     if (!device) {
       return Result.failed(new AppError(GeneralError.NoDevice, ""))
     }
 
     const response = await device.request({
-      endpoint: "ENTITY_CONFIGURATION",
+      endpoint: "ENTITIES_CONFIGURATION",
       method: "GET",
       body: {
-        type: entityType,
+        entityType: entitiesType,
       },
     })
     if (!response.ok) {
       return this.handleError(response.error.type)
     }
 
-    const apiConfig = entityConfigValidator.safeParse(response.data.body)
+    const apiConfig = entitiesConfigValidator.safeParse(response.data.body)
     if (!apiConfig.success) {
       return this.handleError(response.data.status)
     }
     return this.handleSuccess(apiConfig)
   }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntitiesMetadata)
+  public async getEntitiesMetadata({
+    entitiesType,
+    deviceId,
+  }: {
+    entitiesType: string
+    deviceId?: DeviceId
+  }): Promise<ResultObject<EntitiesMetadata>> {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITIES_METADATA",
+      method: "GET",
+      body: {
+        entityType: entitiesType,
+      },
+    })
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+
+    const metadata = entitiesMetadataValidator.safeParse(response.data.body)
+    if (!metadata.success) {
+      return this.handleError(response.data.status)
+    }
+    return this.handleSuccess(metadata)
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntitiesDataGet)
+  public async getEntitiesData({
+    entitiesType,
+    entityId,
+    responseType,
+    deviceId,
+  }: {
+    entitiesType: string
+    responseType: "json" | "file"
+    entityId?: EntityId
+    deviceId?: DeviceId
+  }): Promise<
+    ResultObject<EntitiesJsonData | EntityJsonData | EntitiesFileData>
+  > {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITIES_DATA",
+      method: "GET",
+      body: {
+        entityType: entitiesType,
+        responseType,
+        ...(entityId && { entityId }),
+      },
+    })
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+
+    let data: SafeParseReturnType<
+      typeof response.data.body,
+      EntitiesJsonData | EntityJsonData | EntitiesFileData
+    >
+
+    if (responseType === "file") {
+      if (response.data.status === 202) {
+        return this.getEntitiesData({
+          entitiesType,
+          entityId,
+          responseType,
+          deviceId,
+        })
+      } else if (response.data.status === 200) {
+        data = entitiesFileDataValidator.safeParse(response.data.body)
+      }
+    }
+    if (responseType === "json") {
+      if (entityId === undefined) {
+        data = entitiesJsonDataValidator.safeParse(response.data.body)
+      } else {
+        data = entityJsonDataValidator.safeParse(response.data.body)
+      }
+    }
+
+    if (!data!.success) {
+      return this.handleError(response.data.status)
+    }
+    return this.handleSuccess(data!)
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntitiesDataReadFromFile)
+  public async readEntitiesDataFromFile({
+    transferId,
+  }: {
+    transferId: number
+  }): Promise<ResultObject<EntitiesJsonData>> {
+    try {
+      const file =
+        this.serviceBridge.fileTransfer.getFileByTransferId(transferId)
+      const decodedFile = Buffer.from(file.chunks.join(""), "base64").toString()
+      const data = entitiesJsonDataValidator.safeParse(JSON.parse(decodedFile))
+      this.serviceBridge.fileTransfer.transferClear({ transferId })
+      if (!data.success) {
+        return this.handleError(EntitiesError.EntitiesDataFileCorrupted)
+      }
+      return this.handleSuccess(data)
+    } catch (error) {
+      logger.error(error)
+      return this.handleError(EntitiesError.EntitiesDataFileCorrupted)
+    }
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntityDataReadFromFile)
+  public async readEntityDataFromFile({
+    transferId,
+  }: {
+    transferId: number
+  }): Promise<ResultObject<EntityJsonData>> {
+    try {
+      const file =
+        this.serviceBridge.fileTransfer.getFileByTransferId(transferId)
+      const decodedFile = Buffer.from(file.chunks.join(""), "base64").toString()
+      const data = entityJsonDataValidator.safeParse(JSON.parse(decodedFile))
+      this.serviceBridge.fileTransfer.transferClear({ transferId })
+      if (!data.success) {
+        return this.handleError(EntitiesError.EntitiesDataFileCorrupted)
+      }
+      return this.handleSuccess(data)
+    } catch (error) {
+      logger.error(error)
+      return this.handleError(EntitiesError.EntitiesDataFileCorrupted)
+    }
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntitiesDataDelete)
+  public async deleteEntityData({
+    entitiesType,
+    ids,
+    deviceId,
+  }: {
+    entitiesType: string
+    ids: EntityId[]
+    deviceId?: DeviceId
+  }): Promise<ResultObject<EntitiesDeleteResponse>> {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITIES_DATA",
+      method: "DELETE",
+      body: {
+        entityType: entitiesType,
+        ids,
+      },
+    })
+
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+
+    if (response.data.status === 207) {
+      const failedIdsValidator =
+        entitiesDeletePartialSuccessValidator.safeParse(response.data.body)
+      if (!failedIdsValidator.success) {
+        logger.error(failedIdsValidator.error)
+        return this.handleError(response.data.status)
+      }
+      return Result.success({ failedIds: failedIdsValidator.data.failedIds })
+    }
+
+    return Result.success(undefined)
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntityDataCreate)
+  public async createEntityData({
+    entitiesType,
+    data,
+    deviceId,
+  }: {
+    entitiesType: string
+    data: EntityData
+    deviceId?: DeviceId
+  }): Promise<ResultObject<EntityDataPost>> {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITIES_DATA",
+      method: "POST",
+      body: {
+        entityType: entitiesType,
+        data,
+      },
+    })
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+    const dataValidator = entityDataPostValidator.safeParse(response.data.body)
+    if (!dataValidator.success) {
+      logger.error(dataValidator.error)
+      return this.handleError(response.data.status)
+    }
+    return Result.success(dataValidator.data)
+  }
+
+  @IpcEvent(APIEntitiesServiceEvents.EntityDataUpdate)
+  public async updateEntityData({
+    entitiesType,
+    entityId,
+    data,
+    deviceId,
+  }: {
+    entitiesType: string
+    entityId: EntityId
+    data: EntityData
+    deviceId?: DeviceId
+  }): Promise<ResultObject<EntityDataPatch>> {
+    const device = this.getDevice(deviceId)
+    if (!device) {
+      return Result.failed(new AppError(GeneralError.NoDevice, ""))
+    }
+
+    const response = await device.request({
+      endpoint: "ENTITIES_DATA",
+      method: "PATCH",
+      body: {
+        entityType: entitiesType,
+        entityId,
+        data,
+      },
+    })
+    if (!response.ok) {
+      return this.handleError(response.error.type)
+    }
+    const dataValidator = entityDataPatchValidator.safeParse(response.data.body)
+    if (!dataValidator.success) {
+      logger.error(dataValidator.error)
+      return this.handleError(response.data.status)
+    }
+    return Result.success(dataValidator.data)
+  }
 }
diff --git a/libs/device/feature/src/lib/api-entities/create-entity-data.request.ts b/libs/device/feature/src/lib/api-entities/create-entity-data.request.ts
new file mode 100644
index 0000000000..814e4eecfb
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/create-entity-data.request.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import {
+  APIEntitiesServiceEvents,
+  EntityData,
+  EntityDataPost,
+} from "device/models"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+
+export const createEntityDataRequest = (data: {
+  entitiesType: string
+  data: EntityData
+  deviceId?: DeviceId
+}): Promise<ResultObject<EntityDataPost>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntityDataCreate, data)
+}
diff --git a/libs/device/feature/src/lib/api-entities/delete-entities-data.request.ts b/libs/device/feature/src/lib/api-entities/delete-entities-data.request.ts
new file mode 100644
index 0000000000..71abd5bd7f
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/delete-entities-data.request.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import {
+  APIEntitiesServiceEvents,
+  EntitiesDeleteResponse,
+  EntityId,
+} from "device/models"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+
+export const deleteEntitiesDataRequest = (data: {
+  entitiesType: string
+  ids: EntityId[]
+  deviceId?: DeviceId
+}): Promise<ResultObject<EntitiesDeleteResponse>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntitiesDataDelete, data)
+}
diff --git a/libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts b/libs/device/feature/src/lib/api-entities/get-entities-config.request.ts
similarity index 55%
rename from libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts
rename to libs/device/feature/src/lib/api-entities/get-entities-config.request.ts
index 8c18dedf7f..44db1b1039 100644
--- a/libs/device/feature/src/lib/api-entities/get-api-entities-config.request.ts
+++ b/libs/device/feature/src/lib/api-entities/get-entities-config.request.ts
@@ -6,11 +6,11 @@
 import { ipcRenderer } from "electron-better-ipc"
 import { ResultObject } from "Core/core/builder"
 import { DeviceId } from "Core/device/constants/device-id"
-import { APIEntitiesServiceEvents, EntityConfig } from "device/models"
+import { APIEntitiesServiceEvents, EntitiesConfig } from "device/models"
 
-export const getAPIEntitiesConfigRequest = (data: {
-  entityType: string
+export const getEntitiesConfigRequest = (data: {
+  entitiesType: string
   deviceId?: DeviceId
-}): Promise<ResultObject<EntityConfig>> => {
-  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntityConfig, data)
+}): Promise<ResultObject<EntitiesConfig>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntitiesConfig, data)
 }
diff --git a/libs/device/feature/src/lib/api-entities/get-entities-data.request.ts b/libs/device/feature/src/lib/api-entities/get-entities-data.request.ts
new file mode 100644
index 0000000000..6c65f353c5
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/get-entities-data.request.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+import {
+  APIEntitiesServiceEvents,
+  EntitiesFileData,
+  EntitiesJsonData,
+  EntityId,
+  EntityJsonData,
+} from "device/models"
+
+export type EntityDataResponseType = "json" | "file"
+
+type ReturnType<
+  R extends string = EntityDataResponseType,
+  E extends EntityId | undefined = undefined
+> = R extends "json"
+  ? E extends undefined
+    ? EntitiesJsonData
+    : EntityJsonData
+  : EntitiesFileData
+
+export const getEntitiesDataRequest = <
+  R extends string = EntityDataResponseType,
+  E extends EntityId | undefined = undefined
+>(data: {
+  entitiesType: string
+  entityId?: E
+  responseType: R
+  deviceId: DeviceId
+}): Promise<ResultObject<ReturnType<R, E>>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntitiesDataGet, data)
+}
+
+export const readEntitiesDataFromFileRequest = (data: {
+  transferId: number
+}): Promise<ResultObject<EntitiesJsonData>> => {
+  return ipcRenderer.callMain(
+    APIEntitiesServiceEvents.EntitiesDataReadFromFile,
+    data
+  )
+}
+
+export const readEntityDataFromFileRequest = (data: {
+  transferId: number
+}): Promise<ResultObject<EntityJsonData>> => {
+  return ipcRenderer.callMain(
+    APIEntitiesServiceEvents.EntityDataReadFromFile,
+    data
+  )
+}
diff --git a/libs/device/feature/src/lib/api-entities/get-entities-metadata.request.ts b/libs/device/feature/src/lib/api-entities/get-entities-metadata.request.ts
new file mode 100644
index 0000000000..14b8d5ef9d
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/get-entities-metadata.request.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+import { APIEntitiesServiceEvents, EntitiesMetadata } from "device/models"
+
+export const getEntitiesMetadataRequest = (data: {
+  entitiesType: string
+  deviceId?: DeviceId
+}): Promise<ResultObject<EntitiesMetadata>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntitiesMetadata, data)
+}
diff --git a/libs/device/feature/src/lib/api-entities/index.ts b/libs/device/feature/src/lib/api-entities/index.ts
index 743f3ba553..71743d8a98 100644
--- a/libs/device/feature/src/lib/api-entities/index.ts
+++ b/libs/device/feature/src/lib/api-entities/index.ts
@@ -4,4 +4,9 @@
  */
 
 export * from "./api-entities.service"
-export * from "./get-api-entities-config.request"
+export * from "./delete-entities-data.request"
+export * from "./create-entity-data.request"
+export * from "./get-entities-config.request"
+export * from "./get-entities-data.request"
+export * from "./get-entities-metadata.request"
+export * from "./update-entity-data.request"
diff --git a/libs/device/feature/src/lib/api-entities/update-entity-data.request.ts b/libs/device/feature/src/lib/api-entities/update-entity-data.request.ts
new file mode 100644
index 0000000000..b9840d7b0a
--- /dev/null
+++ b/libs/device/feature/src/lib/api-entities/update-entity-data.request.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import {
+  APIEntitiesServiceEvents,
+  EntityData,
+  EntityDataPatch,
+  EntityId,
+} from "device/models"
+import { ResultObject } from "Core/core/builder"
+import { DeviceId } from "Core/device/constants/device-id"
+
+export const updateEntityDataRequest = (data: {
+  entitiesType: string
+  entityId: EntityId
+  data: EntityData
+  deviceId?: DeviceId
+}): Promise<ResultObject<EntityDataPatch>> => {
+  return ipcRenderer.callMain(APIEntitiesServiceEvents.EntityDataUpdate, data)
+}
diff --git a/libs/device/feature/src/lib/api-module.ts b/libs/device/feature/src/lib/api-module.ts
index 1bb94ca5ec..5b19a03cde 100644
--- a/libs/device/feature/src/lib/api-module.ts
+++ b/libs/device/feature/src/lib/api-module.ts
@@ -45,7 +45,10 @@ export class APIModule {
     this.apiFeaturesService = new APIFeaturesService(deviceProtocol)
     this.apiOutboxService = new APIOutboxService(deviceProtocol)
     this.apiMenuService = new APIMenuService(deviceProtocol)
-    this.apiEntitiesService = new APIEntitiesService(deviceProtocol)
+    this.apiEntitiesService = new APIEntitiesService(
+      deviceProtocol,
+      this.serviceBridge
+    )
     this.serverService = new ServerService()
     this.backupService = new APIBackupService(deviceProtocol)
     this.apiDataTransferService = new APIDataTransferService(deviceProtocol)
diff --git a/libs/device/feature/src/lib/file-transfer/file-transfer.service.ts b/libs/device/feature/src/lib/file-transfer/file-transfer.service.ts
index d9a7c29103..d3398e7da0 100644
--- a/libs/device/feature/src/lib/file-transfer/file-transfer.service.ts
+++ b/libs/device/feature/src/lib/file-transfer/file-transfer.service.ts
@@ -26,6 +26,7 @@ import { APIDevice } from "../api-device"
 import { ServiceBridge } from "../service-bridge"
 import AES from "crypto-js/aes"
 import encUtf8 from "crypto-js/enc-utf8"
+import logger from "Core/__deprecated__/main/utils/logger"
 
 interface Transfer {
   crc32: string
@@ -244,7 +245,13 @@ export class APIFileTransferService {
     const transfer = this.transfers[transferId]
     const data = transfer.chunks.join("")
     const crc32 = crc.crc32(data)
-    return crc32.toLowerCase() === transfer.crc32.toLowerCase()
+    const validChecksum = crc32.toLowerCase() === transfer.crc32.toLowerCase()
+    if (!validChecksum) {
+      logger.error(
+        `File checksum mismatch for ${transfer.filePath}. Expected: ${transfer.crc32} (${transfer.fileSize} bytes), calculated: ${crc32} (${data.length} bytes).`
+      )
+    }
+    return validChecksum
   }
 
   @IpcEvent(ApiFileTransferServiceEvents.PreGet)
diff --git a/libs/device/models/src/lib/api-request.model.ts b/libs/device/models/src/lib/api-request.model.ts
index b7e7826c5f..37f8586304 100644
--- a/libs/device/models/src/lib/api-request.model.ts
+++ b/libs/device/models/src/lib/api-request.model.ts
@@ -19,7 +19,9 @@ export const APIEndpoints = [
   "SYSTEM",
   "PRE_DATA_TRANSFER",
   "DATA_TRANSFER",
-  "ENTITY_CONFIGURATION",
+  "ENTITIES_CONFIGURATION",
+  "ENTITIES_DATA",
+  "ENTITIES_METADATA",
 ] as const
 
 export type APIEndpointType = (typeof APIEndpoints)[number]
@@ -44,7 +46,9 @@ const APIRequests = {
   SYSTEM: ["POST"],
   PRE_DATA_TRANSFER: ["POST"],
   DATA_TRANSFER: ["POST", "GET", "DELETE"],
-  ENTITY_CONFIGURATION: ["GET"],
+  ENTITIES_CONFIGURATION: ["GET"],
+  ENTITIES_DATA: ["GET", "DELETE", "POST", "PATCH"],
+  ENTITIES_METADATA: ["GET"],
 } as const
 
 interface APIRequestConfig<
diff --git a/libs/device/models/src/lib/entities/entities-config.validator.test.ts b/libs/device/models/src/lib/entities/entities-config.validator.test.ts
new file mode 100644
index 0000000000..cd51947390
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-config.validator.test.ts
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  EntitiesConfig,
+  entitiesConfigValidator,
+} from "./entities-config.validator"
+import { ZodError } from "zod"
+
+describe("entitiesConfigValidator", () => {
+  it("validates a correct entity configuration", () => {
+    const validConfig: EntitiesConfig = {
+      globalValidators: {
+        requiredFieldsCombinations: [
+          {
+            fields: ["field2", "field3", "field4.field4a", "5[]"],
+            countLogic: "gt",
+            fieldsCount: 1,
+          },
+        ],
+      },
+      fields: {
+        field1: { type: "string", defaultValue: "default" },
+        field2: { type: "id" },
+        field3: { type: "string", validators: [{ pattern: "/abc/" }] },
+        field4: { type: "object", fields: { field4a: { type: "string" } } },
+        5: { type: "array", items: { type: "string" } },
+      },
+    }
+    expect(() => entitiesConfigValidator.parse(validConfig)).not.toThrow()
+  })
+
+  it("throws an error when there is no field of 'id' type on the top level", () => {
+    const invalidConfig: EntitiesConfig = {
+      fields: {
+        field1: { type: "string" },
+      },
+    }
+    const result = () => entitiesConfigValidator.parse(invalidConfig)
+    expect(result).toThrow()
+
+    try {
+      result()
+    } catch (error) {
+      expect((error as ZodError).errors).toEqual([
+        {
+          code: "custom",
+          message:
+            "There must be exactly one field of 'id' type on the top level of the 'fields' object",
+          path: ["fields"],
+        },
+      ])
+    }
+  })
+
+  it("throws an error when there is more than one field of 'id' type on the top level", () => {
+    const invalidConfig: EntitiesConfig = {
+      fields: {
+        field1: { type: "id" },
+        field2: { type: "id" },
+      },
+    }
+    const result = () => entitiesConfigValidator.parse(invalidConfig)
+    expect(result).toThrow()
+
+    try {
+      result()
+    } catch (error) {
+      expect((error as ZodError).errors).toEqual([
+        {
+          code: "custom",
+          message:
+            "There must be exactly one field of 'id' type on the top level of the 'fields' object",
+          path: ["fields"],
+        },
+      ])
+    }
+  })
+
+  it("throws an error when `defaultValue` is assigned to 'id' type field", () => {
+    const invalidConfig: EntitiesConfig = {
+      fields: {
+        field1: { type: "id", defaultValue: "default" },
+      },
+    } as EntitiesConfig
+    const result = () => entitiesConfigValidator.parse(invalidConfig)
+    expect(result).toThrow()
+
+    try {
+      result()
+    } catch (error) {
+      expect((error as ZodError).errors).toEqual([
+        {
+          code: "unrecognized_keys",
+          keys: ["defaultValue"],
+          message: "Unrecognized key(s) in object: 'defaultValue'",
+          path: ["fields", "field1"],
+        },
+      ])
+    }
+  })
+
+  it("throws an error when 'requiredFieldsCombinations' uses wrong fields", () => {
+    const invalidConfig: EntitiesConfig = {
+      globalValidators: {
+        requiredFieldsCombinations: [
+          {
+            fields: ["field1", "field2.field3a", "field3"],
+            countLogic: "gt",
+            fieldsCount: 1,
+          },
+        ],
+      },
+      fields: {
+        field1: { type: "id" },
+        field2: {
+          type: "array",
+          items: {
+            type: "object",
+            fields: {
+              field3a: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+    const result = () => entitiesConfigValidator.parse(invalidConfig)
+    expect(result).toThrow()
+
+    try {
+      result()
+    } catch (error) {
+      expect((error as ZodError).errors).toEqual([
+        {
+          code: "custom",
+          message:
+            "global validators are mentioning fields not defined in the 'fields' object",
+          path: [
+            "globalValidators",
+            "requiredFieldsCombinations[0]",
+            "fields",
+            "[field2.field3a, field3]",
+          ],
+        },
+      ])
+    }
+  })
+})
diff --git a/libs/device/models/src/lib/entities/entity-config.validator.ts b/libs/device/models/src/lib/entities/entities-config.validator.ts
similarity index 83%
rename from libs/device/models/src/lib/entities/entity-config.validator.ts
rename to libs/device/models/src/lib/entities/entities-config.validator.ts
index 90a78b6aae..c9de56fd53 100644
--- a/libs/device/models/src/lib/entities/entity-config.validator.ts
+++ b/libs/device/models/src/lib/entities/entities-config.validator.ts
@@ -41,13 +41,16 @@ const fieldValidatorsSchema = z
   )
   .optional()
 
+const defaultValueSchema = z.any().optional()
+
 const idFieldSchema = z.object({
   type: z.literal("id"),
-})
+}).strict()
 
 const primitiveFieldSchema = z.object({
   type: z.enum(["string", "number", "boolean"]),
   validators: fieldValidatorsSchema,
+  defaultValue: defaultValueSchema,
 })
 
 const basicFieldSchema = z.discriminatedUnion("type", [
@@ -57,18 +60,21 @@ const basicFieldSchema = z.discriminatedUnion("type", [
 
 const nestedArrayFieldSchema = z.object({
   type: z.literal("array"),
+  defaultValue: defaultValueSchema,
   items: basicFieldSchema,
   validators: fieldValidatorsSchema,
 })
 
 const nestedObjectFieldSchema = z.object({
   type: z.literal("object"),
+  defaultValue: defaultValueSchema,
   fields: z.record(z.string(), basicFieldSchema),
   validators: fieldValidatorsSchema,
 })
 
 const arrayFieldSchema = z.object({
   type: z.literal("array"),
+  defaultValue: defaultValueSchema,
   items: z.union([
     basicFieldSchema,
     nestedArrayFieldSchema,
@@ -79,6 +85,7 @@ const arrayFieldSchema = z.object({
 
 const objectFieldSchema = z.object({
   type: z.literal("object"),
+  defaultValue: defaultValueSchema,
   fields: z.record(
     z.string(),
     z.union([basicFieldSchema, nestedArrayFieldSchema, nestedObjectFieldSchema])
@@ -110,11 +117,10 @@ const globalValidatorSchema = z
   })
   .optional()
 
-export const entityConfigValidator = z
+export const entitiesConfigValidator = z
   .object({
-    fields: z.record(z.string(), fieldSchema),
+    fields: z.record(z.union([z.string(), z.number()]), fieldSchema),
     globalValidators: globalValidatorSchema,
-    metadata: z.unknown().optional(),
   })
   .refine(
     (data) => {
@@ -160,5 +166,19 @@ export const entityConfigValidator = z
       }
     }
   )
+  .refine(
+    (data) => {
+      const fields = data.fields
+      const idFieldsCount = Object.values(fields).filter(
+        (field) => field.type === "id"
+      ).length
+      return idFieldsCount === 1
+    },
+    {
+      message:
+        "There must be exactly one field of 'id' type on the top level of the 'fields' object",
+      path: ["fields"],
+    }
+  )
 
-export type EntityConfig = z.infer<typeof entityConfigValidator>
+export type EntitiesConfig = z.infer<typeof entitiesConfigValidator>
diff --git a/libs/device/models/src/lib/entities/entities-data-get.validator.test.ts b/libs/device/models/src/lib/entities/entities-data-get.validator.test.ts
new file mode 100644
index 0000000000..3e72ab2828
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-data-get.validator.test.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  entitiesJsonDataValidator,
+  entitiesFileDataValidator,
+} from "./entities-data-get.validator"
+
+describe("entitiesJsonDataValidator", () => {
+  it("validates a correct JSON data structure", () => {
+    const validJsonData = { data: [{ id: "1", name: "Entity1", 3: "value" }] }
+    expect(() => entitiesJsonDataValidator.parse(validJsonData)).not.toThrow()
+  })
+
+  it("validates a correct JSON data with empty data array", () => {
+    const validJsonData = { data: [] }
+    expect(() => entitiesJsonDataValidator.parse(validJsonData)).not.toThrow()
+  })
+
+  it("fails validation for JSON data with non-array data field", () => {
+    const invalidJsonData = { data: { id: "1", name: "Entity1" } }
+    expect(() => entitiesJsonDataValidator.parse(invalidJsonData)).toThrow()
+  })
+})
+
+describe("entitiesFileDataValidator", () => {
+  it("validates a correct file data structure", () => {
+    const validFileData = { filePath: "/path/to/file" }
+    expect(() => entitiesFileDataValidator.parse(validFileData)).not.toThrow()
+  })
+
+  it("fails validation for file data with empty filePath", () => {
+    const invalidFileData = { filePath: "" }
+    expect(() => entitiesFileDataValidator.parse(invalidFileData)).toThrow()
+  })
+
+  it("fails validation for file data with non-string filePath", () => {
+    const invalidFileData = { filePath: 123 }
+    expect(() => entitiesFileDataValidator.parse(invalidFileData)).toThrow()
+  })
+})
diff --git a/libs/device/models/src/lib/entities/entities-data-get.validator.ts b/libs/device/models/src/lib/entities/entities-data-get.validator.ts
new file mode 100644
index 0000000000..98e4e357b7
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-data-get.validator.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+import { entityDataSchema } from "./entity-data.validator"
+
+export const entitiesFileDataValidator = z.object({
+  filePath: z.string().min(1),
+})
+export type EntitiesFileData = z.infer<typeof entitiesFileDataValidator>
+
+export const entitiesJsonDataValidator = z.object({
+  data: z.array(entityDataSchema),
+})
+export type EntitiesJsonData = z.infer<typeof entitiesJsonDataValidator>
diff --git a/libs/device/models/src/lib/entities/entities-delete.validator.ts b/libs/device/models/src/lib/entities/entities-delete.validator.ts
new file mode 100644
index 0000000000..816beb04af
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-delete.validator.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+export const entitiesDeletePartialSuccessValidator = z.object({
+  failedIds: z.array(z.string()),
+})
+export type EntitiesDeletePartialSuccess = z.infer<
+  typeof entitiesDeletePartialSuccessValidator
+>
diff --git a/libs/device/models/src/lib/entities/entities-metadata.validator.test.ts b/libs/device/models/src/lib/entities/entities-metadata.validator.test.ts
new file mode 100644
index 0000000000..7d5c9dd10d
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-metadata.validator.test.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { entitiesMetadataValidator } from "./entities-metadata.validator"
+
+describe("entitiesMetadataValidator", () => {
+  it("validates metadata with a nonnegative totalEntities", () => {
+    const validMetadata = { totalEntities: 10 }
+    expect(() => entitiesMetadataValidator.parse(validMetadata)).not.toThrow()
+  })
+
+  it("fails validation for negative totalEntities", () => {
+    const invalidMetadata = { totalEntities: -1 }
+    expect(() => entitiesMetadataValidator.parse(invalidMetadata)).toThrow()
+  })
+
+  it("fails validation for missing totalEntities", () => {
+    const invalidMetadata = {}
+    expect(() => entitiesMetadataValidator.parse(invalidMetadata)).toThrow()
+  })
+
+  it("fails validation for non-numeric totalEntities", () => {
+    const invalidMetadata = { totalEntities: "ten" }
+    expect(() => entitiesMetadataValidator.parse(invalidMetadata)).toThrow()
+  })
+})
diff --git a/libs/device/models/src/lib/entities/entities-metadata.validator.ts b/libs/device/models/src/lib/entities/entities-metadata.validator.ts
new file mode 100644
index 0000000000..826bbe4ba7
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entities-metadata.validator.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+export const entitiesMetadataValidator = z.object({
+  totalEntities: z.number().nonnegative(),
+})
+
+export type EntitiesMetadata = z.infer<typeof entitiesMetadataValidator>
diff --git a/libs/device/models/src/lib/entities/entity-config.validator.test.ts b/libs/device/models/src/lib/entities/entity-config.validator.test.ts
deleted file mode 100644
index 654094c580..0000000000
--- a/libs/device/models/src/lib/entities/entity-config.validator.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { EntityConfig, entityConfigValidator } from "./entity-config.validator"
-import { ZodError } from "zod"
-
-describe("entityConfigValidator", () => {
-  it("validates a correct entity configuration", () => {
-    const validConfig: EntityConfig = {
-      globalValidators: {
-        requiredFieldsCombinations: [
-          {
-            fields: ["field1", "field2", "field3.field3a", "field4[]"],
-            countLogic: "gt",
-            fieldsCount: 1,
-          },
-        ],
-      },
-      fields: {
-        field1: { type: "id" },
-        field2: { type: "string", validators: [{ pattern: "/abc/" }] },
-        field3: { type: "object", fields: { field3a: { type: "string" } } },
-        field4: { type: "array", items: { type: "string" } },
-      },
-    }
-    expect(() => entityConfigValidator.parse(validConfig)).not.toThrow()
-  })
-
-  it("throws an error when 'requiredFieldsCombinations' uses wrong fields", () => {
-    const invalidConfig: EntityConfig = {
-      globalValidators: {
-        requiredFieldsCombinations: [
-          {
-            fields: ["field1", "field2.field3a", "field3"],
-            countLogic: "gt",
-            fieldsCount: 1,
-          },
-        ],
-      },
-      fields: {
-        field1: { type: "id" },
-        field2: {
-          type: "array",
-          items: {
-            type: "object",
-            fields: {
-              field3a: { type: "string" },
-            },
-          },
-        },
-      },
-    }
-    const result = () => entityConfigValidator.parse(invalidConfig)
-    expect(result).toThrow()
-
-    try {
-      result()
-    } catch (error) {
-      expect((error as ZodError).errors).toEqual([
-        {
-          code: "custom",
-          message:
-            "global validators are mentioning fields not defined in the 'fields' object",
-          path: [
-            "globalValidators",
-            "requiredFieldsCombinations[0]",
-            "fields",
-            "[field2.field3a, field3]",
-          ],
-        },
-      ])
-    }
-  })
-})
diff --git a/libs/device/models/src/lib/entities/entity-data-get.validator.test.ts b/libs/device/models/src/lib/entities/entity-data-get.validator.test.ts
new file mode 100644
index 0000000000..9a36d75ad4
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-data-get.validator.test.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { entityJsonDataValidator } from "./entity-data-get.validator"
+
+describe("entityJsonDataValidator", () => {
+  it("validates a correct JSON data structure", () => {
+    const validJsonData = { data: { key1: "value1", key2: 123, 3: "value2" } }
+    expect(() => entityJsonDataValidator.parse(validJsonData)).not.toThrow()
+  })
+
+  it("fails validation for JSON data with non-object data field", () => {
+    const invalidJsonData = { data: "invalid data" }
+    expect(() => entityJsonDataValidator.parse(invalidJsonData)).toThrow()
+  })
+
+  it("fails validation for JSON data with array data field", () => {
+    const invalidJsonData = { data: [] }
+    expect(() => entityJsonDataValidator.parse(invalidJsonData)).toThrow()
+  })
+})
diff --git a/libs/device/models/src/lib/entities/entity-data-get.validator.ts b/libs/device/models/src/lib/entities/entity-data-get.validator.ts
new file mode 100644
index 0000000000..38c80707c4
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-data-get.validator.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+import { entityDataSchema } from "./entity-data.validator"
+
+export const entityJsonDataValidator = z.object({
+  data: entityDataSchema,
+})
+export type EntityJsonData = z.infer<typeof entityJsonDataValidator>
diff --git a/libs/device/models/src/lib/entities/entity-data-patch.validator.ts b/libs/device/models/src/lib/entities/entity-data-patch.validator.ts
new file mode 100644
index 0000000000..4292ae1b2a
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-data-patch.validator.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+import { entityDataSchema } from "./entity-data.validator"
+
+export const entityDataPatchValidator = z.object({
+  data: entityDataSchema,
+})
+export type EntityDataPatch = z.infer<typeof entityDataPatchValidator>
diff --git a/libs/device/models/src/lib/entities/entity-data-post.validator.ts b/libs/device/models/src/lib/entities/entity-data-post.validator.ts
new file mode 100644
index 0000000000..d5fd2a0d20
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-data-post.validator.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+import { entityDataSchema } from "./entity-data.validator"
+
+export const entityDataPostValidator = z.object({
+  data: entityDataSchema,
+})
+export type EntityDataPost = z.infer<typeof entityDataPostValidator>
diff --git a/libs/device/models/src/lib/entities/entity-data.validator.ts b/libs/device/models/src/lib/entities/entity-data.validator.ts
new file mode 100644
index 0000000000..6d9623facb
--- /dev/null
+++ b/libs/device/models/src/lib/entities/entity-data.validator.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+export const entityDataSchema = z.record(z.string(), z.unknown())
+export type EntityData = z.infer<typeof entityDataSchema>
diff --git a/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
index 6a3853dfc9..f59f723c74 100644
--- a/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
+++ b/libs/device/models/src/lib/entities/helpers/flatten-entity-configuration.test.ts
@@ -4,11 +4,11 @@
  */
 
 import { flattenEntityConfiguration } from "./flatten-entity-configuration"
-import { EntityConfig } from "device/models"
+import { EntitiesConfig } from "device/models"
 
 describe("flattenEntityConfiguration", () => {
   it("handles objects with non-object values correctly", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "id",
       },
@@ -31,7 +31,7 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("converts a simple nested object to dot notation correctly", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "object",
         fields: {
@@ -54,7 +54,7 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("handles objects with nested arrays correctly", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "object",
         fields: {
@@ -75,7 +75,7 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("handles arrays with nested arrays correctly", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "array",
         items: {
@@ -94,7 +94,7 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("handles arrays with nested objects correctly", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "array",
         items: {
@@ -115,7 +115,7 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("excludes 'validators' key", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "string",
         validators: [],
@@ -139,12 +139,12 @@ describe("flattenEntityConfiguration", () => {
   })
 
   it("handles empty objects correctly", () => {
-    const input: EntityConfig["fields"] = {}
+    const input: EntitiesConfig["fields"] = {}
     expect(flattenEntityConfiguration(input)).toEqual({})
   })
 
   it("handles nested objects with mixed types", () => {
-    const input: EntityConfig["fields"] = {
+    const input: EntitiesConfig["fields"] = {
       a: {
         type: "object",
         fields: {
diff --git a/libs/device/models/src/lib/entities/index.ts b/libs/device/models/src/lib/entities/index.ts
index 22b0994766..6b791e7218 100644
--- a/libs/device/models/src/lib/entities/index.ts
+++ b/libs/device/models/src/lib/entities/index.ts
@@ -3,4 +3,16 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-export * from "./entity-config.validator"
+import { EntitiesDeletePartialSuccess } from "./entities-delete.validator"
+
+export * from "./entities-config.validator"
+export * from "./entity-data-get.validator"
+export * from "./entities-metadata.validator"
+export * from "./entities-data-get.validator"
+export * from "./entities-delete.validator"
+export * from "./entity-data.validator"
+export * from "./entity-data-post.validator"
+export * from "./entity-data-patch.validator"
+
+export type EntityId = string
+export type EntitiesDeleteResponse = EntitiesDeletePartialSuccess | undefined
diff --git a/libs/device/models/src/lib/feature/data-provider-config.test.ts b/libs/device/models/src/lib/feature/data-provider-config.test.ts
new file mode 100644
index 0000000000..825f5bde9f
--- /dev/null
+++ b/libs/device/models/src/lib/feature/data-provider-config.test.ts
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { dataProviderSchema } from "./data-provider-config"
+
+describe("dataProviderSchema", () => {
+  it("validates entities-array with sort and filters", () => {
+    const validData = {
+      source: "entities-array",
+      entitiesType: "someType",
+      sort: {
+        someField: {
+          priority: 1,
+          direction: "asc",
+          orderingPatterns: ["/pattern/"],
+        },
+      },
+      filters: {
+        someField: ["/pattern/"],
+      },
+    }
+    expect(dataProviderSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("fails validation for entities-array with invalid sort direction", () => {
+    const invalidData = {
+      source: "entities-array",
+      sort: {
+        someField: {
+          priority: 1,
+          direction: "invalid",
+        },
+      },
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("fails validation for entities-array with invalid regex in filters", () => {
+    const invalidData = {
+      source: "entities-array",
+      filters: {
+        someField: ["invalid-regex"],
+      },
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("validates entities-field", () => {
+    const validData = {
+      source: "entities-field",
+      entitiesType: "someType",
+      fields: {
+        dataItemId: "value1",
+        "data.someField": "value2",
+      },
+    }
+    expect(dataProviderSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("fails validation for form-fields with invalid field key", () => {
+    const invalidData = {
+      source: "form-fields",
+      fields: {
+        invalidField: "value",
+      },
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+})
diff --git a/libs/device/models/src/lib/feature/data-provider-config.ts b/libs/device/models/src/lib/feature/data-provider-config.ts
new file mode 100644
index 0000000000..a3be0d3b43
--- /dev/null
+++ b/libs/device/models/src/lib/feature/data-provider-config.ts
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const entitiesTypeSchema = z.string().min(1)
+
+const regexSchema = z
+  .string()
+  .regex(
+    /^\/.+\/[gmiyuvsd]*$/m,
+    "Regex must be in format /regex/ or /regex/flags"
+  )
+
+const fieldsSchema = z.record(
+  z.union([
+    z.literal("dataItemId"),
+    z.string().startsWith("data."),
+    z.string().startsWith("config."),
+  ]),
+  z.string()
+)
+
+const sortSchema = z
+  .record(
+    z.string(),
+    z.object({
+      priority: z.number().nonnegative(),
+      direction: z.union([z.literal("asc"), z.literal("desc")]),
+      orderingPatterns: z.array(regexSchema).optional(),
+    })
+  )
+  .optional()
+
+export type DataProviderSortConfig = z.infer<typeof sortSchema>
+
+const filtersSchema = z.record(z.string(), z.array(regexSchema)).optional()
+
+export type DataProviderFilterConfig = z.infer<typeof filtersSchema>
+
+const entitiesArraySchema = z.object({
+  source: z.literal("entities-array"),
+  entitiesType: entitiesTypeSchema,
+  sort: sortSchema,
+  filters: filtersSchema,
+})
+
+const entitiesFieldSchema = z.object({
+  source: z.literal("entities-field"),
+  entitiesType: entitiesTypeSchema,
+  fields: fieldsSchema,
+})
+
+const formFieldsSchema = z.object({
+  source: z.literal("form-fields"),
+  fields: fieldsSchema,
+})
+
+export const dataProviderSchema = z.union([
+  entitiesArraySchema,
+  entitiesFieldSchema,
+  formFieldsSchema,
+])
+
+export type DataProviderConfig = z.infer<typeof dataProviderSchema>
diff --git a/libs/device/models/src/lib/feature/feature-config.test.ts b/libs/device/models/src/lib/feature/feature-config.test.ts
index 16e21dd7e9..99049fc8a6 100644
--- a/libs/device/models/src/lib/feature/feature-config.test.ts
+++ b/libs/device/models/src/lib/feature/feature-config.test.ts
@@ -25,6 +25,13 @@ const featureConfig: FeatureConfig = {
         callback: jest.fn,
       },
     },
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "dummy",
+      fields: {
+        dataItemId: "dummy",
+      },
+    },
   },
 }
 
@@ -37,7 +44,12 @@ describe("FeatureConfigValidator", () => {
   it("should return fail when correct config is incorrect", () => {
     const feature = {
       ...featureConfig,
-      ...{ incorrect: { component: "incorrect" } },
+      "dummy-1": {
+        ...featureConfig["dummy-1"],
+        config: {
+          wrongProp: "dummy",
+        },
+      },
     }
     const result = featureConfigValidator.safeParse(feature)
     expect(result.success).toBeFalsy()
diff --git a/libs/device/models/src/lib/feature/feature-config.ts b/libs/device/models/src/lib/feature/feature-config.ts
index 7200709e8e..93588589d8 100644
--- a/libs/device/models/src/lib/feature/feature-config.ts
+++ b/libs/device/models/src/lib/feature/feature-config.ts
@@ -6,6 +6,8 @@
 import { z } from "zod"
 import componentValidators from "generic-view/models"
 import { ComponentPropsByName } from "generic-view/utils"
+import { layoutSchema } from "./layout-config"
+import { dataProviderSchema } from "./data-provider-config"
 
 const validators = Object.values(componentValidators).map(
   ({ key, configValidator }) => {
@@ -13,6 +15,9 @@ const validators = Object.values(componentValidators).map(
       .object({
         component: z.literal(key),
         config: configValidator,
+        layout: layoutSchema.optional(),
+        dataProvider: dataProviderSchema.optional(),
+        childrenKeys: z.array(z.string()).optional(),
       })
       .passthrough()
   }
diff --git a/libs/device/models/src/lib/feature/index.ts b/libs/device/models/src/lib/feature/index.ts
index b29e8ce2d5..d0f19b70cd 100644
--- a/libs/device/models/src/lib/feature/index.ts
+++ b/libs/device/models/src/lib/feature/index.ts
@@ -4,3 +4,5 @@
  */
 
 export * from "./feature-config"
+export * from "./layout-config"
+export * from "./data-provider-config"
diff --git a/libs/device/models/src/lib/feature/layout-config.test.ts b/libs/device/models/src/lib/feature/layout-config.test.ts
new file mode 100644
index 0000000000..c72d82a4f6
--- /dev/null
+++ b/libs/device/models/src/lib/feature/layout-config.test.ts
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { layoutSchema } from "./layout-config"
+
+describe("layoutSchema", () => {
+  it("validates layout with margin and padding", () => {
+    const validData = {
+      margin: "10px 5px",
+      padding: "5px 10px",
+    }
+    expect(layoutSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("validates grid layout with all optional fields", () => {
+    const validData = {
+      gridLayout: {
+        rows: ["1fr", "2fr"],
+        columns: ["1fr", "2fr"],
+        justifyContent: "center",
+        justifyItems: "stretch",
+        alignItems: "baseline",
+        rowGap: "10px",
+        columnGap: "10px",
+      },
+    }
+    expect(layoutSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("validates flex layout with all optional fields", () => {
+    const validData = {
+      flexLayout: {
+        direction: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        alignContent: "stretch",
+        wrap: "wrap",
+        rowGap: "10px",
+        columnGap: "10px",
+      },
+    }
+    expect(layoutSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("validates layout with grid and flex placement", () => {
+    const validData = {
+      gridPlacement: {
+        row: 1,
+        column: 2,
+        width: 3,
+        height: 4,
+      },
+      flexPlacement: {
+        grow: 1,
+        shrink: 0,
+        basis: "auto",
+        order: 1,
+        alignSelf: "center",
+      },
+    }
+    expect(layoutSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("fails validation for invalid grid layout justifyContent value", () => {
+    const invalidData = {
+      gridLayout: {
+        rows: ["1fr", "2fr"],
+        columns: ["1fr", "2fr"],
+        justifyContent: "invalid",
+      },
+    }
+    expect(layoutSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("fails validation for invalid flex layout direction value", () => {
+    const invalidData = {
+      flexLayout: {
+        direction: "invalid",
+      },
+    }
+    expect(layoutSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("fails validation for missing required gridPlacement fields", () => {
+    const invalidData = {
+      gridPlacement: {
+        row: 1,
+      },
+    }
+    expect(layoutSchema.safeParse(invalidData).success).toBe(false)
+  })
+})
diff --git a/libs/device/models/src/lib/feature/layout-config.ts b/libs/device/models/src/lib/feature/layout-config.ts
new file mode 100644
index 0000000000..85640bd018
--- /dev/null
+++ b/libs/device/models/src/lib/feature/layout-config.ts
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const primitiveValueSchema = z.union([z.string(), z.number()])
+
+export type PrimitiveValue = z.infer<typeof primitiveValueSchema>
+
+const gapSchema = z.object({
+  rowGap: z.string().optional(),
+  columnGap: z.string().optional(),
+})
+
+const gridLayoutSchema = z.intersection(
+  gapSchema,
+  z.object({
+    rows: z.array(primitiveValueSchema),
+    columns: z.array(primitiveValueSchema),
+    justifyContent: z
+      .union([
+        z.literal("start"),
+        z.literal("end"),
+        z.literal("center"),
+        z.literal("stretch"),
+        z.literal("space-around"),
+        z.literal("space-between"),
+        z.literal("space-evenly"),
+      ])
+      .optional(),
+    justifyItems: z
+      .union([
+        z.literal("start"),
+        z.literal("end"),
+        z.literal("center"),
+        z.literal("stretch"),
+      ])
+      .optional(),
+    alignItems: z
+      .union([
+        z.literal("start"),
+        z.literal("end"),
+        z.literal("center"),
+        z.literal("stretch"),
+        z.literal("baseline"),
+      ])
+      .optional(),
+  })
+)
+
+const gridLayoutBaseSchema = z.object({
+  gridLayout: gridLayoutSchema.optional(),
+})
+
+const flexLayoutSchema = z.intersection(
+  gapSchema,
+  z.object({
+    direction: z.union([
+      z.literal("row"),
+      z.literal("column"),
+      z.literal("row-reverse"),
+      z.literal("column-reverse"),
+    ]),
+    justifyContent: z
+      .union([
+        z.literal("flex-start"),
+        z.literal("flex-end"),
+        z.literal("center"),
+        z.literal("space-between"),
+        z.literal("space-around"),
+        z.literal("space-evenly"),
+      ])
+      .optional(),
+    alignItems: z
+      .union([
+        z.literal("flex-start"),
+        z.literal("flex-end"),
+        z.literal("center"),
+        z.literal("stretch"),
+        z.literal("baseline"),
+      ])
+      .optional(),
+    alignContent: z
+      .union([
+        z.literal("flex-start"),
+        z.literal("flex-end"),
+        z.literal("center"),
+        z.literal("stretch"),
+        z.literal("space-between"),
+        z.literal("space-around"),
+      ])
+      .optional(),
+    wrap: z
+      .union([
+        z.literal("wrap"),
+        z.literal("nowrap"),
+        z.literal("wrap-reverse"),
+      ])
+      .optional(),
+  })
+)
+
+const flexLayoutBaseSchema = z.object({
+  flexLayout: flexLayoutSchema.optional(),
+})
+
+const layoutBaseSchema = z.intersection(
+  gridLayoutBaseSchema,
+  flexLayoutBaseSchema
+)
+
+const gridPlacementSchema = z.object({
+  row: z.number(),
+  column: z.number(),
+  width: z.number(),
+  height: z.number(),
+})
+
+const flexPlacementSchema = z.object({
+  grow: primitiveValueSchema.optional(),
+  shrink: primitiveValueSchema.optional(),
+  basis: primitiveValueSchema.optional(),
+  order: primitiveValueSchema.optional(),
+  alignSelf: z
+    .union([
+      z.literal("flex-start"),
+      z.literal("flex-end"),
+      z.literal("center"),
+      z.literal("stretch"),
+    ])
+    .optional(),
+})
+
+export const layoutSchema = z.intersection(
+  layoutBaseSchema,
+  z.object({
+    gridPlacement: gridPlacementSchema.optional(),
+    flexPlacement: flexPlacementSchema.optional(),
+    margin: z.string().optional(),
+    padding: z.string().optional(),
+  })
+)
+
+export type Layout = z.infer<typeof layoutSchema>
diff --git a/libs/device/models/src/lib/general-error.ts b/libs/device/models/src/lib/general-error.ts
index 0c8ea12b6c..1dddb2796d 100644
--- a/libs/device/models/src/lib/general-error.ts
+++ b/libs/device/models/src/lib/general-error.ts
@@ -24,5 +24,6 @@ export enum ApiFileTransferError {
 }
 
 export enum EntitiesError {
-  EntityTypeNotSupported = 406
+  EntityTypeNotSupported = 406,
+  EntitiesDataFileCorrupted = 422,
 }
diff --git a/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts b/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts
index e513bdc23e..69fa75bed6 100644
--- a/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts
+++ b/libs/device/models/src/lib/renderer-to-main-events/api-entities-service-events.ts
@@ -4,5 +4,12 @@
  */
 
 export enum APIEntitiesServiceEvents {
-  EntityConfig = "apiservice_entity-config",
+  EntitiesConfig = "apiservice_entities-config",
+  EntitiesMetadata = "apiservice_entities-metadata",
+  EntitiesDataGet = "apiservice_entities-data-get",
+  EntitiesDataReadFromFile = "apiservice_entities-data-read-from-file",
+  EntityDataReadFromFile = "apiservice_entity-data-read-from-file",
+  EntitiesDataDelete = "apiservice_entity-data-delete",
+  EntityDataCreate = "apiservice_entity-data-create",
+  EntityDataUpdate = "apiservice_entity-data-update",
 }
diff --git a/libs/generic-view/feature/src/lib/generic-view.tsx b/libs/generic-view/feature/src/lib/generic-view.tsx
index 2d58ac385d..ee0c1f1878 100644
--- a/libs/generic-view/feature/src/lib/generic-view.tsx
+++ b/libs/generic-view/feature/src/lib/generic-view.tsx
@@ -8,13 +8,17 @@ import { useParams } from "react-router"
 import { GenericThemeProvider } from "generic-view/theme"
 import RecursiveLayout from "./recursive-layout"
 import GenericModals from "./generic-modals"
+import { useDevConsole } from "./use-dev-console"
+import { useDevViews } from "./use-dev-views/use-dev-views"
 
 export const GenericView: FunctionComponent = () => {
+  useDevConsole()
   const { viewKey, subviewKey } = useParams<{
     viewKey: string
     subviewKey?: string
   }>()
   const currentViewKey = subviewKey || viewKey
+  useDevViews(currentViewKey)
 
   return (
     <GenericThemeProvider>
diff --git a/libs/generic-view/feature/src/lib/recursive-layout.tsx b/libs/generic-view/feature/src/lib/recursive-layout.tsx
index 90ebaf43c7..641fada5e7 100644
--- a/libs/generic-view/feature/src/lib/recursive-layout.tsx
+++ b/libs/generic-view/feature/src/lib/recursive-layout.tsx
@@ -3,8 +3,9 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { FunctionComponent, useMemo } from "react"
+import React, { useMemo } from "react"
 import { useSelector } from "react-redux"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import apiComponents from "generic-view/ui"
 import { APIFC } from "generic-view/utils"
@@ -18,6 +19,7 @@ import logger from "Core/__deprecated__/main/utils/logger"
 interface Properties {
   viewKey: string
   componentKey: string
+  dataItemId?: string
 }
 
 export const RecursiveLayout: FunctionComponent<Properties> = (
@@ -31,35 +33,44 @@ export const RecursiveLayout: FunctionComponent<Properties> = (
     return selectComponentChildrenKeys(state, { viewKey, componentKey })
   }) as string[] | undefined
   const childrenKeysDependency = JSON.stringify(childrenKeys)
+  const recursiveComponentMetadataDependency = JSON.stringify(
+    recursiveComponentMetadata
+  )
   return useMemo(() => {
-    if (!componentName || !(componentName in apiComponents)) {
+    if (!componentName) {
+      return null
+    }
+    if (!(componentName in apiComponents)) {
       logger.error(
         `Tried to render unknown component "${componentName}" in view "${viewKey}"`
       )
-      // TODO: implement error handling
       return null
     }
-
     const ApiComponent = setupComponent(
       apiComponents[componentName as keyof typeof apiComponents] as APIFC
     )
-
     return (
-      <ApiComponent {...recursiveComponentMetadata}>
+      <ApiComponent
+        {...recursiveComponentMetadata}
+        componentName={componentName}
+      >
         {childrenKeys?.map((key) => {
           return (
-            <RecursiveLayout key={key} viewKey={viewKey} componentKey={key} />
+            <RecursiveLayout
+              key={key}
+              {...recursiveComponentMetadata}
+              componentKey={key}
+            />
           )
         })}
       </ApiComponent>
     )
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
-    childrenKeysDependency,
-    componentName,
-    componentKey,
-    recursiveComponentMetadata,
     viewKey,
+    componentName,
+    childrenKeysDependency,
+    recursiveComponentMetadataDependency,
   ])
 }
 
diff --git a/libs/generic-view/feature/src/lib/setup-component.tsx b/libs/generic-view/feature/src/lib/setup-component.tsx
index cb83bf8e25..8da69b2a42 100644
--- a/libs/generic-view/feature/src/lib/setup-component.tsx
+++ b/libs/generic-view/feature/src/lib/setup-component.tsx
@@ -3,39 +3,163 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { ComponentType } from "react"
+import React, { ComponentType, ReactElement, useMemo } from "react"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import styled, { css } from "styled-components"
 import { useSelector } from "react-redux"
 import {
+  selectActiveApiDeviceId,
   selectComponentConfig,
   selectComponentData,
+  selectComponentDataProvider,
   selectComponentLayout,
+  selectEntitiesData,
+  selectEntitiesIdFieldKey,
+  selectEntityData,
 } from "generic-view/store"
-import { Layout, mapLayoutSizes, RecursiveComponent } from "generic-view/utils"
+import {
+  dataProviderFilter,
+  dataProviderSort,
+  mapLayoutSizes,
+  RecursiveComponent,
+} from "generic-view/utils"
+import { EntityData, Layout } from "device/models"
+import { set } from "lodash"
+import { useFormContext } from "react-hook-form"
 
 export const setupComponent = <P extends object>(
   Component: ComponentType<P>
 ): RecursiveComponent => {
-  return (props) => {
-    const { viewKey, componentKey } = props
+  return ({ children, ...props }) => {
+    const {
+      viewKey,
+      componentKey,
+      style,
+      className,
+      componentName,
+      ...dataProps
+    } = props
+    const deviceId = useSelector(selectActiveApiDeviceId)!
+    const formContext = useFormContext()
+    let dataItemId = props.dataItemId
     const layout = useSelector((state: ReduxRootState) => {
       return selectComponentLayout(state, { viewKey, componentKey })
     })
     const config = useSelector((state: ReduxRootState) => {
       return selectComponentConfig(state, { viewKey, componentKey })
     })
-    const data = useSelector((state: ReduxRootState) => {
+    const dataProvider = useSelector((state: ReduxRootState) => {
+      return selectComponentDataProvider(state, { viewKey, componentKey })
+    })
+    const componentData = useSelector((state: ReduxRootState) => {
+      if (dataProvider) return
       return selectComponentData(state, { viewKey, componentKey })
     })
-    if (layout) {
-      return (
-        <Wrapper $layout={layout}>
-          <Component {...(props as P)} config={config} data={data} />
-        </Wrapper>
+    const entitiesData =
+      useSelector((state: ReduxRootState) => {
+        if (dataProvider?.source !== "entities-array") return
+        return selectEntitiesData(state, {
+          entitiesType: dataProvider.entitiesType,
+          deviceId,
+        }) as EntityData[]
+      }) || []
+    const idFieldKey = useSelector((state: ReduxRootState) => {
+      if (dataProvider?.source !== "entities-array") return
+      return selectEntitiesIdFieldKey(state, {
+        deviceId,
+        entitiesType: dataProvider.entitiesType!,
+      })
+    })
+    const entityData = useSelector((state: ReduxRootState) => {
+      if (dataProvider?.source !== "entities-field") return
+      return selectEntityData(state, {
+        entitiesType: dataProvider.entitiesType,
+        entityId: dataItemId!,
+        deviceId,
+      }) as EntityData
+    })
+
+    const editableProps = {
+      ...dataProps,
+      config: {
+        ...config,
+      },
+      data: undefined as unknown,
+    }
+
+    if (!dataProvider) {
+      editableProps.data = componentData
+    } else if (dataProvider?.source === "entities-array") {
+      const filteredData = dataProviderFilter(
+        [...entitiesData],
+        dataProvider.filters
       )
+      const sortedData = dataProviderSort([...filteredData], dataProvider.sort)
+      editableProps.data = sortedData?.map((item) => item[idFieldKey!])
+    } else if (dataProvider?.source === "entities-field") {
+      if (entityData) {
+        for (const [key, field] of Object.entries(dataProvider.fields)) {
+          const value = entityData[field]
+          if (value === undefined) continue
+          set(editableProps || {}, key, value)
+        }
+      }
+    } else if (dataProvider?.source === "form-fields") {
+      for (const [key, field] of Object.entries(dataProvider.fields)) {
+        const value = formContext.getValues(field)
+        if (value === undefined) continue
+        if (key === "dataItemId") {
+          dataItemId = value
+          continue
+        }
+        set(editableProps, key, value)
+      }
     }
-    return <Component {...(props as P)} config={config} data={data} />
+    const editablePropsDependency = JSON.stringify(editableProps)
+    const layoutDependency = JSON.stringify(layout)
+    const dataProviderDependency = JSON.stringify(dataProvider)
+
+    return useMemo(() => {
+      const ComponentWithProps = () => (
+        <Component
+          {...(editableProps as P)}
+          viewKey={viewKey}
+          componentKey={componentKey}
+          style={style}
+          className={className}
+          dataItemId={dataItemId}
+          componentName={componentName}
+        >
+          {React.Children.map(children, (child) => {
+            if (!React.isValidElement(child)) return null
+            return React.cloneElement(child as ReactElement, {
+              dataItemId,
+            })
+          })}
+        </Component>
+      )
+
+      if (layout) {
+        return (
+          <Wrapper $layout={layout}>
+            <ComponentWithProps />
+          </Wrapper>
+        )
+      }
+      return <ComponentWithProps />
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+      children,
+      style,
+      className,
+      componentKey,
+      viewKey,
+      componentName,
+      dataItemId,
+      layoutDependency,
+      editablePropsDependency,
+      dataProviderDependency,
+    ])
   }
 }
 
diff --git a/libs/generic-view/feature/src/lib/use-dev-console.ts b/libs/generic-view/feature/src/lib/use-dev-console.ts
new file mode 100644
index 0000000000..d6b47c6286
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/use-dev-console.ts
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useEffect } from "react"
+import {
+  getEntitiesDataAction,
+  getEntitiesMetadataAction,
+  getEntityDataAction,
+  selectActiveApiDeviceId,
+  createEntityDataAction,
+  updateEntityDataAction,
+  deleteEntitiesDataAction,
+} from "generic-view/store"
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { EntityData, EntityId } from "device/models"
+
+export const useDevConsole = () => {
+  const dispatch = useDispatch<Dispatch>()
+  const activeDeviceId = useSelector(selectActiveApiDeviceId)
+
+  // Functions for internal testing
+  useEffect(() => {
+    if (process.env.NODE_ENV === "development" && activeDeviceId) {
+      if (typeof global !== "undefined") {
+        Object.assign(global, {
+          _getEntitiesData: (
+            entitiesType: string,
+            responseType: "json" | "file" = "json",
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              getEntitiesDataAction({
+                entitiesType,
+                deviceId,
+                responseType,
+              })
+            )
+          },
+          _getEntityData: (
+            entitiesType: string,
+            entityId: string,
+            responseType: "json" | "file" = "json",
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              getEntityDataAction({
+                entitiesType,
+                entityId,
+                deviceId,
+                responseType,
+              })
+            )
+          },
+          _getEntitiesMetadata: (
+            entitiesType: string,
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              getEntitiesMetadataAction({ entitiesType, deviceId })
+            )
+          },
+          _deleteEntitiesDataAction: (
+            entitiesType: string,
+            ids: EntityId[],
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              deleteEntitiesDataAction({ entitiesType, ids, deviceId })
+            )
+          },
+          _createEntityDataAction: (
+            entitiesType: string,
+            data: EntityData,
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              createEntityDataAction({ entitiesType, data, deviceId })
+            )
+          },
+          _updateEntityDataAction: (
+            entitiesType: string,
+            entityId: EntityId,
+            data: EntityData,
+            deviceId = activeDeviceId
+          ) => {
+            return dispatch(
+              updateEntityDataAction({ entitiesType, entityId, data, deviceId })
+            )
+          },
+        })
+      }
+    }
+  }, [activeDeviceId, dispatch])
+}
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx b/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
new file mode 100644
index 0000000000..a4f8ad892d
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useEffect } from "react"
+import { selectActiveApiDeviceId, setGenericConfig } from "generic-view/store"
+import customViews from "./views"
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+
+export const useDevViews = (viewKey: string) => {
+  const dispatch = useDispatch<Dispatch>()
+  const activeDeviceId = useSelector(selectActiveApiDeviceId)
+
+  // @ts-ignore
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const newConfig =
+    viewKey in customViews
+      ? customViews[viewKey as keyof typeof customViews]
+      : undefined
+
+  useEffect(() => {
+    if (newConfig && process.env.DEV_API_CONFIG === "1") {
+      dispatch(
+        setGenericConfig({
+          feature: viewKey,
+          deviceId: activeDeviceId!,
+          config: newConfig,
+        })
+      )
+    }
+  }, [activeDeviceId, dispatch, newConfig, viewKey])
+}
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
new file mode 100644
index 0000000000..77409b3796
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { View } from "generic-view/utils"
+
+const view: View = {
+  main: {
+    // @ts-ignore
+    screenTitle: "Contacts",
+    component: "block-plain",
+    layout: {
+      gridLayout: {
+        rows: ["auto", "1fr"],
+        columns: ["1fr"],
+      },
+    },
+    childrenKeys: ["importContactsButton", "contactsLoader"],
+  },
+  contactsLoader: {
+    component: "entities-loader",
+    config: {
+      entitiesTypes: ["contacts"],
+    },
+    childrenKeys: ["contactsForm"],
+  },
+  contactsForm: {
+    component: "form",
+    config: {
+      formOptions: {
+        defaultValues: {
+          activeContactId: undefined,
+          selectedContacts: [],
+          totalContacts: 0,
+        },
+      },
+    },
+    childrenKeys: ["contactsFormWrapper"],
+  },
+  contactsFormWrapper: {
+    component: "block-box",
+    layout: {
+      flexLayout: {
+        direction: "row",
+      },
+    },
+    childrenKeys: ["contactsListTable", "detailsWrapper"],
+  },
+  contactsListTable: {
+    component: "table",
+    dataProvider: {
+      source: "entities-array",
+      entitiesType: "contacts",
+      sort: {
+        firstName: {
+          priority: 2,
+          direction: "asc",
+        },
+        lastName: {
+          priority: 1,
+          direction: "asc",
+          orderingPatterns: ["/^\\p{L}/miu", "/^\\d/m", "/^\\#/m"],
+        },
+      },
+      filters: {
+        firstName: ["/.+/"],
+      },
+    },
+    config: {
+      formOptions: {
+        activeIdFieldName: "activeContactId",
+        selectedIdsFieldName: "selectedContacts",
+        totalItemsFieldName: "totalContacts",
+      },
+    },
+    childrenKeys: ["columnCheckbox", "columnName", "columnOptional"],
+  },
+  columnCheckbox: {
+    component: "table.cell",
+    config: {
+      width: 40,
+    },
+    childrenKeys: ["contactCheckbox"],
+  },
+  contactCheckbox: {
+    component: "form.checkboxInput",
+    config: {
+      name: "selectedContacts",
+    },
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "config.value": "contactId",
+      },
+    },
+  },
+  columnName: {
+    component: "table.cell",
+    config: {
+      width: 300,
+    },
+    childrenKeys: ["contactJoinedNames"],
+  },
+  contactJoinedNames: {
+    component: "block-plain",
+    layout: {
+      flexLayout: {
+        direction: "row",
+        columnGap: "0.5rem",
+      },
+    },
+    childrenKeys: ["contactFirstName", "contactLastName"],
+  },
+  contactFirstName: {
+    component: "block-plain",
+    layout: {
+      flexLayout: {
+        direction: "row",
+        columnGap: "0.5rem",
+      },
+    },
+    childrenKeys: ["contactFirstNamePrefix", "contactFirstNameValue"],
+  },
+  contactFirstNamePrefix: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "namePrefix",
+      },
+    },
+  },
+  contactFirstNameValue: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "firstName",
+      },
+    },
+  },
+  contactLastName: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "lastName",
+      },
+    },
+  },
+  columnOptional: {
+    component: "form.conditionalRenderer",
+    config: {
+      formFieldName: "activeContactId",
+      renderIfFalse: true,
+    },
+    childrenKeys: ["columnCompany"],
+  },
+  columnCompany: {
+    component: "table.cell",
+    config: {
+      width: 200,
+    },
+    childrenKeys: ["contactCompany"],
+  },
+  contactCompany: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "company",
+      },
+    },
+  },
+  detailsWrapper: {
+    component: "form.conditionalRenderer",
+    config: {
+      formFieldName: "activeContactId",
+    },
+    childrenKeys: ["details"],
+  },
+  details: {
+    component: "block-box",
+    config: {
+      title: "Contact",
+    },
+    dataProvider: {
+      source: "form-fields",
+      fields: {
+        dataItemId: "activeContactId",
+      },
+    },
+    childrenKeys: ["contactDetails", "disableButton"],
+  },
+  contactDetails: {
+    component: "block-plain",
+    childrenKeys: ["contactDetailsEmail", "contactDetailsName"],
+  },
+  contactDetailsEmail: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "email",
+      },
+    },
+  },
+  contactDetailsName: {
+    component: "text-plain",
+    dataProvider: {
+      source: "entities-field",
+      entitiesType: "contacts",
+      fields: {
+        "data.text": "firstName",
+      },
+    },
+  },
+  disableButton: {
+    component: "button-primary",
+    config: {
+      text: "Hide details",
+      action: {
+        type: "form-set-field",
+        key: "activeContactId",
+        value: undefined,
+      },
+    },
+  },
+}
+
+export default view
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
new file mode 100644
index 0000000000..05d4a0ec54
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import contactsView from "./contacts-view"
+
+export default {
+  contacts: contactsView,
+}
diff --git a/libs/generic-view/models/src/index.ts b/libs/generic-view/models/src/index.ts
index 1b6998e940..a220caac7b 100644
--- a/libs/generic-view/models/src/index.ts
+++ b/libs/generic-view/models/src/index.ts
@@ -47,6 +47,10 @@ import { backupRestoreAvailable } from "./lib/backup-restore-available"
 import { mcImportContactsButton } from "./lib/mc-import-contacts-button"
 import { mcDataMigration } from "./lib/mc-data-migration"
 import { incomingFeatureInfo } from "./lib/incoming-feature-info"
+import { table } from "./lib/table"
+import { formConditionalRenderer } from "./lib/form-conditional-renderer"
+import { tableCell } from "./lib/table-cell"
+import { entitiesLoader } from "./lib/entities-loader"
 
 export * from "./lib/block-box"
 export * from "./lib/block-plain"
@@ -93,6 +97,10 @@ export * from "./lib/mc-import-contacts-button"
 export * from "./lib/modal-visibility-controller"
 export * from "./lib/mc-data-migration"
 export * from "./lib/incoming-feature-info"
+export * from "./lib/table"
+export * from "./lib/table-cell"
+export * from "./lib/form-conditional-renderer"
+export * from "./lib/entities-loader"
 
 export default {
   [blockBox.key]: blockBox,
@@ -123,6 +131,7 @@ export default {
   [formRadioInput.key]: formRadioInput,
   [formSearchInput.key]: formSearchInput,
   [formCheckboxInput.key]: formCheckboxInput,
+  [formConditionalRenderer.key]: formConditionalRenderer,
   [progressBar.key]: progressBar,
   [tooltip.key]: tooltip,
   [tooltipAnchor.key]: tooltipAnchor,
@@ -143,4 +152,7 @@ export default {
   [mcImportContactsButton.key]: mcImportContactsButton,
   [mcDataMigration.key]: mcDataMigration,
   [incomingFeatureInfo.key]: incomingFeatureInfo,
+  [table.key]: table,
+  [tableCell.key]: tableCell,
+  [entitiesLoader.key]: entitiesLoader,
 } as const
diff --git a/libs/generic-view/models/src/lib/common-validators.ts b/libs/generic-view/models/src/lib/common-validators.ts
index 6b62209d38..cb495ff6a2 100644
--- a/libs/generic-view/models/src/lib/common-validators.ts
+++ b/libs/generic-view/models/src/lib/common-validators.ts
@@ -50,10 +50,26 @@ export const customActionValidator = z.object({
 
 export type CustomAction = z.infer<typeof customActionValidator>
 
+export const formActionValidator = z.union([
+  z.object({
+    type: z.literal("form-set-field"),
+    key: z.string(),
+    value: z.union([z.string(), z.number(), z.boolean()]).optional(),
+  }),
+  z.object({
+    type: z.literal("form-toggle-field"),
+    key: z.string(),
+  }),
+  z.object({
+    type: z.literal("form-reset"),
+  }),
+])
+
 export const buttonActionValidator = z.union([
   modalActionValidator,
   navigateActionValidator,
   customActionValidator,
+  formActionValidator,
 ])
 
 export type ButtonAction = z.infer<typeof buttonActionValidator>
diff --git a/libs/generic-view/models/src/lib/entities-loader.ts b/libs/generic-view/models/src/lib/entities-loader.ts
new file mode 100644
index 0000000000..d5f630c6d8
--- /dev/null
+++ b/libs/generic-view/models/src/lib/entities-loader.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z.object({
+  entitiesTypes: z.array(z.string()),
+})
+
+export type EntitiesLoaderConfig = z.infer<typeof configValidator>
+
+export const entitiesLoader = {
+  key: "entities-loader",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/form-checkbox-input.ts b/libs/generic-view/models/src/lib/form-checkbox-input.ts
index ff540b92a0..dadb98bfc7 100644
--- a/libs/generic-view/models/src/lib/form-checkbox-input.ts
+++ b/libs/generic-view/models/src/lib/form-checkbox-input.ts
@@ -14,7 +14,7 @@ const inputValidation: z.ZodType<Pick<RegisterOptions, "required">> = z.object({
 
 const configValidator = z.object({
   name: z.string(),
-  value: z.string(),
+  value: z.string().optional(),
   checked: z.boolean().optional(),
   label: z.string().optional(),
   validation: inputValidation.optional(),
diff --git a/libs/generic-view/models/src/lib/form-conditional-renderer.ts b/libs/generic-view/models/src/lib/form-conditional-renderer.ts
new file mode 100644
index 0000000000..f78095648d
--- /dev/null
+++ b/libs/generic-view/models/src/lib/form-conditional-renderer.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z.object({
+  formFieldName: z.string(),
+  renderIfFalse: z.boolean().optional(),
+})
+
+export type FormConditionalRendererConfig = z.infer<typeof configValidator>
+
+export const formConditionalRenderer = {
+  key: "form.conditionalRenderer",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/table-cell.ts b/libs/generic-view/models/src/lib/table-cell.ts
new file mode 100644
index 0000000000..b72f39ead0
--- /dev/null
+++ b/libs/generic-view/models/src/lib/table-cell.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z.object({
+  width: z.number(),
+  colSpan: z.number().optional(),
+  rowSpan: z.number().optional(),
+})
+
+export type TableCellConfig = z.infer<typeof configValidator>
+
+export const tableCell = {
+  key: "table.cell",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/table.ts b/libs/generic-view/models/src/lib/table.ts
new file mode 100644
index 0000000000..3090092699
--- /dev/null
+++ b/libs/generic-view/models/src/lib/table.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.array(z.string()).optional()
+
+export type TableData = z.infer<typeof dataValidator>
+
+const configValidator = z.object({
+  formOptions: z.object({
+    activeIdFieldName: z.string().optional(),
+    selectedIdsFieldName: z.string().optional(),
+    totalItemsFieldName: z.string().optional(),
+  }),
+  columnsNames: z.array(z.string()).optional(),
+})
+
+export type TableConfig = z.infer<typeof configValidator>
+
+export const table = {
+  key: "table",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/store/src/index.ts b/libs/generic-view/store/src/index.ts
index 71e0c8ecb5..30cbb153da 100644
--- a/libs/generic-view/store/src/index.ts
+++ b/libs/generic-view/store/src/index.ts
@@ -42,6 +42,16 @@ export * from "./lib/external-providers/outlook/outlook.constants"
 export * from "./lib/external-providers/outlook/token-requester"
 export * from "./lib/external-providers/external-providers.interface"
 
+export * from "./lib/entities/reducer"
+export * from "./lib/entities/actions"
+export * from "./lib/entities/get-entities-config.action"
+export * from "./lib/entities/get-entities-data.action"
+export * from "./lib/entities/get-entity-data.action"
+export * from "./lib/entities/get-entities-metadata.action"
+export * from "./lib/entities/delete-entities-data.action"
+export * from "./lib/entities/create-entity-data.action"
+export * from "./lib/entities/update-entity-data.action"
+
 export * from "./lib/data-migration/reducer"
 export * from "./lib/data-migration/actions"
 export * from "./lib/data-migration/start-data.migration"
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index b71a7f01b6..538ebaa1af 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -16,6 +16,7 @@ export enum ActionName {
   AddDevice = "generic-views/add-device",
   RemoveDevice = "generic-views/remove-device",
   SetDeviceState = "generic-views/set-device-state",
+  SetGenericConfig = "generic-views/set-generic-config",
 
   OpenModal = "generic-modals/open-modal",
   CloseModal = "generic-modals/close-modal",
@@ -83,4 +84,16 @@ export enum ActionName {
 
   HelpSetData = "help/set-data",
   HelpRateArticle = "help/rate-article",
+
+  GetEntitiesConfig = "entities/get-entities-config",
+  SetEntitiesConfig = "entities/set-entities-config",
+  SetEntitiesData = "entities/set-entities-data",
+  SetEntityData = "entities/set-entity-data",
+  GetEntitiesData = "entities/get-entities-data",
+  GetEntityData = "entities/get-entity-data",
+  SetEntitiesMetadata = "entities/set-entities-metadata",
+  ClearEntitiesData = "entities/clear-entities-data",
+  DeleteEntityData = "entities/delete-entity-data",
+  CreateEntityData = "entities/create-entity-data",
+  UpdateEntityData = "entities/update-entity-data",
 }
diff --git a/libs/generic-view/store/src/lib/entities/actions.ts b/libs/generic-view/store/src/lib/entities/actions.ts
new file mode 100644
index 0000000000..b65095e88e
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/actions.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import {
+  EntityData,
+  EntitiesMetadata,
+  EntitiesConfig,
+  EntityId,
+} from "device/models"
+import { DeviceId } from "Core/device/constants/device-id"
+
+export const setEntitiesConfig = createAction<{
+  entitiesType: string
+  config: EntitiesConfig
+  idFieldKey: string
+  deviceId: DeviceId
+}>(ActionName.SetEntitiesConfig)
+
+export const setEntitiesMetadata = createAction<{
+  entitiesType: string
+  metadata: EntitiesMetadata
+  deviceId: DeviceId
+}>(ActionName.SetEntitiesMetadata)
+
+export const setEntityData = createAction<{
+  entitiesType: string
+  entityId: EntityId
+  data: EntityData
+  deviceId: DeviceId
+}>(ActionName.SetEntityData)
+
+export const clearEntities = createAction<{ deviceId: DeviceId }>(
+  ActionName.ClearEntitiesData
+)
diff --git a/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
new file mode 100644
index 0000000000..22cb49a7da
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { createEntityDataRequest } from "device/feature"
+import { EntityData } from "device/models"
+import { DeviceId } from "Core/device/constants/device-id"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { ActionName } from "../action-names"
+import logger from "Core/__deprecated__/main/utils/logger"
+
+export const createEntityDataAction = createAsyncThunk<
+  EntityData,
+  {
+    entitiesType: string
+    data: EntityData
+    deviceId: DeviceId
+  },
+  { state: ReduxRootState }
+>(
+  ActionName.CreateEntityData,
+  async ({ entitiesType, data, deviceId }, { rejectWithValue, getState }) => {
+    const response = await createEntityDataRequest({
+      entitiesType,
+      data,
+      deviceId,
+    })
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+
+    const { genericEntities } = getState()
+    const entities = genericEntities[deviceId][entitiesType]
+    const idFieldKey = entities?.idFieldKey
+    if (!entities || !idFieldKey) {
+      logger.error(
+        `Entities of type ${entitiesType} for device ${deviceId} not found`
+      )
+      return rejectWithValue(undefined)
+    }
+    if (
+      entities.data?.find(
+        (entity) => entity[idFieldKey] === response.data.data[idFieldKey]
+      )
+    ) {
+      logger.error(
+        `Entity of type ${entitiesType} with id ${
+          response.data.data[idFieldKey] as string
+        } already exists`
+      )
+      return rejectWithValue(undefined)
+    }
+
+    return response.data.data
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
new file mode 100644
index 0000000000..c18afe2d3c
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { deleteEntitiesDataRequest } from "device/feature"
+import { DeviceId } from "Core/device/constants/device-id"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { ActionName } from "../action-names"
+import { EntityId } from "device/models"
+import { difference } from "lodash"
+
+export const deleteEntitiesDataAction = createAsyncThunk<
+  EntityId[],
+  {
+    entitiesType: string
+    ids: EntityId[]
+    deviceId: DeviceId
+  },
+  { state: ReduxRootState }
+>(
+  ActionName.DeleteEntityData,
+  async ({ entitiesType, ids, deviceId }, { rejectWithValue }) => {
+    const response = await deleteEntitiesDataRequest({
+      entitiesType,
+      ids,
+      deviceId,
+    })
+
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+    if (response.data?.failedIds) {
+      // TODO: Handle partial deletion of entities
+      return difference(ids, response.data.failedIds)
+    }
+    return ids
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
new file mode 100644
index 0000000000..6201c2a93f
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { getEntitiesConfigRequest } from "device/feature"
+import { DeviceId } from "Core/device/constants/device-id"
+import { setEntitiesConfig } from "./actions"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
+import { getEntitiesDataAction } from "./get-entities-data.action"
+
+export const getEntitiesConfigAction = createAsyncThunk<
+  undefined,
+  { deviceId: DeviceId; entitiesTypes?: string[] },
+  { state: ReduxRootState }
+>(
+  ActionName.GetEntitiesConfig,
+  async ({ deviceId, entitiesTypes = [] }, { rejectWithValue, dispatch }) => {
+    for (const entitiesType of entitiesTypes) {
+      const response = await getEntitiesConfigRequest({
+        deviceId,
+        entitiesType,
+      })
+      if (!response.ok) {
+        return rejectWithValue(response.error)
+      }
+      const config = response.data
+      const idFieldKey = Object.entries(config.fields).find(
+        ([, field]) => field.type === "id"
+      )![0]
+
+      dispatch(
+        setEntitiesConfig({
+          entitiesType,
+          config,
+          idFieldKey,
+          deviceId,
+        })
+      )
+      await dispatch(getEntitiesMetadataAction({ entitiesType, deviceId }))
+      dispatch(getEntitiesDataAction({ entitiesType, deviceId }))
+    }
+    return
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
new file mode 100644
index 0000000000..387a3601e1
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import {
+  EntityDataResponseType,
+  getEntitiesDataRequest,
+  readEntitiesDataFromFileRequest,
+} from "device/feature"
+import { DeviceId } from "Core/device/constants/device-id"
+import { EntitiesFileData, EntitiesJsonData, EntityData } from "device/models"
+import { getFile } from "../file-transfer/get-file.action"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { AppError } from "Core/core/errors"
+
+export const getEntitiesDataAction = createAsyncThunk<
+  EntityData[],
+  {
+    entitiesType: string
+    deviceId: DeviceId
+    responseType?: EntityDataResponseType
+  },
+  { state: ReduxRootState; rejectValue?: AppError }
+>(
+  ActionName.GetEntitiesData,
+  async (
+    { responseType = "file", entitiesType, deviceId },
+    { rejectWithValue, dispatch }
+  ) => {
+    const response = await getEntitiesDataRequest({
+      entitiesType,
+      deviceId,
+      responseType,
+    })
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+
+    if (responseType === "file") {
+      const { filePath } = response.data as EntitiesFileData
+      const getFileResponse = await dispatch(
+        getFile({
+          deviceId,
+          filePath,
+        })
+      )
+      if (
+        !getFileResponse.payload ||
+        !("transferId" in getFileResponse.payload)
+      ) {
+        return rejectWithValue(getFileResponse.payload)
+      }
+
+      const readFileResponse = await readEntitiesDataFromFileRequest({
+        transferId: getFileResponse.payload.transferId,
+      })
+      if (!readFileResponse.ok) {
+        return rejectWithValue(readFileResponse.error)
+      }
+      return readFileResponse.data.data
+    } else {
+      const { data } = response.data as EntitiesJsonData
+      return data
+    }
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
new file mode 100644
index 0000000000..529955d562
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { getEntitiesMetadataRequest } from "device/feature"
+import { setEntitiesMetadata } from "./actions"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+
+export const getEntitiesMetadataAction = createAsyncThunk<
+  undefined,
+  Required<Parameters<typeof getEntitiesMetadataRequest>[0]>,
+  { state: ReduxRootState }
+>(ActionName.GetEntitiesData, async (data, { rejectWithValue, dispatch }) => {
+  const response = await getEntitiesMetadataRequest(data)
+
+  if (!response.ok) {
+    return rejectWithValue(response.error)
+  }
+
+  dispatch(
+    setEntitiesMetadata({
+      entitiesType: data.entitiesType,
+      metadata: response.data,
+      deviceId: data.deviceId,
+    })
+  )
+  return
+})
diff --git a/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
new file mode 100644
index 0000000000..f5d07b03b2
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import {
+  EntityDataResponseType,
+  getEntitiesDataRequest,
+  readEntityDataFromFileRequest,
+} from "device/feature"
+import { setEntityData } from "./actions"
+import { DeviceId } from "Core/device/constants/device-id"
+import { EntitiesFileData, EntityId, EntityJsonData } from "device/models"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getFile } from "../file-transfer/get-file.action"
+
+export const getEntityDataAction = createAsyncThunk<
+  undefined,
+  {
+    entitiesType: string
+    entityId: EntityId
+    deviceId: DeviceId
+    responseType?: EntityDataResponseType
+  },
+  { state: ReduxRootState }
+>(
+  ActionName.GetEntityData,
+  async (
+    { responseType = "file", entityId, entitiesType, deviceId },
+    { rejectWithValue, dispatch }
+  ) => {
+    const response = await getEntitiesDataRequest({
+      entitiesType: entitiesType,
+      deviceId,
+      responseType,
+      entityId,
+    })
+
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+
+    if (responseType === "file") {
+      const { filePath } = response.data as EntitiesFileData
+      const getFileResponse = await dispatch(
+        getFile({
+          deviceId,
+          filePath,
+        })
+      )
+      if (
+        !getFileResponse.payload ||
+        !("transferId" in getFileResponse.payload)
+      ) {
+        return rejectWithValue(getFileResponse.payload)
+      }
+
+      const readFileResponse = await readEntityDataFromFileRequest({
+        transferId: getFileResponse.payload.transferId,
+      })
+      if (!readFileResponse.ok) {
+        return rejectWithValue(readFileResponse.error)
+      }
+      dispatch(
+        setEntityData({
+          entitiesType,
+          entityId,
+          data: readFileResponse.data.data,
+          deviceId,
+        })
+      )
+      return
+    } else {
+      const { data } = response.data as EntityJsonData
+      dispatch(
+        setEntityData({
+          entitiesType,
+          entityId,
+          data,
+          deviceId,
+        })
+      )
+      return
+    }
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/reducer.ts b/libs/generic-view/store/src/lib/entities/reducer.ts
new file mode 100644
index 0000000000..3a6beed822
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/reducer.ts
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createReducer } from "@reduxjs/toolkit"
+import { EntitiesConfig, EntitiesMetadata, EntityData } from "device/models"
+import {
+  clearEntities,
+  setEntitiesConfig,
+  setEntitiesMetadata,
+  setEntityData,
+} from "./actions"
+import { getEntitiesDataAction } from "./get-entities-data.action"
+import { DeviceId } from "Core/device/constants/device-id"
+import { deleteEntitiesDataAction } from "./delete-entities-data.action"
+import { createEntityDataAction } from "./create-entity-data.action"
+import { updateEntityDataAction } from "./update-entity-data.action"
+
+type EntitiesType = string
+
+interface Entities {
+  idFieldKey: string
+  config: EntitiesConfig
+  data?: EntityData[]
+  metadata?: EntitiesMetadata
+  loading?: boolean
+  error?: boolean
+}
+
+interface EntitiesState {
+  [key: DeviceId]: {
+    [key: EntitiesType]: Entities | undefined
+  }
+}
+
+const initialState: EntitiesState = {}
+
+export const genericEntitiesReducer = createReducer(initialState, (builder) => {
+  builder.addCase(setEntitiesConfig, (state, action) => {
+    const { deviceId, entitiesType } = action.payload
+
+    if (!state[deviceId]) {
+      state[deviceId] = {
+        [entitiesType]: {
+          config: action.payload.config,
+          idFieldKey: action.payload.idFieldKey,
+        },
+      }
+    } else if (!state[deviceId][entitiesType]) {
+      state[deviceId][entitiesType] = {
+        config: action.payload.config,
+        idFieldKey: action.payload.idFieldKey,
+      }
+    }
+  })
+  builder.addCase(getEntitiesDataAction.pending, (state, action) => {
+    const { deviceId, entitiesType } = action.meta.arg
+    state[deviceId][entitiesType]!.loading = true
+  })
+  builder.addCase(getEntitiesDataAction.fulfilled, (state, action) => {
+    const { deviceId, entitiesType } = action.meta.arg
+
+    state[deviceId][entitiesType]!.data = action.payload
+    state[deviceId][entitiesType]!.loading = false
+  })
+  builder.addCase(getEntitiesDataAction.rejected, (state, action) => {
+    const { deviceId, entitiesType } = action.meta.arg
+
+    state[deviceId][entitiesType]!.loading = false
+    state[deviceId][entitiesType]!.error = true
+  })
+
+  builder.addCase(setEntityData, (state, action) => {
+    const { deviceId, entitiesType, entityId, data } = action.payload
+    const idFieldKey = state[deviceId][entitiesType]?.idFieldKey
+    if (!idFieldKey) {
+      return
+    }
+    const entityIndex = state[deviceId][entitiesType]!.data?.findIndex(
+      (entity) => entity[idFieldKey] === entityId
+    )
+    if (entityIndex !== -1 && state[deviceId][entitiesType]?.data) {
+      state[deviceId][entitiesType]!.data![entityIndex!] = data
+    }
+  })
+  builder.addCase(setEntitiesMetadata, (state, action) => {
+    const { deviceId, entitiesType, metadata } = action.payload
+    state[deviceId][entitiesType]!.metadata = metadata
+  })
+  builder.addCase(clearEntities, (state, action) => {
+    state[action.payload.deviceId] = {}
+  })
+  builder.addCase(deleteEntitiesDataAction.fulfilled, (state, action) => {
+    const entitiesIds = action.payload
+    const { entitiesType, deviceId } = action.meta.arg
+    const entities = state[deviceId][entitiesType]
+
+    if (entities && entities.data && entities.idFieldKey) {
+      entities.data = entities.data.filter(
+        (entity) =>
+          !entitiesIds.includes(entity[entities.idFieldKey!] as string)
+      )
+    }
+  })
+  builder.addCase(createEntityDataAction.fulfilled, (state, action) => {
+    const { entitiesType, deviceId } = action.meta.arg
+    const newEntity = action.payload
+    const entities = state[deviceId][entitiesType]
+
+    if (!entities) return
+    if (!entities.data) {
+      entities.data = [newEntity]
+    } else {
+      entities.data.push(newEntity)
+    }
+  })
+  builder.addCase(updateEntityDataAction.fulfilled, (state, action) => {
+    const { entitiesType, deviceId } = action.meta.arg
+    const updatedEntity = action.payload
+    const entities = state[deviceId][entitiesType]
+    const idFieldKey = entities?.idFieldKey
+
+    if (!entities || !entities.data || !idFieldKey) return
+    const entityIndex = entities.data.findIndex(
+      (entity) => entity[idFieldKey] === updatedEntity[idFieldKey!]
+    )
+    if (entityIndex === -1) return
+    entities.data[entityIndex] = updatedEntity
+  })
+})
diff --git a/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
new file mode 100644
index 0000000000..5cce2f738b
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { updateEntityDataRequest } from "device/feature"
+import { EntityData, EntityId } from "device/models"
+import { DeviceId } from "Core/device/constants/device-id"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { ActionName } from "../action-names"
+import logger from "Core/__deprecated__/main/utils/logger"
+
+export const updateEntityDataAction = createAsyncThunk<
+  EntityData,
+  {
+    entitiesType: string
+    entityId: EntityId
+    data: EntityData
+    deviceId: DeviceId
+  },
+  { state: ReduxRootState }
+>(
+  ActionName.UpdateEntityData,
+  async (
+    { entitiesType, entityId, data, deviceId },
+    { rejectWithValue, getState }
+  ) => {
+    const response = await updateEntityDataRequest({
+      entitiesType,
+      entityId,
+      data,
+      deviceId,
+    })
+
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+
+    const { genericEntities } = getState()
+    const entities = genericEntities[deviceId][entitiesType]
+    const idFieldKey = entities?.idFieldKey
+    if (!entities || !idFieldKey) {
+      logger.error(
+        `Entities of type ${entitiesType} for device ${deviceId} not found`
+      )
+      return rejectWithValue(undefined)
+    }
+    if (
+      !entities.data?.find(
+        (entity) => entity[idFieldKey] === response.data.data[idFieldKey]
+      )
+    ) {
+      logger.error(
+        `Entity of type ${entitiesType} with id ${
+          response.data.data[idFieldKey] as string
+        } not found`
+      )
+      return rejectWithValue(undefined)
+    }
+
+    return response.data.data
+  }
+)
diff --git a/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts b/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
index a8325b0344..e6458bd14a 100644
--- a/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
+++ b/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
@@ -26,6 +26,7 @@ export const getGenericConfig = createAsyncThunk<
 
     if (response.ok) {
       const fullView = transformGenericComponents(response.data)
+
       return { deviceId, feature, view: fullView }
     }
 
diff --git a/libs/generic-view/store/src/lib/file-transfer/get-file.action.ts b/libs/generic-view/store/src/lib/file-transfer/get-file.action.ts
index c5dd38ea7b..497acd6c04 100644
--- a/libs/generic-view/store/src/lib/file-transfer/get-file.action.ts
+++ b/libs/generic-view/store/src/lib/file-transfer/get-file.action.ts
@@ -33,7 +33,7 @@ export const getFile = createAsyncThunk<
   {
     deviceId: DeviceId
     filePath: string
-    targetPath: string
+    targetPath?: string
     preTransfer?: PreTransferGet
   },
   { state: ReduxRootState; rejectValue: GetFileError | undefined }
@@ -80,7 +80,8 @@ export const getFile = createAsyncThunk<
         if (aborted) {
           return rejectWithValue(undefined)
         }
-        const { ok, error } = await getFileRequest(transferId, chunkNumber)
+        const fileResp = await getFileRequest(transferId, chunkNumber, deviceId)
+        const { ok, error } = fileResp
         if (!ok) {
           await sendClearRequest(transferId)
           return rejectWithValue({
diff --git a/libs/generic-view/store/src/lib/get-api-config.ts b/libs/generic-view/store/src/lib/get-api-config.ts
index 722be9276c..3af59038a1 100644
--- a/libs/generic-view/store/src/lib/get-api-config.ts
+++ b/libs/generic-view/store/src/lib/get-api-config.ts
@@ -12,6 +12,7 @@ import { ActionName } from "./action-names"
 import { getAllFeatures } from "./features/get-all-features"
 import { getMenuConfig } from "./get-menu-config"
 import { ResultObject } from "Core/core/builder"
+import { getEntitiesConfigAction } from "./entities/get-entities-config.action"
 
 export const getAPIConfig = createAsyncThunk<
   { deviceId: string; apiConfig: ApiConfig },
@@ -28,8 +29,17 @@ export const getAPIConfig = createAsyncThunk<
     } while (retry && retires++ < retryLimit && !response.ok)
 
     if (response.ok) {
-      dispatch(getMenuConfig({ deviceId }))
-      dispatch(getAllFeatures({ deviceId, features: response.data.features }))
+      await dispatch(getMenuConfig({ deviceId }))
+      await dispatch(
+        getAllFeatures({ deviceId, features: response.data.features })
+      )
+      dispatch(
+        getEntitiesConfigAction({
+          deviceId,
+          entitiesTypes: response.data.entityTypes,
+        })
+      )
+
       return { deviceId, apiConfig: response.data }
     }
     return rejectWithValue(response.error)
diff --git a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
index 42fe4fdf19..d6cddc56bd 100644
--- a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
@@ -21,6 +21,7 @@ import {
   selectDataMigrationSourceDevice,
   selectDataMigrationTargetDevice,
 } from "../selectors/data-migration-devices"
+import { clearEntities } from "../entities/actions"
 
 export const useAPISerialPortListeners = () => {
   const dispatch = useDispatch<Dispatch>()
@@ -93,6 +94,7 @@ const useHandleDevicesDetached = () => {
 
       for (const event of apiEvents) {
         dispatch(removeDevice(event))
+        dispatch(clearEntities({ deviceId: event.id }))
       }
       dispatch(closeAllModals())
 
diff --git a/libs/generic-view/store/src/lib/selectors/component.ts b/libs/generic-view/store/src/lib/selectors/component.ts
index 7bb102d625..926b74f6bd 100644
--- a/libs/generic-view/store/src/lib/selectors/component.ts
+++ b/libs/generic-view/store/src/lib/selectors/component.ts
@@ -26,6 +26,11 @@ export const selectComponentConfig = createSelector(
   (config) => config?.config
 )
 
+export const selectComponentDataProvider = createSelector(
+  selectComponent,
+  (config) => config?.dataProvider
+)
+
 export const selectComponentLayout = createSelector(
   selectComponent,
   (config) => config?.layout
diff --git a/libs/generic-view/store/src/lib/selectors/entities.ts b/libs/generic-view/store/src/lib/selectors/entities.ts
new file mode 100644
index 0000000000..afb6c943f7
--- /dev/null
+++ b/libs/generic-view/store/src/lib/selectors/entities.ts
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "reselect"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+
+const selectEntitiesOfDevice = createSelector(
+  (state: ReduxRootState) => state.genericEntities,
+  (state: ReduxRootState, { deviceId }: { deviceId: string }) => deviceId,
+  (entities, deviceId) => {
+    return entities[deviceId]
+  }
+)
+
+export const selectEntitiesIdFieldKey = createSelector(
+  selectEntitiesOfDevice,
+  (state: ReduxRootState, { entitiesType }: { entitiesType?: string }) => {
+    return entitiesType
+  },
+  (entities, entitiesType) => {
+    if (!entitiesType) return undefined
+    return entities[entitiesType]?.idFieldKey
+  }
+)
+
+const selectEntities = createSelector(
+  selectEntitiesOfDevice,
+  (state: ReduxRootState, { entitiesType }: { entitiesType: string }) =>
+    entitiesType,
+  (entities, entityType) => {
+    return entities[entityType]
+  }
+)
+
+export const selectEntitiesData = createSelector(
+  selectEntities,
+  (entities) => entities?.data
+)
+
+export const selectEntityData = createSelector(
+  selectEntities,
+  (state: ReduxRootState, { entityId }: { entityId: string }) => entityId,
+  (entities, entityId) => {
+    if (!entities || !entities.data || !entities.idFieldKey) {
+      return undefined
+    }
+    return entities.data.find(
+      (entity) => entity[entities.idFieldKey!] === entityId
+    )
+  }
+)
+
+export const selectEntitiesLoadingState = createSelector(
+  selectEntitiesOfDevice,
+  (entities) => {
+    return Object.entries(entities).reduce(
+      (
+        acc: Record<string, "loading" | "loaded" | "idle" | "error">,
+        [entitiesType, entity]
+      ) => {
+        if (entity?.error) {
+          acc[entitiesType] = "error"
+        } else if (entity?.metadata?.totalEntities === 0 || entity?.data) {
+          acc[entitiesType] = "loaded"
+        } else if (entity?.loading) {
+          acc[entitiesType] = "loading"
+        } else {
+          acc[entitiesType] = "idle"
+        }
+        return acc
+      },
+      {}
+    )
+  }
+)
diff --git a/libs/generic-view/store/src/lib/selectors/index.ts b/libs/generic-view/store/src/lib/selectors/index.ts
index 2aff2bd537..94836956dc 100644
--- a/libs/generic-view/store/src/lib/selectors/index.ts
+++ b/libs/generic-view/store/src/lib/selectors/index.ts
@@ -31,3 +31,4 @@ export * from "./select-generic-view-state"
 export * from "./data-migration-pure-db-indexing"
 export * from "./device-error-modal-opened"
 export * from "./data-transfer-error-type"
+export * from "./entities"
diff --git a/libs/generic-view/store/src/lib/views/actions.ts b/libs/generic-view/store/src/lib/views/actions.ts
index a39b4104a5..fa0221358b 100644
--- a/libs/generic-view/store/src/lib/views/actions.ts
+++ b/libs/generic-view/store/src/lib/views/actions.ts
@@ -34,3 +34,9 @@ export const setLastRefresh = createAction<number>(ActionName.SetLastRefresh)
 export const setDeviceState = createAction<{ id: string; state: DeviceState }>(
   ActionName.SetDeviceState
 )
+
+export const setGenericConfig = createAction<{
+  config: View
+  feature: string
+  deviceId: string
+}>(ActionName.SetGenericConfig)
diff --git a/libs/generic-view/store/src/lib/views/reducer.ts b/libs/generic-view/store/src/lib/views/reducer.ts
index 536ebaec03..9f33dc3b0a 100644
--- a/libs/generic-view/store/src/lib/views/reducer.ts
+++ b/libs/generic-view/store/src/lib/views/reducer.ts
@@ -21,11 +21,13 @@ import {
   addDevice,
   removeDevice,
   setDeviceState,
+  setGenericConfig,
   setLastRefresh,
   setMenu,
   setViewData,
   setViewLayout,
 } from "./actions"
+import { transformGenericComponents } from "../features/transform-generic-components"
 
 export interface GenericState {
   menu: MenuElement[] | undefined
@@ -195,4 +197,20 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
       }
     }
   })
+  // Helper action for setting custom generic config without a need of reloading the app
+  builder.addCase(setGenericConfig, (state, action) => {
+    const { deviceId, feature, config } = action.payload
+    if (state.devices[deviceId] !== undefined) {
+      state.devices[deviceId].features = {
+        ...state.devices[deviceId].features,
+        [feature]: {
+          config: transformGenericComponents({
+            ...state.devices[deviceId].features?.[feature].config,
+            ...config,
+          }),
+          data: state.devices[deviceId].features?.[feature]?.data,
+        },
+      }
+    }
+  })
 })
diff --git a/libs/generic-view/ui/src/index.ts b/libs/generic-view/ui/src/index.ts
index 575a88447c..f7e3459752 100644
--- a/libs/generic-view/ui/src/index.ts
+++ b/libs/generic-view/ui/src/index.ts
@@ -11,6 +11,8 @@ import { interactive } from "./lib/interactive/interactive"
 import { buttons } from "./lib/buttons/buttons"
 import { texts } from "./lib/texts"
 import { Icon } from "./lib/icon/icon"
+import { table } from "./lib/table"
+import { entities } from "./lib/entities"
 
 export * from "./lib/icon/icon"
 export * from "./lib/api-connection-demo"
@@ -29,6 +31,7 @@ export * from "./lib/buttons/button-text"
 export * from "./lib/buttons/button-primary"
 export * from "./lib/texts/paragraphs"
 export * from "./lib/texts/headers"
+export * from "./lib/entities"
 
 const apiComponents = {
   ...predefinedComponents,
@@ -38,6 +41,8 @@ const apiComponents = {
   ...interactive,
   ...buttons,
   ...texts,
+  ...table,
+  ...entities,
   icon: Icon,
 }
 
diff --git a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
index aa63cba9f1..690356d801 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
+++ b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
@@ -15,11 +15,14 @@ import { ButtonAction } from "generic-view/utils"
 import { useDispatch } from "react-redux"
 import { useHistory } from "react-router"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { useFormContext } from "react-hook-form"
+import logger from "Core/__deprecated__/main/utils/logger"
 
 export const useButtonAction = (viewKey: string) => {
   const dispatch = useDispatch<Dispatch>()
   const navigate = useHistory()
   const currentViewName = useScreenTitle(viewKey)
+  const formContext = useFormContext()
 
   return (action?: ButtonAction) => {
     if (!action) return
@@ -59,6 +62,21 @@ export const useButtonAction = (viewKey: string) => {
           },
         })
         break
+      case "form-set-field":
+        formContext.setValue(action.key, action.value)
+        break
+      case "form-toggle-field":
+        if (typeof formContext.getValues(action.key) === "boolean") {
+          formContext.setValue(action.key, !formContext.getValues(action.key))
+        } else if (typeof formContext.getValues(action.key) === "undefined") {
+          logger.error(`Tried to toggle not existing field: ${action.key}`)
+        } else {
+          logger.error(`Tried to toggle non-boolean field: ${action.key}`)
+        }
+        break
+      case "form-reset":
+        formContext.reset()
+        break
       case "custom":
         action.callback()
         break
diff --git a/libs/generic-view/ui/src/lib/entities/entities-loader.tsx b/libs/generic-view/ui/src/lib/entities/entities-loader.tsx
new file mode 100644
index 0000000000..872d345c41
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/entities/entities-loader.tsx
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { useEffect } from "react"
+import { APIFC } from "generic-view/utils"
+import { EntitiesLoaderConfig } from "generic-view/models"
+import {
+  getEntitiesDataAction,
+  selectActiveApiDeviceId,
+  selectEntitiesLoadingState,
+} from "generic-view/store"
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { SpinnerLoader } from "../shared/spinner-loader"
+import styled from "styled-components"
+
+export const EntitiesLoader: APIFC<undefined, EntitiesLoaderConfig> = ({
+  config,
+  children,
+}) => {
+  const dispatch = useDispatch<Dispatch>()
+  const deviceId = useSelector(selectActiveApiDeviceId)!
+  const entitiesLoadingStates = useSelector((state: ReduxRootState) =>
+    selectEntitiesLoadingState(state, { deviceId })
+  )
+  const allLoaded = config.entitiesTypes.every(
+    (entitiesType) => entitiesLoadingStates[entitiesType] === "loaded"
+  )
+
+  useEffect(() => {
+    for (const entitiesType of config.entitiesTypes) {
+      if (entitiesLoadingStates[entitiesType] === "idle") {
+        dispatch(getEntitiesDataAction({ entitiesType, deviceId }))
+      }
+    }
+  }, [config.entitiesTypes, deviceId, dispatch, entitiesLoadingStates])
+
+  if (allLoaded) {
+    return children
+  }
+  return (
+    <Wrapper>
+      <SpinnerLoader dark />
+    </Wrapper>
+  )
+}
+
+const Wrapper = styled.div`
+  & > * {
+    width: 5rem;
+    height: 5rem;
+  }
+`
diff --git a/libs/generic-view/ui/src/lib/entities/index.ts b/libs/generic-view/ui/src/lib/entities/index.ts
new file mode 100644
index 0000000000..07dae8db43
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/entities/index.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntitiesLoader } from "./entities-loader"
+import { entitiesLoader } from "generic-view/models"
+
+export const entities = {
+  [entitiesLoader.key]: EntitiesLoader,
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/form/form.tsx b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
index 4baaefab11..20b96a3a4c 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/form.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
@@ -11,12 +11,14 @@ import { RadioInput } from "./input/radio-input"
 import { CheckboxInput } from "./input/checkbox-input"
 import { SearchInput } from "./input/search-input"
 import { FormConfig } from "generic-view/models"
+import { FormConditionalRenderer } from "./helpers/form-conditional-renderer"
 
 export const Form: APIFC<undefined, FormConfig> & {
   TextInput: typeof TextInput
   RadioInput: typeof RadioInput
   CheckboxInput: typeof CheckboxInput
   SearchInput: typeof SearchInput
+  ConditionalRenderer: typeof FormConditionalRenderer
 } = ({ config, children }) => {
   const methods = useForm({
     mode: "onTouched",
@@ -28,5 +30,6 @@ Form.TextInput = TextInput
 Form.RadioInput = RadioInput
 Form.CheckboxInput = CheckboxInput
 Form.SearchInput = SearchInput
+Form.ConditionalRenderer = FormConditionalRenderer
 
 export default Form
diff --git a/libs/generic-view/ui/src/lib/interactive/form/helpers/form-conditional-renderer.tsx b/libs/generic-view/ui/src/lib/interactive/form/helpers/form-conditional-renderer.tsx
new file mode 100644
index 0000000000..914252a48c
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/interactive/form/helpers/form-conditional-renderer.tsx
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { APIFC } from "generic-view/utils"
+import { FormConditionalRendererConfig } from "generic-view/models"
+import { useFormContext } from "react-hook-form"
+
+export const FormConditionalRenderer: APIFC<
+  undefined,
+  FormConditionalRendererConfig
+> = ({ children, config }) => {
+  const formContext = useFormContext()
+  const value = Boolean(formContext.watch(config.formFieldName))
+  const shouldRender = config.renderIfFalse ? !value : value
+
+  if (shouldRender) {
+    return children
+  }
+  return null
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
index 7ba1dd99d9..98ddf01c49 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
@@ -27,7 +27,12 @@ export const CheckboxInput: APIFC<undefined, Config> = ({
   })
 
   return (
-    <Wrapper {...props}>
+    <Wrapper
+      {...props}
+      onClick={(e) => {
+        e.stopPropagation()
+      }}
+    >
       <Input
         id={"checkbox-" + id}
         type={"checkbox"}
@@ -44,7 +49,7 @@ export const CheckboxInput: APIFC<undefined, Config> = ({
         <InputBox>
           <CheckIcon />
         </InputBox>
-        {children || config.label}
+        {children || (config.label ? <span>{config.label}</span> : null)}
       </Label>
     </Wrapper>
   )
@@ -87,11 +92,15 @@ const InputBox = styled.div`
   align-self: baseline;
   border-radius: ${({ theme }) => theme.radius.xs};
   border: 0.1rem solid ${({ theme }) => theme.color.grey4};
-  margin: 0 1.4rem 0 0;
+  margin: 0;
   transition: background-color 0.2s ease-in-out;
   overflow: hidden;
   box-sizing: border-box;
 
+  & + * {
+    margin-left: 1.4rem;
+  }
+
   ${CheckIcon} {
     opacity: 0;
     visibility: hidden;
diff --git a/libs/generic-view/ui/src/lib/interactive/interactive.ts b/libs/generic-view/ui/src/lib/interactive/interactive.ts
index eb4a479520..0cb6c30873 100644
--- a/libs/generic-view/ui/src/lib/interactive/interactive.ts
+++ b/libs/generic-view/ui/src/lib/interactive/interactive.ts
@@ -11,6 +11,7 @@ import Tooltip from "./tooltip/tooltip"
 import {
   form,
   formCheckboxInput,
+  formConditionalRenderer,
   formRadioInput,
   formSearchInput,
   formTextInput,
@@ -44,6 +45,7 @@ export const interactive = {
   [formSearchInput.key]: Form.SearchInput,
   [formRadioInput.key]: Form.RadioInput,
   [formCheckboxInput.key]: Form.CheckboxInput,
+  [formConditionalRenderer.key]: Form.ConditionalRenderer,
   [progressBar.key]: ProgressBar,
   [tooltip.key]: Tooltip,
   [tooltipAnchor.key]: Tooltip.Anchor,
diff --git a/libs/generic-view/ui/src/lib/table/index.ts b/libs/generic-view/ui/src/lib/table/index.ts
new file mode 100644
index 0000000000..e17c62956e
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/table/index.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { table as tableWrapper, tableCell } from "generic-view/models"
+import { Table } from "./table"
+
+export const table = {
+  [tableWrapper.key]: Table,
+  [tableCell.key]: Table.Cell,
+}
diff --git a/libs/generic-view/ui/src/lib/table/table-cell.tsx b/libs/generic-view/ui/src/lib/table/table-cell.tsx
new file mode 100644
index 0000000000..d21d31f05f
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/table/table-cell.tsx
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { useMemo } from "react"
+import { APIFC } from "generic-view/utils"
+import { TableCellConfig } from "generic-view/models"
+import styled from "styled-components"
+
+export const TableCell: APIFC<undefined, TableCellConfig> = ({
+  children,
+  config,
+  data,
+  ...props
+}) => {
+  const propsDependencies = JSON.stringify(props)
+  const configDependencies = JSON.stringify(config)
+  return useMemo(
+    () => {
+      return (
+        <Cell
+          {...props}
+          colSpan={config.colSpan}
+          rowSpan={config.rowSpan}
+          $width={config.width}
+        >
+          {children}
+        </Cell>
+      )
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [children, configDependencies, propsDependencies]
+  )
+}
+
+export const Cell = styled.td<{
+  $width: number
+}>`
+  min-width: ${({ $width }) => $width}px;
+  max-width: ${({ $width }) => $width}px;
+  overflow: hidden;
+`
diff --git a/libs/generic-view/ui/src/lib/table/table.tsx b/libs/generic-view/ui/src/lib/table/table.tsx
new file mode 100644
index 0000000000..1ec7dd1cdb
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/table/table.tsx
@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, {
+  Children,
+  ReactElement,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react"
+import styled, { css } from "styled-components"
+import { APIFC } from "generic-view/utils"
+import { TableConfig, TableData } from "generic-view/models"
+import { TableCell } from "./table-cell"
+import { useFormContext } from "react-hook-form"
+import { P1 } from "../texts/paragraphs"
+
+const rowHeight = 64
+
+export const Table: APIFC<TableData, TableConfig> & {
+  Cell: typeof TableCell
+} = ({ data = [], config, children, ...props }) => {
+  const formContext = useFormContext()
+  const scrollWrapperRef = useRef<HTMLDivElement>(null)
+  const [visibleRowsBounds, setVisibleRowsBounds] = useState<[number, number]>([
+    -1, -1,
+  ])
+
+  const { formOptions, columnsNames } = config
+  const { activeIdFieldName } = formOptions
+
+  const activeRowId = activeIdFieldName
+    ? formContext.watch(activeIdFieldName)
+    : undefined
+
+  const onRowClick = useCallback(
+    (id: string) => {
+      if (!activeIdFieldName) return
+      formContext.setValue(activeIdFieldName!, id)
+    },
+    [activeIdFieldName, formContext]
+  )
+
+  const handleScroll = useCallback(() => {
+    if (!scrollWrapperRef.current) return
+    const { scrollTop, clientHeight } = scrollWrapperRef.current
+    const rowsPerPage = Math.ceil(clientHeight / rowHeight) || 0
+    const currentRowIndex = Math.floor(scrollTop / rowHeight)
+    const firstVisibleRowIndex = currentRowIndex - rowsPerPage
+    const lastVisibleRowIndex = currentRowIndex + rowsPerPage * 2
+    setVisibleRowsBounds([firstVisibleRowIndex, lastVisibleRowIndex])
+  }, [])
+
+  useEffect(() => {
+    if (formOptions.totalItemsFieldName) {
+      formContext.setValue(formOptions.totalItemsFieldName, data?.length)
+    }
+  }, [formOptions.totalItemsFieldName, data?.length, formContext])
+
+  useEffect(() => {
+    const scrollWrapper = scrollWrapperRef.current
+    if (!scrollWrapper) return
+
+    handleScroll()
+    scrollWrapper.addEventListener("scroll", handleScroll)
+    return () => {
+      scrollWrapper.removeEventListener("scroll", handleScroll)
+    }
+  }, [data.length, handleScroll])
+
+  const placeholder = useMemo(() => {
+    return (
+      <RowPlaceholder>
+        <td colSpan={Children.count(children)}>
+          <div />
+        </td>
+      </RowPlaceholder>
+    )
+  }, [children])
+
+  const renderChildren = useCallback(
+    (id: string) => {
+      return Children.map(children, (child) => {
+        if (!React.isValidElement(child)) return null
+        return React.cloneElement(child as ReactElement, {
+          dataItemId: id,
+        })
+      })
+    },
+    [children]
+  )
+
+  const renderRow = useCallback(
+    (id: string, index: number) => {
+      if (index < visibleRowsBounds[0] || index > visibleRowsBounds[1]) {
+        return placeholder
+      }
+      const onClick = () => onRowClick(id)
+      const isActive = activeRowId === id
+
+      return (
+        <Row onClick={onClick} $active={isActive}>
+          {renderChildren(id)}
+        </Row>
+      )
+    },
+    [activeRowId, onRowClick, placeholder, renderChildren, visibleRowsBounds]
+  )
+
+  return useMemo(
+    () => (
+      <ScrollableWrapper ref={scrollWrapperRef} {...props}>
+        <TableWrapper>
+          {columnsNames && columnsNames?.length > 0 && (
+            <TableHeader>
+              <tr>
+                {columnsNames.map((columnName) => (
+                  <th key={columnName}>
+                    <P1>{columnName}</P1>
+                  </th>
+                ))}
+              </tr>
+            </TableHeader>
+          )}
+          <TableBody>
+            {data?.map((id, index) => renderRow(id, index))}
+          </TableBody>
+        </TableWrapper>
+      </ScrollableWrapper>
+    ),
+    [columnsNames, data, props, renderRow]
+  )
+}
+
+Table.Cell = TableCell
+
+const ScrollableWrapper = styled.div`
+  height: 100%;
+  width: 100%;
+  overflow: auto;
+  position: relative;
+`
+
+const TableWrapper = styled.table`
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: min-content;
+  max-height: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+`
+
+const TableHeader = styled.thead`
+  background: #fff;
+  height: ${rowHeight / 10}rem;
+  position: sticky;
+  z-index: 2;
+  top: 0;
+
+  th {
+    text-align: left;
+    white-space: nowrap;
+  }
+`
+
+const TableBody = styled.tbody`
+  tr {
+    height: ${rowHeight / 10}rem;
+  }
+  td {
+    text-align: left;
+  }
+`
+
+// TODO: Add proper styles for the table row
+const Row = styled.tr<{ $active?: boolean }>`
+  ${({ $active }) =>
+    $active &&
+    css`
+      border-left: 0.2rem solid #000;
+    `}
+  height: ${rowHeight / 10}rem;
+`
+
+const RowPlaceholder = styled.tr`
+  height: ${rowHeight / 10}rem;
+
+  div {
+    display: block;
+    height: 2.4rem;
+    border-radius: ${({ theme }) => theme.radius.md};
+    background: ${({ theme }) => theme.color.grey6};
+  }
+`
diff --git a/libs/generic-view/utils/src/index.ts b/libs/generic-view/utils/src/index.ts
index ac7fe08d3c..c9d9f25a0f 100644
--- a/libs/generic-view/utils/src/index.ts
+++ b/libs/generic-view/utils/src/index.ts
@@ -8,7 +8,7 @@ export * from "./lib/models/api-fc.types"
 export * from "./lib/models/api-views.types"
 export * from "./lib/models/icons.types"
 export * from "./lib/models/button.types"
-export * from "./lib/models/layout.types"
 export * from "./lib/view-generators/generate-view-config"
 export * from "./lib/map-layout-sizes/map-layout-sizes"
 export * from "./lib/models/modal.types"
+export * from "./lib/data-provider-helpers"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
new file mode 100644
index 0000000000..bfc8e351c1
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { dataProviderFilter } from "./data-provider-filter"
+
+describe("dataProviderFilter", () => {
+  it("returns all data when no filters are provided", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataProviderFilter(data)
+    expect(result).toEqual(data)
+  })
+
+  it("filters data based on single field with single pattern", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const filters = { name: ["/Alice/"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([{ name: "Alice" }])
+  })
+
+  it("filters data based on nested field with single pattern", () => {
+    const data = [{ user: { name: "Alice" } }, { user: { name: "Bob" } }]
+    const filters = { "user.name": ["/Alice/"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([{ user: { name: "Alice" } }])
+  })
+
+  it("filters data based on single field with multiple patterns", () => {
+    const data = [{ name: "Alice" }, { name: "Anastasia" }, { name: "Charlie" }]
+    const filters = { name: ["/^A/m", "/.+e$/m"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([{ name: "Alice" }])
+  })
+
+  it("filters data based on multiple fields", () => {
+    const data = [
+      { name: "Alice", age: "25" },
+      { name: "Anastasia", age: "29" },
+      { name: "Agnes", age: "30" },
+    ]
+    const filters = { name: ["/^A/m"], age: ["/2[\\d]/"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([
+      { name: "Alice", age: "25" },
+      { name: "Anastasia", age: "29" },
+    ])
+  })
+
+  it("returns empty array when no data matches the filters", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const filters = { name: ["/Charlie/"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([])
+  })
+
+  it("handles empty data array", () => {
+    const data: Record<string, unknown>[] = []
+    const filters = { name: ["/Alice/"] }
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined data", () => {
+    const filters = { name: ["/Alice/"] }
+    const result = dataProviderFilter(undefined, filters)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined filters", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataProviderFilter(data, undefined)
+    expect(result).toEqual(data)
+  })
+
+  it("handles empty filters", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const filters = {}
+    const result = dataProviderFilter(data, filters)
+    expect(result).toEqual(data)
+  })
+})
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
new file mode 100644
index 0000000000..33022cb6c8
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DataProviderFilterConfig } from "device/models"
+import { stringToRegex } from "./string-to-regex"
+import { get } from "lodash"
+
+export const dataProviderFilter = (
+  data: Record<string, unknown>[] = [],
+  filters?: DataProviderFilterConfig
+) => {
+  if (!filters || !data) return data
+
+  return data.filter((item) => {
+    return Object.entries(filters).every(([key, patterns]) => {
+      const field = get(item, key) as string
+      return patterns.every((pattern) => {
+        const regex = stringToRegex(pattern)
+        return regex.test(field || "")
+      })
+    })
+  })
+}
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
new file mode 100644
index 0000000000..26663baf19
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { dataProviderSort } from "./data-provider-sort"
+import { DataProviderSortConfig } from "device/models"
+
+describe("dataProviderSort", () => {
+  it("returns all data when no sort configuration is provided", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataProviderSort(data)
+    expect(result).toEqual(data)
+  })
+
+  it("sorts data based on single field in ascending order", () => {
+    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
+    const sort = {
+      name: { direction: "asc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      { name: "Alice" },
+      { name: "Bob" },
+      { name: "Charlie" },
+    ])
+  })
+
+  it("sorts data based on nested field in ascending order", () => {
+    const data = [
+      { user: { name: "Charlie" } },
+      { user: { name: "Alice" } },
+      { user: { name: "Bob" } },
+    ]
+    const sort = {
+      "user.name": { direction: "asc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      { user: { name: "Alice" } },
+      { user: { name: "Bob" } },
+      { user: { name: "Charlie" } },
+    ])
+  })
+
+  it("sorts data based on single field in descending order", () => {
+    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
+    const sort = {
+      name: { direction: "desc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      { name: "Charlie" },
+      { name: "Bob" },
+      { name: "Alice" },
+    ])
+  })
+
+  it("sorts data based on multiple fields with different priorities", () => {
+    const data = [
+      { name: "Alice", age: "30" },
+      { name: "Alice", age: "25" },
+      { name: "Bob", age: "20" },
+    ]
+    const sort = {
+      name: { direction: "asc", priority: 1 },
+      age: { direction: "asc", priority: 2 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      { name: "Alice", age: "25" },
+      { name: "Alice", age: "30" },
+      { name: "Bob", age: "20" },
+    ])
+  })
+
+  it("sorts incomplete data based on multiple fields with different priorities", () => {
+    const data = [
+      { name: "Bob", surname: "Smith" },
+      { name: "Alice" },
+      { name: "Alice", surname: "Smith" },
+    ]
+    const sort = {
+      name: { direction: "asc", priority: 2 },
+      surname: { direction: "asc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      {
+        name: "Alice",
+      },
+      {
+        name: "Alice",
+        surname: "Smith",
+      },
+      {
+        name: "Bob",
+        surname: "Smith",
+      },
+    ])
+  })
+
+  it("sorts data based on ordering patterns ", () => {
+    const data = [
+      { name: "Charlie" },
+      { name: "Bob" },
+      { name: "Alice" },
+      { name: "Beatrice" },
+    ]
+    const sort = {
+      name: { direction: "asc", priority: 1, orderingPatterns: ["/^B/m"] },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([
+      { name: "Beatrice" },
+      { name: "Bob" },
+      { name: "Alice" },
+      { name: "Charlie" },
+    ])
+  })
+
+  it("returns empty array when data is empty", () => {
+    const data: Record<string, unknown>[] = []
+    const sort = {
+      name: { direction: "asc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined data", () => {
+    const sort = {
+      name: { direction: "asc", priority: 1 },
+    } as DataProviderSortConfig
+    const result = dataProviderSort(undefined, sort)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined sort configuration", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataProviderSort(data, undefined)
+    expect(result).toEqual(data)
+  })
+
+  it("handles empty sort configuration", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const sort = {}
+    const result = dataProviderSort(data, sort)
+    expect(result).toEqual(data)
+  })
+})
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
new file mode 100644
index 0000000000..156e57e29c
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DataProviderSortConfig } from "device/models"
+import { stringToRegex } from "./string-to-regex"
+import { get } from "lodash"
+
+export const dataProviderSort = (
+  data: Record<string, unknown>[] = [],
+  sort?: DataProviderSortConfig
+) => {
+  if (!sort || !data) return data
+  const fieldsSortedByPriority = Object.entries(sort)
+    .sort((a, b) => a[1].priority - b[1].priority)
+    .map(([key, { direction, orderingPatterns }]) => ({
+      key,
+      direction,
+      orderingPatterns,
+    }))
+
+  return data.sort((a, b) => {
+    let score = 0
+    for (const {
+      key,
+      direction,
+      orderingPatterns = [],
+    } of fieldsSortedByPriority) {
+      const fieldA = get(a, key) as string
+      const fieldB = get(b, key) as string
+      if (!fieldA || !fieldB) {
+        continue
+      }
+
+      for (let i = 0; i < orderingPatterns.length; i++) {
+        const regex = stringToRegex(orderingPatterns[i])
+        const matchA = regex.test(fieldA)
+        const matchB = regex.test(fieldB)
+
+        if (matchA && !matchB) {
+          score = -1
+          break
+        }
+        if (!matchA && matchB) {
+          score = 1
+          break
+        }
+      }
+      if (score === 0) {
+        score =
+          direction === "asc"
+            ? fieldA.localeCompare(fieldB)
+            : fieldB.localeCompare(fieldA)
+        if (score !== 0) {
+          break
+        }
+      }
+    }
+    return score
+  })
+}
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/index.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/index.ts
new file mode 100644
index 0000000000..167c355b9f
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./data-provider-sort"
+export * from "./data-provider-filter"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts
new file mode 100644
index 0000000000..ac47356170
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { stringToRegex } from "./string-to-regex"
+
+describe("stringToRegex", () => {
+  it("converts valid regex string with options", () => {
+    const regex = stringToRegex("/abc/i")
+    expect(regex).toEqual(new RegExp("abc", "i"))
+  })
+
+  it("converts valid regex string without options", () => {
+    const regex = stringToRegex("/abc/")
+    expect(regex).toEqual(new RegExp("abc"))
+  })
+
+  it("throws error for invalid regex string", () => {
+    expect(() => stringToRegex("abc")).toThrow("Invalid regex")
+  })
+
+  it("throws error for empty string", () => {
+    expect(() => stringToRegex("")).toThrow("Invalid regex")
+  })
+
+  it("throws error for undefined input", () => {
+    expect(() => stringToRegex(undefined)).toThrow("Invalid regex")
+  })
+})
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts
new file mode 100644
index 0000000000..d6938c248f
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export const stringToRegex = (value?: string) => {
+  const main = value?.match(/\/(.+)\/.*/)?.[1]
+  const options = value?.match(/\/.+\/(.*)/)?.[1]
+  if (!main) {
+    throw new Error("Invalid regex")
+  }
+  return new RegExp(main, options)
+}
diff --git a/libs/generic-view/utils/src/lib/map-layout-sizes/map-layout-sizes.ts b/libs/generic-view/utils/src/lib/map-layout-sizes/map-layout-sizes.ts
index 3749464af8..702b605090 100644
--- a/libs/generic-view/utils/src/lib/map-layout-sizes/map-layout-sizes.ts
+++ b/libs/generic-view/utils/src/lib/map-layout-sizes/map-layout-sizes.ts
@@ -3,7 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { PrimitiveValue } from "../models/layout.types"
+import { PrimitiveValue } from "device/models"
 
 export const mapLayoutSizes = (sizes: PrimitiveValue[]) => {
   return sizes
diff --git a/libs/generic-view/utils/src/lib/models/api-fc.types.ts b/libs/generic-view/utils/src/lib/models/api-fc.types.ts
index f0b6401f0d..a1757ba559 100644
--- a/libs/generic-view/utils/src/lib/models/api-fc.types.ts
+++ b/libs/generic-view/utils/src/lib/models/api-fc.types.ts
@@ -28,7 +28,11 @@ export type BaseGenericComponent<
 export type APIFC<Data = undefined, Config = undefined> = BaseGenericComponent<
   Data,
   Config,
-  { viewKey?: string; componentKey?: string }
+  {
+    viewKey?: string
+    componentKey?: string
+    dataItemId?: string
+  }
 >
 
 export type RecursiveComponent = BaseGenericComponent<
@@ -37,5 +41,7 @@ export type RecursiveComponent = BaseGenericComponent<
   {
     viewKey: string
     componentKey: string
+    dataItemId?: string
+    componentName?: string
   }
 >
diff --git a/libs/generic-view/utils/src/lib/models/api-views.types.ts b/libs/generic-view/utils/src/lib/models/api-views.types.ts
index b10e5f26e9..61912ea586 100644
--- a/libs/generic-view/utils/src/lib/models/api-views.types.ts
+++ b/libs/generic-view/utils/src/lib/models/api-views.types.ts
@@ -4,8 +4,8 @@
  */
 
 import { z } from "zod"
-import { Layout } from "./layout.types"
 import componentsValidators from "generic-view/models"
+import { DataProviderConfig, Layout } from "device/models"
 
 type ComponentConfigProp<T> = T extends undefined
   ? { config?: T }
@@ -14,11 +14,13 @@ type ComponentConfigProp<T> = T extends undefined
 type ComponentProps<T> = T extends {
   key: string
   configValidator: z.ZodSchema
+  dataValidator: z.ZodSchema
 }
   ? {
       component: T["key"]
       layout?: Layout
       childrenKeys?: string[]
+      dataProvider?: DataProviderConfig
     } & ComponentConfigProp<z.infer<T["configValidator"]>>
   : never
 
diff --git a/libs/generic-view/utils/src/lib/models/button.types.ts b/libs/generic-view/utils/src/lib/models/button.types.ts
index 1a9c203e3b..5b1a15355f 100644
--- a/libs/generic-view/utils/src/lib/models/button.types.ts
+++ b/libs/generic-view/utils/src/lib/models/button.types.ts
@@ -28,9 +28,27 @@ export interface NavigateAction {
   viewKey: string
 }
 
+export type FormAction =
+  | {
+      type: "form-set-field"
+      key: string
+      value?: string | number | boolean
+    }
+  | {
+      type: "form-toggle-field"
+      key: string
+    }
+  | {
+      type: "form-reset"
+    }
+
 export interface CustomAction {
   type: "custom"
   callback: VoidFunction
 }
 
-export type ButtonAction = ModalAction | NavigateAction | CustomAction
+export type ButtonAction =
+  | ModalAction
+  | NavigateAction
+  | FormAction
+  | CustomAction
diff --git a/libs/generic-view/utils/src/lib/models/layout.types.ts b/libs/generic-view/utils/src/lib/models/layout.types.ts
deleted file mode 100644
index b3ae28309c..0000000000
--- a/libs/generic-view/utils/src/lib/models/layout.types.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-export type PrimitiveValue = string | number
-
-interface Gap {
-  rowGap?: string
-  columnGap?: string
-}
-
-export interface GridLayout extends Gap {
-  rows: PrimitiveValue[]
-  columns: PrimitiveValue[]
-  justifyContent?:
-    | "start"
-    | "end"
-    | "center"
-    | "stretch"
-    | "space-around"
-    | "space-between"
-    | "space-evenly"
-  justifyItems?: "start" | "end" | "center" | "stretch"
-  alignItems?: "start" | "end" | "center" | "stretch" | "baseline"
-}
-
-export interface GridPlacement {
-  row: number
-  column: number
-  width: number
-  height: number
-}
-
-export interface FlexLayout extends Gap {
-  direction?: "row" | "column" | "row-reverse" | "column-reverse"
-  justifyContent?:
-    | "flex-start"
-    | "flex-end"
-    | "center"
-    | "space-between"
-    | "space-around"
-    | "space-evenly"
-  alignItems?: "flex-start" | "flex-end" | "center" | "stretch" | "baseline"
-  alignContent?:
-    | "flex-start"
-    | "flex-end"
-    | "center"
-    | "stretch"
-    | "space-between"
-    | "space-around"
-  wrap?: "wrap" | "nowrap" | "wrap-reverse"
-}
-
-export interface FlexPlacement {
-  grow?: PrimitiveValue
-  shrink?: PrimitiveValue
-  basis?: PrimitiveValue
-  order?: PrimitiveValue
-  alignSelf?: "flex-start" | "flex-end" | "center" | "stretch"
-}
-
-interface GridLayoutBase {
-  gridLayout?: GridLayout
-  flexLayout?: undefined
-}
-
-interface FlexLayoutBase {
-  flexLayout?: FlexLayout
-  gridLayout?: undefined
-}
-
-type LayoutBase = GridLayoutBase | FlexLayoutBase
-
-export type Layout = {
-  gridPlacement?: GridPlacement
-  flexPlacement?: FlexPlacement
-  margin?: string
-  padding?: string
-} & LayoutBase

From 4c95d6b617aa06e409ec3a8078246a631c27c5d1 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 24 Sep 2024 10:40:35 +0200
Subject: [PATCH 13/64] [CP-3134] Random values are throwing errors in code
 that compiles and works fine on mudita-center-e2e project (#2075)

---
 apps/mudita-center-e2e/tsconfig.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/mudita-center-e2e/tsconfig.json b/apps/mudita-center-e2e/tsconfig.json
index 865837d96d..eb7f7b6494 100644
--- a/apps/mudita-center-e2e/tsconfig.json
+++ b/apps/mudita-center-e2e/tsconfig.json
@@ -10,9 +10,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "target": "es5",
-    "outDir": "./dist",
-    "typeRoots": ["./node_modules/@types", "./typings"]
+    "outDir": "./dist"
   },
-  "include": ["src/**/*", "./wdio.conf.ts"],
+  "include": ["src/**/*"],
   "exclude": ["node_modules"]
 }

From ef865401ef6b42a5e02012b2e95677e62cfe2e1c Mon Sep 17 00:00:00 2001
From: Maciej Kupiec <115480562+MaciejMDDV@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:08:24 +0200
Subject: [PATCH 14/64] Cp e2e - Windows/Linux fix for self-hosted (#2083)

---
 .github/workflows/e2e-feature-branch.yml | 64 +++++++++++++++++++++---
 1 file changed, 57 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e-feature-branch.yml b/.github/workflows/e2e-feature-branch.yml
index 3961132b44..94462b2f18 100644
--- a/.github/workflows/e2e-feature-branch.yml
+++ b/.github/workflows/e2e-feature-branch.yml
@@ -1,4 +1,4 @@
-name: e2e on Linux for feature branch
+name: e2e on Linux / Windows self-hosted for feature branch
 
 on:
   push:
@@ -7,7 +7,10 @@ on:
 
 jobs:
   e2e:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ Windows, Linux ]
     environment: development
     steps:
       - name: Checkout code
@@ -16,7 +19,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18.16.1
-      - name: Setup environment variables
+      - name: Setup environment variables for Linux
+        if: matrix.os == 'Linux'
         env:
           E2ECI: "true"
           TEST_GITHUB_TOKEN: ${{ secrets.MC_GITHUB_ACCESS_TOKEN }}
@@ -46,14 +50,60 @@ jobs:
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
         run: |
           printenv > .env
+      - name: Setup environment variables for Windows
+        if: matrix.os == 'Windows'
+        env:
+          E2ECI: "true"
+          TEST_GITHUB_TOKEN: ${{ secrets.MC_GITHUB_ACCESS_TOKEN }}
+          TEST_BINARY_PATH: 'C:\actions-runner\_work\mudita-center\mudita-center\apps\mudita-center\release\win-unpacked\Mudita Center.exe'
+          PHRASE_API_KEY: ${{ secrets.PHRASE_API_KEY }}
+          PHRASE_API_URL: ${{ secrets.PHRASE_API_URL }}
+          PHRASE_API_KEY_DEV: ${{ secrets.PHRASE_API_KEY_DEV }}
+          MUDITA_CENTER_SERVER_URL: ${{ secrets.MUDITA_CENTER_SERVER_URL }}
+          MUDITA_CENTER_SERVER_V2_URL: ${{ secrets.MUDITA_CENTER_SERVER_V2_URL }}
+          ROLLBAR_TOKEN: ${{ secrets.ROLLBAR_TOKEN }}
+          RELEASES_REPOSITORY_NAME: ${{ secrets.RELEASES_REPOSITORY_NAME }}
+          PRERELEASES_ENABLED: ${{ secrets.PRERELEASES_ENABLED }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.MC_GITHUB_ACCESS_TOKEN }}
+          LOGIN_MICROSOFT_ONLINE_CLIENT_ID: ${{ secrets.LOGIN_MICROSOFT_ONLINE_CLIENT_ID }}
+          FONTS_DIRECTORY_URL: ${{ secrets.FONTS_DIRECTORY_URL }}
+          FRESHDESK_API_URL: ${{ secrets.FRESHDESK_API_URL }}
+          FRESHDESK_API_TOKEN: ${{ secrets.FRESHDESK_API_TOKEN }}
+          ANALYTICS_ENABLED: ${{ secrets.ANALYTICS_ENABLED }}
+          ANALYTICS_API_URL: ${{ secrets.ANALYTICS_API_URL }}
+          ANALYTICS_API_SITE_ID: ${{ secrets.ANALYTICS_API_SITE_ID }}
+          FEATURE_TOGGLE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_ENVIRONMENT }}
+          STATIC_CONFIGURATION_FILE_PATH: ${{ secrets.STATIC_CONFIGURATION_FILE_PATH }}
+          DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
+          DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
+          FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
+          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
+          MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
+          NEW_HELP_ENABLED: ${{ secrets.NEW_HELP_ENABLED }}
+        shell: cmd
+        run: |
+          SET > .env
       - name: Setup dependencies
         run: npm run setup
-      - name: Build App
+      - name: Build App for Linux
+        if: matrix.os == 'Linux'
         run: |
           export NODE_OPTIONS="--max-old-space-size=4096"
           npm run app:dist
-      - name: Run E2E tests headless with Xvfb
+      - name: Build App for Windows
+        if: matrix.os == 'Windows'
+        run: |
+          $env:NODE_OPTIONS="--max-old-space-size=4096"
+          $env:LOCALAPPDATA=""
+          npm run app:dist
+      - name: Run E2E tests headless with Xvfb on Linux
+        if: matrix.os == 'Linux'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y xvfb
           npm run e2e:test:cicd:standalone
+      - name: Run E2E tests headless on Windows
+        env:
+          TEST_BINARY_PATH: 'C:\actions-runner\_work\mudita-center\mudita-center\apps\mudita-center\release\win-unpacked\Mudita Center.exe'
+        if: matrix.os == 'Windows'
+        run: |
+          cd apps/mudita-center-e2e
+          npm run e2e:test:cicd:standalone
\ No newline at end of file

From f235e33313897b98fa88be4d87942ded8ca70171 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Thu, 26 Sep 2024 11:16:19 +0200
Subject: [PATCH 15/64] CP-3150 fixed typo contacts to contact

---
 libs/e2e-mock/responses/src/lib/default-responses.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/e2e-mock/responses/src/lib/default-responses.ts b/libs/e2e-mock/responses/src/lib/default-responses.ts
index 692283a7f2..743b979c64 100644
--- a/libs/e2e-mock/responses/src/lib/default-responses.ts
+++ b/libs/e2e-mock/responses/src/lib/default-responses.ts
@@ -166,7 +166,7 @@ export const DEFAULT_RESPONSES: MockResponsesMap = {
             type: "mc-overview-backup",
             title: "Backup",
             backupFeatures: [
-              { label: "Contacts list", key: "CONTACTS_LIST" },
+              { label: "Contact list", key: "CONTACT_LIST" },
               { label: "Call log", key: "CALL_LOG" },
               { label: "Messages", key: "MESSAGES" },
               { label: "Notes", key: "NOTES" },

From 34ad1bb62ad8416bb72f10712481c530017c397b Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 30 Sep 2024 11:05:00 +0200
Subject: [PATCH 16/64] CP-2726 first part of the test

---
 .../src/page-objects/help-modal.page.ts       | 47 ++++++++++++
 .../src/page-objects/help.page.ts             |  4 +
 .../help/contact-support-unhappy-path.ts      | 73 +++++++++++++++++++
 .../consts/test-filenames.const.ts            |  1 +
 apps/mudita-center-e2e/wdio.conf.ts           | 17 ++++-
 5 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
index 9dcfb00b17..2e0f784a5f 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
@@ -27,6 +27,10 @@ class HelpModalPage extends Page {
     return $('[data-testid="submit-button"]')
   }
 
+  public get sendButtonLabel() {
+    return $("p*=Send")
+  }
+
   /** returns an Array containing list of attached files */
   async attachmentsList() {
     return $('[data-testid="file-list"]').$$('[data-testid="file-list-file"]')
@@ -46,6 +50,49 @@ class HelpModalPage extends Page {
   public get invalidEmailTextElement() {
     return $('//input[@data-testid="email-input"]/following-sibling::*[1]')
   }
+
+  public get iconSupport() {
+    return $('[data-testid="icon-Support"]')
+  }
+
+  public get iconAttachment() {
+    return $('[data-testid="icon-Attachment"]')
+  }
+
+  public get modalTitle() {
+    return $("h1*=Mudita Center Support")
+  }
+
+  public get modalSubtitle() {
+    return $(
+      "p*=Contact Mudita support team and we will do our best to help you resolve your issues."
+    )
+  }
+
+  public get currentDateZipFile() {
+    const currentDate = new Date().toISOString().split("T")[0] // Get current date in YYYY-MM-DD format
+    return $(`p*=${currentDate}.zip`)
+  }
+
+  public get attachedFilesText() {
+    return $("p*=Attached files")
+  }
+
+  public get attachedFilesSubText() {
+    return $("p*=The attached files will help us resolve your problem")
+  }
+
+  public get emailLabel() {
+    return $("p*=Email")
+  }
+
+  public get messageLabel() {
+    return $("p*=Message (optional)")
+  }
+
+  public get wholeModal() {
+    return $('[data-testid="contact-support-modal"]')
+  }
 }
 
 export default new HelpModalPage()
diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index 59106add62..da8a0af04f 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -41,6 +41,10 @@ class HelpPage extends Page {
   public get contactSupportButtonTooltip() {
     return $('[data-testid="icon-button-with-tooltip-description"]')
   }
+
+  public get helpMainFooterContactSupportButton() {
+    return $('[data-testid="help-main-footer-contact-support-button"]')
+  }
 }
 
 export default new HelpPage()
diff --git a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
new file mode 100644
index 0000000000..b5fb4d1f1d
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpPage from "../../page-objects/help.page"
+import HomePage from "../../page-objects/home.page"
+import HelpModalPage from "../../page-objects/help-modal.page"
+
+describe("Contact Support - Unhappy Path", () => {
+  before(async () => {
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+  })
+
+  it("Open Mudita Help Center and open Contact Support Modal", async () => {
+    const helpTab = NavigationTabs.helpTab
+    await helpTab.click()
+
+    const helpMainFooterContactSupportButton =
+      HelpPage.helpMainFooterContactSupportButton
+    await helpMainFooterContactSupportButton.click()
+  })
+
+  it("Check contents of Contact Form", async () => {
+    const wholeModal = HelpModalPage.wholeModal
+    await expect(wholeModal).toBeDisplayed()
+
+    const closeModalButton = HelpModalPage.closeModalButton
+    await expect(closeModalButton).toBeDisplayed()
+
+    const modalHeader = HelpModalPage.modalHeader
+    await expect(modalHeader).toBeDisplayed()
+
+    const iconSupport = HelpModalPage.iconSupport
+    await expect(iconSupport).toBeDisplayed()
+
+    const modalTitle = HelpModalPage.modalTitle
+    await expect(modalTitle).toBeDisplayed()
+    await expect(modalTitle).toHaveText("Mudita Center Support")
+
+    const modalSubtitle = HelpModalPage.modalSubtitle
+    await expect(modalSubtitle).toBeDisplayed()
+    await expect(modalSubtitle).toHaveText(
+      "Contact Mudita support team and we will do our best to help you resolve your issues."
+    )
+
+    const emailLabel = HelpModalPage.emailLabel
+    await expect(emailLabel).toHaveText("Email")
+    const emailInput = HelpModalPage.emailInput
+    await expect(emailInput).toBeDisplayed()
+
+    const messageLabel = HelpModalPage.messageLabel
+    await expect(messageLabel).toHaveText("Message (optional)")
+    const descriptionInput = HelpModalPage.descriptionInput
+    await expect(descriptionInput).toBeDisplayed()
+
+    const attachedFilesText = HelpModalPage.attachedFilesText
+    const attachedFilesSubText = HelpModalPage.attachedFilesSubText
+    const singleAttachment = HelpModalPage.singleAttachment
+    const iconAttachment = HelpModalPage.iconAttachment
+    const currentDateZipFile = HelpModalPage.currentDateZipFile
+    await expect(singleAttachment).toBeDisplayed()
+    await expect(iconAttachment).toBeDisplayed()
+    await expect(currentDateZipFile).toBeDisplayed() //checks if zipfile has current date (date of sending the logs is the same as zip file name)
+    await expect(attachedFilesText).toHaveText("Attached files")
+    await expect(attachedFilesSubText).toHaveText(
+      "The attached files will help us resolve your problem"
+    )
+  })
+})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index 0ab7dc591e..ffb04d240c 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -27,5 +27,6 @@ export enum TestFilesPaths {
   kompaktAbout = "src/specs/overview/kompakt-about.ts",
   kompaktConnectedDevicesModalStressTest = "src/specs/stress-tests/connected-devices-stress-test.ts",
   kompaktDrawerStressTest = "src/specs/stress-tests/device-drawer-stress-test.ts",
+  contactSupportUnhappyPath = "src/specs/help/contact-support-unhappy-path.ts",
 }
 export const toRelativePath = (path: string) => `./${path}`
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 2c8ab5a6c3..4b951b5a15 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -76,6 +76,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.kompaktAbout),
     toRelativePath(TestFilesPaths.kompaktConnectedDevicesModalStressTest),
     toRelativePath(TestFilesPaths.kompaktDrawerStressTest),
+    toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
   ],
   suites: {
     standalone: [
@@ -86,6 +87,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.backupLocationTest),
       toRelativePath(TestFilesPaths.privacyPolicyTest),
       toRelativePath(TestFilesPaths.licenseTest),
+      toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
     ],
     mock: [
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
@@ -118,6 +120,7 @@ export const config: Options.Testrunner = {
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.termsOfServiceTest),
+      toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
     ],
     cicdMock: [
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
@@ -174,9 +177,17 @@ export const config: Options.Testrunner = {
         binary: process.env.TEST_BINARY_PATH,
         args: [],
       },
-      'wdio:chromedriverOptions': {
-        binary: path.resolve(__dirname, '..', '..', 'node_modules', 'chromedriver', 'bin', 'chromedriver')
-      }
+      "wdio:chromedriverOptions": {
+        binary: path.resolve(
+          __dirname,
+          "..",
+          "..",
+          "node_modules",
+          "chromedriver",
+          "bin",
+          "chromedriver"
+        ),
+      },
       // If outputDir is provided WebdriverIO can capture driver session logs
       // it is possible to configure which logTypes to include/exclude.
       // excludeDriverLogs: ['*'], // pass '*' to exclude all driver session logs

From 7b339612eeca5885a22334620abbea767a76449d Mon Sep 17 00:00:00 2001
From: Tomasz Malecki <135224481+tomaszmaleckimudita@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:00:36 +0200
Subject: [PATCH 17/64] CP-3071 [E2E][Help] Q4 2024 Change - Verify Help
 Contents, Search and Contact button (#2052)

---
 .../src/page-objects/help-article.page.ts     |  69 +++++++
 .../src/page-objects/help.page.ts             |  71 ++++---
 .../src/specs/help/help-section-check.e2e.ts  | 180 ++++++++++++++++++
 .../src/specs/help/help-window-check.e2e.ts   | 107 -----------
 .../consts/test-filenames.const.ts            |   2 +-
 apps/mudita-center-e2e/wdio.conf.ts           |   6 +-
 6 files changed, 298 insertions(+), 137 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/page-objects/help-article.page.ts
 create mode 100644 apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
 delete mode 100644 apps/mudita-center-e2e/src/specs/help/help-window-check.e2e.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/help-article.page.ts b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
new file mode 100644
index 0000000000..2276653183
--- /dev/null
+++ b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ChainablePromiseElement } from "webdriverio"
+import Page from "./page"
+
+class HelpArticlePage extends Page {
+    public get helpTabTitle() { 
+        return $('[data-testid="location"]')
+    }
+    public get helpArticleBackButton() {
+        return $('[data-testid="help-article-back-button"]')
+    }
+    public get helpArticleTitle() {
+        return $('[data-testid="help-article-title"]')
+    }
+    public get helpArticleWarningIcon() {
+        return $('[data-testid="help-article-warning-icon"]')
+    }
+    public get helpArticleWarning() {
+        return $('[data-testid="help-article-warning"]')
+    }
+    public get helpArticleContent() {
+        return $('[data-testid="help-article-content"]')
+    }
+    public get helpArticleContentBlocks() {
+        return $$('[data-testid="help-article-content-block"]')
+    }
+    getHelpArticleContentBlock(index: number) {
+        return $$('[data-testid="help-article-content-block"]')[index]
+    }
+    getHelpArticleContentBlockTitle(index: number) {
+        return $$('[data-testid="help-article-content-block-title"]')[index]
+    }
+    public get helpArticleContentBlockText() {
+        return $$('[data-testid="help-article-content-block-text"]')
+    }
+    getHelpArticleContentBlockText(index: number) {
+        return $$('[data-testid="help-article-content-block"]')[index].$('[data-testid="help-article-content-block-text"]')
+    }
+    public get helpArticleFeedback() {
+        return $('[data-testid="help-article-feedback"]')
+    }
+    public get helpArticleFeedbackTitle() {
+        return $('[data-testid="help-article-feedback-title"]')
+    }
+    public get helpArticleFeedbackYesButton() {
+        return $('[data-testid="help-article-feedback-yes-button"]')
+    }
+    public get helpArticleFeedbackNoButton() {
+        return $('[data-testid="help-article-feedback-no-button"]')
+    }
+    public get helpArticleFooter() {
+        return $('[data-testid="help-article-footer"]')
+    }
+    public get helpArticleFooterTitle() {
+        return $('[data-testid="help-article-footer-title"]')
+    }
+    public get helpArticleFooterButton() {
+        return $('[data-testid="help-article-footer-button"]')
+    }
+    public get helpArticleFooterVisitSupportButton() {
+        return $('[data-testid="help-article-footer-button"]')
+    }
+}
+
+export default new HelpArticlePage()
diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index da8a0af04f..d3f3ca5796 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -6,40 +6,59 @@
 import Page from "./page"
 
 class HelpPage extends Page {
-  public get listElement() {
-    return $('[data-testid="help-component-question"]')
+  public get helpTabTitle() { 
+    return $('[data-testid="location"]')
   }
-
-  public get listElements() {
-    return $$('[data-testid="help-component-question"]')
+  public get helpMainHeader() {
+    return $('[data-testid="help-main-header"]')
   }
-
-  public get windowTitle() {
-    return $('[data-testid="help-component-title"]')
+  public get helpMainSubHeader() { 
+    return $('[data-testid="help-main-subheader"]')
   }
-
-  public get searchIcon() {
-    return $('[data-testid="icon-Magnifier"]')
+  public get iconSearch() {
+    return $('[data-testid="icon-search"]')
   }
-
-  public get searchPlaceholder() {
-    return $('[type="search"]')
+  public get helpSearchInput() {
+    return $('[data-testid="help-search-input"]')
   }
-
-  public get topicContent() {
-    return $('[data-testid="content"]')
+  public get helpSearchResults() {
+    return $('[data-testid="help-search-results"]')
   }
-
-  public get articleBackLink() {
-    return $('[data-testid="back-link"]')
+  public get helpSearchResultsParagraph() {
+    return $('[data-testid="help-search-results"] p')
   }
-
-  public get contactSupportButton() {
-    return $('[data-testid="help-support-button"]')
+  public get helpSearchResultsList()  {
+    return $('[data-testid="help-search-results"] ul')
   }
-
-  public get contactSupportButtonTooltip() {
-    return $('[data-testid="icon-button-with-tooltip-description"]')
+  public get helpSearchResultsItems() {
+    return $$('[data-testid="help-search-result-item"]')
+  }
+  public get helpCategoriesTitle() {
+    return $('[data-testid="help-categories-title"]')
+  }
+  public get helpCategoriesList() {
+    return $('[data-testid="help-categories-list"]')
+  }
+  public get helpCategoriesListItems() {
+    return $$('[data-testid="help-categories-list-item"]')
+  }
+  public get helpSubCategoriesList() {
+    return $('[data-testid="help-subcategories-list"]')
+  }
+  public get helpSubCategoriesListItems() {
+    return $$('[data-testid="help-subcategories-list-item"]')
+  }
+  public get helpSubCategoriesListItemsLeftColumn() {
+    return $$('[data-testid="help-subcategories-list"]>div')[0].$$('[data-testid="help-subcategories-list-item"]')
+  }
+  public get helpSubCategoriesListItemsRightColumn() {
+    return $$('[data-testid="help-subcategories-list"]>div')[1].$$('[data-testid="help-subcategories-list-item"]')
+  }
+  public get helpMainFooterDescription() {
+      return $('[data-testid="help-main-footer-description"]')
+  }
+  public get helpMainFooterContactSupportButton() {
+      return $('[data-testid="help-main-footer-contact-support-button"]')
   }
 
   public get helpMainFooterContactSupportButton() {
diff --git a/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
new file mode 100644
index 0000000000..7b66bbdaef
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
@@ -0,0 +1,180 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpPage from "../../page-objects/help.page"
+import HelpArticlePage from "../../page-objects/help-article.page"
+import HomePage from "../../page-objects/home.page"
+
+describe("Check Help window", () => {
+  before(async () => {
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+  })
+
+  it("Open Help window", async () => {
+    const helpTab = await NavigationTabs.helpTab
+    await helpTab.waitForDisplayed({ timeout: 15000 })
+    await helpTab.click()
+
+    //Check window title
+    const helpTabTitle = await HelpPage.helpTabTitle
+    await helpTabTitle.waitForDisplayed({ timeout: 15000 })
+    await expect(helpTabTitle).toHaveText("Mudita Help Center")
+
+    //Verify welcome message
+    const helpMainHeader = await HelpPage.helpMainHeader
+    await expect(helpMainHeader).toHaveText("Welcome! How can we help you?")
+
+    //Verify welcome paragraph
+    const helpMainSubHeader = await HelpPage.helpMainSubHeader
+    await expect(helpMainSubHeader).toHaveText("Browse our selection of how-to and troubleshooting guides")
+
+    //Verify search bar
+    const iconSearch = await HelpPage.iconSearch
+    await expect(iconSearch).toBeDisplayed()
+
+    //Verify search bar icon
+    const helpSearchInput = await HelpPage.helpSearchInput
+    await expect(helpSearchInput).toBeDisplayed()
+
+    //Verify placeholder
+    await expect(helpSearchInput).toHaveAttrContaining("placeholder", "Search topics")
+    
+    //Verify main section title
+    const helpCategoriesTitle = await HelpPage.helpCategoriesTitle
+    await expect(helpCategoriesTitle).toHaveText("Which device are you using with Mudita Center?")
+
+    //Section tabs
+    const helpCategoriesList = await HelpPage.helpCategoriesList
+    await expect(helpCategoriesList).toBeDisplayed()
+    const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
+    await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+    await expect(helpCategoriesListItems).toBeDisplayed()
+    
+    //Active section tab
+    expect(helpCategoriesListItems[0]).toHaveElementClassContaining("active")
+    const activeTabColor = await helpCategoriesListItems[0].getCSSProperty("color")
+    await expect(activeTabColor.value).toBe("rgba(0,0,0,1)")
+    const activeTabBackground = await helpCategoriesListItems[0].getCSSProperty(
+      "background-color"
+    )
+    await expect(activeTabBackground.value).toBe(
+      "rgba(237,237,237,1)"
+    )
+
+    //Hover on section tabs
+    await helpCategoriesListItems[1].moveTo()
+    const hoverTabColor = await helpCategoriesListItems[0].getCSSProperty("color")
+    await expect(hoverTabColor.value).toBe("rgba(0,0,0,1)")
+    const hoverTabBackground = await helpCategoriesListItems[0].getCSSProperty(
+      "background-color"
+    )
+    await expect(hoverTabBackground.value).toBe(
+      "rgba(237,237,237,1)"
+    )
+  })
+
+  it("Verify Harmony Section titles", async () => {
+
+    //Verify all items
+    const helpSubCategoriesListItems = await HelpPage.helpSubCategoriesListItems
+    await expect(helpSubCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+
+    //Verify left column
+    const helpSubCategoriesListItemsLeftColumn = await HelpPage.helpSubCategoriesListItemsLeftColumn
+    await expect(helpSubCategoriesListItemsLeftColumn).toBeElementsArrayOfSize({ gte: 1 })
+
+    //Verify right column
+    const helpSubCategoriesListItemsRightColumn = await HelpPage.helpSubCategoriesListItemsRightColumn
+    await expect(helpSubCategoriesListItemsRightColumn).toBeElementsArrayOfSize({ gte: 1 })
+
+    //Every sub category should not be empty
+    const helpSubCategoryArticlesListItemTitles = await helpSubCategoriesListItems.map((element) => {
+       return element.$('[data-testid="help-subcategories-list-item-title"]').getText()
+    })
+    await expect(helpSubCategoryArticlesListItemTitles.length).toBeGreaterThanOrEqual(1)
+
+    //List of articles should not be empty in any of the categories
+    let helpSubCategoriesListItem
+    for await (helpSubCategoriesListItem of helpSubCategoriesListItems) {
+      await expect(helpSubCategoriesListItem.$$('[data-testid="help-subcategory-articles-list-item"]')).toBeElementsArrayOfSize({ gte: 1 })
+    }
+  })
+  it("Search for questions and verify results", async () => {
+    const helpSearchInput = await HelpPage.helpSearchInput
+    await helpSearchInput.setValue("How to do factory reset on Pure")
+
+    //Verify quick search results
+    const helpSearchResults = await HelpPage.helpSearchResults
+    await expect(helpSearchResults).toBeDisplayed()
+    const helpSearchResultsParagraph = await HelpPage.helpSearchResultsParagraph
+    await expect(helpSearchResultsParagraph).toBeDisplayed()
+    await expect(helpSearchResultsParagraph).toHaveText("Quick Links")
+    //List should not be empty, bigger than 1
+    const helpSearchResultsItems = await HelpPage.helpSearchResultsItems
+    await expect(helpSearchResultsItems).toBeElementsArrayOfSize({ gte: 1 })
+    //Click first article
+    helpSearchResultsItems[0].click()
+  })
+  it("Check first article", async () => {
+    //Check window title
+    const helpTabTitle = await HelpPage.helpTabTitle
+    await helpTabTitle.waitForDisplayed({ timeout: 15000 })
+    await expect(helpTabTitle).toHaveText("Mudita Help Center")
+
+    //Check back button
+    const helpArticleBackButton = await HelpArticlePage.helpArticleBackButton
+    await expect(helpArticleBackButton).toBeClickable()
+
+    //Check article title
+    const helpArticleTitle = await HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toHaveText("How to do factory reset on Pure")
+
+    //Check article warning 
+    const helpArticleWarningIcon = await HelpArticlePage.helpArticleWarningIcon
+    await expect(helpArticleWarningIcon).toBeDisplayed()
+
+    const helpArticleWarning = await HelpArticlePage.helpArticleWarning
+    await expect(helpArticleWarning).toHaveTextContaining("This will delete everything on your phone!")
+
+    //Check article content
+    const helpArticleContent = await HelpArticlePage.helpArticleContent
+    await expect(helpArticleContent).toBeDisplayed() 
+    const helpArticleContentBlocks = await HelpArticlePage.helpArticleContentBlocks
+    await expect(helpArticleContentBlocks).toBeElementsArrayOfSize({ gte: 2 })
+    await expect(HelpArticlePage.getHelpArticleContentBlockTitle(0)).toHaveTextContaining("If your Pure is locked:")
+    await expect(HelpArticlePage.getHelpArticleContentBlockText(0)).toHaveTextContaining("Turn off your Pure, hold down the right selection key > select Yes")
+  
+    //Check article helpful section
+    const helpArticleFeedbackYesButton = await HelpArticlePage.helpArticleFeedbackYesButton
+    await expect(helpArticleFeedbackYesButton).toBeDisplayed()
+    await expect(helpArticleFeedbackYesButton).toBeClickable()
+
+    const helpArticleFeedbackNoButton = await HelpArticlePage.helpArticleFeedbackNoButton
+    await expect(helpArticleFeedbackNoButton).toBeDisplayed()
+    await expect(helpArticleFeedbackNoButton).toBeClickable()
+
+    const helpArticleFooter = await HelpArticlePage.helpArticleFooter
+    await helpArticleFooter.scrollIntoView()
+
+    const helpArticleFooterTitle = await HelpArticlePage.helpArticleFooterTitle
+    await expect(helpArticleFooterTitle).toHaveText("Need more help?\nVisit our Support Website")
+    
+    const helpArticleFooterVisitSupportButton = await HelpArticlePage.helpArticleFooterVisitSupportButton
+    await expect(helpArticleFooterVisitSupportButton).toHaveText("VISIT SUPPORT WEBSITE")
+
+    helpArticleBackButton.click()
+  })
+  it("Verify you are back in active first category", async () => {
+    const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
+    await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+    await expect(helpCategoriesListItems).toBeDisplayed()
+    
+    //Active section tab
+    expect(helpCategoriesListItems[0]).toHaveElementClassContaining("active")
+  })
+})
diff --git a/apps/mudita-center-e2e/src/specs/help/help-window-check.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-window-check.e2e.ts
deleted file mode 100644
index a05bd5a71e..0000000000
--- a/apps/mudita-center-e2e/src/specs/help/help-window-check.e2e.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import NavigationTabs from "../../page-objects/tabs.page"
-import HelpPage from "../../page-objects/help.page"
-import HomePage from "../../page-objects/home.page"
-import HelpModalPage from "../../page-objects/help-modal.page"
-import NewsPage from "../../page-objects/news.page"
-
-describe("Check Help window", () => {
-  before(async () => {
-    const notNowButton = await HomePage.notNowButton
-    await notNowButton.waitForDisplayed()
-    await notNowButton.click()
-  })
-
-  it("Open Help window", async () => {
-    const helpTab = await NavigationTabs.helpTab
-    await helpTab.waitForDisplayed({ timeout: 15000 })
-    await helpTab.click()
-
-    await browser.switchWindow("#/help")
-
-    // Check window title
-    const helpTitle = await HelpPage.windowTitle
-    await helpTitle.waitForDisplayed({ timeout: 15000 })
-    await expect(helpTitle).toHaveText("Mudita Center Help")
-  })
-
-  it("Check contents of Mudita Help", async () => {
-    // Check presence of the search engine
-    const searchIcon = await HelpPage.searchIcon
-    await expect(searchIcon).toBeDisplayed()
-
-    const searchPlaceholder = await HelpPage.searchPlaceholder
-    await expect(searchPlaceholder).toHaveAttributeContaining(
-      "placeholder",
-      "Search"
-    )
-
-    // Check presence of Contact support button
-    const contactSupportButton = await HelpPage.contactSupportButton
-    await expect(contactSupportButton).toBeDisplayed()
-    await expect(contactSupportButton).toBeClickable()
-
-    const contactSupportButtonTooltip =
-      await HelpPage.contactSupportButtonTooltip
-    contactSupportButton.moveTo()
-    await expect(contactSupportButtonTooltip).toBeDisplayed()
-    await expect(contactSupportButtonTooltip).toHaveText("Contact support")
-
-    // Check accordion
-    const helpTopic = await HelpPage.listElement
-
-    await expect(helpTopic).toBeDisplayed()
-    const noOfArticles = await HelpPage.listElements
-    await expect(noOfArticles).toBeElementsArrayOfSize({ gte: 25 })
-  })
-
-  it("Check content of first article", async () => {
-    const helpTopic = await HelpPage.listElement
-    await expect(helpTopic).toHaveText(
-      "How to import my iCloud contacts into Mudita Pure by using .vcf file?"
-    )
-    await helpTopic.click()
-    const helpTopicContent = await HelpPage.topicContent
-    await expect(helpTopicContent).toBeDisplayed()
-    await expect(helpTopicContent).toHaveTextContaining(
-      "Click on the “Import” button."
-    )
-    const backLink = await HelpPage.articleBackLink
-    await backLink.click()
-    const helpTitle = await HelpPage.windowTitle
-    await expect(helpTitle).toHaveText("Mudita Center Help")
-  })
-
-  it("Search for questions & check search results", async () => {
-    const searchPlaceholder = await HelpPage.searchPlaceholder
-    searchPlaceholder.setValue("fail")
-    browser.keys("\uE007")
-    const helpTopic = await HelpPage.listElement
-    await expect(helpTopic).toHaveText("OS update failed")
-    searchPlaceholder.setValue("harMony")
-    await helpTopic.waitForDisplayed({ timeout: 15000 })
-    await expect(helpTopic).toHaveText(
-      "How to connect my Mudita Harmony to Center?"
-    )
-    const noOfArticles = await HelpPage.listElements
-    await expect(noOfArticles).toBeElementsArrayOfSize({ gte: 4 })
-  })
-
-  it("Check Contact support modal", async () => {
-    const contactSupportButton = await HelpPage.contactSupportButton
-    await contactSupportButton.click()
-    const modalHeader = await HelpModalPage.modalHeader
-    await expect(modalHeader).toBeDisplayed
-    const closeButton = await HelpModalPage.closeModalButton
-    await closeButton.click()
-
-    await browser.switchWindow("#/news")
-    const newsHeader = await NewsPage.newsHeader
-    await expect(newsHeader).toBeDisplayed
-    await expect(newsHeader).toHaveText("Mudita News")
-  })
-})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index ffb04d240c..1d40ca54ca 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -6,7 +6,7 @@
 // the format should stay as it is - it should contain `./` at the beginning
 export enum TestFilesPaths {
   messagesInAppNavigationTest = "src/specs/messages/messages-in-app-navigation.e2e.ts",
-  helpWindowCheckTest = "src/specs/help/help-window-check.e2e.ts",
+  helpSectionCheckTest = "src/specs/help/help-section-check.e2e.ts",
   homePageTestDeviceNotConnectedTest = "src/specs/overview/home-page-device-not-connecting.e2e.ts",
   e2eMockSample = "src/specs/overview/e2e-mock-sample.e2e.ts",
   mcCheckForUpdatesTest = "src/specs/settings/mc-version-check-for-updates.e2e.ts",
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 4b951b5a15..9942f6ca00 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -56,7 +56,7 @@ export const config: Options.Testrunner = {
   //
   specs: [
     toRelativePath(TestFilesPaths.messagesInAppNavigationTest),
-    toRelativePath(TestFilesPaths.helpWindowCheckTest),
+    toRelativePath(TestFilesPaths.helpSectionCheckTest),
     toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
     toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
     toRelativePath(TestFilesPaths.newsPageOnlineTest),
@@ -80,7 +80,7 @@ export const config: Options.Testrunner = {
   ],
   suites: {
     standalone: [
-      //toRelativePath(TestFilesPaths.helpWindowCheckTest),
+      //toRelativePath(TestFilesPaths.helpSectionCheckTest),
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.termsOfServiceTest),
@@ -116,7 +116,7 @@ export const config: Options.Testrunner = {
     kompakt: [],
     deviceUpdate: [],
     cicdStandalone: [
-      //toRelativePath(TestFilesPaths.helpWindowCheckTest),
+      //toRelativePath(TestFilesPaths.helpSectionCheckTest),
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.termsOfServiceTest),

From 20350d34b54b4e96534f17cedba77576181b1b6a Mon Sep 17 00:00:00 2001
From: robertmudi <158469469+robertmudi@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:35:58 +0200
Subject: [PATCH 18/64] CP-2930 [API Device][Kompakt] Backup - Getting Initial
 Information (Overview Config Check) (#2069)

---
 .../page-objects/modal-backup-kompakt.page.ts |  94 +++++++++
 .../kompakt-backup-getting-initial-info.ts    | 192 ++++++++++++++++++
 .../consts/test-filenames.const.ts            |   1 +
 apps/mudita-center-e2e/wdio.conf.ts           |   3 +
 .../responses/src/lib/default-responses.ts    |   6 +-
 .../responses/src/lib/overview-responses.ts   |  90 ++++++++
 6 files changed, 383 insertions(+), 3 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
 create mode 100644 apps/mudita-center-e2e/src/specs/overview/kompakt-backup-getting-initial-info.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
new file mode 100644
index 0000000000..de4baace23
--- /dev/null
+++ b/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { OverviewPage } from "./overview.page"
+
+class ModalBackupKompaktPage extends OverviewPage {
+  public get backupInfo() {
+    return $('//div[@data-testid="block-box-backup"]//p')
+  }
+  public get createBackupButton() {
+    return $('//button[@type="button" and .//span[text()="Create backup"]]')
+  }
+  public get createBackupProceedNext() {
+    return $('[data-testid="backup-features-modal-create-action"]')
+  }
+
+  public get contactList() {
+    return $$('[data-testid="backup-features-modal-element-active"]')[0]
+  }
+  public get callLog() {
+    return $$('[data-testid="backup-features-modal-element-active"]')[1]
+  }
+  public get backupModalTitle() {
+    return $('[data-testid="backup-features-modal-title"]')
+  }
+  public get backupModalDescription() {
+    return $('[data-testid="backup-features-modal-description"]')
+  }
+  public get backupModalCancel() {
+    return $('[data-testid="backup-features-modal-cancel-action"]')
+  }
+
+  public get backupModalClose() {
+    return $('[data-testid="modal-close-button-icon-button"]')
+  }
+
+  public get createBackupPasswordModalTitle() {
+    return $('[data-testid="predefined-backup-password-title"]')
+  }
+
+  public get createBackupPasswordOptionalText() {
+    return $('[data-testid="predefined-backup-password-title"] span')
+  }
+  public get createBackupPasswordModalDescription() {
+    return $('[data-testid="predefined-backup-password-description"]')
+  }
+
+  public get createBackupPasswordModalDescriptionMore() {
+    return $('[data-testid="predefined-backup-password-description"] span')
+  }
+
+  public get createBackupPasswordPlaceholder() {
+    return $('[data-testid="predefined-backup-password-placeholder"]')
+  }
+
+  public get createBackupPasswordRepeatPlaceholder() {
+    return $('[data-testid="predefined-backup-password-repeat-placeholder"]')
+  }
+
+  public get createBackupPasswordConfirm() {
+    return $('[data-testid="predefined-backup-password-confirm-button"]')
+  }
+
+  public get createBackupPasswordSkip() {
+    return $('[data-testid="predefined-backup-password-skip-button"]')
+  }
+
+  public get createBackupPasswordClose() {
+    return $('[data-testid="modal-close-button-icon-button"]')
+  }
+
+  public get inputPassword() {
+    return $$('[data-testid="interactive-text-input-input"]')[0]
+  }
+
+  public get repeatInputPassword() {
+    return $$('[data-testid="interactive-text-input-input"]')[1]
+  }
+
+  public get unhidePasswordIcon() {
+    return $('[data-testid="icon-password-hide"]')
+  }
+
+  public get hidePasswordIcon() {
+    return $('[data-testid="icon-password-show"]')
+  }
+
+  public get passwordsDoNotMatch() {
+    return $('[data-testid="interactive-text-input-error-text"]')
+  }
+}
+export default new ModalBackupKompaktPage()
diff --git a/apps/mudita-center-e2e/src/specs/overview/kompakt-backup-getting-initial-info.ts b/apps/mudita-center-e2e/src/specs/overview/kompakt-backup-getting-initial-info.ts
new file mode 100644
index 0000000000..f4ce089902
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/overview/kompakt-backup-getting-initial-info.ts
@@ -0,0 +1,192 @@
+import { E2EMockClient } from "../../../../../libs/e2e-mock/client/src"
+import {
+  overviewConfigForBackup,
+  overviewDataWithOneSimCard,
+} from "../../../../../libs/e2e-mock/responses/src"
+import ModalBackupKompaktPage from "../../page-objects/modal-backup-kompakt.page"
+
+describe("E2E mock sample - overview view", () => {
+  before(async () => {
+    E2EMockClient.connect()
+    //wait for a connection to be established
+    await browser.waitUntil(() => {
+      return E2EMockClient.checkConnection()
+    })
+  })
+
+  after(() => {
+    E2EMockClient.stopServer()
+    E2EMockClient.disconnect()
+  })
+
+  it("Connect device", async () => {
+    E2EMockClient.mockResponse({
+      path: "path-1",
+      body: overviewConfigForBackup,
+      endpoint: "FEATURE_CONFIGURATION",
+      method: "GET",
+      status: 200,
+    })
+    E2EMockClient.mockResponse({
+      path: "path-1",
+      body: overviewDataWithOneSimCard,
+      endpoint: "FEATURE_DATA",
+      method: "GET",
+      status: 200,
+    })
+    E2EMockClient.addDevice({
+      path: "path-1",
+      serialNumber: "first-serial-number",
+    })
+
+    await browser.pause(6000)
+    const menuItem = await $(`//a[@href="#/generic/mc-overview"]`)
+
+    await menuItem.waitForDisplayed({ timeout: 10000 })
+    await expect(menuItem).toBeDisplayed()
+  })
+
+  it("Wait for Overview Page and click Create Backup", async () => {
+    const createBackupButton = await ModalBackupKompaktPage.createBackupButton
+    await expect(createBackupButton).toBeDisplayed()
+    await expect(createBackupButton).toBeClickable()
+    await createBackupButton.click()
+  })
+
+  it("Verify modal in scope of available backup options, verify text and buttons", async () => {
+    const contactList = await ModalBackupKompaktPage.contactList
+    await expect(contactList).toBeDisplayed()
+    const contactListText = await contactList?.getProperty("textContent")
+    expect(contactListText).toContain("Contact list")
+    expect(contactListText).not.toContain("Coming soon!")
+
+    const callLog = await ModalBackupKompaktPage.callLog
+    await expect(callLog).toBeDisplayed()
+    const callLogText = await callLog?.getProperty("textContent")
+    expect(callLogText).toContain("Call log")
+    expect(callLogText).not.toContain("Coming soon!")
+
+    const backupModalTitle = ModalBackupKompaktPage.backupModalTitle
+    await expect(backupModalTitle).toBeDisplayed()
+    await expect(backupModalTitle).toHaveText("Create backup")
+
+    const backupModalDescription = ModalBackupKompaktPage.backupModalDescription
+    await expect(backupModalDescription).toBeDisplayed()
+    await expect(backupModalDescription).toHaveText(
+      "All backup data stays on your computer."
+    )
+
+    const backupModalCancel = ModalBackupKompaktPage.backupModalCancel
+    await expect(backupModalCancel).toBeClickable()
+
+    const backupModalClose = ModalBackupKompaktPage.backupModalClose
+    await expect(backupModalClose).toBeClickable()
+  })
+
+  it("Click Create backup - verify modal about create password for backup", async () => {
+    const createBackupProceedNext =
+      await ModalBackupKompaktPage.createBackupProceedNext
+    await expect(createBackupProceedNext).toBeClickable()
+    await createBackupProceedNext.click()
+
+    const createBackupPasswordModalTitle =
+      ModalBackupKompaktPage.createBackupPasswordModalTitle
+    await expect(createBackupPasswordModalTitle).toHaveTextContaining(
+      "Create password for backup"
+    )
+
+    const createBackupPasswordOptionalText =
+      ModalBackupKompaktPage.createBackupPasswordOptionalText
+    await expect(createBackupPasswordOptionalText).toHaveText("(optional)")
+
+    const createBackupPasswordModalDescription =
+      ModalBackupKompaktPage.createBackupPasswordModalDescription
+    await expect(createBackupPasswordModalDescription).toHaveTextContaining(
+      "You can protect backup with a new password."
+    )
+
+    const createBackupPasswordModalDescriptionMore =
+      ModalBackupKompaktPage.createBackupPasswordModalDescriptionMore
+    await expect(createBackupPasswordModalDescriptionMore).toHaveText(
+      "* You can't change/recover the password later."
+    )
+
+    const createBackupPasswordPlaceholder =
+      ModalBackupKompaktPage.createBackupPasswordPlaceholder
+    await expect(createBackupPasswordPlaceholder).toBeClickable()
+
+    const createBackupPasswordRepeatPlaceholder =
+      ModalBackupKompaktPage.createBackupPasswordRepeatPlaceholder
+    await expect(createBackupPasswordRepeatPlaceholder).toBeClickable()
+
+    const createBackupPasswordConfirm =
+      ModalBackupKompaktPage.createBackupPasswordConfirm
+    await expect(createBackupPasswordConfirm).not.toBeClickable()
+
+    const createBackupPasswordSkip =
+      ModalBackupKompaktPage.createBackupPasswordSkip
+    await expect(createBackupPasswordSkip).toBeClickable()
+
+    const createBackupPasswordClose =
+      ModalBackupKompaktPage.createBackupPasswordClose
+    await expect(createBackupPasswordClose).toBeClickable()
+  })
+
+  it("Fill password for a backup, unhide it and verify value and design", async () => {
+    const inputPassword = ModalBackupKompaktPage.inputPassword
+    await inputPassword.click()
+    const randomPassword = Math.random().toString(36).substring(2, 10)
+    await inputPassword.setValue(randomPassword)
+
+    const checkPassword = await inputPassword.getAttribute("type")
+    await expect(checkPassword).toBe("password")
+
+    const unhidePasswordIcon = ModalBackupKompaktPage.unhidePasswordIcon
+    await unhidePasswordIcon.click()
+
+    //Verify design, and it's value to check if user can hide password if it was displayed
+    const hidePasswordIcon = ModalBackupKompaktPage.hidePasswordIcon
+    await expect(hidePasswordIcon).toBeClickable()
+  })
+
+  it("Fill repeat password for a backup, unhide it and verify value and design, verify (passwords do not match)", async () => {
+    const repeatInputPassword = ModalBackupKompaktPage.repeatInputPassword
+    await repeatInputPassword.click()
+    const randomPassword2 = Math.random().toString(36).substring(2, 10)
+    await repeatInputPassword.setValue(randomPassword2)
+
+    const checkPassword = await repeatInputPassword.getAttribute("type")
+    await expect(checkPassword).toBe("password")
+
+    const unhidePasswordIcon = ModalBackupKompaktPage.unhidePasswordIcon
+    await unhidePasswordIcon.click()
+
+    //Verify design and it's value to check if user can hide password if it was displayed
+    const hidePasswordIcon = ModalBackupKompaktPage.hidePasswordIcon
+    await expect(hidePasswordIcon).toBeClickable()
+
+    const passwordsDoNotMatch = ModalBackupKompaktPage.passwordsDoNotMatch
+    await expect(passwordsDoNotMatch).toHaveText("Passwords do not match")
+  })
+
+  it("Fill repeat password with first filed password and verify if passwords do not match is gone", async () => {
+    const inputPassword = ModalBackupKompaktPage.inputPassword
+    const repeatInputPassword = ModalBackupKompaktPage.repeatInputPassword
+    const randomPassword = Math.random().toString(36).substring(2, 10)
+    await inputPassword.click()
+    await inputPassword.clearValue()
+    await inputPassword.setValue(randomPassword)
+
+    await repeatInputPassword.click()
+    await repeatInputPassword.clearValue()
+    await repeatInputPassword.setValue(randomPassword)
+
+    const passwordsDoNotMatch = ModalBackupKompaktPage.passwordsDoNotMatch
+    await expect(passwordsDoNotMatch).not.toBeDisplayed()
+
+    const createBackupPasswordConfirm =
+      ModalBackupKompaktPage.createBackupPasswordConfirm
+    await expect(createBackupPasswordConfirm).toBeClickable()
+    await createBackupPasswordConfirm.click()
+  })
+})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index 1d40ca54ca..c93795b1ee 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -28,5 +28,6 @@ export enum TestFilesPaths {
   kompaktConnectedDevicesModalStressTest = "src/specs/stress-tests/connected-devices-stress-test.ts",
   kompaktDrawerStressTest = "src/specs/stress-tests/device-drawer-stress-test.ts",
   contactSupportUnhappyPath = "src/specs/help/contact-support-unhappy-path.ts",
+  kompaktBackupModalGettingInitialInfo = "src/specs/overview/kompakt-backup-getting-initial-info.ts",
 }
 export const toRelativePath = (path: string) => `./${path}`
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 9942f6ca00..738ccc734e 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -77,6 +77,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.kompaktConnectedDevicesModalStressTest),
     toRelativePath(TestFilesPaths.kompaktDrawerStressTest),
     toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
+    toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
   ],
   suites: {
     standalone: [
@@ -103,6 +104,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.kompaktAbout),
       toRelativePath(TestFilesPaths.kompaktConnectedDevicesModalStressTest),
       toRelativePath(TestFilesPaths.kompaktDrawerStressTest),
+      toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
     ],
     multidevicePureHarmony: [],
     multideviceSingleHarmony: [],
@@ -136,6 +138,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.kompaktAbout),
       toRelativePath(TestFilesPaths.kompaktConnectedDevicesModalStressTest),
       toRelativePath(TestFilesPaths.kompaktDrawerStressTest),
+      toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
     ],
   },
   // Patterns to exclude.
diff --git a/libs/e2e-mock/responses/src/lib/default-responses.ts b/libs/e2e-mock/responses/src/lib/default-responses.ts
index 743b979c64..e9b4fe9db8 100644
--- a/libs/e2e-mock/responses/src/lib/default-responses.ts
+++ b/libs/e2e-mock/responses/src/lib/default-responses.ts
@@ -179,9 +179,9 @@ export const DEFAULT_RESPONSES: MockResponsesMap = {
             ],
             restoreFeatures: [
               {
-                label: "Contacts list",
-                feature: "CONTACTS_LIST",
-                keys: ["CONTACTS_LIST"],
+                label: "Contact list",
+                feature: "CONTACT_LIST",
+                keys: ["CONTACT_LIST"],
               },
               { label: "Call log", feature: "CALL_LOG", keys: ["CALL_LOG"] },
               { label: "Messages", feature: "MESSAGES", keys: ["MESSAGES"] },
diff --git a/libs/e2e-mock/responses/src/lib/overview-responses.ts b/libs/e2e-mock/responses/src/lib/overview-responses.ts
index f9fb72dd07..a7edba2edc 100644
--- a/libs/e2e-mock/responses/src/lib/overview-responses.ts
+++ b/libs/e2e-mock/responses/src/lib/overview-responses.ts
@@ -172,3 +172,93 @@ export const overviewDataWithOneSimCard6th = {
     },
   },
 }
+export const overviewConfigForBackup = {
+  title: "Overview",
+  summary: {
+    show: true,
+    showImg: true,
+    imgVariant: "black",
+    showSerialNumber: true,
+    serialNumberLabel: "Serial number",
+    showAbout: true,
+    aboutTitle: "About your device",
+    aboutIcon: "device",
+    aboutSubtitle: "Device details",
+    aboutFields: [
+      {
+        dataKey: "serialNumber",
+        type: "detail-list-text",
+        title: "Serial number",
+      },
+      {
+        dataKey: "imei1",
+        type: "detail-list-text",
+        title: "IMEI (sim slot 1)",
+      },
+      {
+        dataKey: "imei2",
+        type: "detail-list-text",
+        title: "IMEI (sim slot 2)",
+      },
+      {
+        dataKey: "sar",
+        type: "detail-list-modal",
+        title: "SAR",
+        buttonText: "Check SAR information",
+      },
+    ],
+  },
+  sections: [
+    {
+      title: "Status",
+      type: "tile-list",
+      dataKey: "status",
+      fields: [
+        { dataKey: "battery", type: "icon-text" },
+        { dataKey: "airplane-mode", type: "icon-text" },
+      ],
+    },
+    {
+      dataKey: "update",
+      type: "mc-overview-update",
+      title: "Android OS",
+      currentVersionKey: "version",
+      showBadge: false,
+      versionLabel: "Current version:",
+    },
+    {
+      dataKey: "backup",
+      type: "mc-overview-backup",
+      title: "Backup",
+      backupFeatures: [
+        { label: "Contact list", key: "CONTACT_LIST" },
+        { label: "Call log", key: "CALL_LOG" },
+      ],
+      restoreFeatures: [
+        {
+          label: "Contact list",
+          feature: "CONTACT_LIST",
+          keys: ["CONTACT_LIST"],
+        },
+        { label: "Call log", feature: "CALL_LOG", keys: ["CALL_LOG"] },
+        { label: "Messages", feature: "MESSAGES", keys: ["MESSAGES"] },
+        { label: "Notes", feature: "NOTES", keys: ["NOTES"] },
+        {
+          label: "Calendar events",
+          feature: "CALENDAR_EVENTS",
+          keys: ["CALENDAR_EVENTS"],
+        },
+        {
+          label: "OS version & OS settings",
+          feature: "OS_VERSION_AND_SETTINGS",
+          keys: ["OS_VERSION_AND_SETTINGS"],
+        },
+        {
+          label: "App settings: Phone, Messages",
+          feature: "APP_SETTINGS",
+          keys: ["APP_SETTINGS"],
+        },
+      ],
+    },
+  ],
+}

From 0c1578856583a8a1ed924d732e5be99e742f8ada Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 30 Sep 2024 12:46:43 +0200
Subject: [PATCH 19/64] CP-2726 updated help-modal.page.ts

---
 .../src/page-objects/help-modal.page.ts       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
index 2e0f784a5f..22fb98910a 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
@@ -26,11 +26,10 @@ class HelpModalPage extends Page {
   public get sendButton() {
     return $('[data-testid="submit-button"]')
   }
-
+  /**[Selector] Send button label */
   public get sendButtonLabel() {
     return $("p*=Send")
   }
-
   /** returns an Array containing list of attached files */
   async attachmentsList() {
     return $('[data-testid="file-list"]').$$('[data-testid="file-list-file"]')
@@ -47,49 +46,51 @@ class HelpModalPage extends Page {
   public get closeBottomButton() {
     return $('[data-testid="close-bottom-button"]')
   }
+  /**[Selector] Invalid email text */
   public get invalidEmailTextElement() {
     return $('//input[@data-testid="email-input"]/following-sibling::*[1]')
   }
 
+  /**[Selector] Support icon */
   public get iconSupport() {
     return $('[data-testid="icon-Support"]')
   }
-
+  /**[Selector] Attachment icon */
   public get iconAttachment() {
     return $('[data-testid="icon-Attachment"]')
   }
-
+  /**[Selector] Modal title with specific text */
   public get modalTitle() {
     return $("h1*=Mudita Center Support")
   }
-
+  /**[Selector] Modal subtitle */
   public get modalSubtitle() {
     return $(
       "p*=Contact Mudita support team and we will do our best to help you resolve your issues."
     )
   }
-
+  /**[Selector] Current date zip file */
   public get currentDateZipFile() {
     const currentDate = new Date().toISOString().split("T")[0] // Get current date in YYYY-MM-DD format
     return $(`p*=${currentDate}.zip`)
   }
-
+  /**[Selector] Attached files text */
   public get attachedFilesText() {
     return $("p*=Attached files")
   }
-
+  /**[Selector] Attached files subtext */
   public get attachedFilesSubText() {
     return $("p*=The attached files will help us resolve your problem")
   }
-
+  /**[Selector] Email label */
   public get emailLabel() {
     return $("p*=Email")
   }
-
+  /**[Selector] Message label */
   public get messageLabel() {
     return $("p*=Message (optional)")
   }
-
+  /**[Selector] Whole modal */
   public get wholeModal() {
     return $('[data-testid="contact-support-modal"]')
   }

From d74d0275a5d9dd1a4657a960d1ee5ba4019de7a4 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 30 Sep 2024 12:48:25 +0200
Subject: [PATCH 20/64] CP-2726 removed duplicated selector

---
 .../src/page-objects/help.page.ts             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index d3f3ca5796..97ae9e1d94 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -6,13 +6,13 @@
 import Page from "./page"
 
 class HelpPage extends Page {
-  public get helpTabTitle() { 
+  public get helpTabTitle() {
     return $('[data-testid="location"]')
   }
   public get helpMainHeader() {
     return $('[data-testid="help-main-header"]')
   }
-  public get helpMainSubHeader() { 
+  public get helpMainSubHeader() {
     return $('[data-testid="help-main-subheader"]')
   }
   public get iconSearch() {
@@ -27,7 +27,7 @@ class HelpPage extends Page {
   public get helpSearchResultsParagraph() {
     return $('[data-testid="help-search-results"] p')
   }
-  public get helpSearchResultsList()  {
+  public get helpSearchResultsList() {
     return $('[data-testid="help-search-results"] ul')
   }
   public get helpSearchResultsItems() {
@@ -49,18 +49,18 @@ class HelpPage extends Page {
     return $$('[data-testid="help-subcategories-list-item"]')
   }
   public get helpSubCategoriesListItemsLeftColumn() {
-    return $$('[data-testid="help-subcategories-list"]>div')[0].$$('[data-testid="help-subcategories-list-item"]')
+    return $$('[data-testid="help-subcategories-list"]>div')[0].$$(
+      '[data-testid="help-subcategories-list-item"]'
+    )
   }
   public get helpSubCategoriesListItemsRightColumn() {
-    return $$('[data-testid="help-subcategories-list"]>div')[1].$$('[data-testid="help-subcategories-list-item"]')
+    return $$('[data-testid="help-subcategories-list"]>div')[1].$$(
+      '[data-testid="help-subcategories-list-item"]'
+    )
   }
   public get helpMainFooterDescription() {
-      return $('[data-testid="help-main-footer-description"]')
+    return $('[data-testid="help-main-footer-description"]')
   }
-  public get helpMainFooterContactSupportButton() {
-      return $('[data-testid="help-main-footer-contact-support-button"]')
-  }
-
   public get helpMainFooterContactSupportButton() {
     return $('[data-testid="help-main-footer-contact-support-button"]')
   }

From 7b2616295489fabf4d237cea25da365d755eb8ba Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 30 Sep 2024 13:58:18 +0200
Subject: [PATCH 21/64] CP-2726 added 6 more tests to finish

---
 .../help/contact-support-unhappy-path.ts      | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
index b5fb4d1f1d..85e6daf69b 100644
--- a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
+++ b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
@@ -70,4 +70,58 @@ describe("Contact Support - Unhappy Path", () => {
       "The attached files will help us resolve your problem"
     )
   })
+
+  it("Check if SEND button is present, has proper name and is disabled", async () => {
+    const sendButton = HelpModalPage.sendButton
+    const sendButtonLabel = HelpModalPage.sendButtonLabel
+    await expect(sendButton).toBeDisplayed()
+    await expect(sendButtonLabel).toHaveText("SEND")
+    await expect(sendButton).toBeDisabled()
+  })
+
+  it("Try to Send form without any input", async () => {
+    const sendButton = HelpModalPage.sendButton
+
+    const isDisabled = await sendButton.getAttribute("disabled")
+
+    // Verify if the button is disabled before attempting to click
+    if (isDisabled !== null) {
+      console.log("The button is disabled and cannot be clicked.")
+    } else {
+      // Attempt to click only if the button is not disabled
+      await sendButton.click()
+      console.log("The button was clicked successfully.")
+    }
+  })
+
+  it("Verify e-mail without @ character", async () => {
+    const emailInput = HelpModalPage.emailInput
+    await emailInput.setValue("emailtest.com")
+    const emailWarning = "Email is invalid"
+    const invalidEmailTextElement = HelpModalPage.invalidEmailTextElement
+    await expect(invalidEmailTextElement).toHaveText(emailWarning)
+  })
+
+  it("Check e-mail with @@ characters", async () => {
+    const emailInput = HelpModalPage.emailInput
+    await emailInput.setValue("email@@test.com")
+    const emailWarning = "Email is invalid"
+    const invalidEmailTextElement = HelpModalPage.invalidEmailTextElement
+    await expect(invalidEmailTextElement).toHaveText(emailWarning)
+  })
+
+  it("Enter correct e-mail to check if error message dissappears", async () => {
+    const emailInput = HelpModalPage.emailInput
+    await emailInput.setValue("email@test.com")
+    const invalidEmailTextElement = HelpModalPage.invalidEmailTextElement
+    await expect(invalidEmailTextElement).not.toBeDisplayed()
+  })
+
+  it("Check e-mail with , character", async () => {
+    const emailInput = HelpModalPage.emailInput
+    await emailInput.setValue("email@test,com")
+    const emailWarning = "Email is invalid"
+    const invalidEmailTextElement = HelpModalPage.invalidEmailTextElement
+    await expect(invalidEmailTextElement).toHaveText(emailWarning)
+  })
 })

From 4259ba26d5b541ed84a5d56543971be6da7d888d Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Tue, 1 Oct 2024 14:37:59 +0200
Subject: [PATCH 22/64] [CP-3153] Added test ids to start backup action and
 contact support modal

---
 apps/mudita-center-e2e/src/helpers/index.ts   |  1 +
 .../src/helpers/testid.helper.ts              | 10 +++++++
 .../contact-support-modal.component.tsx       | 30 ++++++++++++++-----
 libs/e2e-test-ids/src/e2e-test-ids.ts         | 13 ++++++++
 .../ui/src/lib/buttons/button-primary.tsx     |  8 ++++-
 5 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/helpers/testid.helper.ts

diff --git a/apps/mudita-center-e2e/src/helpers/index.ts b/apps/mudita-center-e2e/src/helpers/index.ts
index 844f85e401..62a4e2bea6 100644
--- a/apps/mudita-center-e2e/src/helpers/index.ts
+++ b/apps/mudita-center-e2e/src/helpers/index.ts
@@ -4,3 +4,4 @@
  */
 
 export * from "./sleep.helper"
+export * from "./testid.helper"
diff --git a/apps/mudita-center-e2e/src/helpers/testid.helper.ts b/apps/mudita-center-e2e/src/helpers/testid.helper.ts
new file mode 100644
index 0000000000..be1037dee1
--- /dev/null
+++ b/apps/mudita-center-e2e/src/helpers/testid.helper.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+const PRIMARY_BUTTON_TEST_ID = "primary-button"
+
+export const getPrimaryButtonTestId = (componentId: string) => {
+  return `${PRIMARY_BUTTON_TEST_ID}-${componentId}`
+}
diff --git a/libs/core/contact-support/components/contact-support-modal.component.tsx b/libs/core/contact-support/components/contact-support-modal.component.tsx
index 96e25a9ee7..f60a60b667 100644
--- a/libs/core/contact-support/components/contact-support-modal.component.tsx
+++ b/libs/core/contact-support/components/contact-support-modal.component.tsx
@@ -36,6 +36,7 @@ import { HelpActions } from "Core/__deprecated__/common/enums/help-actions.enum"
 import { ModalTestIds } from "Core/__deprecated__/renderer/components/core/modal/modal-test-ids.enum"
 import { Close } from "Core/__deprecated__/renderer/components/core/modal/modal.styled.elements"
 import { SpinnerLoader } from "../../../generic-view/ui/src/lib/shared/spinner-loader"
+import { NewContactSupportModalTestIds } from "e2e-test-ids"
 
 const messages = defineMessages({
   actionButton: {
@@ -95,8 +96,12 @@ interface FormInputLabelProps {
 
 export const FormInputLabelComponent: FunctionComponent<
   FormInputLabelProps
-> = ({ className, label, optional }) => (
-  <Text className={className} displayStyle={TextDisplayStyle.Paragraph3}>
+> = ({ className, label, optional, ...rest }) => (
+  <Text
+    className={className}
+    displayStyle={TextDisplayStyle.Paragraph3}
+    {...rest}
+  >
     <FormattedMessage {...label} />
     {optional && (
       <Text
@@ -211,15 +216,18 @@ const ContactSupportModal: FunctionComponent<Props> = ({
             <IconWrapper>
               <Icon type={IconType.Support} />
             </IconWrapper>
-            <h1>
+            <h1 data-testid={NewContactSupportModalTestIds.Title}>
               <FormattedMessage {...messages.title} />
             </h1>
-            <p>
+            <p data-testid={NewContactSupportModalTestIds.Subtitle}>
               <FormattedMessage {...messages.description} />
             </p>
           </ModalHeader>
           <Form onSubmit={sendEmail}>
-            <FormInputLabel label={messages.emailLabel} />
+            <FormInputLabel
+              label={messages.emailLabel}
+              data-testid={NewContactSupportModalTestIds.EmailLabel}
+            />
             <InputComponent
               disabled={sending}
               outlined
@@ -230,7 +238,11 @@ const ContactSupportModal: FunctionComponent<Props> = ({
               label={intl.formatMessage(messages.emailPlaceholder)}
               {...register(FieldKeys.Email, emailValidator)}
             />
-            <FormInputLabel optional label={messages.messageLabel} />
+            <FormInputLabel
+              optional
+              label={messages.messageLabel}
+              data-testid={NewContactSupportModalTestIds.MessageLabel}
+            />
             <DescriptionInput
               disabled={sending}
               type="textarea"
@@ -239,11 +251,15 @@ const ContactSupportModal: FunctionComponent<Props> = ({
               data-testid={ContactSupportModalTestIds.DescriptionInput}
               {...register(FieldKeys.Description)}
             />
-            <FormInputLabel label={messages.filesLabel} />
+            <FormInputLabel
+              label={messages.filesLabel}
+              data-testid={NewContactSupportModalTestIds.AttachedFilesLabel}
+            />
             <FilesDescription
               displayStyle={TextDisplayStyle.Paragraph3}
               element={"p"}
               message={messages.filesLabelDescription}
+              data-testid={NewContactSupportModalTestIds.AttachedFilesSubtext}
             />
             <Files
               files={files}
diff --git a/libs/e2e-test-ids/src/e2e-test-ids.ts b/libs/e2e-test-ids/src/e2e-test-ids.ts
index bb43215e3d..cef7c4410f 100644
--- a/libs/e2e-test-ids/src/e2e-test-ids.ts
+++ b/libs/e2e-test-ids/src/e2e-test-ids.ts
@@ -29,6 +29,10 @@ export enum ContactSupportModalTestIds {
   CloseButton = "contact-support-modal-success-close-button",
 }
 
+export enum ButtonTestIds {
+  PrimaryButton = "primary-button",
+}
+
 export enum BackupModalTestIds {
   Title = "backup-features-modal-title",
   Description = "backup-features-modal-description",
@@ -41,3 +45,12 @@ export enum BackupModalTestIds {
 export enum ModalTestIds {
   Modal = "modal-content",
 }
+
+export enum NewContactSupportModalTestIds {
+  Title = "contact-support-modal-title",
+  Subtitle = "contact-support-modal-subtitle",
+  EmailLabel = "email-label",
+  MessageLabel = "message-label",
+  AttachedFilesLabel = "attached-files-label",
+  AttachedFilesSubtext = "attached-files-subtext",
+}
diff --git a/libs/generic-view/ui/src/lib/buttons/button-primary.tsx b/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
index 029aac78e3..a92fd6d91b 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
+++ b/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
@@ -9,6 +9,7 @@ import { APIFC } from "generic-view/utils"
 import { ButtonBase } from "./button-base/button-base"
 import { Icon } from "../icon/icon"
 import { ButtonPrimaryConfig } from "generic-view/models"
+import { ButtonTestIds } from "e2e-test-ids"
 
 export const ButtonPrimary: APIFC<undefined, ButtonPrimaryConfig> = ({
   data,
@@ -17,7 +18,12 @@ export const ButtonPrimary: APIFC<undefined, ButtonPrimaryConfig> = ({
   ...props
 }) => {
   return (
-    <Button {...props} disabled={config.disabled} action={config.action}>
+    <Button
+      data-testid={`${ButtonTestIds.PrimaryButton}-${props.componentKey}`}
+      {...props}
+      disabled={config.disabled}
+      action={config.action}
+    >
       {children}
       {config.icon && <Icon data={{ type: config.icon }} />}
       <span>{config.text}</span>

From 1b0c2a248621ccb2be660a2aec0efd47f1e61dff Mon Sep 17 00:00:00 2001
From: MateuszMudita <mateusz.bolewski@mudita.com>
Date: Tue, 1 Oct 2024 17:08:41 +0200
Subject: [PATCH 23/64] Fixed tests

---
 .../contact-support-modal.component.test.tsx        | 13 +++++++++++++
 .../contact-support-flow.container.test.tsx         |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/libs/core/contact-support/components/contact-support-modal.component.test.tsx b/libs/core/contact-support/components/contact-support-modal.component.test.tsx
index 2312575fb4..1657bcf933 100644
--- a/libs/core/contact-support/components/contact-support-modal.component.test.tsx
+++ b/libs/core/contact-support/components/contact-support-modal.component.test.tsx
@@ -12,6 +12,19 @@ import { ContactSupportModalTestIds } from "Core/contact-support/components/cont
 import { noop } from "Core/__deprecated__/renderer/utils/noop"
 import { FileListTestIds } from "Core/__deprecated__/renderer/components/core/file-list/file-list-test-ids.enum"
 
+jest.mock("e2e-test-ids", () => {
+  return {
+    NewContactSupportModalTestIds: {
+      Title: "contact-support-modal-title",
+      Subtitle: "contact-support-modal-subtitle",
+      EmailLabel: "email-label",
+      MessageLabel: "message-label",
+      AttachedFilesLabel: "attached-files-label",
+      AttachedFilesSubtext: "attached-files-subtext",
+    },
+  }
+})
+
 type Props = ComponentProps<typeof ContactSupportModal>
 const defaultProps: Props = {
   open: true,
diff --git a/libs/core/contact-support/containers/contact-support-flow.container.test.tsx b/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
index 5eb53540ae..11d8df7f02 100644
--- a/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
+++ b/libs/core/contact-support/containers/contact-support-flow.container.test.tsx
@@ -20,6 +20,14 @@ jest.mock("e2e-test-ids", () => {
     ModalTestIds: {
       Modal: "modal-content",
     },
+    NewContactSupportModalTestIds: {
+      Title: "contact-support-modal-title",
+      Subtitle: "contact-support-modal-subtitle",
+      EmailLabel: "email-label",
+      MessageLabel: "message-label",
+      AttachedFilesLabel: "attached-files-label",
+      AttachedFilesSubtext: "attached-files-subtext",
+    },
   }
 })
 

From e8ff6ac6be47798ad425ddeb0b24c54ce990e7d6 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Tue, 1 Oct 2024 18:07:57 +0200
Subject: [PATCH 24/64] CP-2726 added the newest testIDs for current selectors

---
 .../src/page-objects/help-modal.page.ts        | 18 ++++++++----------
 .../specs/help/contact-support-unhappy-path.ts |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
index 22fb98910a..acc273595f 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-modal.page.ts
@@ -28,7 +28,7 @@ class HelpModalPage extends Page {
   }
   /**[Selector] Send button label */
   public get sendButtonLabel() {
-    return $("p*=Send")
+    return $('//button[@data-testid="submit-button"]//p')
   }
   /** returns an Array containing list of attached files */
   async attachmentsList() {
@@ -61,13 +61,11 @@ class HelpModalPage extends Page {
   }
   /**[Selector] Modal title with specific text */
   public get modalTitle() {
-    return $("h1*=Mudita Center Support")
+    return $('[data-testid="contact-support-modal-title"]')
   }
   /**[Selector] Modal subtitle */
   public get modalSubtitle() {
-    return $(
-      "p*=Contact Mudita support team and we will do our best to help you resolve your issues."
-    )
+    return $('[data-testid="contact-support-modal-subtitle"]')
   }
   /**[Selector] Current date zip file */
   public get currentDateZipFile() {
@@ -75,20 +73,20 @@ class HelpModalPage extends Page {
     return $(`p*=${currentDate}.zip`)
   }
   /**[Selector] Attached files text */
-  public get attachedFilesText() {
-    return $("p*=Attached files")
+  public get attachedFilesLabel() {
+    return $('[data-testid="attached-files-label"]')
   }
   /**[Selector] Attached files subtext */
   public get attachedFilesSubText() {
-    return $("p*=The attached files will help us resolve your problem")
+    return $('[data-testid="attached-files-subtext"]')
   }
   /**[Selector] Email label */
   public get emailLabel() {
-    return $("p*=Email")
+    return $('[data-testid="email-label"]')
   }
   /**[Selector] Message label */
   public get messageLabel() {
-    return $("p*=Message (optional)")
+    return $('[data-testid="message-label"]')
   }
   /**[Selector] Whole modal */
   public get wholeModal() {
diff --git a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
index 85e6daf69b..2df2c3bbfd 100644
--- a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
+++ b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
@@ -57,7 +57,7 @@ describe("Contact Support - Unhappy Path", () => {
     const descriptionInput = HelpModalPage.descriptionInput
     await expect(descriptionInput).toBeDisplayed()
 
-    const attachedFilesText = HelpModalPage.attachedFilesText
+    const attachedFilesLabel = HelpModalPage.attachedFilesLabel
     const attachedFilesSubText = HelpModalPage.attachedFilesSubText
     const singleAttachment = HelpModalPage.singleAttachment
     const iconAttachment = HelpModalPage.iconAttachment
@@ -65,7 +65,7 @@ describe("Contact Support - Unhappy Path", () => {
     await expect(singleAttachment).toBeDisplayed()
     await expect(iconAttachment).toBeDisplayed()
     await expect(currentDateZipFile).toBeDisplayed() //checks if zipfile has current date (date of sending the logs is the same as zip file name)
-    await expect(attachedFilesText).toHaveText("Attached files")
+    await expect(attachedFilesLabel).toHaveText("Attached files")
     await expect(attachedFilesSubText).toHaveText(
       "The attached files will help us resolve your problem"
     )

From 5ac5f52c1783ba37d8cd7b041e3402e7f44a6f4f Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Fri, 4 Oct 2024 10:50:44 +0200
Subject: [PATCH 25/64] CP-2726 added a change in wdio.conf.ts

---
 apps/mudita-center-e2e/wdio.conf.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 738ccc734e..1d39370a45 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -125,6 +125,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
     ],
     cicdMock: [
+      toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
       toRelativePath(TestFilesPaths.mcCheckForUpdatesOfflineTest),
       toRelativePath(TestFilesPaths.newsPageOfflineTest),

From bacea47e2827828afe68733a4bd22899812dbae2 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Fri, 4 Oct 2024 11:02:38 +0200
Subject: [PATCH 26/64] CP-2726 updated disable check to simple assertion

---
 .../src/specs/help/contact-support-unhappy-path.ts   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
index 2df2c3bbfd..ef933d7ef9 100644
--- a/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
+++ b/apps/mudita-center-e2e/src/specs/help/contact-support-unhappy-path.ts
@@ -81,17 +81,7 @@ describe("Contact Support - Unhappy Path", () => {
 
   it("Try to Send form without any input", async () => {
     const sendButton = HelpModalPage.sendButton
-
-    const isDisabled = await sendButton.getAttribute("disabled")
-
-    // Verify if the button is disabled before attempting to click
-    if (isDisabled !== null) {
-      console.log("The button is disabled and cannot be clicked.")
-    } else {
-      // Attempt to click only if the button is not disabled
-      await sendButton.click()
-      console.log("The button was clicked successfully.")
-    }
+    await expect(sendButton).toBeDisabled()
   })
 
   it("Verify e-mail without @ character", async () => {

From cb4e6110e49af7b9d947f8e5b75f6197a42859ad Mon Sep 17 00:00:00 2001
From: robertmudi <158469469+robertmudi@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:31:35 +0200
Subject: [PATCH 27/64] CP-3154 fix selector and tests for "Create backup"  and
 "backupInfo" on overview - Kompakt (#2095)

---
 .../src/page-objects/modal-backup-kompakt.page.ts            | 5 +----
 .../src/page-objects/overview-kompakt.page.ts                | 2 +-
 apps/mudita-center-e2e/src/page-objects/overview.page.ts     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts b/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
index de4baace23..9d5714b246 100644
--- a/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/modal-backup-kompakt.page.ts
@@ -6,11 +6,8 @@
 import { OverviewPage } from "./overview.page"
 
 class ModalBackupKompaktPage extends OverviewPage {
-  public get backupInfo() {
-    return $('//div[@data-testid="block-box-backup"]//p')
-  }
   public get createBackupButton() {
-    return $('//button[@type="button" and .//span[text()="Create backup"]]')
+    return $('[data-testid="primary-button-backupcreate-backup-button"]')
   }
   public get createBackupProceedNext() {
     return $('[data-testid="backup-features-modal-create-action"]')
diff --git a/apps/mudita-center-e2e/src/page-objects/overview-kompakt.page.ts b/apps/mudita-center-e2e/src/page-objects/overview-kompakt.page.ts
index 79ccf96a76..907decc013 100644
--- a/apps/mudita-center-e2e/src/page-objects/overview-kompakt.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/overview-kompakt.page.ts
@@ -31,7 +31,7 @@ class OverviewKompaktPage extends OverviewPage {
   }
 
   public get backupInfo() {
-    return $(`//div[@data-testid="block-box-backup"]//p`)
+    return $('div[data-testid="block-box-backup"] p')
   }
 
   public get serialNumberLabel() {
diff --git a/apps/mudita-center-e2e/src/page-objects/overview.page.ts b/apps/mudita-center-e2e/src/page-objects/overview.page.ts
index ece1accf18..e7e199f245 100644
--- a/apps/mudita-center-e2e/src/page-objects/overview.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/overview.page.ts
@@ -55,7 +55,7 @@ export class OverviewPage extends Page {
   }
 
   public get createBackupButton() {
-    return $('//button[@type="button" and .//span[text()="Create backup"]]')
+    return $('[data-testid="primary-button-backupcreate-backup-button"]')
   }
 
   public get restoreBackupButton() {

From e53494130b84b9d0954b4528488cabee08737d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Tue, 8 Oct 2024 10:29:05 +0200
Subject: [PATCH 28/64] [CP-2995] Contacts list (#2079)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 apps/mudita-center-e2e/wdio.conf.js           | 346 -------------
 apps/mudita-center/src/app.tsx                |   1 +
 apps/mudita-center/src/wdyr.ts                |  13 +
 .../components/core/text/text.component.tsx   |   2 +-
 .../header/__snapshots__/header.test.tsx.snap |   1 +
 .../rest/header/header.component.tsx          |   1 +
 .../__deprecated__/renderer/store/reducers.ts |   2 +
 .../contact-support-modal-error.component.tsx |  10 +-
 ...ontact-support-modal-success.component.tsx |  10 +-
 .../contact-edit/contact-edit.component.tsx   |  36 +-
 .../api-device-initialization-modal-flow.tsx  |   3 +-
 .../template-form/template-form.component.tsx |   5 +-
 .../entities-config.validator.test.ts         |  14 +
 .../lib/entities/entities-config.validator.ts |  89 +++-
 .../lib/feature/data-provider-config.test.ts  | 140 +++++-
 .../src/lib/feature/data-provider-config.ts   |  78 ++-
 .../models/src/lib/feature/extra-config.ts    |  35 ++
 .../src/lib/feature/feature-config.test.ts    |  29 +-
 .../models/src/lib/feature/feature-config.ts  |   2 +
 libs/device/models/src/lib/feature/index.ts   |   3 +-
 .../feature/src/lib/generic-toasts.tsx        |  57 +++
 .../feature/src/lib/generic-view.tsx          |  16 +-
 .../src/lib/seed-data/contacts-seed-data.ts   | 464 ++++++++++++++++++
 .../feature/src/lib/setup-component.tsx       | 317 ++++++++----
 .../feature/src/lib/use-dev-console.ts        |  15 +
 .../src/lib/use-dev-views/use-dev-views.tsx   |   3 +-
 .../lib/use-dev-views/views/contacts-view.ts  | 231 +--------
 libs/generic-view/models/src/index.ts         |  26 +-
 .../generic-view/models/src/lib/app-portal.ts |  20 +
 .../models/src/lib/button-primary.ts          |   6 +-
 .../models/src/lib/button-text.ts             |   8 +-
 .../models/src/lib/common-validators.ts       |  63 ++-
 .../models/src/lib/conditional-renderer.ts    |  19 +
 libs/generic-view/models/src/lib/device.ts    |  29 +-
 .../models/src/lib/entities-loader.ts         |   1 +
 .../models/src/lib/form-checkbox-input.ts     |   2 +
 libs/generic-view/models/src/lib/form.ts      |   2 +
 .../models/src/lib/format-message.ts          |  27 +
 .../models/src/lib/modal-close-button.ts      |   4 +-
 .../generic-view/models/src/lib/paragraphs.ts |  26 +-
 .../models/src/lib/selection-manager.ts       |  18 +
 .../generic-view/models/src/lib/table-cell.ts |   2 +-
 libs/generic-view/models/src/lib/table.ts     |  10 +-
 libs/generic-view/models/src/lib/toast.ts     |  22 +
 libs/generic-view/store/src/index.ts          |   8 +
 .../store/src/lib/action-names.ts             |   8 +-
 .../lib/entities/create-entity-data.action.ts |   5 +-
 .../entities/delete-entities-data.action.ts   |  39 +-
 .../lib/entities/get-entities-data.action.ts  |  17 +-
 .../entities/helpers/compute-field.test.ts    | 451 +++++++++++++++++
 .../src/lib/entities/helpers/compute-field.ts | 106 ++++
 .../lib/entities/helpers/enhance-entity.ts    |  22 +
 .../store/src/lib/entities/reducer.ts         |   1 +
 .../lib/entities/update-entity-data.action.ts |   5 +-
 .../store/src/lib/selectors/component.ts      |   5 +
 .../store/src/lib/selectors/entities.ts       |  28 +-
 .../store/src/lib/selectors/index.ts          |   1 +
 .../store/src/lib/selectors/view.ts           |  10 +
 .../store/src/lib/toasts/actions.ts           |  13 +
 .../store/src/lib/toasts/open-toast.action.ts |  21 +
 .../store/src/lib/toasts/reducer.ts           |  30 ++
 .../store/src/lib/use-form-field.ts           |  55 +++
 .../store/src/lib/use-form-register.ts        |  43 ++
 .../store/src/lib/views/actions.ts            |  25 +-
 .../store/src/lib/views/reducer.ts            |  51 +-
 libs/generic-view/theme/src/lib/font-size.ts  |   1 +
 .../generic-view/theme/src/lib/line-height.ts |   1 +
 libs/generic-view/ui/src/index.ts             |   5 +-
 .../lib/buttons/button-base/button-base.tsx   |   8 +-
 .../button-base/use-button-action.test.ts     |  77 ++-
 .../buttons/button-base/use-button-action.ts  | 176 ++++---
 .../ui/src/lib/buttons/button-primary.tsx     |  22 +-
 .../ui/src/lib/buttons/button-secondary.tsx   |  10 +-
 .../ui/src/lib/buttons/button-text.tsx        |  40 +-
 .../ui/src/lib/data-rows/app-portal.tsx       |  14 +
 .../ui/src/lib/data-rows/badge.tsx            |  15 +-
 .../ui/src/lib/data-rows/data-rows.ts         |   3 +
 .../ui/src/lib/data-rows/text-formatted.tsx   |   2 +-
 .../ui/src/lib/entities/entities-loader.tsx   |  49 +-
 .../generated/mc-import-contacts-button.ts    |  12 +-
 .../ui/src/lib/icon/get-icon.helper.tsx       |   2 +
 .../ui/src/lib/icon/svg/delete.svg            |   5 +
 .../lib/interactive/conditional-renderer.tsx  |  17 +
 .../ui/src/lib/interactive/form/form.tsx      |  12 +-
 .../interactive/form/input/checkbox-input.tsx | 178 ++++++-
 .../ui/src/lib/interactive/format-message.tsx |  34 ++
 .../ui/src/lib/interactive/interactive.ts     |   9 +
 .../modal/helpers/modal-close-button.tsx      |   4 +-
 .../modal/helpers/modal-title-icon.tsx        |  13 +-
 .../ui/src/lib/interactive/modal/modal.tsx    |   2 +-
 .../src/lib/interactive/modal/text-modal.tsx  |   6 +-
 .../ui/src/lib/interactive/toast/toast.tsx    | 123 +++++
 .../interactive/tooltip/tooltip-helpers.tsx   |  48 ++
 .../src/lib/interactive/tooltip/tooltip.tsx   | 192 +++++++-
 .../backup-restore/backup-restore-error.tsx   |   5 +-
 .../backup-restore-password.tsx               |   5 +-
 .../backup-restore/backup-restore-select.tsx  |   7 +-
 .../backup-restore/backup-restore-success.tsx |  10 +-
 .../backup-restore/backup-restore.tsx         |   8 +-
 .../lib/predefined/backup/backup-create.tsx   |   8 +-
 .../lib/predefined/backup/backup-error.tsx    |   5 +-
 .../lib/predefined/backup/backup-features.tsx |   8 +-
 .../lib/predefined/backup/backup-password.tsx |   7 +-
 .../lib/predefined/backup/backup-success.tsx  |   7 +-
 .../components/cancel-confirm-modal.tsx       |   7 +-
 .../data-migration/components/device-card.tsx |   2 +-
 .../data-migration/components/error-modal.tsx |   5 +-
 .../components/features-selector.tsx          |   4 +
 .../components/progress-modal.tsx             |   6 +-
 .../components/success-modal.tsx              |   5 +-
 .../components/transfer-cancelled-modal.tsx   |   5 +-
 .../data-migration/transfer-setup.tsx         |  10 +-
 .../import-contacts/import-contacts-error.tsx |   5 +-
 .../import-contacts/import-contacts-list.tsx  |  46 +-
 .../import-contacts-progress.tsx              |  25 +-
 .../import-contacts-provider.tsx              |  50 +-
 .../import-contacts-success.tsx               |   5 +-
 .../import-contacts/import-contacts.tsx       |   6 +-
 .../ui/src/lib/predefined/predefined.ts       |   3 +
 .../recovery-mode/recovery-mode.tsx           |  10 +-
 .../src/lib/predefined/selection-manager.tsx  |  23 +
 .../ui/src/lib/shared/spinner-loader.tsx      |  14 +-
 .../ui/src/lib/table/table-cell.tsx           |  15 +-
 libs/generic-view/ui/src/lib/table/table.tsx  |  51 +-
 libs/generic-view/ui/src/lib/texts/index.ts   |  12 +-
 .../ui/src/lib/texts/paragraphs.tsx           |  84 +++-
 libs/generic-view/utils/src/index.ts          |   4 +-
 .../data-provider-filter.test.ts              |  32 +-
 .../data-provider-filter.ts                   |  10 +-
 .../data-provider-sort.test.ts                |  59 ++-
 .../data-provider-sort.ts                     |  18 +-
 .../src/lib/forms-provider/forms-provider.tsx |  80 +++
 .../utils/src/lib/models/api-views.types.ts   |   3 +-
 .../utils/src/lib/models/button.types.ts      |  54 --
 .../utils/src/lib/models/icons.types.ts       |   1 +
 .../utils/src/lib/use-current-view-key.ts     |  14 +
 .../mc-about/list-modal/list-modal.test.ts    |  10 +-
 .../src/lib/mc-about/list-modal/list-modal.ts |  12 +-
 .../section-backup/section-backup.ts          |  24 +-
 .../src/lib/mc-overview/summary/summary.ts    |  10 +-
 .../ui/src/lib/components/article-content.tsx |  10 +-
 .../ui/src/lib/components/article-footer.tsx  |  10 +-
 .../ui/src/lib/components/article-header.tsx  |  10 +-
 .../ui/src/lib/components/help-footer.tsx     |  10 +-
 package-lock.json                             |  25 +-
 package.json                                  |   3 +-
 146 files changed, 3740 insertions(+), 1354 deletions(-)
 delete mode 100644 apps/mudita-center-e2e/wdio.conf.js
 create mode 100644 apps/mudita-center/src/wdyr.ts
 create mode 100644 libs/device/models/src/lib/feature/extra-config.ts
 create mode 100644 libs/generic-view/feature/src/lib/generic-toasts.tsx
 create mode 100644 libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
 create mode 100644 libs/generic-view/models/src/lib/app-portal.ts
 create mode 100644 libs/generic-view/models/src/lib/conditional-renderer.ts
 create mode 100644 libs/generic-view/models/src/lib/format-message.ts
 create mode 100644 libs/generic-view/models/src/lib/selection-manager.ts
 create mode 100644 libs/generic-view/models/src/lib/toast.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/helpers/compute-field.test.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/helpers/compute-field.ts
 create mode 100644 libs/generic-view/store/src/lib/entities/helpers/enhance-entity.ts
 create mode 100644 libs/generic-view/store/src/lib/toasts/actions.ts
 create mode 100644 libs/generic-view/store/src/lib/toasts/open-toast.action.ts
 create mode 100644 libs/generic-view/store/src/lib/toasts/reducer.ts
 create mode 100644 libs/generic-view/store/src/lib/use-form-field.ts
 create mode 100644 libs/generic-view/store/src/lib/use-form-register.ts
 create mode 100644 libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
 create mode 100644 libs/generic-view/ui/src/lib/icon/svg/delete.svg
 create mode 100644 libs/generic-view/ui/src/lib/interactive/conditional-renderer.tsx
 create mode 100644 libs/generic-view/ui/src/lib/interactive/format-message.tsx
 create mode 100644 libs/generic-view/ui/src/lib/interactive/toast/toast.tsx
 create mode 100644 libs/generic-view/ui/src/lib/interactive/tooltip/tooltip-helpers.tsx
 create mode 100644 libs/generic-view/ui/src/lib/predefined/selection-manager.tsx
 create mode 100644 libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
 delete mode 100644 libs/generic-view/utils/src/lib/models/button.types.ts
 create mode 100644 libs/generic-view/utils/src/lib/use-current-view-key.ts

diff --git a/apps/mudita-center-e2e/wdio.conf.js b/apps/mudita-center-e2e/wdio.conf.js
deleted file mode 100644
index 6f1e461bb9..0000000000
--- a/apps/mudita-center-e2e/wdio.conf.js
+++ /dev/null
@@ -1,346 +0,0 @@
-"use strict";
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = void 0;
-var dotenv = require("dotenv");
-var test_filenames_1 = require("./src/test-filenames");
-dotenv.config();
-exports.config = {
-    //
-    // ====================
-    // Runner Configuration
-    // ====================
-    //
-    //
-    // =====================
-    // ts-node Configurations
-    // =====================
-    //
-    // You can write tests using TypeScript to get autocompletion and type safety.
-    // You will need typescript and ts-node installed as devDependencies.
-    // WebdriverIO will automatically detect if these dependencies are installed
-    // and will compile your config and tests for you.
-    // If you need to configure how ts-node runs please use the
-    // environment variables for ts-node or use wdio config's autoCompileOpts section.
-    //
-    autoCompileOpts: {
-        autoCompile: true,
-        // see https://github.com/TypeStrong/ts-node#cli-and-programmatic-options
-        // for all available options
-        tsNodeOpts: {
-            transpileOnly: true,
-            project: "tsconfig.json",
-        },
-    },
-    //
-    // ==================
-    // Specify Test Files
-    // ==================
-    // Define which test specs should run. The pattern is relative to the directory
-    // from which `wdio` was called.
-    //
-    // The specs are defined as an array of spec files (optionally using wildcards
-    // that will be expanded). The test for each spec file will be run in a separate
-    // worker process. In order to have a group of spec files run in the same worker
-    // process simply enclose them in an array within the specs array.
-    //
-    // If you are calling `wdio` from an NPM script (see https://docs.npmjs.com/cli/run-script),
-    // then the current working directory is where your `package.json` resides, so `wdio`
-    // will be called from there.
-    //
-    specs: [
-        (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.messagesInAppNavigationTest),
-        (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.helpWindowCheckTest),
-        (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.mcCheckForUpdatesTest),
-        (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.homePageTestDeviceNotConnectedTest)
-    ],
-    suites: {
-        standalone: [
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.helpWindowCheckTest),
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.mcCheckForUpdatesTest),
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.homePageTestDeviceNotConnectedTest)
-        ],
-        multidevicePureHarmony: [],
-        multideviceSingleHarmony: [],
-        multideviceSinglePure: [],
-        multideviceSingleKompakt: [],
-        multidevicePureKompakt: [],
-        multideviceHarmonyKompakt: [],
-        multideviceGeneral: [],
-        harmony: [],
-        pure: [
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.messagesInAppNavigationTest),
-        ],
-        kompakt: [],
-        deviceUpdate: [],
-        cicd: [
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.helpWindowCheckTest),
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.mcCheckForUpdatesTest),
-            (0, test_filenames_1.toRelativePath)(test_filenames_1.TestFilesPaths.homePageTestDeviceNotConnectedTest)
-        ],
-    },
-    // Patterns to exclude.
-    exclude: [
-    // 'path/to/excluded/files'
-    ],
-    filesToWatch: ["./src/specs/**/*.e2e.ts"],
-    //
-    // ============
-    // Capabilities
-    // ============
-    // Define your capabilities here. WebdriverIO can run multiple capabilities at the same
-    // time. Depending on the number of capabilities, WebdriverIO launches several test
-    // sessions. Within your capabilities you can overwrite the spec and exclude options in
-    // order to group specific specs to a specific capability.
-    //
-    // First, you can define how many instances should be started at the same time. Let's
-    // say you have 3 different capabilities (Chrome, Firefox, and Safari) and you have
-    // set maxInstances to 1; wdio will spawn 3 processes. Therefore, if you have 10 spec
-    // files and you set maxInstances to 10, all spec files will get tested at the same time
-    // and 30 processes will get spawned. The property handles how many capabilities
-    // from the same test should run tests.
-    //
-    maxInstances: 1,
-    //
-    // If you have trouble getting all important capabilities together, check out the
-    // Sauce Labs platform configurator - a great tool to configure your capabilities:
-    // https://saucelabs.com/platform/platform-configurator
-    //
-    capabilities: [
-        {
-            // maxInstances can get overwritten per capability. So if you have an in-house Selenium
-            // grid with only 5 firefox instances available you can make sure that not more than
-            // 5 instances get started at a time.
-            // maxInstances: 5,
-            //
-            browserName: "chrome",
-            "goog:chromeOptions": {
-                binary: process.env.TEST_BINARY_PATH,
-                args: [],
-            },
-            // If outputDir is provided WebdriverIO can capture driver session logs
-            // it is possible to configure which logTypes to include/exclude.
-            // excludeDriverLogs: ['*'], // pass '*' to exclude all driver session logs
-            // excludeDriverLogs: ['bugreport', 'server'],
-        },
-    ],
-    //
-    // ===================
-    // Test Configurations
-    // ===================
-    // Define all options that are relevant for the WebdriverIO instance here
-    //
-    // Level of logging verbosity: trace | debug | info | warn | error | silent
-    logLevel: process.env.TEST_LOG_LEVEL || "info",
-    //
-    // Set specific log levels per logger
-    // loggers:
-    // - webdriver, webdriverio
-    // - @wdio/browserstack-service, @wdio/devtools-service, @wdio/sauce-service
-    // - @wdio/mocha-framework, @wdio/jasmine-framework
-    // - @wdio/local-runner
-    // - @wdio/sumologic-reporter
-    // - @wdio/cli, @wdio/config, @wdio/utils
-    // Level of logging verbosity: trace | debug | info | warn | error | silent
-    // logLevels: {
-    //     webdriver: 'info',
-    //     '@wdio/appium-service': 'info'
-    // },
-    //
-    // If you only want to run your tests until a specific amount of tests have failed use
-    // bail (default is 0 - don't bail, run all tests).
-    bail: 0,
-    //
-    // Set a base URL in order to shorten url command calls. If your `url` parameter starts
-    // with `/`, the base url gets prepended, not including the path portion of your baseUrl.
-    // If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url
-    // gets prepended directly.
-    baseUrl: "http://localhost",
-    //
-    // Default timeout for all waitFor* commands.
-    waitforTimeout: 6000,
-    //
-    // Default timeout in milliseconds for request
-    // if browser driver or grid doesn't send response
-    connectionRetryTimeout: 120000,
-    //
-    // Default request retries count
-    connectionRetryCount: 3,
-    //
-    // Test runner services
-    // Services take over a specific job you don't want to take care of. They enhance
-    // your test setup with almost no effort. Unlike plugins, they don't add new
-    // commands. Instead, they hook themselves up into the test process.
-    services: ["chromedriver"],
-    // Framework you want to run your specs with.
-    // The following are supported: Mocha, Jasmine, and Cucumber
-    // see also: https://webdriver.io/docs/frameworks
-    //
-    // Make sure you have the wdio adapter package for the specific framework installed
-    // before running any tests.
-    framework: "mocha",
-    //
-    // The number of times to retry the entire specfile when it fails as a whole
-    // specFileRetries: 1,
-    //
-    // Delay in seconds between the spec file retry attempts
-    // specFileRetriesDelay: 0,
-    //
-    // Whether or not retried specfiles should be retried immediately or deferred to the end of the queue
-    // specFileRetriesDeferred: false,
-    //
-    // Test reporter for stdout.
-    // The only one supported by default is 'dot'
-    // see also: https://webdriver.io/docs/dot-reporter
-    reporters: [
-        "spec",
-        [
-            "json",
-            {
-                outputDir: "./results",
-            },
-        ],
-    ],
-    //
-    // Options to be passed to Mocha.
-    // See the full list at http://mochajs.org/
-    mochaOpts: {
-        ui: "bdd",
-        timeout: 60000000,
-    },
-    //
-    // =====
-    // Hooks
-    // =====
-    // WebdriverIO provides several hooks you can use to interfere with the test process in order to enhance
-    // it and to build services around it. You can either apply a single function or an array of
-    // methods to it. If one of them returns with a promise, WebdriverIO will wait until that promise got
-    // resolved to continue.
-    /**
-     * Gets executed once before all workers get launched.
-     * @param {Object} config wdio configuration object
-     * @param {Array.<Object>} capabilities list of capabilities details
-     */
-    // onPrepare: async function (_config, _capabilities) {},
-    /**
-     * Gets executed before a worker process is spawned and can be used to initialise specific service
-     * for that worker as well as modify runtime environments in an async fashion.
-     * @param  {String} cid      capability id (e.g 0-0)
-     * @param  {[type]} caps     object containing capabilities for session that will be spawn in the worker
-     * @param  {[type]} specs    specs to be run in the worker process
-     * @param  {[type]} args     object that will be merged with the main configuration once worker is initialised
-     * @param  {[type]} execArgv list of string arguments passed to the worker process
-     */
-    // onWorkerStart: function (cid, caps, specs, args, execArgv) {},
-    /**
-     * Gets executed just before initialising the webdriver session and test framework. It allows you
-     * to manipulate configurations depending on the capability or spec.
-     * @param {Object} config wdio configuration object
-     * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {Array.<String>} specs List of spec file paths that are to be run
-     * @param {String} cid worker id (e.g. 0-0)
-     */
-    // beforeSession: async function (_config, _capabilities, specs, _cid) {},
-    /**
-     * Gets executed before test execution begins. At this point you can access to all global
-     * variables like `browser`. It is the perfect place to define custom commands.
-     * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {Array.<String>} specs        List of spec file paths that are to be run
-     * @param {Object}         browser      instance of created browser/device session
-     */
-    // before: function (capabilities, specs) {
-    // },
-    /**
-     * Runs before a WebdriverIO command gets executed.
-     * @param {String} commandName hook command name
-     * @param {Array} args arguments that command would receive
-     */
-    // beforeCommand: function (commandName, args) {
-    // },
-    /**
-     * Hook that gets executed before the suite starts
-     * @param {Object} suite suite details
-     */
-    // beforeSuite: function (suite) {
-    // },
-    /**
-     * Function to be executed before a test (in Mocha/Jasmine) starts.
-     */
-    // beforeTest: function (test, context) {
-    // },
-    /**
-     * Hook that gets executed _before_ a hook within the suite starts (e.g. runs before calling
-     * beforeEach in Mocha)
-     */
-    // beforeHook: function (test, context) {
-    // },
-    /**
-     * Hook that gets executed _after_ a hook within the suite starts (e.g. runs after calling
-     * afterEach in Mocha)
-     */
-    // afterHook: function (test, context, { error, result, duration, passed, retries }) {
-    // },
-    /**
-     * Function to be executed after a test (in Mocha/Jasmine only)
-     * @param {Object}  test             test object
-     * @param {Object}  context          scope object the test was executed with
-     * @param {Error}   result.error     error object in case the test fails, otherwise `undefined`
-     * @param {Any}     result.result    return object of test function
-     * @param {Number}  result.duration  duration of test
-     * @param {Boolean} result.passed    true if test has passed, otherwise false
-     * @param {Object}  result.retries   informations to spec related retries, e.g. `{ attempts: 0, limit: 0 }`
-     */
-    // afterTest: function(test, context, { error, result, duration, passed, retries }) {
-    // },
-    /**
-     * Hook that gets executed after the suite has ended
-     * @param {Object} suite suite details
-     */
-    // afterSuite: function (suite) {
-    // },
-    /**
-     * Runs after a WebdriverIO command gets executed
-     * @param {String} commandName hook command name
-     * @param {Array} args arguments that command would receive
-     * @param {Number} result 0 - command success, 1 - command error
-     * @param {Object} error error object if any
-     */
-    // afterCommand: function (commandName, args, result, error) {
-    // },
-    /**
-     * Gets executed after all tests are done. You still have access to all global variables from
-     * the test.
-     * @param {Number} result 0 - test pass, 1 - test fail
-     * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {Array.<String>} specs List of spec file paths that ran
-     */
-    // after: function (result, capabilities, specs) {
-    // },
-    /**
-     * Gets executed right after terminating the webdriver session.
-     * @param {Object} config wdio configuration object
-     * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {Array.<String>} specs List of spec file paths that ran
-     */
-    // afterSession: async function (_config, _capabilities, _specs) {},
-    /**
-     * Gets executed after all workers got shut down and the process is about to exit. An error
-     * thrown in the onComplete hook will result in the test run failing.
-     * @param {Object} exitCode 0 - success, 1 - fail
-     * @param {Object} config wdio configuration object
-     * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {<Object>} results object containing test results
-     */
-    // onComplete: function(exitCode, config, capabilities, results) {
-    // },
-    /**
-     * Gets executed when a refresh happens.
-     * @param {String} oldSessionId session ID of the old session
-     * @param {String} newSessionId session ID of the new session
-     */
-    //onReload: function(oldSessionId, newSessionId) {
-    //}
-};
diff --git a/apps/mudita-center/src/app.tsx b/apps/mudita-center/src/app.tsx
index e3c5a2b39f..cab83f0456 100644
--- a/apps/mudita-center/src/app.tsx
+++ b/apps/mudita-center/src/app.tsx
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import "./wdyr"
 import "reflect-metadata"
 import translationConfig from "App/translations.config.json"
 import App from "App/app.component"
diff --git a/apps/mudita-center/src/wdyr.ts b/apps/mudita-center/src/wdyr.ts
new file mode 100644
index 0000000000..bcd74bcdf4
--- /dev/null
+++ b/apps/mudita-center/src/wdyr.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React from "react"
+
+if (process.env.NODE_ENV === "development") {
+  const whyDidYouRender = require("@welldone-software/why-did-you-render")
+  whyDidYouRender(React, {
+    trackAllPureComponents: false,
+  })
+}
diff --git a/libs/core/__deprecated__/renderer/components/core/text/text.component.tsx b/libs/core/__deprecated__/renderer/components/core/text/text.component.tsx
index 942a55012f..b72c909919 100644
--- a/libs/core/__deprecated__/renderer/components/core/text/text.component.tsx
+++ b/libs/core/__deprecated__/renderer/components/core/text/text.component.tsx
@@ -121,6 +121,7 @@ export interface TextProps {
   readonly onClick?: () => void
   readonly testId?: string
   readonly textRef?: React.Ref<HTMLElement>
+  readonly id?: string
 }
 
 export enum TextDisplayStyle {
@@ -185,7 +186,6 @@ const Text: FunctionComponent<TextProps> = ({
     {message && typeof message !== "string" && (
       <FormattedMessage {...message} />
     )}
-
     {!message && children}
   </TextWrapper>
 )
diff --git a/libs/core/__deprecated__/renderer/components/rest/header/__snapshots__/header.test.tsx.snap b/libs/core/__deprecated__/renderer/components/rest/header/__snapshots__/header.test.tsx.snap
index 31e38428d9..cf836f30fe 100644
--- a/libs/core/__deprecated__/renderer/components/rest/header/__snapshots__/header.test.tsx.snap
+++ b/libs/core/__deprecated__/renderer/components/rest/header/__snapshots__/header.test.tsx.snap
@@ -43,6 +43,7 @@ exports[`matches snapshot without tabs 1`] = `
     class="c1 c2"
     color="primary"
     data-testid="location"
+    id="app-header"
   >
     [value] module.overview
   </h4>
diff --git a/libs/core/__deprecated__/renderer/components/rest/header/header.component.tsx b/libs/core/__deprecated__/renderer/components/rest/header/header.component.tsx
index 3d319f3adf..b765349bc1 100644
--- a/libs/core/__deprecated__/renderer/components/rest/header/header.component.tsx
+++ b/libs/core/__deprecated__/renderer/components/rest/header/header.component.tsx
@@ -122,6 +122,7 @@ const Header: FunctionComponent<HeaderProps> = ({
         </BackButton>
       ) : (
         <HeaderText
+          id={"app-header"}
           displayStyle={TextDisplayStyle.Headline4}
           message={currentLocation}
           data-testid={"location"}
diff --git a/libs/core/__deprecated__/renderer/store/reducers.ts b/libs/core/__deprecated__/renderer/store/reducers.ts
index 7420ce271f..ab36d034c1 100644
--- a/libs/core/__deprecated__/renderer/store/reducers.ts
+++ b/libs/core/__deprecated__/renderer/store/reducers.ts
@@ -33,6 +33,7 @@ import {
   importsReducer,
   externalProvidersReducer,
   genericEntitiesReducer,
+  genericToastsReducer,
 } from "generic-view/store"
 import { appStateReducer } from "shared/app-state"
 import { activeDeviceRegistryReducer } from "active-device-registry/feature"
@@ -70,6 +71,7 @@ export const reducers = {
   genericDataTransfer: genericDataTransferReducer,
   helpV2: helpReducer,
   genericEntities: genericEntitiesReducer,
+  genericToasts: genericToastsReducer,
 }
 
 export const combinedReducers = combineReducers(reducers)
diff --git a/libs/core/contact-support/components/contact-support-modal-error.component.tsx b/libs/core/contact-support/components/contact-support-modal-error.component.tsx
index a5a5327055..f731d802c5 100644
--- a/libs/core/contact-support/components/contact-support-modal-error.component.tsx
+++ b/libs/core/contact-support/components/contact-support-modal-error.component.tsx
@@ -32,10 +32,12 @@ export const ContactSupportModalError: FunctionComponent<Props> = ({
       <ButtonSecondary
         config={{
           text: intl.formatMessage(messages.closeButtonLabel),
-          action: {
-            type: "custom",
-            callback: closeContactSupportFlow,
-          },
+          actions: [
+            {
+              type: "custom",
+              callback: closeContactSupportFlow,
+            },
+          ],
         }}
       />
     </Modal.Buttons>
diff --git a/libs/core/contact-support/components/contact-support-modal-success.component.tsx b/libs/core/contact-support/components/contact-support-modal-success.component.tsx
index 911630a3e1..674407149d 100644
--- a/libs/core/contact-support/components/contact-support-modal-success.component.tsx
+++ b/libs/core/contact-support/components/contact-support-modal-success.component.tsx
@@ -38,10 +38,12 @@ export const ContactSupportModalSuccess: FunctionComponent<Props> = ({
         data-testid={ContactSupportModalTestIds.CloseButton}
         config={{
           text: intl.formatMessage(messages.closeButtonLabel),
-          action: {
-            type: "custom",
-            callback: closeContactSupportFlow,
-          },
+          actions: [
+            {
+              type: "custom",
+              callback: closeContactSupportFlow,
+            },
+          ],
         }}
       />
     </Modal.Buttons>
diff --git a/libs/core/contacts/components/contact-edit/contact-edit.component.tsx b/libs/core/contacts/components/contact-edit/contact-edit.component.tsx
index 29976af023..c0a2710d3b 100644
--- a/libs/core/contacts/components/contact-edit/contact-edit.component.tsx
+++ b/libs/core/contacts/components/contact-edit/contact-edit.component.tsx
@@ -211,7 +211,10 @@ const ContactEdit: FunctionComponent<ContactEditProps> = ({
             <Input
               type="text"
               label={intl.formatMessage(messages.firstName)}
-              {...register("firstName", nameValidator)}
+              {...register("firstName", {
+                ...nameValidator,
+                deps: [],
+              })}
               errorMessage={errors.firstName?.message}
               onBlur={handleUsernameBlur}
               data-testid={ContactEditTestIdsEnum.FirstName}
@@ -219,7 +222,10 @@ const ContactEdit: FunctionComponent<ContactEditProps> = ({
             <Input
               type="text"
               label={intl.formatMessage(messages.secondName)}
-              {...register("lastName", nameValidator)}
+              {...register("lastName", {
+                ...nameValidator,
+                deps: [],
+              })}
               errorMessage={errors.lastName?.message}
               onBlur={handleUsernameBlur}
               data-testid={ContactEditTestIdsEnum.SecondName}
@@ -227,20 +233,20 @@ const ContactEdit: FunctionComponent<ContactEditProps> = ({
             <Input
               type="tel"
               label={intl.formatMessage(messages.primaryNumber)}
-              {...register(
-                "primaryPhoneNumber",
-                primaryPhoneNumberValidator(fields)
-              )}
+              {...register("primaryPhoneNumber", {
+                ...primaryPhoneNumberValidator(fields),
+                deps: [],
+              })}
               errorMessage={errors.primaryPhoneNumber?.message}
               data-testid={ContactEditTestIdsEnum.PrimaryNumber}
             />
             <Input
               type="tel"
               label={intl.formatMessage(messages.secondaryNumber)}
-              {...register(
-                "secondaryPhoneNumber",
-                secondaryPhoneNumberValidator(fields)
-              )}
+              {...register("secondaryPhoneNumber", {
+                ...secondaryPhoneNumberValidator(fields),
+                deps: [],
+              })}
               errorMessage={errors.secondaryPhoneNumber?.message}
               data-testid={ContactEditTestIdsEnum.SecondaryNumber}
             />
@@ -260,7 +266,10 @@ const ContactEdit: FunctionComponent<ContactEditProps> = ({
             <Input
               type="text"
               label={intl.formatMessage(messages.firstAddressLine)}
-              {...register("firstAddressLine", addressValidator)}
+              {...register("firstAddressLine", {
+                ...addressValidator,
+                deps: [],
+              })}
               errorMessage={errors.firstAddressLine?.message}
               onBlur={trimInputValue}
               data-testid={ContactEditTestIdsEnum.FirstAddressLine}
@@ -268,7 +277,10 @@ const ContactEdit: FunctionComponent<ContactEditProps> = ({
             <Input
               type="text"
               label={intl.formatMessage(messages.secondAddressLine)}
-              {...register("secondAddressLine", addressValidator)}
+              {...register("secondAddressLine", {
+                ...addressValidator,
+                deps: [],
+              })}
               errorMessage={errors.secondAddressLine?.message}
               onBlur={trimInputValue}
               data-testid={ContactEditTestIdsEnum.SecondAddressLine}
diff --git a/libs/core/device-initialization/components/devices-initialization-modal-flows/api-device-initialization-modal-flow.tsx b/libs/core/device-initialization/components/devices-initialization-modal-flows/api-device-initialization-modal-flow.tsx
index b684c93e80..5ac4a4f2da 100644
--- a/libs/core/device-initialization/components/devices-initialization-modal-flows/api-device-initialization-modal-flow.tsx
+++ b/libs/core/device-initialization/components/devices-initialization-modal-flows/api-device-initialization-modal-flow.tsx
@@ -24,7 +24,7 @@ import {
 import { activeDeviceIdSelector } from "active-device-registry/feature"
 import { Modal } from "generic-view/ui"
 import { GenericThemeProvider } from "generic-view/theme"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
@@ -37,6 +37,7 @@ import {
 import { setDeviceInitializationStatus } from "Core/device-initialization/actions/base.action"
 import { DeviceInitializationStatus } from "Core/device-initialization/reducers/device-initialization.interface"
 import { useDeactivateDeviceAndRedirect } from "Core/overview/components/overview-screens/pure-overview/use-deactivate-device-and-redirect.hook"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   lockedModalHeadline: {
diff --git a/libs/core/templates/components/template-form/template-form.component.tsx b/libs/core/templates/components/template-form/template-form.component.tsx
index 5d9b274657..64d47e174f 100644
--- a/libs/core/templates/components/template-form/template-form.component.tsx
+++ b/libs/core/templates/components/template-form/template-form.component.tsx
@@ -96,7 +96,10 @@ export const TemplateForm: FunctionComponent<TemplateFormProps> = ({
       <Form onSubmit={handleSave}>
         <Content>
           <TextArea
-            {...register("text", templateValidator())}
+            {...register("text", {
+              ...templateValidator(),
+              deps: [],
+            })}
             data-testid={TemplateFormTestIds.TextFiled}
             type="textarea"
             defaultHeight="100%"
diff --git a/libs/device/models/src/lib/entities/entities-config.validator.test.ts b/libs/device/models/src/lib/entities/entities-config.validator.test.ts
index cd51947390..52d5f960c6 100644
--- a/libs/device/models/src/lib/entities/entities-config.validator.test.ts
+++ b/libs/device/models/src/lib/entities/entities-config.validator.test.ts
@@ -28,6 +28,20 @@ describe("entitiesConfigValidator", () => {
         field4: { type: "object", fields: { field4a: { type: "string" } } },
         5: { type: "array", items: { type: "string" } },
       },
+      computedFields: {
+        computedField1: {
+          type: "join",
+          separator: " ",
+          fields: [
+            "field1",
+            {
+              type: "join",
+              separator: ",",
+              fields: ["field2", "field3"],
+            },
+          ],
+        },
+      },
     }
     expect(() => entitiesConfigValidator.parse(validConfig)).not.toThrow()
   })
diff --git a/libs/device/models/src/lib/entities/entities-config.validator.ts b/libs/device/models/src/lib/entities/entities-config.validator.ts
index c9de56fd53..75841b28a9 100644
--- a/libs/device/models/src/lib/entities/entities-config.validator.ts
+++ b/libs/device/models/src/lib/entities/entities-config.validator.ts
@@ -43,9 +43,11 @@ const fieldValidatorsSchema = z
 
 const defaultValueSchema = z.any().optional()
 
-const idFieldSchema = z.object({
-  type: z.literal("id"),
-}).strict()
+const idFieldSchema = z
+  .object({
+    type: z.literal("id"),
+  })
+  .strict()
 
 const primitiveFieldSchema = z.object({
   type: z.enum(["string", "number", "boolean"]),
@@ -117,10 +119,91 @@ const globalValidatorSchema = z
   })
   .optional()
 
+// COMPUTED FIELDS SCHEMA
+const computedFieldFilterSchema = z
+  .object({
+    type: z.literal("filter"),
+  })
+  .merge(patternValidatorSchema.pick({ pattern: true, negatePattern: true }))
+type ComputedFieldFilter = z.infer<typeof computedFieldFilterSchema>
+
+const computedFieldClearSchema = z.object({
+  type: z.literal("clear"),
+  allowEmptyString: z.boolean().optional(),
+  allowZero: z.boolean().optional(),
+  allowFalse: z.boolean().optional(),
+})
+type ComputedFieldClear = z.infer<typeof computedFieldClearSchema>
+
+const computedFieldSliceSchema = z.object({
+  type: z.literal("slice"),
+  start: z.number().optional(),
+  end: z.number().optional(),
+})
+type ComputedFieldSlice = z.infer<typeof computedFieldSliceSchema>
+
+const computedFieldJoinSchema = z.object({
+  type: z.literal("join"),
+  separator: z.string().optional(),
+})
+type ComputedFieldJoin = z.infer<typeof computedFieldJoinSchema>
+
+const computedFieldConcatSchema = z.object({
+  type: z.literal("concat"),
+})
+type ComputedFieldConcat = z.infer<typeof computedFieldConcatSchema>
+
+const computedFieldMergeSchema = z.object({
+  type: z.literal("merge"),
+})
+type ComputedFieldMerge = z.infer<typeof computedFieldMergeSchema>
+
+const computedFieldWrapSchema = z.object({
+  type: z.literal("wrap"),
+  prefix: z.unknown().optional(),
+  suffix: z.unknown().optional(),
+})
+type ComputedFieldWrap = z.infer<typeof computedFieldWrapSchema>
+
+const computedFieldObjectifySchema = z.object({
+  type: z.literal("objectify"),
+  keys: z.array(z.string()),
+})
+type ComputedFieldObjectify = z.infer<typeof computedFieldObjectifySchema>
+
+type ComputedFieldMethod =
+  | ComputedFieldFilter
+  | ComputedFieldClear
+  | ComputedFieldSlice
+  | ComputedFieldConcat
+  | ComputedFieldMerge
+  | ComputedFieldJoin
+  | ComputedFieldWrap
+  | ComputedFieldObjectify
+
+const computedFieldFieldsSchema = z.object({
+  fields: z.array(z.union([z.string(), z.lazy(() => computedFieldSchema)])),
+})
+
+export type EntityComputedFieldConfig = ComputedFieldMethod & {
+  fields: (string | EntityComputedFieldConfig)[]
+}
+const computedFieldSchema: z.ZodType<EntityComputedFieldConfig> = z.union([
+  computedFieldFilterSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldClearSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldSliceSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldJoinSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldConcatSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldMergeSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldWrapSchema.extend(computedFieldFieldsSchema.shape),
+  computedFieldObjectifySchema.extend(computedFieldFieldsSchema.shape),
+])
+
 export const entitiesConfigValidator = z
   .object({
     fields: z.record(z.union([z.string(), z.number()]), fieldSchema),
     globalValidators: globalValidatorSchema,
+    computedFields: z.record(z.string(), computedFieldSchema).optional(),
   })
   .refine(
     (data) => {
diff --git a/libs/device/models/src/lib/feature/data-provider-config.test.ts b/libs/device/models/src/lib/feature/data-provider-config.test.ts
index 825f5bde9f..59925e6826 100644
--- a/libs/device/models/src/lib/feature/data-provider-config.test.ts
+++ b/libs/device/models/src/lib/feature/data-provider-config.test.ts
@@ -3,23 +3,27 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { dataProviderSchema } from "./data-provider-config"
+import { DataProviderConfig, dataProviderSchema } from "./data-provider-config"
 
 describe("dataProviderSchema", () => {
   it("validates entities-array with sort and filters", () => {
-    const validData = {
+    const validData: DataProviderConfig = {
       source: "entities-array",
       entitiesType: "someType",
-      sort: {
-        someField: {
-          priority: 1,
+      sort: [
+        {
+          providerField: "someField",
           direction: "asc",
+          priority: 1,
           orderingPatterns: ["/pattern/"],
         },
-      },
-      filters: {
-        someField: ["/pattern/"],
-      },
+      ],
+      filters: [
+        {
+          providerField: "someField",
+          patterns: ["/pattern/"],
+        },
+      ],
     }
     expect(dataProviderSchema.safeParse(validData).success).toBe(true)
   })
@@ -48,23 +52,125 @@ describe("dataProviderSchema", () => {
   })
 
   it("validates entities-field", () => {
-    const validData = {
+    const validData: DataProviderConfig = {
       source: "entities-field",
       entitiesType: "someType",
-      fields: {
-        dataItemId: "value1",
-        "data.someField": "value2",
-      },
+      fields: [
+        {
+          providerField: "value1",
+          componentField: "dataItemId",
+        },
+        {
+          providerField: "value2",
+          componentField: "data.someField",
+        },
+      ],
     }
     expect(dataProviderSchema.safeParse(validData).success).toBe(true)
   })
 
   it("fails validation for form-fields with invalid field key", () => {
+    const invalidData: DataProviderConfig = {
+      source: "form-fields",
+      fields: [
+        {
+          providerField: "invalidField",
+          componentField: "invalidField",
+          value: "value",
+        },
+      ],
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("validates form-fields", () => {
+    const validData: DataProviderConfig = {
+      source: "form-fields",
+      fields: [
+        {
+          providerField: "value1",
+          componentField: "dataItemId",
+        },
+        {
+          providerField: "value2",
+          componentField: "config.someField",
+        },
+        {
+          providerField: "value3",
+          componentField: "config.otherField",
+        },
+      ],
+    }
+    expect(dataProviderSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("validates form-fields with extended config", () => {
+    const validData: DataProviderConfig = {
+      source: "form-fields",
+      fields: [
+        {
+          providerField: "value1",
+          componentField: "dataItemId",
+        },
+        {
+          providerField: "value2",
+          componentField: "config.someField",
+        },
+        {
+          providerField: "value3",
+          componentField: "config.otherField",
+          modifier: "boolean",
+          condition: "eq",
+          value: true,
+        },
+      ],
+    }
+    expect(dataProviderSchema.safeParse(validData).success).toBe(true)
+  })
+
+  it("fails validation for form-fields with invalid modifier", () => {
     const invalidData = {
       source: "form-fields",
-      fields: {
-        invalidField: "value",
-      },
+      fields: [
+        {
+          providerField: "value",
+          componentField: "config.someField",
+          modifier: "invalid",
+          condition: "eq",
+          value: "value",
+        },
+      ],
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("fails validation for form-fields with invalid condition", () => {
+    const invalidData = {
+      source: "form-fields",
+      fields: [
+        {
+          field: "value",
+          componentField: "config.someField",
+          modifier: "length",
+          condition: "invalid",
+          value: "value",
+        },
+      ],
+    }
+    expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
+  })
+
+  it("fails validation for form-fields with missing value", () => {
+    const invalidData: DataProviderConfig = {
+      source: "form-fields",
+      fields: [
+        {
+          providerField: "value",
+          componentField: "config.someField",
+          modifier: "length",
+          condition: "eq",
+        },
+      ],
     }
     expect(dataProviderSchema.safeParse(invalidData).success).toBe(false)
   })
diff --git a/libs/device/models/src/lib/feature/data-provider-config.ts b/libs/device/models/src/lib/feature/data-provider-config.ts
index a3be0d3b43..afe0d6e82f 100644
--- a/libs/device/models/src/lib/feature/data-provider-config.ts
+++ b/libs/device/models/src/lib/feature/data-provider-config.ts
@@ -14,19 +14,60 @@ const regexSchema = z
     "Regex must be in format /regex/ or /regex/flags"
   )
 
-const fieldsSchema = z.record(
-  z.union([
-    z.literal("dataItemId"),
-    z.string().startsWith("data."),
-    z.string().startsWith("config."),
-  ]),
-  z.string()
+const componentFieldSchema = z.union([
+  z.literal("dataItemId"),
+  z.string().startsWith("data."),
+  z.string().startsWith("extra-data."),
+  z.string().startsWith("config."),
+])
+
+const baseFieldSchema = z
+  .object({
+    providerField: z.string(),
+    componentField: componentFieldSchema,
+  })
+  .strict()
+const enhancedFieldSchema = z
+  .object({
+    modifier: z.union([z.literal("length"), z.literal("boolean")]).optional(),
+    slice: z
+      .union([z.tuple([z.number()]), z.tuple([z.number(), z.number()])])
+      .optional(),
+    flat: z.string().optional(),
+  })
+  .merge(baseFieldSchema)
+  .strict()
+const superEnhancedFieldSchema = enhancedFieldSchema
+  .extend({
+    condition: z.union([
+      z.literal("eq"),
+      z.literal("ne"),
+      z.literal("gt"),
+      z.literal("lt"),
+    ]),
+    value: z.union([
+      z.string(),
+      z.number(),
+      z.boolean(),
+      z.array(z.unknown()),
+      z.record(z.union([z.string(), z.number()]), z.unknown()),
+    ]),
+  })
+  .strict()
+
+const fieldsSchema = z.array(
+  z.union([baseFieldSchema, enhancedFieldSchema, superEnhancedFieldSchema])
 )
 
+export type DataProviderField =
+  | z.infer<typeof baseFieldSchema>
+  | z.infer<typeof enhancedFieldSchema>
+  | z.infer<typeof superEnhancedFieldSchema>
+
 const sortSchema = z
-  .record(
-    z.string(),
+  .array(
     z.object({
+      providerField: z.string(),
       priority: z.number().nonnegative(),
       direction: z.union([z.literal("asc"), z.literal("desc")]),
       orderingPatterns: z.array(regexSchema).optional(),
@@ -36,9 +77,16 @@ const sortSchema = z
 
 export type DataProviderSortConfig = z.infer<typeof sortSchema>
 
-const filtersSchema = z.record(z.string(), z.array(regexSchema)).optional()
+const filtersSchema = z
+  .array(
+    z.object({
+      providerField: z.string(),
+      patterns: z.array(regexSchema),
+    })
+  )
+  .optional()
 
-export type DataProviderFilterConfig = z.infer<typeof filtersSchema>
+export type DataProviderFiltersConfig = z.infer<typeof filtersSchema>
 
 const entitiesArraySchema = z.object({
   source: z.literal("entities-array"),
@@ -55,6 +103,13 @@ const entitiesFieldSchema = z.object({
 
 const formFieldsSchema = z.object({
   source: z.literal("form-fields"),
+  formKey: z.string().optional(),
+  fields: fieldsSchema,
+})
+
+const formFieldsSchemaV2 = z.object({
+  source: z.literal("form-fields-v2"),
+  formName: z.string(),
   fields: fieldsSchema,
 })
 
@@ -62,6 +117,7 @@ export const dataProviderSchema = z.union([
   entitiesArraySchema,
   entitiesFieldSchema,
   formFieldsSchema,
+  formFieldsSchemaV2,
 ])
 
 export type DataProviderConfig = z.infer<typeof dataProviderSchema>
diff --git a/libs/device/models/src/lib/feature/extra-config.ts b/libs/device/models/src/lib/feature/extra-config.ts
new file mode 100644
index 0000000000..b825c6b25b
--- /dev/null
+++ b/libs/device/models/src/lib/feature/extra-config.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const TooltipPlacementEnum = z.enum([
+  "bottom-right",
+  "bottom-left",
+  "top-right",
+  "top-left",
+])
+
+export type TooltipPlacement = z.infer<typeof TooltipPlacementEnum>
+
+const TooltipOffset = z.object({
+  x: z.number(),
+  y: z.number(),
+})
+
+export type TooltipOffsetType = z.infer<typeof TooltipOffset>
+
+const tooltipSchema = z.object({
+  contentText: z.string().optional(),
+  contentList: z.array(z.string()).optional(),
+  placement: TooltipPlacementEnum.optional(),
+  offset: TooltipOffset.optional(),
+})
+
+export const extraConfigSchema = z.object({
+  tooltip: tooltipSchema.optional(),
+})
+
+export type ExtraConfig = z.infer<typeof extraConfigSchema>
diff --git a/libs/device/models/src/lib/feature/feature-config.test.ts b/libs/device/models/src/lib/feature/feature-config.test.ts
index 99049fc8a6..2f2e9aa9c6 100644
--- a/libs/device/models/src/lib/feature/feature-config.test.ts
+++ b/libs/device/models/src/lib/feature/feature-config.test.ts
@@ -10,27 +10,34 @@ const featureConfig: FeatureConfig = {
     component: "button-text",
     config: {
       text: "dummy",
-      action: {
-        type: "custom",
-        callback: jest.fn,
-      },
+      actions: [
+        {
+          type: "custom",
+          callback: jest.fn,
+        },
+      ],
     },
   },
   "dummy-2": {
     component: "button-primary",
     config: {
       text: "dummy",
-      action: {
-        type: "custom",
-        callback: jest.fn,
-      },
+      actions: [
+        {
+          type: "custom",
+          callback: jest.fn,
+        },
+      ],
     },
     dataProvider: {
       source: "entities-field",
       entitiesType: "dummy",
-      fields: {
-        dataItemId: "dummy",
-      },
+      fields: [
+        {
+          providerField: "dummy",
+          componentField: "dataItemId",
+        },
+      ],
     },
   },
 }
diff --git a/libs/device/models/src/lib/feature/feature-config.ts b/libs/device/models/src/lib/feature/feature-config.ts
index 93588589d8..454a13a18b 100644
--- a/libs/device/models/src/lib/feature/feature-config.ts
+++ b/libs/device/models/src/lib/feature/feature-config.ts
@@ -8,6 +8,7 @@ import componentValidators from "generic-view/models"
 import { ComponentPropsByName } from "generic-view/utils"
 import { layoutSchema } from "./layout-config"
 import { dataProviderSchema } from "./data-provider-config"
+import { extraConfigSchema } from "./extra-config"
 
 const validators = Object.values(componentValidators).map(
   ({ key, configValidator }) => {
@@ -17,6 +18,7 @@ const validators = Object.values(componentValidators).map(
         config: configValidator,
         layout: layoutSchema.optional(),
         dataProvider: dataProviderSchema.optional(),
+        extra: extraConfigSchema.optional(),
         childrenKeys: z.array(z.string()).optional(),
       })
       .passthrough()
diff --git a/libs/device/models/src/lib/feature/index.ts b/libs/device/models/src/lib/feature/index.ts
index d0f19b70cd..c753f7c0cc 100644
--- a/libs/device/models/src/lib/feature/index.ts
+++ b/libs/device/models/src/lib/feature/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./data-provider-config"
+export * from "./extra-config"
 export * from "./feature-config"
 export * from "./layout-config"
-export * from "./data-provider-config"
diff --git a/libs/generic-view/feature/src/lib/generic-toasts.tsx b/libs/generic-view/feature/src/lib/generic-toasts.tsx
new file mode 100644
index 0000000000..b585ae8a6e
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/generic-toasts.tsx
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { FunctionComponent, useMemo } from "react"
+import { useSelector } from "react-redux"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import RecursiveLayout from "./recursive-layout"
+import { selectViewConfig } from "generic-view/store"
+import { createSelector } from "reselect"
+import { isEmpty } from "lodash"
+import styled from "styled-components"
+
+const selectToastsToRender = createSelector(selectViewConfig, (config) => {
+  return Object.entries(config || {})
+    .filter(([, { component }]) => component === "toast")
+    .map(([key]) => key)
+})
+
+interface Props {
+  viewKey: string
+}
+
+export const GenericToasts: FunctionComponent<Props> = ({ viewKey }) => {
+  const toastsToRender = useSelector((state: ReduxRootState) =>
+    selectToastsToRender(state, { viewKey })
+  )
+  const toastsToRenderDependency = JSON.stringify(toastsToRender)
+
+  return useMemo(() => {
+    if (isEmpty(toastsToRender)) {
+      return null
+    }
+    return (
+      <ToastsWrapper>
+        {toastsToRender.map((toastKey) => {
+          return (
+            <RecursiveLayout
+              key={toastKey}
+              viewKey={viewKey}
+              componentKey={toastKey}
+            />
+          )
+        })}
+      </ToastsWrapper>
+    )
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [toastsToRenderDependency, viewKey])
+}
+
+const ToastsWrapper = styled.div`
+  position: fixed;
+  right: 3.2rem;
+  bottom: 3.2rem;
+  z-index: 3;
+`
diff --git a/libs/generic-view/feature/src/lib/generic-view.tsx b/libs/generic-view/feature/src/lib/generic-view.tsx
index ee0c1f1878..6f893a9603 100644
--- a/libs/generic-view/feature/src/lib/generic-view.tsx
+++ b/libs/generic-view/feature/src/lib/generic-view.tsx
@@ -4,26 +4,26 @@
  */
 
 import React, { FunctionComponent } from "react"
-import { useParams } from "react-router"
 import { GenericThemeProvider } from "generic-view/theme"
 import RecursiveLayout from "./recursive-layout"
 import GenericModals from "./generic-modals"
 import { useDevConsole } from "./use-dev-console"
 import { useDevViews } from "./use-dev-views/use-dev-views"
+import { GenericToasts } from "./generic-toasts"
+import { FormsProvider, useCurrentViewKey } from "generic-view/utils"
 
 export const GenericView: FunctionComponent = () => {
   useDevConsole()
-  const { viewKey, subviewKey } = useParams<{
-    viewKey: string
-    subviewKey?: string
-  }>()
-  const currentViewKey = subviewKey || viewKey
+  const currentViewKey = useCurrentViewKey()
   useDevViews(currentViewKey)
 
   return (
     <GenericThemeProvider>
-      <RecursiveLayout viewKey={currentViewKey} componentKey={"main"} />
-      <GenericModals viewKey={currentViewKey} />
+      <FormsProvider>
+        <RecursiveLayout viewKey={currentViewKey} componentKey={"main"} />
+        <GenericModals viewKey={currentViewKey} />
+        <GenericToasts viewKey={currentViewKey} />
+      </FormsProvider>
     </GenericThemeProvider>
   )
 }
diff --git a/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
new file mode 100644
index 0000000000..0db4556b3c
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
@@ -0,0 +1,464 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntityData } from "device/models"
+
+const contactFullData1 = {
+  firstName: "Anna",
+  lastName: "Nowak",
+  namePrefix: "Dr.",
+  nameSuffix: "Jr.",
+  middleName: "Maria",
+  phoneNumbers: [{ phoneNumber: "+48123456789", phoneType: "MOBILE" }],
+  emailAddresses: [
+    { emailAddress: "anna.nowak@example.com", emailType: "WORK" },
+  ],
+  company: "ABC Corp.",
+  department: "HR",
+  workTitle: "Manager",
+  address: {
+    streetAddress: "Main Street 12",
+    city: "Warsaw",
+    country: "Poland",
+    type: "WORK",
+  },
+  website: "https://example.com",
+  notes: "VIP client",
+  entityType: "contacts",
+}
+
+const contactFullData2 = {
+  firstName: "John",
+  lastName: "Doe",
+  namePrefix: "Mr.",
+  nameSuffix: "Sr.",
+  middleName: "Paul",
+  phoneNumbers: [
+    { phoneNumber: "+441234567890", phoneType: "MOBILE" },
+    { phoneNumber: "+441987654321", phoneType: "HOME" },
+  ],
+  emailAddresses: [
+    { emailAddress: "john.doe@workplace.com", emailType: "WORK" },
+    { emailAddress: "johnny.doe@gmail.com", emailType: "PERSONAL" },
+  ],
+  company: "Tech Solutions Inc.",
+  department: "Engineering",
+  workTitle: "Senior Developer",
+  address: {
+    streetAddress: "123 Elm Street",
+    city: "London",
+    country: "UK",
+    type: "HOME",
+  },
+  website: "https://johndoe.com",
+  notes: "Key project stakeholder.",
+  entityType: "contacts",
+}
+
+const contactFullData3 = {
+  firstName: "Emily",
+  lastName: "Clark",
+  namePrefix: "Ms.",
+  nameSuffix: "",
+  middleName: "Rose",
+  phoneNumbers: [{ phoneNumber: "+12123456789", phoneType: "WORK" }],
+  emailAddresses: [
+    { emailAddress: "emily.clark@startup.com", emailType: "WORK" },
+  ],
+  company: "Innovatech",
+  department: "Marketing",
+  workTitle: "Marketing Director",
+  address: {
+    streetAddress: "456 Innovation Ave",
+    city: "San Francisco",
+    country: "USA",
+    type: "WORK",
+  },
+  website: "https://emilyclark.me",
+  notes: "Lead of the marketing strategy team.",
+  entityType: "contacts",
+}
+
+const contactFullData4 = {
+  firstName: "Michael",
+  lastName: "Johnson",
+  namePrefix: "Dr.",
+  nameSuffix: "PhD",
+  middleName: "David",
+  phoneNumbers: [
+    { phoneNumber: "+49876543210", phoneType: "MOBILE" },
+    { phoneNumber: "+49871234567", phoneType: "HOME" },
+  ],
+  emailAddresses: [
+    { emailAddress: "michael.j@researchlab.com", emailType: "WORK" },
+  ],
+  company: "Research Labs",
+  department: "R&D",
+  workTitle: "Chief Scientist",
+  address: {
+    streetAddress: "789 Science Blvd",
+    city: "Berlin",
+    country: "Germany",
+    type: "WORK",
+  },
+  website: "https://michaeljohnsonphd.com",
+  notes: "Collaborating on AI research projects.",
+  entityType: "contacts",
+}
+
+const contactFullData5 = {
+  firstName: "Sophia",
+  lastName: "Martinez",
+  namePrefix: "Mrs.",
+  nameSuffix: "",
+  middleName: "Isabel",
+  phoneNumbers: [{ phoneNumber: "+33678901234", phoneType: "MOBILE" }],
+  emailAddresses: [
+    {
+      emailAddress: "sophia.martinez@fashionhouse.com",
+      emailType: "WORK",
+    },
+    {
+      emailAddress: "sophia.isabel@yahoo.com",
+      emailType: "PERSONAL",
+    },
+  ],
+  company: "Fashion House",
+  department: "Design",
+  workTitle: "Creative Director",
+  address: {
+    streetAddress: "101 Avenue des Champs-Élysées",
+    city: "Paris",
+    country: "France",
+    type: "WORK",
+  },
+  website: "https://sophiamartinezdesigns.com",
+  notes: "Influential in modern fashion trends.",
+  entityType: "contacts",
+}
+
+const contactWithNumbersInName = {
+  firstName: "Numer (last name is numeric)",
+  lastName: "12345",
+  phoneNumbers: [{ phoneNumber: "+48901234567", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithPrefixSuffix = {
+  namePrefix: "Prof.",
+  nameSuffix: "PhD. (prefix & suffix only)",
+  phoneNumbers: [{ phoneNumber: "+48345678901", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithMiddleNameOnly = {
+  middleName: "Jan (only middle name)",
+  entityType: "contacts",
+}
+
+const contactWithGermanyPhoneNumberOnly = {
+  phoneNumbers: [{ phoneNumber: "490123456789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithIndiaPhoneNumberOnly = {
+  phoneNumbers: [{ phoneNumber: "911234567890", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithChinaPhoneNumberOnly = {
+  phoneNumbers: [{ phoneNumber: "8612345678901", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+
+const contactWithMobilePhoneNumberOnly = {
+  phoneNumbers: [{ phoneNumber: "+48345678902", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithMobileAndHomePhoneNumbers = {
+  phoneNumbers: [
+    { phoneNumber: "+48345678902", phoneType: "MOBILE" },
+    { phoneNumber: "+48445678903", phoneType: "HOME" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithMobileHomeAndWorkPhoneNumbers = {
+  phoneNumbers: [
+    { phoneNumber: "+48345678902", phoneType: "MOBILE" },
+    { phoneNumber: "+48445678903", phoneType: "HOME" },
+    { phoneNumber: "+48555678904", phoneType: "WORK" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithAllPhoneTypesPhoneNumbers = {
+  phoneNumbers: [
+    { phoneNumber: "+48345678902", phoneType: "MOBILE" },
+    { phoneNumber: "+48445678903", phoneType: "HOME" },
+    { phoneNumber: "+48555678904", phoneType: "WORK" },
+    { phoneNumber: "+48665678905", phoneType: "OTHER" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithWorkAndOtherPhoneNumbers = {
+  phoneNumbers: [
+    { phoneNumber: "+48555678904", phoneType: "WORK" },
+    { phoneNumber: "+48665678905", phoneType: "OTHER" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithGermanyPhoneNumberAndFirstName = {
+  firstName: "Anna (Germany-style)",
+  phoneNumbers: [{ phoneNumber: "48123456789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithBrazilPhoneNumberAndFirstName = {
+  firstName: "Carlos (Brazil-style)",
+  phoneNumbers: [{ phoneNumber: "551112345678", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithJapanPhoneNumberAndFirstName = {
+  firstName: "Yuki (Japan-style)",
+  phoneNumbers: [{ phoneNumber: "81312345678", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithContrastingPhoneNumbers1 = {
+  firstName: "Liam (Ireland & Australia)",
+  phoneNumbers: [
+    { phoneNumber: "1512345678", phoneType: "MOBILE" },
+    { phoneNumber: "611234567890123", phoneType: "WORK" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithContrastingPhoneNumbers2 = {
+  firstName: "Amina (Morocco & USA)",
+  phoneNumbers: [
+    { phoneNumber: "201234567", phoneType: "HOME" },
+    { phoneNumber: "14155552671", phoneType: "MOBILE" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithHomeEmailOnly = {
+  emailAddresses: [{ emailAddress: "home@email.com", emailType: "HOME" }],
+  entityType: "contacts",
+}
+
+const contactWithHomeAndWorkEmails = {
+  emailAddresses: [
+    { emailAddress: "home@email.com", emailType: "HOME" },
+    { emailAddress: "work@email.com", emailType: "WORK" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithHomeWorkAndOtherEmails = {
+  emailAddresses: [
+    { emailAddress: "home@email.com", emailType: "HOME" },
+    { emailAddress: "work@email.com", emailType: "WORK" },
+    { emailAddress: "other@email.com", emailType: "OTHER" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithAllEmailTypes = {
+  emailAddresses: [
+    { emailAddress: "home@email.com", emailType: "HOME" },
+    { emailAddress: "work@email.com", emailType: "WORK" },
+    { emailAddress: "other@email.com", emailType: "OTHER" },
+    { emailAddress: "unknown@email.com", emailType: "UNKNOWN" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithWorkAndOtherEmails = {
+  emailAddresses: [
+    { emailAddress: "work@email.com", emailType: "WORK" },
+    { emailAddress: "other@email.com", emailType: "OTHER" },
+  ],
+  entityType: "contacts",
+}
+
+const contactWithNicknameOnly = {
+  nickName: "Bobby (nickname only)",
+  entityType: "contacts",
+}
+
+const contactWithCompanyOnly = {
+  company: "Innovative Technologies (company)",
+  entityType: "contacts",
+}
+
+const contactWithDepartmentOnly = {
+  department: "Human Resources (department)",
+  entityType: "contacts",
+}
+
+const contactWithWorkTitleOnly = {
+  workTitle: "Chief Marketing Officer (job title)",
+  entityType: "contacts",
+}
+
+const contactWithCompanyAndDepartment = {
+  company: "Innovative Technologies (company & department)",
+  department: "Human Resources",
+  entityType: "contacts",
+}
+
+const contactWithCompanyAndWorkTitle = {
+  company: "Innovative Technologies (company & job title)",
+  workTitle: "Chief Marketing Officer",
+  entityType: "contacts",
+}
+
+const contactWithDepartmentAndWorkTitle = {
+  department: "Human Resources (department & job title)",
+  workTitle: "Chief Marketing Officer",
+  entityType: "contacts",
+}
+
+const contactWithCompanyDepartmentAndWorkTitle = {
+  company: "Innovative Technologies (company, department & job title)",
+  department: "Human Resources",
+  workTitle: "Chief Marketing Officer",
+  entityType: "contacts",
+}
+
+const contactWithFullAddressOnly = {
+  address: {
+    streetAddress: "Street 7 (full address)",
+    city: "Berlin",
+    zipCode: "10115",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithStreetAddressOnly = {
+  contactId: "2",
+  firstName: "Jane",
+  lastName: "Smith",
+  address: {
+    streetAddress: "Street 5 (only street address)",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithCityOnly = {
+  contactId: "3",
+  firstName: "Adam",
+  lastName: "Johnson",
+  address: {
+    city: "Krakow",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithZipCodeOnly = {
+  contactId: "4",
+  firstName: "Emily",
+  lastName: "Davis",
+  address: {
+    zipCode: "00-002",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithStreetAndZipCode = {
+  contactId: "5",
+  firstName: "Michael",
+  lastName: "Brown",
+  address: {
+    streetAddress: "Street 9",
+    zipCode: "00-003",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithStateAndCountry = {
+  contactId: "5",
+  firstName: "Michael",
+  lastName: "Brown",
+  address: {
+    state: "California",
+    country: "USA",
+    type: "HOME",
+  },
+  entityType: "contacts",
+}
+
+const contactWithSipOnly = {
+  sip: "sip:jan.nowak@siponly.com",
+  entityType: "contacts",
+}
+
+const contactWithWebsiteOnly = {
+  website: "https://websiteonly.com",
+  entityType: "contacts",
+}
+
+const contactWithNotesOnly = {
+  notes: "This is a test note. (only notes)",
+  entityType: "contacts",
+}
+
+export const contactsSeedData: EntityData[] = [
+  contactFullData1,
+  contactFullData2,
+  contactFullData3,
+  contactFullData4,
+  contactFullData5,
+  contactWithNumbersInName,
+  contactWithPrefixSuffix,
+  contactWithMiddleNameOnly,
+  contactWithGermanyPhoneNumberOnly,
+  contactWithIndiaPhoneNumberOnly,
+  contactWithChinaPhoneNumberOnly,
+  contactWithMobilePhoneNumberOnly,
+  contactWithMobileAndHomePhoneNumbers,
+  contactWithMobileHomeAndWorkPhoneNumbers,
+  contactWithAllPhoneTypesPhoneNumbers,
+  contactWithWorkAndOtherPhoneNumbers,
+  contactWithGermanyPhoneNumberAndFirstName,
+  contactWithBrazilPhoneNumberAndFirstName,
+  contactWithJapanPhoneNumberAndFirstName,
+  contactWithContrastingPhoneNumbers1,
+  contactWithContrastingPhoneNumbers2,
+  contactWithHomeEmailOnly,
+  contactWithHomeAndWorkEmails,
+  contactWithHomeWorkAndOtherEmails,
+  contactWithAllEmailTypes,
+  contactWithWorkAndOtherEmails,
+  contactWithNicknameOnly,
+  contactWithCompanyOnly,
+  contactWithDepartmentOnly,
+  contactWithWorkTitleOnly,
+  contactWithCompanyAndDepartment,
+  contactWithCompanyAndWorkTitle,
+  contactWithDepartmentAndWorkTitle,
+  contactWithCompanyDepartmentAndWorkTitle,
+  contactWithFullAddressOnly,
+  contactWithStreetAddressOnly,
+  contactWithCityOnly,
+  contactWithZipCodeOnly,
+  contactWithStreetAndZipCode,
+  contactWithStateAndCountry,
+  contactWithSipOnly,
+  contactWithWebsiteOnly,
+  contactWithNotesOnly,
+]
diff --git a/libs/generic-view/feature/src/lib/setup-component.tsx b/libs/generic-view/feature/src/lib/setup-component.tsx
index 8da69b2a42..5ed9e43377 100644
--- a/libs/generic-view/feature/src/lib/setup-component.tsx
+++ b/libs/generic-view/feature/src/lib/setup-component.tsx
@@ -3,29 +3,51 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { ComponentType, ReactElement, useMemo } from "react"
+import React, {
+  ComponentType,
+  CSSProperties,
+  ReactElement,
+  useMemo,
+} from "react"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import styled, { css } from "styled-components"
 import { useSelector } from "react-redux"
 import {
   selectActiveApiDeviceId,
   selectComponentConfig,
   selectComponentData,
   selectComponentDataProvider,
+  selectComponentExtra,
   selectComponentLayout,
   selectEntitiesData,
   selectEntitiesIdFieldKey,
   selectEntityData,
+  useFormField,
 } from "generic-view/store"
 import {
   dataProviderFilter,
   dataProviderSort,
   mapLayoutSizes,
   RecursiveComponent,
+  useViewFormContext,
 } from "generic-view/utils"
-import { EntityData, Layout } from "device/models"
-import { set } from "lodash"
-import { useFormContext } from "react-hook-form"
+import {
+  DataProviderField,
+  EntityData,
+  ExtraConfig,
+  Layout,
+} from "device/models"
+import {
+  cloneDeep,
+  flatten,
+  get,
+  isArray,
+  isNumber,
+  isObject,
+  isString,
+  map,
+  set,
+} from "lodash"
+import { Tooltip, Paragraph5 } from "generic-view/ui"
 
 export const setupComponent = <P extends object>(
   Component: ComponentType<P>
@@ -40,7 +62,8 @@ export const setupComponent = <P extends object>(
       ...dataProps
     } = props
     const deviceId = useSelector(selectActiveApiDeviceId)!
-    const formContext = useFormContext()
+    const getFormContext = useViewFormContext()
+
     let dataItemId = props.dataItemId
     const layout = useSelector((state: ReduxRootState) => {
       return selectComponentLayout(state, { viewKey, componentKey })
@@ -51,10 +74,19 @@ export const setupComponent = <P extends object>(
     const dataProvider = useSelector((state: ReduxRootState) => {
       return selectComponentDataProvider(state, { viewKey, componentKey })
     })
+    const extra = useSelector((state: ReduxRootState) => {
+      return selectComponentExtra(state, { viewKey, componentKey })
+    })
     const componentData = useSelector((state: ReduxRootState) => {
       if (dataProvider) return
       return selectComponentData(state, { viewKey, componentKey })
     })
+    const formDataV2 = useFormField({
+      formName:
+        dataProvider?.source === "form-fields-v2"
+          ? dataProvider.formName
+          : undefined,
+    })
     const entitiesData =
       useSelector((state: ReduxRootState) => {
         if (dataProvider?.source !== "entities-array") return
@@ -79,17 +111,15 @@ export const setupComponent = <P extends object>(
       }) as EntityData
     })
 
-    const editableProps = {
+    const extraData: ExtraConfig = {}
+
+    const editableProps = cloneDeep({
       ...dataProps,
-      config: {
-        ...config,
-      },
-      data: undefined as unknown,
-    }
+      config,
+      data: componentData,
+    })
 
-    if (!dataProvider) {
-      editableProps.data = componentData
-    } else if (dataProvider?.source === "entities-array") {
+    if (dataProvider?.source === "entities-array") {
       const filteredData = dataProviderFilter(
         [...entitiesData],
         dataProvider.filters
@@ -98,34 +128,73 @@ export const setupComponent = <P extends object>(
       editableProps.data = sortedData?.map((item) => item[idFieldKey!])
     } else if (dataProvider?.source === "entities-field") {
       if (entityData) {
-        for (const [key, field] of Object.entries(dataProvider.fields)) {
-          const value = entityData[field]
-          if (value === undefined) continue
-          set(editableProps || {}, key, value)
+        for (const fieldConfig of dataProvider.fields) {
+          const { componentField, providerField, ...config } = fieldConfig
+          const value = processFormFields(
+            config,
+            get(entityData, providerField)
+          )
+          if (isString(value) && componentField === "dataItemId") {
+            dataItemId = value
+            continue
+          }
+          if (componentField.startsWith("extra-data.")) {
+            const extraPropsKey = componentField.replace(/^extra-data\./, "")
+            set(extraData, extraPropsKey, value)
+            continue
+          }
+          set(editableProps || {}, componentField, value)
         }
       }
     } else if (dataProvider?.source === "form-fields") {
-      for (const [key, field] of Object.entries(dataProvider.fields)) {
-        const value = formContext.getValues(field)
-        if (value === undefined) continue
-        if (key === "dataItemId") {
+      const formContext = getFormContext(dataProvider.formKey)
+      const isFormElement = componentName!.startsWith("form.")
+
+      for (const fieldConfig of dataProvider.fields) {
+        const { componentField, providerField, ...config } = fieldConfig
+        const fieldValue = isFormElement
+          ? formContext.getValues(providerField)
+          : formContext.watch(providerField)
+        const value = processFormFields(config, fieldValue)
+
+        if (isString(value) && componentField === "dataItemId") {
           dataItemId = value
           continue
         }
-        set(editableProps, key, value)
+        set(editableProps || {}, componentField, value)
+      }
+    } else if (dataProvider?.source === "form-fields-v2") {
+      for (const fieldConfig of dataProvider.fields) {
+        const { componentField, providerField, ...config } = fieldConfig
+        const value = processFormFields(
+          config,
+          formDataV2.getValue(providerField)
+        )
+        if (isString(value) && componentField === "dataItemId") {
+          dataItemId = value
+          continue
+        }
+        set(editableProps || {}, componentField, value)
       }
     }
     const editablePropsDependency = JSON.stringify(editableProps)
     const layoutDependency = JSON.stringify(layout)
+    const styleDependency = JSON.stringify(style)
     const dataProviderDependency = JSON.stringify(dataProvider)
+    const formDataV2Dependency = JSON.stringify(formDataV2)
+
+    const styles = useMemo(() => {
+      return setupStyles(style, layout)
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [layoutDependency, styleDependency])
 
     return useMemo(() => {
-      const ComponentWithProps = () => (
+      const componentElement = (
         <Component
           {...(editableProps as P)}
           viewKey={viewKey}
           componentKey={componentKey}
-          style={style}
+          style={styles}
           className={className}
           dataItemId={dataItemId}
           componentName={componentName}
@@ -139,87 +208,149 @@ export const setupComponent = <P extends object>(
         </Component>
       )
 
-      if (layout) {
-        return (
-          <Wrapper $layout={layout}>
-            <ComponentWithProps />
-          </Wrapper>
+      let innerContentComponent
+
+      if (extra?.tooltip?.contentText) {
+        innerContentComponent = (
+          <Paragraph5>{extra?.tooltip.contentText}</Paragraph5>
+        )
+      }
+
+      if (extraData.tooltip?.contentList) {
+        innerContentComponent = (
+          <>
+            {extraData.tooltip?.contentList?.map((content) => (
+              <Paragraph5 key={content}>{content}</Paragraph5>
+            ))}
+          </>
         )
       }
-      return <ComponentWithProps />
+
+      return extra?.tooltip ? (
+        <Tooltip
+          placement={extra.tooltip.placement}
+          offset={extra.tooltip.offset}
+        >
+          <Tooltip.Anchor>{componentElement}</Tooltip.Anchor>
+          <Tooltip.Content $defaultStyles>
+            {innerContentComponent}
+          </Tooltip.Content>
+        </Tooltip>
+      ) : (
+        componentElement
+      )
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
       children,
-      style,
       className,
       componentKey,
       viewKey,
       componentName,
       dataItemId,
-      layoutDependency,
       editablePropsDependency,
       dataProviderDependency,
+      styles,
+      formDataV2Dependency,
     ])
   }
 }
 
-const wrapperStyles = css<{
-  $layout: Pick<
-    Layout,
-    "flexPlacement" | "gridPlacement" | "margin" | "padding"
-  >
-}>(({ $layout }) => ({
-  ...($layout.gridPlacement && {
-    gridRow: $layout.gridPlacement.row,
-    gridColumn: $layout.gridPlacement.column,
-    gridRowEnd: $layout.gridPlacement.row + $layout.gridPlacement.height,
-    gridColumnEnd: $layout.gridPlacement.column + $layout.gridPlacement.width,
-  }),
-  ...($layout.flexPlacement && {
-    flexGrow: $layout.flexPlacement.grow,
-    flexBasis: $layout.flexPlacement.basis,
-    flexShrink: $layout.flexPlacement.shrink,
-    alignSelf: $layout.flexPlacement.alignSelf,
-    order: $layout.flexPlacement.order,
-  }),
-  ...($layout.margin && {
-    margin: $layout.margin,
-  }),
-  ...($layout.padding && {
-    padding: $layout.padding,
-  }),
-}))
-
-const childStyles = css<{
-  $layout: Pick<Layout, "flexLayout" | "gridLayout">
-}>(({ $layout }) => ({
-  ...($layout.gridLayout && {
-    display: "grid",
-    gridTemplateRows: mapLayoutSizes($layout.gridLayout.rows),
-    gridTemplateColumns: mapLayoutSizes($layout.gridLayout.columns),
-    rowGap: $layout.gridLayout.rowGap || 0,
-    columnGap: $layout.gridLayout.columnGap || 0,
-    justifyContent: $layout.gridLayout.justifyContent,
-    alignItems: $layout.gridLayout.alignItems,
-    justifyItems: $layout.gridLayout.justifyItems,
-  }),
-  ...($layout.flexLayout && {
-    display: "flex",
-    flexDirection: $layout.flexLayout.direction,
-    justifyContent: $layout.flexLayout.justifyContent,
-    alignItems: $layout.flexLayout.alignItems,
-    flexWrap: $layout.flexLayout.wrap,
-    rowGap: $layout.flexLayout.rowGap || 0,
-    columnGap: $layout.flexLayout.columnGap || 0,
-  }),
-}))
-
-const Wrapper = styled.div<{ $layout: Layout }>`
-  ${wrapperStyles};
-
-  > * {
-    width: 100%;
-    height: 100%;
-    ${childStyles};
+function flattenListByKey<T>(list: T[], key: string): unknown {
+  return flatten(map(list, (item) => get(item, key, [])))
+}
+
+const processFormFields = (
+  field: Partial<DataProviderField>,
+  value: unknown
+) => {
+  let newValue = value
+  if ("slice" in field && field.slice !== undefined && value instanceof Array) {
+    newValue =
+      field.slice.length > 1
+        ? value.slice(...field.slice)
+        : value.slice(field.slice[0])
+  }
+  if ("flat" in field && field.flat !== undefined && value instanceof Array) {
+    newValue = flattenListByKey(newValue as unknown[], field.flat)
+  }
+
+  if ("modifier" in field) {
+    switch (field.modifier) {
+      case "length":
+        if (isString(newValue) || isArray(newValue)) {
+          newValue = newValue.length
+        } else if (isObject(value)) {
+          newValue = Object.keys(value).length
+        }
+        break
+      case "boolean":
+        newValue = Boolean(value)
+        break
+    }
+  }
+  if ("condition" in field) {
+    switch (field.condition) {
+      case "eq":
+        newValue = newValue === field.value
+        break
+      case "ne":
+        newValue = newValue !== field.value
+        break
+      case "gt":
+        if (isNumber(newValue) && isNumber(field.value)) {
+          newValue = newValue > field.value
+        }
+        break
+      case "lt":
+        if (isNumber(newValue) && isNumber(field.value)) {
+          newValue = newValue < field.value
+        }
+        break
+    }
+  }
+  return newValue
+}
+
+const setupStyles = (style?: CSSProperties, layout?: Layout) => {
+  return {
+    ...style,
+    ...(layout?.gridPlacement && {
+      gridRow: layout.gridPlacement.row,
+      gridColumn: layout.gridPlacement.column,
+      gridRowEnd: layout.gridPlacement.row + layout.gridPlacement.height,
+      gridColumnEnd: layout.gridPlacement.column + layout.gridPlacement.width,
+    }),
+    ...(layout?.flexPlacement && {
+      flexGrow: layout.flexPlacement.grow,
+      flexBasis: layout.flexPlacement.basis,
+      flexShrink: layout.flexPlacement.shrink,
+      alignSelf: layout.flexPlacement.alignSelf,
+      order: layout.flexPlacement.order,
+    }),
+    ...(layout?.margin && {
+      margin: layout.margin,
+    }),
+    ...(layout?.padding && {
+      padding: layout.padding,
+    }),
+    ...(layout?.flexLayout && {
+      display: "flex",
+      flexDirection: layout.flexLayout.direction,
+      justifyContent: layout.flexLayout.justifyContent,
+      alignItems: layout.flexLayout.alignItems,
+      flexWrap: layout.flexLayout.wrap,
+      rowGap: layout.flexLayout.rowGap || 0,
+      columnGap: layout.flexLayout.columnGap || 0,
+    }),
+    ...(layout?.gridLayout && {
+      display: "grid",
+      gridTemplateRows: mapLayoutSizes(layout.gridLayout.rows),
+      gridTemplateColumns: mapLayoutSizes(layout.gridLayout.columns),
+      rowGap: layout.gridLayout.rowGap || 0,
+      columnGap: layout.gridLayout.columnGap || 0,
+      justifyContent: layout.gridLayout.justifyContent,
+      alignItems: layout.gridLayout.alignItems,
+      justifyItems: layout.gridLayout.justifyItems,
+    }),
   }
-`
+}
diff --git a/libs/generic-view/feature/src/lib/use-dev-console.ts b/libs/generic-view/feature/src/lib/use-dev-console.ts
index d6b47c6286..30f9824346 100644
--- a/libs/generic-view/feature/src/lib/use-dev-console.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-console.ts
@@ -16,6 +16,7 @@ import {
 import { useDispatch, useSelector } from "react-redux"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { EntityData, EntityId } from "device/models"
+import { contactsSeedData } from "./seed-data/contacts-seed-data"
 
 export const useDevConsole = () => {
   const dispatch = useDispatch<Dispatch>()
@@ -26,6 +27,9 @@ export const useDevConsole = () => {
     if (process.env.NODE_ENV === "development" && activeDeviceId) {
       if (typeof global !== "undefined") {
         Object.assign(global, {
+          _seedDataMap: {
+            contacts: contactsSeedData,
+          },
           _getEntitiesData: (
             entitiesType: string,
             responseType: "json" | "file" = "json",
@@ -90,6 +94,17 @@ export const useDevConsole = () => {
               updateEntityDataAction({ entitiesType, entityId, data, deviceId })
             )
           },
+          _createMultipleEntities: async (
+            entitiesType: string,
+            entities: EntityData[],
+            deviceId = activeDeviceId
+          ) => {
+            for (const data of entities) {
+              await dispatch(
+                createEntityDataAction({ entitiesType, data, deviceId })
+              )
+            }
+          },
         })
       }
     }
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx b/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
index a4f8ad892d..c20a849bec 100644
--- a/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
+++ b/libs/generic-view/feature/src/lib/use-dev-views/use-dev-views.tsx
@@ -8,6 +8,7 @@ import { selectActiveApiDeviceId, setGenericConfig } from "generic-view/store"
 import customViews from "./views"
 import { useDispatch, useSelector } from "react-redux"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { isEmpty } from "lodash"
 
 export const useDevViews = (viewKey: string) => {
   const dispatch = useDispatch<Dispatch>()
@@ -21,7 +22,7 @@ export const useDevViews = (viewKey: string) => {
       : undefined
 
   useEffect(() => {
-    if (newConfig && process.env.DEV_API_CONFIG === "1") {
+    if (!isEmpty(newConfig) && process.env.DEV_API_CONFIG === "1") {
       dispatch(
         setGenericConfig({
           feature: viewKey,
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
index 77409b3796..0e78e70e6b 100644
--- a/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
@@ -5,234 +5,7 @@
 
 import { View } from "generic-view/utils"
 
-const view: View = {
-  main: {
-    // @ts-ignore
-    screenTitle: "Contacts",
-    component: "block-plain",
-    layout: {
-      gridLayout: {
-        rows: ["auto", "1fr"],
-        columns: ["1fr"],
-      },
-    },
-    childrenKeys: ["importContactsButton", "contactsLoader"],
-  },
-  contactsLoader: {
-    component: "entities-loader",
-    config: {
-      entitiesTypes: ["contacts"],
-    },
-    childrenKeys: ["contactsForm"],
-  },
-  contactsForm: {
-    component: "form",
-    config: {
-      formOptions: {
-        defaultValues: {
-          activeContactId: undefined,
-          selectedContacts: [],
-          totalContacts: 0,
-        },
-      },
-    },
-    childrenKeys: ["contactsFormWrapper"],
-  },
-  contactsFormWrapper: {
-    component: "block-box",
-    layout: {
-      flexLayout: {
-        direction: "row",
-      },
-    },
-    childrenKeys: ["contactsListTable", "detailsWrapper"],
-  },
-  contactsListTable: {
-    component: "table",
-    dataProvider: {
-      source: "entities-array",
-      entitiesType: "contacts",
-      sort: {
-        firstName: {
-          priority: 2,
-          direction: "asc",
-        },
-        lastName: {
-          priority: 1,
-          direction: "asc",
-          orderingPatterns: ["/^\\p{L}/miu", "/^\\d/m", "/^\\#/m"],
-        },
-      },
-      filters: {
-        firstName: ["/.+/"],
-      },
-    },
-    config: {
-      formOptions: {
-        activeIdFieldName: "activeContactId",
-        selectedIdsFieldName: "selectedContacts",
-        totalItemsFieldName: "totalContacts",
-      },
-    },
-    childrenKeys: ["columnCheckbox", "columnName", "columnOptional"],
-  },
-  columnCheckbox: {
-    component: "table.cell",
-    config: {
-      width: 40,
-    },
-    childrenKeys: ["contactCheckbox"],
-  },
-  contactCheckbox: {
-    component: "form.checkboxInput",
-    config: {
-      name: "selectedContacts",
-    },
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "config.value": "contactId",
-      },
-    },
-  },
-  columnName: {
-    component: "table.cell",
-    config: {
-      width: 300,
-    },
-    childrenKeys: ["contactJoinedNames"],
-  },
-  contactJoinedNames: {
-    component: "block-plain",
-    layout: {
-      flexLayout: {
-        direction: "row",
-        columnGap: "0.5rem",
-      },
-    },
-    childrenKeys: ["contactFirstName", "contactLastName"],
-  },
-  contactFirstName: {
-    component: "block-plain",
-    layout: {
-      flexLayout: {
-        direction: "row",
-        columnGap: "0.5rem",
-      },
-    },
-    childrenKeys: ["contactFirstNamePrefix", "contactFirstNameValue"],
-  },
-  contactFirstNamePrefix: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "namePrefix",
-      },
-    },
-  },
-  contactFirstNameValue: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "firstName",
-      },
-    },
-  },
-  contactLastName: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "lastName",
-      },
-    },
-  },
-  columnOptional: {
-    component: "form.conditionalRenderer",
-    config: {
-      formFieldName: "activeContactId",
-      renderIfFalse: true,
-    },
-    childrenKeys: ["columnCompany"],
-  },
-  columnCompany: {
-    component: "table.cell",
-    config: {
-      width: 200,
-    },
-    childrenKeys: ["contactCompany"],
-  },
-  contactCompany: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "company",
-      },
-    },
-  },
-  detailsWrapper: {
-    component: "form.conditionalRenderer",
-    config: {
-      formFieldName: "activeContactId",
-    },
-    childrenKeys: ["details"],
-  },
-  details: {
-    component: "block-box",
-    config: {
-      title: "Contact",
-    },
-    dataProvider: {
-      source: "form-fields",
-      fields: {
-        dataItemId: "activeContactId",
-      },
-    },
-    childrenKeys: ["contactDetails", "disableButton"],
-  },
-  contactDetails: {
-    component: "block-plain",
-    childrenKeys: ["contactDetailsEmail", "contactDetailsName"],
-  },
-  contactDetailsEmail: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "email",
-      },
-    },
-  },
-  contactDetailsName: {
-    component: "text-plain",
-    dataProvider: {
-      source: "entities-field",
-      entitiesType: "contacts",
-      fields: {
-        "data.text": "firstName",
-      },
-    },
-  },
-  disableButton: {
-    component: "button-primary",
-    config: {
-      text: "Hide details",
-      action: {
-        type: "form-set-field",
-        key: "activeContactId",
-        value: undefined,
-      },
-    },
-  },
-}
+// @ts-ignore
+const view: View = {}
 
 export default view
diff --git a/libs/generic-view/models/src/index.ts b/libs/generic-view/models/src/index.ts
index a220caac7b..272681437b 100644
--- a/libs/generic-view/models/src/index.ts
+++ b/libs/generic-view/models/src/index.ts
@@ -38,7 +38,13 @@ import { overviewOsVersion } from "./lib/overview-os-version"
 import { tooltipContent } from "./lib/tooltip-content"
 import { aboutDataBox } from "./lib/about-data-box"
 import { h3Component, h4Component, h5Component } from "./lib/headers"
-import { p1Component, p2Component, p3Component } from "./lib/paragraphs"
+import {
+  p1Component,
+  p2Component,
+  p3Component,
+  p4Component,
+  p5Component,
+} from "./lib/paragraphs"
 import { lastBackupDate } from "./lib/last-backup-date"
 import { backupCreate } from "./lib/backup-create"
 import { importContacts } from "./lib/import-contacts"
@@ -51,6 +57,11 @@ import { table } from "./lib/table"
 import { formConditionalRenderer } from "./lib/form-conditional-renderer"
 import { tableCell } from "./lib/table-cell"
 import { entitiesLoader } from "./lib/entities-loader"
+import { conditionalRenderer } from "./lib/conditional-renderer"
+import { toast } from "./lib/toast"
+import { selectionManager } from "./lib/selection-manager"
+import { formatMessage } from "./lib/format-message"
+import { appPortal } from "./lib/app-portal"
 
 export * from "./lib/block-box"
 export * from "./lib/block-plain"
@@ -101,6 +112,12 @@ export * from "./lib/table"
 export * from "./lib/table-cell"
 export * from "./lib/form-conditional-renderer"
 export * from "./lib/entities-loader"
+export * from "./lib/common-validators"
+export * from "./lib/conditional-renderer"
+export * from "./lib/format-message"
+export * from "./lib/toast"
+export * from "./lib/selection-manager"
+export * from "./lib/app-portal"
 
 export default {
   [blockBox.key]: blockBox,
@@ -142,6 +159,8 @@ export default {
   [p1Component.key]: p1Component,
   [p2Component.key]: p2Component,
   [p3Component.key]: p3Component,
+  [p4Component.key]: p4Component,
+  [p5Component.key]: p5Component,
   [overviewOsVersion.key]: overviewOsVersion,
   [aboutDataBox.key]: aboutDataBox,
   [lastBackupDate.key]: lastBackupDate,
@@ -155,4 +174,9 @@ export default {
   [table.key]: table,
   [tableCell.key]: tableCell,
   [entitiesLoader.key]: entitiesLoader,
+  [conditionalRenderer.key]: conditionalRenderer,
+  [formatMessage.key]: formatMessage,
+  [toast.key]: toast,
+  [selectionManager.key]: selectionManager,
+  [appPortal.key]: appPortal,
 } as const
diff --git a/libs/generic-view/models/src/lib/app-portal.ts b/libs/generic-view/models/src/lib/app-portal.ts
new file mode 100644
index 0000000000..e1d2527d1d
--- /dev/null
+++ b/libs/generic-view/models/src/lib/app-portal.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z.object({
+  portal: z.literal("app-header"),
+})
+
+export type AppPortalConfig = z.infer<typeof configValidator>
+
+export const appPortal = {
+  key: "app-portal",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/button-primary.ts b/libs/generic-view/models/src/lib/button-primary.ts
index 3428389296..84a11994b0 100644
--- a/libs/generic-view/models/src/lib/button-primary.ts
+++ b/libs/generic-view/models/src/lib/button-primary.ts
@@ -5,14 +5,14 @@
 
 import { z } from "zod"
 import { IconType } from "generic-view/utils"
-import { buttonActionValidator } from "./common-validators"
+import { buttonActionsValidator } from "./common-validators"
 
 const dataValidator = z.undefined()
 
 const configValidator = z.object({
-  text: z.string(),
+  text: z.string().optional(),
   icon: z.nativeEnum(IconType).optional(),
-  action: buttonActionValidator,
+  actions: buttonActionsValidator,
   disabled: z.boolean().optional(),
 })
 
diff --git a/libs/generic-view/models/src/lib/button-text.ts b/libs/generic-view/models/src/lib/button-text.ts
index b3e79b9eaf..159d9edffc 100644
--- a/libs/generic-view/models/src/lib/button-text.ts
+++ b/libs/generic-view/models/src/lib/button-text.ts
@@ -5,16 +5,16 @@
 
 import { z } from "zod"
 import { IconType } from "generic-view/utils"
-import { buttonActionValidator } from "./common-validators"
+import { buttonActionsValidator } from "./common-validators"
 
 const dataValidator = z.undefined()
 
 const configValidator = z.object({
-  text: z.string(),
+  text: z.string().optional(),
   icon: z.nativeEnum(IconType).optional(),
-  action: buttonActionValidator,
+  actions: buttonActionsValidator,
   modifiers: z
-    .array(z.enum(["link", "uppercase", "hover-underline"]))
+    .array(z.enum(["link", "uppercase", "hover-underline", "hover-background"]))
     .optional(),
 })
 
diff --git a/libs/generic-view/models/src/lib/common-validators.ts b/libs/generic-view/models/src/lib/common-validators.ts
index cb495ff6a2..2e30a02d22 100644
--- a/libs/generic-view/models/src/lib/common-validators.ts
+++ b/libs/generic-view/models/src/lib/common-validators.ts
@@ -54,22 +54,69 @@ export const formActionValidator = z.union([
   z.object({
     type: z.literal("form-set-field"),
     key: z.string(),
-    value: z.union([z.string(), z.number(), z.boolean()]).optional(),
+    formKey: z.string().optional(),
+    value: z
+      .union([
+        z.string(),
+        z.number(),
+        z.boolean(),
+        z.array(z.unknown()),
+        z.record(z.union([z.string(), z.number()]), z.unknown()),
+      ])
+      .optional(),
   }),
   z.object({
     type: z.literal("form-toggle-field"),
     key: z.string(),
+    formKey: z.string().optional(),
   }),
   z.object({
     type: z.literal("form-reset"),
+    formKey: z.string().optional(),
   }),
 ])
 
-export const buttonActionValidator = z.union([
-  modalActionValidator,
-  navigateActionValidator,
-  customActionValidator,
-  formActionValidator,
-])
+export const toastActionValidator = z.object({
+  type: z.literal("open-toast"),
+  toastKey: z.string(),
+})
+
+const entityPostActionsValidator = z
+  .array(
+    z.union([
+      modalActionValidator,
+      navigateActionValidator,
+      customActionValidator,
+      formActionValidator,
+      toastActionValidator,
+    ])
+  )
+  .optional()
+
+export const entityActionValidator = z.object({
+  type: z.literal("entities-delete"),
+  entitiesType: z.string(),
+  ids: z.array(z.string()),
+  postActions: z
+    .object({
+      success: entityPostActionsValidator,
+      failure: entityPostActionsValidator,
+    })
+    .optional(),
+})
+
+export type EntityAction = z.infer<typeof entityActionValidator>
+
+export const buttonActionsValidator = z.array(
+  z.union([
+    modalActionValidator,
+    navigateActionValidator,
+    customActionValidator,
+    formActionValidator,
+    entityActionValidator,
+    toastActionValidator,
+  ])
+)
 
-export type ButtonAction = z.infer<typeof buttonActionValidator>
+export type ButtonActions = z.infer<typeof buttonActionsValidator>
+export type ButtonAction = ButtonActions[number]
diff --git a/libs/generic-view/models/src/lib/conditional-renderer.ts b/libs/generic-view/models/src/lib/conditional-renderer.ts
new file mode 100644
index 0000000000..4fb8d1d596
--- /dev/null
+++ b/libs/generic-view/models/src/lib/conditional-renderer.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.object({
+  render: z.boolean(),
+})
+export type ConditionalRendererData = z.infer<typeof dataValidator>
+
+const configValidator = z.undefined()
+
+export const conditionalRenderer = {
+  key: "conditional-renderer",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/device.ts b/libs/generic-view/models/src/lib/device.ts
index f53139f291..96055219ae 100644
--- a/libs/generic-view/models/src/lib/device.ts
+++ b/libs/generic-view/models/src/lib/device.ts
@@ -9,20 +9,21 @@ import { DeviceProperties } from "device-manager/models"
 import { ApiConfig, MenuConfig, OverviewData } from "device/models"
 import { DeviceId } from "Core/device/constants/device-id"
 
+export interface GenericForm {
+  fields: Record<string, unknown>
+}
+
+interface Feature<Data = Record<string, unknown>> {
+  config?: View
+  data?: Data
+  forms?: Record<string, GenericForm>
+}
+
 export type Features = {
-  "mc-overview"?: {
-    config?: View
-    data?: OverviewData
-  }
-  "mc-about"?: {
-    config?: View
-    data?: OverviewData
-  }
+  "mc-overview"?: Feature<OverviewData>
+  "mc-about"?: Feature<OverviewData>
 } & {
-  [key: string]: {
-    config?: View
-    data?: Record<string, unknown>
-  }
+  [key: string]: Feature
 }
 
 export interface DeviceConfiguration {
@@ -31,9 +32,7 @@ export interface DeviceConfiguration {
   features?: Features
 }
 
-export interface Device
-  extends DeviceProperties,
-    Partial<DeviceConfiguration> {
+export interface Device extends DeviceProperties, Partial<DeviceConfiguration> {
   id: DeviceId
   serialNumber: string | undefined
   deviceType: DeviceType
diff --git a/libs/generic-view/models/src/lib/entities-loader.ts b/libs/generic-view/models/src/lib/entities-loader.ts
index d5f630c6d8..52c649a21b 100644
--- a/libs/generic-view/models/src/lib/entities-loader.ts
+++ b/libs/generic-view/models/src/lib/entities-loader.ts
@@ -9,6 +9,7 @@ const dataValidator = z.undefined()
 
 const configValidator = z.object({
   entitiesTypes: z.array(z.string()),
+  text: z.string().optional(),
 })
 
 export type EntitiesLoaderConfig = z.infer<typeof configValidator>
diff --git a/libs/generic-view/models/src/lib/form-checkbox-input.ts b/libs/generic-view/models/src/lib/form-checkbox-input.ts
index dadb98bfc7..c4007db408 100644
--- a/libs/generic-view/models/src/lib/form-checkbox-input.ts
+++ b/libs/generic-view/models/src/lib/form-checkbox-input.ts
@@ -15,10 +15,12 @@ const inputValidation: z.ZodType<Pick<RegisterOptions, "required">> = z.object({
 const configValidator = z.object({
   name: z.string(),
   value: z.string().optional(),
+  multipleValues: z.array(z.union([z.string(), z.number()])).optional(),
   checked: z.boolean().optional(),
   label: z.string().optional(),
   validation: inputValidation.optional(),
   disabled: z.boolean().optional(),
+  size: z.enum(["small", "large"]).optional(),
 })
 
 export type FormCheckboxInputConfig = z.infer<typeof configValidator>
diff --git a/libs/generic-view/models/src/lib/form.ts b/libs/generic-view/models/src/lib/form.ts
index cb764f2674..1c4901b526 100644
--- a/libs/generic-view/models/src/lib/form.ts
+++ b/libs/generic-view/models/src/lib/form.ts
@@ -10,6 +10,7 @@ const dataValidator = z.undefined()
 
 interface Config {
   formOptions?: Pick<UseFormProps, "mode" | "reValidateMode" | "defaultValues">
+  defaultValues?: Record<string, unknown>
 }
 
 const configValidator: z.ZodType<Config | undefined> = z
@@ -21,6 +22,7 @@ const configValidator: z.ZodType<Config | undefined> = z
       reValidateMode: z.enum(["onChange", "onBlur", "onSubmit"]).optional(),
       defaultValues: z.record(z.string(), z.any()).optional(),
     }),
+    defaultValues: z.record(z.string(), z.any()).optional(),
   })
   .optional()
 
diff --git a/libs/generic-view/models/src/lib/format-message.ts b/libs/generic-view/models/src/lib/format-message.ts
new file mode 100644
index 0000000000..e86ac67c54
--- /dev/null
+++ b/libs/generic-view/models/src/lib/format-message.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const fieldsSchema = z.record(z.string(), z.union([z.string(), z.number()]))
+
+const dataValidator = z.object({
+  fields: fieldsSchema,
+})
+
+export type FormatMessageData = z.infer<typeof dataValidator>
+
+const configValidator = z.object({
+  messageTemplate: z.string(),
+  fields: fieldsSchema.optional(),
+})
+
+export type FormatMessageConfig = z.infer<typeof configValidator>
+
+export const formatMessage = {
+  key: "format-message",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/modal-close-button.ts b/libs/generic-view/models/src/lib/modal-close-button.ts
index dc96be4ef0..95da618a2a 100644
--- a/libs/generic-view/models/src/lib/modal-close-button.ts
+++ b/libs/generic-view/models/src/lib/modal-close-button.ts
@@ -4,13 +4,13 @@
  */
 
 import { z } from "zod"
-import { buttonActionValidator } from "./common-validators"
+import { buttonActionsValidator } from "./common-validators"
 
 const dataValidator = z.undefined()
 
 const configValidator = z
   .object({
-    action: buttonActionValidator.optional(),
+    actions: buttonActionsValidator.optional(),
   })
   .optional()
 
diff --git a/libs/generic-view/models/src/lib/paragraphs.ts b/libs/generic-view/models/src/lib/paragraphs.ts
index 36ec641203..2949c294b1 100644
--- a/libs/generic-view/models/src/lib/paragraphs.ts
+++ b/libs/generic-view/models/src/lib/paragraphs.ts
@@ -4,12 +4,20 @@
  */
 
 import { z } from "zod"
+import { color } from "../../../theme/src/lib/color"
 
 const dataValidator = z.undefined()
 
-const configValidator = z.object({
-  text: z.string(),
-})
+const configValidator = z
+  .object({
+    text: z.string().optional(),
+    color: z
+      .enum(
+        Object.keys(color) as [keyof typeof color, ...(keyof typeof color)[]]
+      )
+      .optional(),
+  })
+  .optional()
 
 export type ParagraphConfig = z.infer<typeof configValidator>
 
@@ -30,3 +38,15 @@ export const p3Component = {
   dataValidator,
   configValidator,
 } as const
+
+export const p4Component = {
+  key: "p4-component",
+  dataValidator,
+  configValidator,
+} as const
+
+export const p5Component = {
+  key: "p5-component",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/selection-manager.ts b/libs/generic-view/models/src/lib/selection-manager.ts
new file mode 100644
index 0000000000..238fa50eed
--- /dev/null
+++ b/libs/generic-view/models/src/lib/selection-manager.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z.undefined().optional()
+
+export type SelectionManagerConfig = z.infer<typeof configValidator>
+
+export const selectionManager = {
+  key: "selection-manager",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/models/src/lib/table-cell.ts b/libs/generic-view/models/src/lib/table-cell.ts
index b72f39ead0..5accd9abbc 100644
--- a/libs/generic-view/models/src/lib/table-cell.ts
+++ b/libs/generic-view/models/src/lib/table-cell.ts
@@ -8,7 +8,7 @@ import { z } from "zod"
 const dataValidator = z.undefined()
 
 const configValidator = z.object({
-  width: z.number(),
+  width: z.number().or(z.string()).optional(),
   colSpan: z.number().optional(),
   rowSpan: z.number().optional(),
 })
diff --git a/libs/generic-view/models/src/lib/table.ts b/libs/generic-view/models/src/lib/table.ts
index 3090092699..947045cfbe 100644
--- a/libs/generic-view/models/src/lib/table.ts
+++ b/libs/generic-view/models/src/lib/table.ts
@@ -13,7 +13,15 @@ const configValidator = z.object({
   formOptions: z.object({
     activeIdFieldName: z.string().optional(),
     selectedIdsFieldName: z.string().optional(),
-    totalItemsFieldName: z.string().optional(),
+    allIdsFieldName: z.string().optional(),
+  }),
+  form: z.object({
+    formName: z.string(),
+    assignFields: z.object({
+      activeIdFieldName: z.string().optional(),
+      selectedIdsFieldName: z.string().optional(),
+      allIdsFieldName: z.string().optional(),
+    }),
   }),
   columnsNames: z.array(z.string()).optional(),
 })
diff --git a/libs/generic-view/models/src/lib/toast.ts b/libs/generic-view/models/src/lib/toast.ts
new file mode 100644
index 0000000000..371fae78b1
--- /dev/null
+++ b/libs/generic-view/models/src/lib/toast.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { z } from "zod"
+
+const dataValidator = z.undefined()
+
+const configValidator = z
+  .object({
+    visibilityDuration: z.number().nonnegative().optional(),
+  })
+  .optional()
+
+export type ToastConfig = z.infer<typeof configValidator>
+
+export const toast = {
+  key: "toast",
+  dataValidator,
+  configValidator,
+} as const
diff --git a/libs/generic-view/store/src/index.ts b/libs/generic-view/store/src/index.ts
index 30cbb153da..1aec393a46 100644
--- a/libs/generic-view/store/src/index.ts
+++ b/libs/generic-view/store/src/index.ts
@@ -61,4 +61,12 @@ export * from "./lib/data-transfer/reducer"
 export * from "./lib/data-transfer/actions"
 export * from "./lib/data-transfer/abort-data-transfer.action"
 export * from "./lib/data-migration/data-migration-percentage-progress.interface"
+
+export * from "./lib/toasts/reducer"
+export * from "./lib/toasts/actions"
+export * from "./lib/toasts/open-toast.action"
+
 export * from "./lib/action-names"
+
+export * from "./lib/use-form-field"
+export * from "./lib/use-form-register"
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index 538ebaa1af..dbac0d8c57 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -10,13 +10,13 @@ export enum ActionName {
   GetOutboxData = "api-actions/get-outbox-data",
 
   SetMenu = "generic-views/set-menu",
-  SetViewLayout = "generic-views/set-view-layout",
-  SetViewData = "generic-views/set-view-data",
   SetLastRefresh = "generic-views/set-last-refresh",
   AddDevice = "generic-views/add-device",
   RemoveDevice = "generic-views/remove-device",
   SetDeviceState = "generic-views/set-device-state",
   SetGenericConfig = "generic-views/set-generic-config",
+  RegisterForm = "generic-views/register-form",
+  SetFormField = "generic-views/set-form-field",
 
   OpenModal = "generic-modals/open-modal",
   CloseModal = "generic-modals/close-modal",
@@ -25,6 +25,10 @@ export enum ActionName {
   CloseDomainModals = "generic-modals/close-domain-modals",
   SetDeviceErrorModalOpened = "generic-modals/set-device-error-modal-opened",
 
+  AddToast = "generic-toasts/add-toast",
+  OpenToast = "generic-toasts/open-toast",
+  RemoveToast = "generic-toasts/remove-toast",
+
   SetBackupProcess = "generic-backups/set-backup-process",
   CleanBackupProcess = "generic-backups/clean-backup-process",
   BackupProcessStatus = "generic-backups/backup-process-status",
diff --git a/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
index 22cb49a7da..d3f743f62c 100644
--- a/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
@@ -10,6 +10,7 @@ import { DeviceId } from "Core/device/constants/device-id"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { ActionName } from "../action-names"
 import logger from "Core/__deprecated__/main/utils/logger"
+import { enhanceEntity } from "./helpers/enhance-entity"
 
 export const createEntityDataAction = createAsyncThunk<
   EntityData,
@@ -53,6 +54,8 @@ export const createEntityDataAction = createAsyncThunk<
       return rejectWithValue(undefined)
     }
 
-    return response.data.data
+    const computedFields =
+      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+    return enhanceEntity(response.data.data, { computedFields })
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
index c18afe2d3c..f6da0077da 100644
--- a/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
@@ -10,31 +10,44 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { ActionName } from "../action-names"
 import { EntityId } from "device/models"
 import { difference } from "lodash"
+import delayResponse from "@appnroll/delay-response"
+
+interface DeleteEntitiesDataActionPayload {
+  entitiesType: string
+  ids: EntityId[]
+  deviceId: DeviceId
+  onSuccess?: () => Promise<void> | void
+  onError?: () => Promise<void> | void
+}
 
 export const deleteEntitiesDataAction = createAsyncThunk<
   EntityId[],
-  {
-    entitiesType: string
-    ids: EntityId[]
-    deviceId: DeviceId
-  },
+  DeleteEntitiesDataActionPayload,
   { state: ReduxRootState }
 >(
   ActionName.DeleteEntityData,
-  async ({ entitiesType, ids, deviceId }, { rejectWithValue }) => {
-    const response = await deleteEntitiesDataRequest({
-      entitiesType,
-      ids,
-      deviceId,
-    })
-
+  async (
+    { entitiesType, ids, deviceId, onSuccess, onError },
+    { rejectWithValue }
+  ) => {
+    const response = await delayResponse(
+      deleteEntitiesDataRequest({
+        entitiesType,
+        ids,
+        deviceId,
+      }),
+      1000
+    )
     if (!response.ok) {
+      await onError?.()
       return rejectWithValue(response.error)
     }
+    // TODO: consider handling partial success
     if (response.data?.failedIds) {
-      // TODO: Handle partial deletion of entities
+      await onSuccess?.()
       return difference(ids, response.data.failedIds)
     }
+    await onSuccess?.()
     return ids
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
index 387a3601e1..e0509c323e 100644
--- a/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
@@ -15,6 +15,7 @@ import { EntitiesFileData, EntitiesJsonData, EntityData } from "device/models"
 import { getFile } from "../file-transfer/get-file.action"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { AppError } from "Core/core/errors"
+import { enhanceEntity } from "./helpers/enhance-entity"
 
 export const getEntitiesDataAction = createAsyncThunk<
   EntityData[],
@@ -28,8 +29,11 @@ export const getEntitiesDataAction = createAsyncThunk<
   ActionName.GetEntitiesData,
   async (
     { responseType = "file", entitiesType, deviceId },
-    { rejectWithValue, dispatch }
+    { rejectWithValue, dispatch, getState }
   ) => {
+    let data = []
+    const { genericEntities } = getState()
+
     const response = await getEntitiesDataRequest({
       entitiesType,
       deviceId,
@@ -60,10 +64,15 @@ export const getEntitiesDataAction = createAsyncThunk<
       if (!readFileResponse.ok) {
         return rejectWithValue(readFileResponse.error)
       }
-      return readFileResponse.data.data
+      data = readFileResponse.data.data
     } else {
-      const { data } = response.data as EntitiesJsonData
-      return data
+      ;({ data } = response.data as EntitiesJsonData)
     }
+
+    const computedFields =
+      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+    return data.map((entity) => {
+      return enhanceEntity(entity, { computedFields })
+    })
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/helpers/compute-field.test.ts b/libs/generic-view/store/src/lib/entities/helpers/compute-field.test.ts
new file mode 100644
index 0000000000..ffc065fff3
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/helpers/compute-field.test.ts
@@ -0,0 +1,451 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntityComputedFieldConfig, EntityData } from "device/models"
+import { computeField } from "./compute-field"
+
+describe("computeField", () => {
+  describe("filters fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+      moreHobbies: ["cycling", "dancing"],
+    }
+    it("based on a regex pattern", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "filter",
+        pattern: "/Doe/",
+        fields: ["name", "surname"],
+      }
+      expect(computeField(entity, config)).toEqual(["Doe"])
+    })
+    it("based on a regex pattern with flags", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "filter",
+        pattern: "/^D/m",
+        fields: ["name", "surname"],
+      }
+      expect(computeField(entity, config)).toEqual(["Doe"])
+    })
+    it("based on a negated regex pattern", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "filter",
+        pattern: "/Doe/",
+        negatePattern: true,
+        fields: ["name", "surname"],
+      }
+      expect(computeField(entity, config)).toEqual(["John"])
+    })
+    it("based on a regex pattern with an array field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "filter",
+        pattern: "/^r/m",
+        fields: ["hobbies[]"],
+      }
+      expect(computeField(entity, config)).toEqual(["reading", "running"])
+    })
+  })
+
+  describe("clears fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "",
+      middleName: undefined,
+      age: 0,
+      isStudent: false,
+      address: {},
+      hobbies: [],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "clear",
+      fields: [
+        "name",
+        "surname",
+        "age",
+        "isStudent",
+        "address",
+        "hobbies",
+        "job",
+      ],
+    }
+    it("with default conditions", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual(["John"])
+    })
+    it("with default conditions and an array field", () => {
+      const entityWithArray: EntityData = {
+        ...entity,
+        test: [1, "", 3],
+      }
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        fields: ["test[]"],
+      }
+      expect(computeField(entityWithArray, config)).toEqual([1, 3])
+    })
+    it("with empty strings allowed", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        allowEmptyString: true,
+      }
+      expect(computeField(entity, config)).toEqual(["John", ""])
+    })
+    it("with zeros allowed", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        allowZero: true,
+      }
+      expect(computeField(entity, config)).toEqual(["John", 0])
+    })
+    it("with false values allowed", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        allowFalse: true,
+      }
+      expect(computeField(entity, config)).toEqual(["John", false])
+    })
+  })
+
+  describe("slices fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "slice",
+      fields: ["name", "surname", "age"],
+    }
+    it("with default conditions", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual(["John", "Doe", 25])
+    })
+    it("with start index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        start: 1,
+      }
+      expect(computeField(entity, config)).toEqual(["Doe", 25])
+    })
+    it("with end index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        end: 2,
+      }
+      expect(computeField(entity, config)).toEqual(["John", "Doe"])
+    })
+    it("with start and end index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        start: 1,
+        end: 2,
+      }
+      expect(computeField(entity, config)).toEqual(["Doe"])
+    })
+    it("with negative start index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        start: -1,
+      }
+      expect(computeField(entity, config)).toEqual([25])
+    })
+    it("with negative end index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        end: -1,
+      }
+      expect(computeField(entity, config)).toEqual(["John", "Doe"])
+    })
+    it("with negative start and end index", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        start: -2,
+        end: -1,
+      }
+      expect(computeField(entity, config)).toEqual(["Doe"])
+    })
+    it("with an array field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "slice",
+        fields: ["hobbies[]"],
+        start: 1,
+        end: 2,
+      }
+      expect(computeField(entity, config)).toEqual(["swimming"])
+    })
+  })
+
+  describe("joins fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+      moreHobbies: ["cycling", "dancing"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "join",
+      fields: ["name", "surname"],
+    }
+    it("with default conditions", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual("JohnDoe")
+    })
+    it("with a separator", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        separator: " ",
+      }
+      expect(computeField(entity, config)).toEqual("John Doe")
+    })
+    it("with field as an array of strings", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "join",
+        fields: ["hobbies"],
+        separator: ",",
+      }
+      expect(computeField(entity, config)).toEqual("reading,swimming,running")
+    })
+    it("with field as an array of arrays", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "join",
+        fields: ["hobbies", "moreHobbies"],
+        separator: ",",
+      }
+      expect(computeField(entity, config)).toEqual(
+        "reading,swimming,running,cycling,dancing"
+      )
+    })
+    it("throws an error if a field is not a string, number or array", () => {
+      const customEntity: EntityData = {
+        ...entity,
+        name: { first: "John", last: "Doe" },
+      }
+      const config: EntityComputedFieldConfig = {
+        type: "join",
+        fields: ["middleName", "name"],
+      }
+      expect(() => computeField(customEntity, config)).toThrow(
+        "Join method can be used only with arrays, strings and numbers."
+      )
+    })
+  })
+
+  describe("concatenates fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+      moreHobbies: ["cycling", "dancing"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "concat",
+      fields: ["hobbies", "moreHobbies"],
+    }
+    it("with default conditions", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual([
+        "reading",
+        "swimming",
+        "running",
+        "cycling",
+        "dancing",
+      ])
+    })
+    it("with field as a string", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "concat",
+        fields: ["name", "surname"],
+      }
+      expect(computeField(entity, config)).toEqual(["John", "Doe"])
+    })
+  })
+
+  describe("merges fields", () => {
+    const entity: EntityData = {
+      name: {
+        first: "John",
+        last: "Doe",
+      },
+      health: {
+        height: 180,
+        weight: 75,
+        age: 25,
+      },
+      hobbies: ["reading", "swimming", "running"],
+      moreHobbies: ["cycling", "dancing"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "merge",
+      fields: ["name", "health"],
+    }
+    it("with default conditions", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual({
+        first: "John",
+        last: "Doe",
+        height: 180,
+        weight: 75,
+        age: 25,
+      })
+    })
+  })
+
+  describe("wraps fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "wrap",
+      fields: ["name", "surname"],
+    }
+    it("with prefix", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        prefix: "Mr. ",
+      }
+      expect(computeField(entity, config)).toEqual(["Mr. ", "John", "Doe"])
+    })
+    it("with suffix", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        suffix: " Sr.",
+      }
+      expect(computeField(entity, config)).toEqual(["John", "Doe", " Sr."])
+    })
+    it("with prefix and suffix", () => {
+      const config: EntityComputedFieldConfig = {
+        ...baseConfig,
+        prefix: "Mr. ",
+        suffix: " Sr.",
+      }
+      expect(computeField(entity, config)).toEqual([
+        "Mr. ",
+        "John",
+        "Doe",
+        " Sr.",
+      ])
+    })
+    it("with an array field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "wrap",
+        fields: ["hobbies"],
+        prefix: "prefix",
+        suffix: "suffix",
+      }
+      expect(computeField(entity, config)).toEqual([
+        "prefix",
+        ["reading", "swimming", "running"],
+        "suffix",
+      ])
+    })
+    it("with an array of arrays field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "wrap",
+        fields: ["hobbies[]"],
+        prefix: "prefix",
+        suffix: "suffix",
+      }
+      expect(computeField(entity, config)).toEqual([
+        "prefix",
+        "reading",
+        "swimming",
+        "running",
+        "suffix",
+      ])
+    })
+    it("with object prefix and suffix", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "wrap",
+        fields: ["hobbies[]"],
+        prefix: { prefix: "prefix" },
+        suffix: { suffix: "suffix" },
+      }
+      expect(computeField(entity, config)).toEqual([
+        { prefix: "prefix" },
+        "reading",
+        "swimming",
+        "running",
+        { suffix: "suffix" },
+      ])
+    })
+  })
+
+  describe("objectifies fields", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+    }
+    const baseConfig: EntityComputedFieldConfig = {
+      type: "objectify",
+      keys: ["n", "s"],
+      fields: ["name", "surname"],
+    }
+    it("with simple fields", () => {
+      const config: EntityComputedFieldConfig = baseConfig
+      expect(computeField(entity, config)).toEqual({
+        n: "John",
+        s: "Doe",
+      })
+    })
+    it("with an array field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "objectify",
+        keys: ["hobbies"],
+        fields: ["hobbies"],
+      }
+      expect(computeField(entity, config)).toEqual({
+        hobbies: ["reading", "swimming", "running"],
+      })
+    })
+    it("with an array of arrays field", () => {
+      const config: EntityComputedFieldConfig = {
+        type: "objectify",
+        keys: ["first", "second"],
+        fields: ["hobbies[]"],
+      }
+      expect(computeField(entity, config)).toEqual({
+        first: "reading",
+        second: "swimming",
+      })
+    })
+  })
+
+  it("supports nested fields configuration", () => {
+    const entity: EntityData = {
+      name: "John",
+      surname: "Doe",
+      age: 25,
+      hobbies: ["reading", "swimming", "running"],
+      moreHobbies: ["cycling", "dancing"],
+    }
+    const config: EntityComputedFieldConfig = {
+      type: "join",
+      separator: ",",
+      fields: [
+        {
+          type: "filter",
+          pattern: "/^r/m",
+          fields: ["hobbies[]"],
+        },
+        {
+          type: "filter",
+          pattern: "/^d/m",
+          fields: ["moreHobbies[]"],
+        },
+      ],
+    }
+    expect(computeField(entity, config)).toEqual("reading,running,dancing")
+  })
+})
diff --git a/libs/generic-view/store/src/lib/entities/helpers/compute-field.ts b/libs/generic-view/store/src/lib/entities/helpers/compute-field.ts
new file mode 100644
index 0000000000..c650e87530
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/helpers/compute-field.ts
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntityComputedFieldConfig, EntityData } from "device/models"
+import {
+  concat,
+  get,
+  isArray,
+  isNumber,
+  isObject,
+  isString,
+  join,
+  merge,
+  slice,
+} from "lodash"
+import { stringToRegex } from "generic-view/utils"
+
+export const computeField = (
+  entity: EntityData,
+  config: EntityComputedFieldConfig
+): unknown => {
+  const { type, fields } = config
+
+  const values = fields.reduce((acc: unknown[], field) => {
+    if (typeof field === "string") {
+      if (field.endsWith("[]")) {
+        return [...acc, ...(get(entity, field.slice(0, -2)) as unknown[])]
+      }
+      acc.push(get(entity, field))
+      return acc
+    }
+    acc.push(computeField(entity, field))
+    return acc
+  }, [])
+
+  switch (type) {
+    case "filter": {
+      const regex = stringToRegex(config.pattern)
+      return values.filter((value) => {
+        const matches = regex.test(
+          isString(value) ? value : JSON.stringify(value)
+        )
+        return config.negatePattern ? !matches : matches
+      })
+    }
+    case "clear": {
+      return values.filter((value) => {
+        const emptyStringCondition = config.allowEmptyString || value !== ""
+        const zeroCondition = config.allowZero || value !== 0
+        const falseCondition = config.allowFalse || value !== false
+        const undefinedCondition = value !== undefined
+        const emptyArrayCondition = isArray(value) ? value.length !== 0 : true
+        const emptyObjectCondition = isObject(value)
+          ? Object.keys(value).length !== 0
+          : true
+        return (
+          undefinedCondition &&
+          emptyStringCondition &&
+          emptyArrayCondition &&
+          emptyObjectCondition &&
+          zeroCondition &&
+          falseCondition
+        )
+      })
+    }
+    case "slice":
+      return slice(values, config.start, config.end)
+    case "join": {
+      if (
+        values.every(
+          (value) => isNumber(value) || isString(value) || isArray(value)
+        )
+      ) {
+        return join(values, config.separator ?? "")
+      }
+      throw new Error(
+        "Join method can be used only with arrays, strings and numbers."
+      )
+    }
+    case "concat": {
+      return concat(...values)
+    }
+    case "merge": {
+      return merge({}, ...values)
+    }
+    case "wrap": {
+      return [
+        ...(config.prefix ? [config.prefix] : []),
+        ...values,
+        ...(config.suffix ? [config.suffix] : []),
+      ]
+    }
+    case "objectify": {
+      return values.reduce((acc: Record<string, unknown>, value, index) => {
+        const key = config.keys[index]
+        if (!key) {
+          return acc
+        }
+        acc[key] = value
+        return acc
+      }, {})
+    }
+  }
+}
diff --git a/libs/generic-view/store/src/lib/entities/helpers/enhance-entity.ts b/libs/generic-view/store/src/lib/entities/helpers/enhance-entity.ts
new file mode 100644
index 0000000000..ab1b16dce2
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/helpers/enhance-entity.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { EntitiesConfig, EntityData } from "device/models"
+import { computeField } from "./compute-field"
+
+export const enhanceEntity = (
+  entity: EntityData,
+  config: Partial<EntitiesConfig>
+) => {
+  const enhancedEntity = { ...entity }
+  if (config.computedFields) {
+    for (const [fieldKey, fieldConfig] of Object.entries(
+      config.computedFields
+    )) {
+      enhancedEntity[fieldKey] = computeField(enhancedEntity, fieldConfig)
+    }
+  }
+  return enhancedEntity
+}
diff --git a/libs/generic-view/store/src/lib/entities/reducer.ts b/libs/generic-view/store/src/lib/entities/reducer.ts
index 3a6beed822..1e3f45cc30 100644
--- a/libs/generic-view/store/src/lib/entities/reducer.ts
+++ b/libs/generic-view/store/src/lib/entities/reducer.ts
@@ -25,6 +25,7 @@ interface Entities {
   data?: EntityData[]
   metadata?: EntitiesMetadata
   loading?: boolean
+  progress?: number
   error?: boolean
 }
 
diff --git a/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
index 5cce2f738b..7dcfce37fa 100644
--- a/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
@@ -10,6 +10,7 @@ import { DeviceId } from "Core/device/constants/device-id"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { ActionName } from "../action-names"
 import logger from "Core/__deprecated__/main/utils/logger"
+import { enhanceEntity } from "./helpers/enhance-entity"
 
 export const updateEntityDataAction = createAsyncThunk<
   EntityData,
@@ -59,6 +60,8 @@ export const updateEntityDataAction = createAsyncThunk<
       return rejectWithValue(undefined)
     }
 
-    return response.data.data
+    const computedFields =
+      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+    return enhanceEntity(response.data.data, { computedFields })
   }
 )
diff --git a/libs/generic-view/store/src/lib/selectors/component.ts b/libs/generic-view/store/src/lib/selectors/component.ts
index 926b74f6bd..48af964199 100644
--- a/libs/generic-view/store/src/lib/selectors/component.ts
+++ b/libs/generic-view/store/src/lib/selectors/component.ts
@@ -31,6 +31,11 @@ export const selectComponentDataProvider = createSelector(
   (config) => config?.dataProvider
 )
 
+export const selectComponentExtra = createSelector(
+  selectComponent,
+  (config) => config?.extra
+)
+
 export const selectComponentLayout = createSelector(
   selectComponent,
   (config) => config?.layout
diff --git a/libs/generic-view/store/src/lib/selectors/entities.ts b/libs/generic-view/store/src/lib/selectors/entities.ts
index afb6c943f7..7c1f445094 100644
--- a/libs/generic-view/store/src/lib/selectors/entities.ts
+++ b/libs/generic-view/store/src/lib/selectors/entities.ts
@@ -57,17 +57,35 @@ export const selectEntitiesLoadingState = createSelector(
   (entities) => {
     return Object.entries(entities).reduce(
       (
-        acc: Record<string, "loading" | "loaded" | "idle" | "error">,
+        acc: Record<
+          string,
+          | { state: "error" }
+          | {
+              state: "loading" | "loaded" | "idle"
+              progress: number
+            }
+        >,
         [entitiesType, entity]
       ) => {
         if (entity?.error) {
-          acc[entitiesType] = "error"
+          acc[entitiesType] = {
+            state: "error",
+          }
         } else if (entity?.metadata?.totalEntities === 0 || entity?.data) {
-          acc[entitiesType] = "loaded"
+          acc[entitiesType] = {
+            state: "loaded",
+            progress: 100,
+          }
         } else if (entity?.loading) {
-          acc[entitiesType] = "loading"
+          acc[entitiesType] = {
+            state: "loading",
+            progress: entity.progress || 0,
+          }
         } else {
-          acc[entitiesType] = "idle"
+          acc[entitiesType] = {
+            state: "idle",
+            progress: 0,
+          }
         }
         return acc
       },
diff --git a/libs/generic-view/store/src/lib/selectors/index.ts b/libs/generic-view/store/src/lib/selectors/index.ts
index 94836956dc..44bb81c2a2 100644
--- a/libs/generic-view/store/src/lib/selectors/index.ts
+++ b/libs/generic-view/store/src/lib/selectors/index.ts
@@ -32,3 +32,4 @@ export * from "./data-migration-pure-db-indexing"
 export * from "./device-error-modal-opened"
 export * from "./data-transfer-error-type"
 export * from "./entities"
+export * from "./active-device-configuration"
diff --git a/libs/generic-view/store/src/lib/selectors/view.ts b/libs/generic-view/store/src/lib/selectors/view.ts
index 333f3b27b8..e740adc5aa 100644
--- a/libs/generic-view/store/src/lib/selectors/view.ts
+++ b/libs/generic-view/store/src/lib/selectors/view.ts
@@ -26,3 +26,13 @@ export const selectViewData = createSelector(
   selectView,
   (config) => config?.data
 )
+
+const selectViewForms = createSelector(selectView, (config) => config?.forms)
+
+export const selectViewForm = createSelector(
+  selectViewForms,
+  (state: ReduxRootState, { formName }: { formName: string }) => formName,
+  (forms, formName) => {
+    return forms?.[formName]
+  }
+)
diff --git a/libs/generic-view/store/src/lib/toasts/actions.ts b/libs/generic-view/store/src/lib/toasts/actions.ts
new file mode 100644
index 0000000000..c953f66d0b
--- /dev/null
+++ b/libs/generic-view/store/src/lib/toasts/actions.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction } from "@reduxjs/toolkit"
+import { Toast } from "./reducer"
+import { ActionName } from "../action-names"
+
+export const addToast = createAction<Toast["key"]>(
+  ActionName.AddToast
+)
+export const removeToast = createAction(ActionName.RemoveToast)
diff --git a/libs/generic-view/store/src/lib/toasts/open-toast.action.ts b/libs/generic-view/store/src/lib/toasts/open-toast.action.ts
new file mode 100644
index 0000000000..983c48adb3
--- /dev/null
+++ b/libs/generic-view/store/src/lib/toasts/open-toast.action.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { Toast } from "./reducer"
+import { ActionName } from "../action-names"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { addToast } from "./actions"
+
+export const openToastAction = createAsyncThunk<
+  void,
+  Toast["key"],
+  { state: ReduxRootState }
+>(ActionName.OpenToast, async (toastKey, { dispatch }) => {
+  dispatch(addToast(toastKey))
+  // Delay action to add toast before the state will update
+  await new Promise((resolve) => setTimeout(resolve, 100))
+  return
+})
diff --git a/libs/generic-view/store/src/lib/toasts/reducer.ts b/libs/generic-view/store/src/lib/toasts/reducer.ts
new file mode 100644
index 0000000000..be6415dfd3
--- /dev/null
+++ b/libs/generic-view/store/src/lib/toasts/reducer.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createReducer } from "@reduxjs/toolkit"
+import { addToast, removeToast } from "./actions"
+
+export interface Toast {
+  key: string
+}
+
+interface GenericState {
+  queue: Toast[]
+}
+
+const initialState: GenericState = {
+  queue: [],
+}
+
+export const genericToastsReducer = createReducer(initialState, (builder) => {
+  builder.addCase(addToast, (state, action) => {
+    state.queue.push({
+      key: action.payload,
+    })
+  })
+  builder.addCase(removeToast, (state) => {
+    state.queue.shift()
+  })
+})
diff --git a/libs/generic-view/store/src/lib/use-form-field.ts b/libs/generic-view/store/src/lib/use-form-field.ts
new file mode 100644
index 0000000000..807819cb12
--- /dev/null
+++ b/libs/generic-view/store/src/lib/use-form-field.ts
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { selectActiveApiDeviceId } from "./selectors/select-active-api-device-id"
+import { selectViewForm } from "./selectors"
+import { setFormField } from "./views/actions"
+import { get } from "lodash"
+import { useCallback } from "react"
+import { useCurrentViewKey } from "generic-view/utils"
+
+interface UseViewForm {
+  formName?: string
+}
+
+export const useFormField = ({ formName }: UseViewForm) => {
+  const viewKey = useCurrentViewKey()
+  const dispatch = useDispatch<Dispatch>()
+  const activeDeviceId = useSelector(selectActiveApiDeviceId)
+  const form = useSelector((state: ReduxRootState) => {
+    if (!formName) return undefined
+    return selectViewForm(state, { formName, viewKey })
+  })
+
+  const getValue = useCallback(
+    (field: string) => {
+      return field && form?.fields ? get(form.fields, field) : undefined
+    },
+    [form?.fields]
+  )
+
+  const setValue = useCallback(
+    (field: string, value: unknown) => {
+      if (!activeDeviceId || !field || !formName) return
+      dispatch(
+        setFormField({
+          field,
+          value,
+          deviceId: activeDeviceId,
+          feature: viewKey,
+          formName,
+        })
+      )
+    },
+    [activeDeviceId, dispatch, formName, viewKey]
+  )
+
+  return {
+    getValue,
+    setValue,
+  }
+}
diff --git a/libs/generic-view/store/src/lib/use-form-register.ts b/libs/generic-view/store/src/lib/use-form-register.ts
new file mode 100644
index 0000000000..ba628968e2
--- /dev/null
+++ b/libs/generic-view/store/src/lib/use-form-register.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { selectActiveApiDeviceId } from "./selectors/select-active-api-device-id"
+import { registerForm } from "./views/actions"
+import { useEffect } from "react"
+import { selectViewForm } from "./selectors"
+import { useCurrentViewKey } from "generic-view/utils"
+
+interface UseViewForm {
+  formName: string
+  options?: {
+    defaultValues?: Record<string, unknown>
+  }
+}
+
+export const useFormRegister = ({ formName, options }: UseViewForm) => {
+  const viewKey = useCurrentViewKey()
+  const dispatch = useDispatch<Dispatch>()
+  const activeDeviceId = useSelector(selectActiveApiDeviceId)
+  const form = useSelector((state: ReduxRootState) => {
+    return selectViewForm(state, { formName, viewKey })
+  })
+
+  useEffect(() => {
+    if (!activeDeviceId || form) return
+    const { defaultValues = {} } = options || {}
+    dispatch(
+      registerForm({
+        deviceId: activeDeviceId,
+        feature: viewKey,
+        formName,
+        form: {
+          fields: defaultValues,
+        },
+      })
+    )
+  }, [activeDeviceId, dispatch, form, formName, options, viewKey])
+}
diff --git a/libs/generic-view/store/src/lib/views/actions.ts b/libs/generic-view/store/src/lib/views/actions.ts
index fa0221358b..29683f1cf1 100644
--- a/libs/generic-view/store/src/lib/views/actions.ts
+++ b/libs/generic-view/store/src/lib/views/actions.ts
@@ -9,6 +9,7 @@ import { DeviceState } from "device-manager/models"
 import { DeviceBaseProperties } from "device-protocol/models"
 import { MenuElement } from "Core/__deprecated__/renderer/constants/menu-elements"
 import { ActionName } from "../action-names"
+import { GenericForm } from "generic-view/models"
 
 export const addDevice = createAction<
   DeviceBaseProperties & Partial<{ state: DeviceState.Failed }>
@@ -19,15 +20,6 @@ export const removeDevice = createAction<DeviceBaseProperties>(
 )
 
 export const setMenu = createAction<MenuElement[]>(ActionName.SetMenu)
-export const setViewLayout = createAction<{
-  feature: string
-  layout: View
-}>(ActionName.SetViewLayout)
-
-export const setViewData = createAction<{
-  feature: string
-  data: Record<string, unknown>
-}>(ActionName.SetViewData)
 
 export const setLastRefresh = createAction<number>(ActionName.SetLastRefresh)
 
@@ -35,6 +27,21 @@ export const setDeviceState = createAction<{ id: string; state: DeviceState }>(
   ActionName.SetDeviceState
 )
 
+export const registerForm = createAction<{
+  formName: string
+  form: GenericForm
+  feature: string
+  deviceId: string
+}>(ActionName.RegisterForm)
+
+export const setFormField = createAction<{
+  formName: string
+  field: string
+  value: unknown
+  feature: string
+  deviceId: string
+}>(ActionName.SetFormField)
+
 export const setGenericConfig = createAction<{
   config: View
   feature: string
diff --git a/libs/generic-view/store/src/lib/views/reducer.ts b/libs/generic-view/store/src/lib/views/reducer.ts
index 9f33dc3b0a..0c96215d04 100644
--- a/libs/generic-view/store/src/lib/views/reducer.ts
+++ b/libs/generic-view/store/src/lib/views/reducer.ts
@@ -5,7 +5,6 @@
 
 import { createReducer } from "@reduxjs/toolkit"
 import { MenuElement } from "Core/__deprecated__/renderer/constants/menu-elements"
-import { View } from "generic-view/utils"
 import { DeviceState } from "device-manager/models"
 import { Device, Features } from "generic-view/models"
 import { ApiError } from "device/models"
@@ -19,25 +18,18 @@ import { getOutboxData } from "../outbox/get-outbox-data.action"
 import { getGenericConfig } from "../features/get-generic-config.actions"
 import {
   addDevice,
+  registerForm,
   removeDevice,
   setDeviceState,
+  setFormField,
   setGenericConfig,
   setLastRefresh,
   setMenu,
-  setViewData,
-  setViewLayout,
 } from "./actions"
 import { transformGenericComponents } from "../features/transform-generic-components"
 
 export interface GenericState {
   menu: MenuElement[] | undefined
-  views: Record<
-    string,
-    {
-      layout: View
-      data: Record<string, unknown>
-    }
-  >
   lastResponse: unknown
   lastRefresh?: number
   devices: Record<string, Device>
@@ -46,7 +38,6 @@ export interface GenericState {
 
 const initialState: GenericState = {
   menu: undefined,
-  views: {},
   lastResponse: {},
   devices: {},
   apiErrors: {},
@@ -56,18 +47,6 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
   builder.addCase(setMenu, (state, action) => {
     state.menu = action.payload
   })
-  builder.addCase(setViewLayout, (state, action) => {
-    state.views[action.payload.feature] = {
-      ...state.views[action.payload.feature],
-      layout: action.payload.layout,
-    }
-  })
-  builder.addCase(setViewData, (state, action) => {
-    state.views[action.payload.feature] = {
-      ...state.views[action.payload.feature],
-      data: action.payload.data,
-    }
-  })
   builder.addCase(addDevice, (state, action) => {
     state.devices[action.payload.id] = {
       ...action.payload,
@@ -197,6 +176,31 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
       }
     }
   })
+  builder.addCase(registerForm, (state, action) => {
+    const { deviceId, feature, form, formName } = action.payload
+    state.devices[deviceId].features = {
+      ...state.devices[deviceId].features,
+      [feature]: {
+        ...state.devices[deviceId].features?.[feature],
+        forms: {
+          ...state.devices[deviceId].features?.[feature]?.forms,
+          [formName]: form,
+        },
+      },
+    }
+  })
+  builder.addCase(setFormField, (state, action) => {
+    const { deviceId, feature, formName, field, value } = action.payload
+    const viewFeature = state.devices[deviceId].features?.[feature]
+    if (
+      !viewFeature ||
+      !viewFeature.forms ||
+      !viewFeature.forms[formName] ||
+      !field
+    )
+      return
+    viewFeature.forms[formName].fields[field] = value
+  })
   // Helper action for setting custom generic config without a need of reloading the app
   builder.addCase(setGenericConfig, (state, action) => {
     const { deviceId, feature, config } = action.payload
@@ -204,6 +208,7 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
       state.devices[deviceId].features = {
         ...state.devices[deviceId].features,
         [feature]: {
+          ...state.devices[deviceId].features?.[feature],
           config: transformGenericComponents({
             ...state.devices[deviceId].features?.[feature].config,
             ...config,
diff --git a/libs/generic-view/theme/src/lib/font-size.ts b/libs/generic-view/theme/src/lib/font-size.ts
index 9dd0314645..fa81aea023 100644
--- a/libs/generic-view/theme/src/lib/font-size.ts
+++ b/libs/generic-view/theme/src/lib/font-size.ts
@@ -14,6 +14,7 @@ export const fontSize = {
   paragraph2: "1.6rem",
   paragraph3: "1.4rem",
   paragraph4: "1.4rem",
+  paragraph5: "1.2rem",
   tag: "1.2rem",
   buttonLink: "1.4rem",
   buttonText: "1.2rem",
diff --git a/libs/generic-view/theme/src/lib/line-height.ts b/libs/generic-view/theme/src/lib/line-height.ts
index 45c869ba88..b8b295f0fc 100644
--- a/libs/generic-view/theme/src/lib/line-height.ts
+++ b/libs/generic-view/theme/src/lib/line-height.ts
@@ -14,6 +14,7 @@ export const lineHeight = {
   paragraph2: "2.4rem",
   paragraph3: "2.2rem",
   paragraph4: "2.2rem",
+  paragraph5: "2rem",
   tag: "2rem",
   buttonLink: "2.2rem",
   buttonText: "2rem",
diff --git a/libs/generic-view/ui/src/index.ts b/libs/generic-view/ui/src/index.ts
index f7e3459752..932b0da6ef 100644
--- a/libs/generic-view/ui/src/index.ts
+++ b/libs/generic-view/ui/src/index.ts
@@ -16,10 +16,11 @@ import { entities } from "./lib/entities"
 
 export * from "./lib/icon/icon"
 export * from "./lib/api-connection-demo"
+export * from "./lib/interactive/form/form"
+export * from "./lib/interactive/form/input/search-input"
 export * from "./lib/interactive/modal"
 export * from "./lib/interactive/modal/modal-base"
-export * from "./lib/interactive/form/input/search-input"
-export * from "./lib/interactive/form/form"
+export * from "./lib/interactive/tooltip/tooltip"
 export * from "./lib/shared/shared"
 export * from "./lib/predefined/backup/backup-error"
 export * from "./lib/predefined/backup-restore/backup-restore-error"
diff --git a/libs/generic-view/ui/src/lib/buttons/button-base/button-base.tsx b/libs/generic-view/ui/src/lib/buttons/button-base/button-base.tsx
index 24b12061a8..b8a3d25057 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-base/button-base.tsx
+++ b/libs/generic-view/ui/src/lib/buttons/button-base/button-base.tsx
@@ -4,19 +4,19 @@
  */
 
 import React, { FunctionComponent, HTMLAttributes } from "react"
-import { ButtonAction } from "generic-view/utils"
 import { useButtonAction } from "./use-button-action"
 import { DefaultButton } from "../../shared/button"
+import { ButtonActions } from "generic-view/models"
 
 interface Props extends HTMLAttributes<HTMLButtonElement> {
-  action: ButtonAction
+  actions: ButtonActions
   viewKey?: string
   disabled?: boolean
 }
 
-export const ButtonBase: FunctionComponent<Props> = ({ action, ...props }) => {
+export const ButtonBase: FunctionComponent<Props> = ({ actions, ...props }) => {
   const callButtonAction = useButtonAction(props.viewKey as string)
-  const callAction = () => callButtonAction(action)
+  const callAction = () => callButtonAction(actions)
 
   return <DefaultButton {...props} onClick={callAction} type={"button"} />
 }
diff --git a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.test.ts b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.test.ts
index cbd63c1194..497a9ba196 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.test.ts
+++ b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.test.ts
@@ -30,27 +30,58 @@ describe("useButtonAction", () => {
   it("calls the correct action for 'open-modal'", () => {
     const openModal = jest.requireMock("generic-view/store").openModal
     const { result } = renderHook(() => useButtonAction("testKey"))
-    result.current({
-      type: "open-modal",
-      modalKey: "testModalKey",
+    result.current([
+      {
+        type: "open-modal",
+        modalKey: "testModalKey",
+        domain: "testDomain",
+        permanent: false,
+      },
+    ])
+
+    expect(openModal).toHaveBeenCalledWith({
+      key: "testModalKey",
       domain: "testDomain",
       permanent: false,
     })
+  })
+
+  it("calls multiple actions", () => {
+    const openModal = jest.requireMock("generic-view/store").openModal
+    const closeModal = jest.requireMock("generic-view/store").closeModal
+    const { result } = renderHook(() => useButtonAction("testKey"))
+    result.current([
+      {
+        type: "open-modal",
+        modalKey: "testModalKey",
+        domain: "testDomain",
+        permanent: false,
+      },
+      {
+        type: "close-modal",
+        modalKey: "testModalKey",
+      },
+    ])
 
     expect(openModal).toHaveBeenCalledWith({
       key: "testModalKey",
       domain: "testDomain",
       permanent: false,
     })
+    expect(closeModal).toHaveBeenCalledWith({
+      key: "testModalKey",
+    })
   })
 
   it("calls the correct action for 'close-modal'", () => {
     const closeModal = jest.requireMock("generic-view/store").closeModal
     const { result } = renderHook(() => useButtonAction("testKey"))
-    result.current({
-      type: "close-modal",
-      modalKey: "testModalKey",
-    })
+    result.current([
+      {
+        type: "close-modal",
+        modalKey: "testModalKey",
+      },
+    ])
 
     expect(closeModal).toHaveBeenCalledWith({
       key: "testModalKey",
@@ -60,12 +91,14 @@ describe("useButtonAction", () => {
   it("calls the correct action for 'replace-modal'", () => {
     const replaceModal = jest.requireMock("generic-view/store").replaceModal
     const { result } = renderHook(() => useButtonAction("testKey"))
-    result.current({
-      type: "replace-modal",
-      modalKey: "testModalKey",
-      domain: "testDomain",
-      permanent: false,
-    })
+    result.current([
+      {
+        type: "replace-modal",
+        modalKey: "testModalKey",
+        domain: "testDomain",
+        permanent: false,
+      },
+    ])
 
     expect(replaceModal).toHaveBeenCalledWith({
       key: "testModalKey",
@@ -77,9 +110,11 @@ describe("useButtonAction", () => {
   it("calls the correct action for 'close-all-modals'", () => {
     const closeAllModals = jest.requireMock("generic-view/store").closeAllModals
     const { result } = renderHook(() => useButtonAction("testKey"))
-    result.current({
-      type: "close-all-modals",
-    })
+    result.current([
+      {
+        type: "close-all-modals",
+      },
+    ])
 
     expect(closeAllModals).toHaveBeenCalled()
   })
@@ -90,10 +125,12 @@ describe("useButtonAction", () => {
       .requireMock("react-router")
       .useHistory.mockImplementation(() => ({ push }))
     const { result } = renderHook(() => useButtonAction("testKey"))
-    result.current({
-      type: "navigate",
-      viewKey: "testViewKey",
-    })
+    result.current([
+      {
+        type: "navigate",
+        viewKey: "testViewKey",
+      },
+    ])
 
     expect(push).toHaveBeenCalledWith({
       pathname: "/generic/testViewKey",
diff --git a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
index 690356d801..b84c06d989 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
+++ b/libs/generic-view/ui/src/lib/buttons/button-base/use-button-action.ts
@@ -7,81 +7,135 @@ import {
   closeAllModals,
   closeDomainModals,
   closeModal,
+  deleteEntitiesDataAction,
   openModal,
+  openToastAction,
   replaceModal,
+  selectActiveApiDeviceId,
   useScreenTitle,
 } from "generic-view/store"
-import { ButtonAction } from "generic-view/utils"
-import { useDispatch } from "react-redux"
+import { useDispatch, useSelector } from "react-redux"
 import { useHistory } from "react-router"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
-import { useFormContext } from "react-hook-form"
 import logger from "Core/__deprecated__/main/utils/logger"
+import { ButtonActions } from "generic-view/models"
+import { useViewFormContext } from "generic-view/utils"
 
 export const useButtonAction = (viewKey: string) => {
   const dispatch = useDispatch<Dispatch>()
   const navigate = useHistory()
-  const currentViewName = useScreenTitle(viewKey)
-  const formContext = useFormContext()
+  const currentViewName = useScreenTitle(viewKey)!
+  const getFormContext = useViewFormContext()
+  const activeDeviceId = useSelector(selectActiveApiDeviceId)!
 
-  return (action?: ButtonAction) => {
-    if (!action) return
-    switch (action.type) {
-      case "open-modal":
-        dispatch(
-          openModal({
-            key: action.modalKey,
-            domain: action.domain,
-            permanent: action.permanent,
-          })
-        )
-        break
-      case "close-modal":
-        dispatch(closeModal({ key: action.modalKey }))
-        break
-      case "replace-modal":
-        dispatch(
-          replaceModal({
-            key: action.modalKey,
-            domain: action.domain,
-            permanent: action.permanent,
+  return (actions: ButtonActions) =>
+    runActions(actions)({
+      dispatch,
+      navigate,
+      currentViewName,
+      getFormContext,
+      activeDeviceId,
+    })
+}
+
+interface RunActionsProviders {
+  dispatch: Dispatch
+  navigate: ReturnType<typeof useHistory>
+  currentViewName: string
+  getFormContext: ReturnType<typeof useViewFormContext>
+  activeDeviceId: string
+}
+
+const runActions = (actions?: ButtonActions) => {
+  return async (providers: RunActionsProviders) => {
+    if (!actions) return
+
+    const {
+      dispatch,
+      navigate,
+      currentViewName,
+      getFormContext,
+      activeDeviceId,
+    } = providers
+
+    for (const action of actions) {
+      switch (action.type) {
+        case "open-modal":
+          dispatch(
+            openModal({
+              key: action.modalKey,
+              domain: action.domain,
+              permanent: action.permanent,
+            })
+          )
+          break
+        case "close-modal":
+          dispatch(closeModal({ key: action.modalKey }))
+          break
+        case "replace-modal":
+          dispatch(
+            replaceModal({
+              key: action.modalKey,
+              domain: action.domain,
+              permanent: action.permanent,
+            })
+          )
+          break
+        case "close-domain-modals":
+          dispatch(closeDomainModals({ domain: action.domain }))
+          break
+        case "close-all-modals":
+          dispatch(closeAllModals())
+          break
+        case "navigate":
+          navigate.push({
+            pathname: `/generic/${action.viewKey}`,
+            state: {
+              previousViewName: currentViewName,
+            },
           })
-        )
-        break
-      case "close-domain-modals":
-        dispatch(closeDomainModals({ domain: action.domain }))
-        break
-      case "close-all-modals":
-        dispatch(closeAllModals())
-        break
-      case "navigate":
-        navigate.push({
-          pathname: `/generic/${action.viewKey}`,
-          state: {
-            previousViewName: currentViewName,
-          },
-        })
-        break
-      case "form-set-field":
-        formContext.setValue(action.key, action.value)
-        break
-      case "form-toggle-field":
-        if (typeof formContext.getValues(action.key) === "boolean") {
-          formContext.setValue(action.key, !formContext.getValues(action.key))
-        } else if (typeof formContext.getValues(action.key) === "undefined") {
-          logger.error(`Tried to toggle not existing field: ${action.key}`)
-        } else {
-          logger.error(`Tried to toggle non-boolean field: ${action.key}`)
+          break
+        case "form-set-field":
+          getFormContext(action.formKey).setValue(action.key, action.value)
+          break
+        case "form-toggle-field": {
+          const formContext = getFormContext(action.formKey)
+          if (typeof formContext.getValues(action.key) === "boolean") {
+            formContext.setValue(action.key, !formContext.getValues(action.key))
+          } else if (typeof formContext.getValues(action.key) === "undefined") {
+            logger.error(`Tried to toggle not existing field: ${action.key}`)
+          } else {
+            logger.error(`Tried to toggle non-boolean field: ${action.key}`)
+          }
+          break
         }
-        break
-      case "form-reset":
-        formContext.reset()
-        break
-      case "custom":
-        action.callback()
-        break
-      default:
-        break
+        case "form-reset":
+          getFormContext(action.formKey)?.reset()
+          break
+        case "entities-delete":
+          await dispatch(
+            deleteEntitiesDataAction({
+              entitiesType: action.entitiesType,
+              ids: action.ids,
+              deviceId: activeDeviceId,
+              onSuccess: () => {
+                return runActions(action.postActions?.success)(providers)
+              },
+              onError: () => {
+                return runActions(action.postActions?.failure)(providers)
+              },
+            })
+          )
+          break
+        case "open-toast":
+          await dispatch(openToastAction(action.toastKey))
+          break
+        case "custom":
+          action.callback()
+          break
+        default:
+          break
+      }
     }
   }
 }
diff --git a/libs/generic-view/ui/src/lib/buttons/button-primary.tsx b/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
index a92fd6d91b..d2ef65938d 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
+++ b/libs/generic-view/ui/src/lib/buttons/button-primary.tsx
@@ -22,11 +22,11 @@ export const ButtonPrimary: APIFC<undefined, ButtonPrimaryConfig> = ({
       data-testid={`${ButtonTestIds.PrimaryButton}-${props.componentKey}`}
       {...props}
       disabled={config.disabled}
-      action={config.action}
+      actions={config.actions}
     >
       {children}
       {config.icon && <Icon data={{ type: config.icon }} />}
-      <span>{config.text}</span>
+      {config.text}
     </Button>
   )
 }
@@ -37,16 +37,15 @@ const Button = styled(ButtonBase)`
   padding: 0 1rem;
   transition: background-color 0.15s ease-in-out;
   border-radius: ${({ theme }) => theme.radius.sm};
+  font-size: ${({ theme }) => theme.fontSize.buttonText};
+  line-height: ${({ theme }) => theme.lineHeight.buttonText};
+  color: ${({ theme }) => theme.color.white};
+  letter-spacing: 0.1em;
+  text-transform: uppercase;
+
   && {
     height: 4rem;
   }
-  span {
-    font-size: ${({ theme }) => theme.fontSize.buttonText};
-    line-height: ${({ theme }) => theme.lineHeight.buttonText};
-    color: ${({ theme }) => theme.color.white};
-    letter-spacing: 0.1em;
-    text-transform: uppercase;
-  }
 
   &:hover {
     background-color: ${({ theme }) => theme.color.black};
@@ -58,9 +57,6 @@ const Button = styled(ButtonBase)`
 
   &:disabled {
     background-color: ${({ theme }) => theme.color.grey4};
-
-    span {
-      color: ${({ theme }) => theme.color.grey2};
-    }
+    color: ${({ theme }) => theme.color.grey2};
   }
 `
diff --git a/libs/generic-view/ui/src/lib/buttons/button-secondary.tsx b/libs/generic-view/ui/src/lib/buttons/button-secondary.tsx
index ef0a7a04b0..3f3ece468a 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-secondary.tsx
+++ b/libs/generic-view/ui/src/lib/buttons/button-secondary.tsx
@@ -18,10 +18,7 @@ export const ButtonSecondary: APIFC<undefined, ButtonSecondaryConfig> = (
 const Button = styled(ButtonPrimary)`
   background-color: ${({ theme }) => theme.color.white};
   border: 0.1rem solid ${({ theme }) => theme.color.black};
-
-  span {
-    color: ${({ theme }) => theme.color.black};
-  }
+  color: ${({ theme }) => theme.color.black};
 
   &:hover {
     background-color: ${({ theme }) => theme.color.grey5};
@@ -34,9 +31,6 @@ const Button = styled(ButtonPrimary)`
   &:disabled {
     background-color: ${({ theme }) => theme.color.white};
     border-color: ${({ theme }) => theme.color.grey4};
-
-    span {
-      color: ${({ theme }) => theme.color.grey3};
-    }
+    color: ${({ theme }) => theme.color.grey3};
   }
 `
diff --git a/libs/generic-view/ui/src/lib/buttons/button-text.tsx b/libs/generic-view/ui/src/lib/buttons/button-text.tsx
index 07e9d6f215..461d2e9571 100644
--- a/libs/generic-view/ui/src/lib/buttons/button-text.tsx
+++ b/libs/generic-view/ui/src/lib/buttons/button-text.tsx
@@ -20,12 +20,12 @@ export const ButtonText: APIFC<undefined, ButtonTextConfig> = ({
     <Button
       data-testid={`button-text_${props.componentKey}`}
       {...props}
-      action={config.action}
+      actions={config.actions}
       $modifiers={config.modifiers}
     >
       {children}
       {config.icon && <Icon className={"icon"} data={{ type: config.icon }} />}
-      <span>{config.text}</span>
+      {config.text}
     </Button>
   )
 }
@@ -34,24 +34,23 @@ const Button = styled(ButtonBase)<{
   $modifiers?: ButtonTextConfig["modifiers"]
 }>`
   color: ${({ theme }) => theme.color.grey1};
+  font-size: ${({ theme }) => theme.fontSize.buttonLink};
+  line-height: ${({ theme }) => theme.lineHeight.buttonLink};
+  letter-spacing: 0.05em;
+  text-transform: unset;
+  transition: color 0.15s ease-in-out;
 
   &:hover {
     color: ${({ theme }) => theme.color.black};
   }
 
-  span {
-    font-size: ${({ theme }) => theme.fontSize.buttonLink};
-    line-height: ${({ theme }) => theme.lineHeight.buttonLink};
-    letter-spacing: 0.05em;
-    text-transform: unset;
-    transition: color 0.15s ease-in-out;
-  }
-
   ${({ $modifiers }) => $modifiers?.includes("link") && buttonLinkModifier};
   ${({ $modifiers }) =>
     $modifiers?.includes("uppercase") && buttonUpperCaseModifier};
   ${({ $modifiers }) =>
     $modifiers?.includes("hover-underline") && buttonHoverUnderlineModifier};
+  ${({ $modifiers }) =>
+    $modifiers?.includes("hover-background") && buttonHoverBackgroundModifier};
 
   .icon {
     width: 2.2rem;
@@ -71,18 +70,23 @@ const buttonLinkModifier = css`
 `
 
 const buttonUpperCaseModifier = css`
-  span {
-    text-transform: uppercase;
-    font-size: ${({ theme }) => theme.fontSize.buttonText};
-    line-height: ${({ theme }) => theme.lineHeight.buttonText};
-    letter-spacing: 0.1em;
-    margin-top: 0.1rem;
-  }
+  text-transform: uppercase;
+  font-size: ${({ theme }) => theme.fontSize.buttonText};
+  line-height: ${({ theme }) => theme.lineHeight.buttonText};
+  letter-spacing: 0.1em;
+  transform: translateY(0.1rem);
 `
 
 const buttonHoverUnderlineModifier = css`
-  &:hover span {
+  &:hover {
     text-decoration: underline;
     text-decoration-color: currentColor;
   }
 `
+
+const buttonHoverBackgroundModifier = css`
+  &:hover {
+    background-color: ${({ theme }) => theme.color.grey5};
+    border-radius: ${({ theme }) => theme.radius.xs};
+  }
+`
diff --git a/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx b/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
new file mode 100644
index 0000000000..ff8d5aa2b9
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { APIFC } from "generic-view/utils"
+import { AppPortalConfig } from "generic-view/models"
+import { createPortal } from "react-dom"
+
+export const AppPortal: APIFC<undefined, AppPortalConfig> = ({ children, config }) => {
+  const appHeaderElement = document.querySelector(`#${config.portal}`)
+  if (!appHeaderElement || !children) return null
+  return createPortal(children, appHeaderElement)
+}
diff --git a/libs/generic-view/ui/src/lib/data-rows/badge.tsx b/libs/generic-view/ui/src/lib/data-rows/badge.tsx
index 4c781a87df..4c729980ba 100644
--- a/libs/generic-view/ui/src/lib/data-rows/badge.tsx
+++ b/libs/generic-view/ui/src/lib/data-rows/badge.tsx
@@ -9,11 +9,17 @@ import { APIFC } from "generic-view/utils"
 import { Tag } from "../shared/tag"
 import { BadgeData } from "generic-view/models"
 
-export const Badge: APIFC<BadgeData> = ({ data, config, ...props }) => {
-  if (!data) return null
+export const Badge: APIFC<BadgeData> = ({
+  data,
+  config,
+  children,
+  ...props
+}) => {
+  if (!data && !children) return null
+
   return (
-    <BadgeWrapper {...props} variant={data.variant || "light"}>
-      {data.text}
+    <BadgeWrapper {...props} variant={data?.variant || "light"}>
+      {data?.text || children}
     </BadgeWrapper>
   )
 }
@@ -21,6 +27,7 @@ export const Badge: APIFC<BadgeData> = ({ data, config, ...props }) => {
 const BadgeWrapper = styled(Tag)<{ variant: BadgeData["variant"] }>`
   height: 2.2rem;
   line-height: 2.2rem;
+  letter-spacing: 0.04em;
 
   ${({ variant, theme }) =>
     variant === "dark" &&
diff --git a/libs/generic-view/ui/src/lib/data-rows/data-rows.ts b/libs/generic-view/ui/src/lib/data-rows/data-rows.ts
index ca4efd3590..c201001814 100644
--- a/libs/generic-view/ui/src/lib/data-rows/data-rows.ts
+++ b/libs/generic-view/ui/src/lib/data-rows/data-rows.ts
@@ -9,7 +9,9 @@ import { LabeledText } from "./labeled-text"
 import { TextPlain } from "./text-plain"
 import { TextFormatted } from "./text-formatted"
 import { Badge } from "./badge"
+import { AppPortal } from "./app-portal"
 import {
+  appPortal,
   badge,
   iconText,
   image,
@@ -25,4 +27,5 @@ export const rows = {
   [textPlain.key]: TextPlain,
   [textFormatted.key]: TextFormatted,
   [badge.key]: Badge,
+  [appPortal.key]: AppPortal,
 }
diff --git a/libs/generic-view/ui/src/lib/data-rows/text-formatted.tsx b/libs/generic-view/ui/src/lib/data-rows/text-formatted.tsx
index 13a8a61119..b0105b264e 100644
--- a/libs/generic-view/ui/src/lib/data-rows/text-formatted.tsx
+++ b/libs/generic-view/ui/src/lib/data-rows/text-formatted.tsx
@@ -13,7 +13,7 @@ export const TextFormatted: APIFC<TextFormattedData> = ({ data }) => {
   return <Content>{data?.text}</Content>
 }
 
-const Content = styled(Markdown)`
+export const Content = styled(Markdown)`
   color: ${({ theme }) => theme.color.black};
 
   h1 {
diff --git a/libs/generic-view/ui/src/lib/entities/entities-loader.tsx b/libs/generic-view/ui/src/lib/entities/entities-loader.tsx
index 872d345c41..34794d8bd9 100644
--- a/libs/generic-view/ui/src/lib/entities/entities-loader.tsx
+++ b/libs/generic-view/ui/src/lib/entities/entities-loader.tsx
@@ -3,7 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { useEffect } from "react"
+import React, { useEffect, useState } from "react"
 import { APIFC } from "generic-view/utils"
 import { EntitiesLoaderConfig } from "generic-view/models"
 import {
@@ -13,12 +13,16 @@ import {
 } from "generic-view/store"
 import { useDispatch, useSelector } from "react-redux"
 import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { SpinnerLoader } from "../shared/spinner-loader"
 import styled from "styled-components"
+import { H3 } from "../texts/headers"
+import { ProgressBar } from "../interactive/progress-bar/progress-bar"
+import { sum } from "lodash"
 
 export const EntitiesLoader: APIFC<undefined, EntitiesLoaderConfig> = ({
   config,
+  data,
   children,
+  ...props
 }) => {
   const dispatch = useDispatch<Dispatch>()
   const deviceId = useSelector(selectActiveApiDeviceId)!
@@ -26,30 +30,49 @@ export const EntitiesLoader: APIFC<undefined, EntitiesLoaderConfig> = ({
     selectEntitiesLoadingState(state, { deviceId })
   )
   const allLoaded = config.entitiesTypes.every(
-    (entitiesType) => entitiesLoadingStates[entitiesType] === "loaded"
+    (entitiesType) => entitiesLoadingStates[entitiesType].state === "loaded"
   )
+  const [showProgress, setShowProgress] = useState(!allLoaded)
+  const [totalProgress, setTotalProgress] = useState(0)
 
   useEffect(() => {
+    const progress: Record<string, number> = {}
+
     for (const entitiesType of config.entitiesTypes) {
-      if (entitiesLoadingStates[entitiesType] === "idle") {
+      const entity = entitiesLoadingStates[entitiesType]
+      if (entity.state === "idle") {
+        progress[entitiesType] = 0
         dispatch(getEntitiesDataAction({ entitiesType, deviceId }))
+      } else if (entity.state === "loading" || entity.state === "loaded") {
+        progress[entitiesType] = entity.progress
       }
     }
+    setTotalProgress(
+      sum(Object.values(progress)) / Object.keys(progress).length
+    )
   }, [config.entitiesTypes, deviceId, dispatch, entitiesLoadingStates])
 
-  if (allLoaded) {
+  useEffect(() => {
+    let timeout: NodeJS.Timeout
+    if (allLoaded) {
+      timeout = setTimeout(() => setShowProgress(false), 300)
+    }
+    return () => {
+      clearTimeout(timeout)
+    }
+  }, [allLoaded])
+
+  if (!showProgress) {
     return children
   }
   return (
-    <Wrapper>
-      <SpinnerLoader dark />
-    </Wrapper>
+    <div {...props}>
+      {config.text && <H3>{config.text}</H3>}
+      <Progress config={{ maxValue: 100 }} data={{ value: totalProgress }} />
+    </div>
   )
 }
 
-const Wrapper = styled.div`
-  & > * {
-    width: 5rem;
-    height: 5rem;
-  }
+const Progress = styled(ProgressBar)`
+  max-width: 22.3rem;
 `
diff --git a/libs/generic-view/ui/src/lib/generated/mc-import-contacts-button.ts b/libs/generic-view/ui/src/lib/generated/mc-import-contacts-button.ts
index 59fd42a7fc..13957245d7 100644
--- a/libs/generic-view/ui/src/lib/generated/mc-import-contacts-button.ts
+++ b/libs/generic-view/ui/src/lib/generated/mc-import-contacts-button.ts
@@ -14,11 +14,13 @@ export const generateMcImportContactsButton: ComponentGenerator<
       component: "button-primary",
       config: {
         text: config.text,
-        action: {
-          type: "open-modal",
-          modalKey: `${key}-modal`,
-          domain: "import-contacts",
-        },
+        actions: [
+          {
+            type: "open-modal",
+            modalKey: `${key}-modal`,
+            domain: "import-contacts",
+          },
+        ],
       },
       layout,
     },
diff --git a/libs/generic-view/ui/src/lib/icon/get-icon.helper.tsx b/libs/generic-view/ui/src/lib/icon/get-icon.helper.tsx
index 200f88110c..49c93fcd26 100644
--- a/libs/generic-view/ui/src/lib/icon/get-icon.helper.tsx
+++ b/libs/generic-view/ui/src/lib/icon/get-icon.helper.tsx
@@ -52,6 +52,7 @@ import ArrowBack from "./svg/arrow-back.svg"
 import Support from "./svg/support.svg"
 import Exclamation from "./svg/exclamation.svg"
 import Namaste from "./svg/namaste.svg"
+import Delete from "./svg/delete.svg"
 
 import { IconType } from "generic-view/utils"
 
@@ -102,6 +103,7 @@ const typeToIcon: Record<IconType, typeof BatteryHigh> = {
   [IconType.Support]: Support,
   [IconType.Exclamation]: Exclamation,
   [IconType.Namaste]: Namaste,
+  [IconType.Delete]: Delete,
 }
 
 export const getIcon = (
diff --git a/libs/generic-view/ui/src/lib/icon/svg/delete.svg b/libs/generic-view/ui/src/lib/icon/svg/delete.svg
new file mode 100644
index 0000000000..abcb1d3b68
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/icon/svg/delete.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M13.5421 5.5C14.313 5.5 14.9437 6.13585 14.9437 6.913V7.42522H17.9744C18.2723 7.42522 18.5 7.65483 18.5 7.95509V7.99042C18.4825 8.27302 18.2547 8.50263 17.9744 8.48497H17.0459L16.4853 17.1749C16.4503 17.9168 15.8371 18.5173 15.0838 18.4996H8.91714C8.16383 18.5173 7.55066 17.9168 7.51563 17.1749L6.95502 8.48497H5.99148C5.71117 8.4673 5.48343 8.23769 5.50095 7.95509C5.50095 7.65483 5.72869 7.42522 6.02652 7.42522H9.05729V6.913C9.05729 6.13585 9.68797 5.5 10.4588 5.5H13.5421ZM15.9773 8.48497H8.02367L8.56676 17.1043V17.1219C8.58428 17.3162 8.74195 17.4575 8.91714 17.4399H15.1013C15.294 17.4399 15.4342 17.2809 15.4342 17.1043L15.9773 8.48497ZM10.5639 10.0393C10.8442 10.0569 11.072 10.2865 11.0895 10.5691V15.3557C11.072 15.6383 10.8442 15.8679 10.5639 15.8856C10.2661 15.8856 10.0384 15.656 10.0384 15.3557V10.5691C10.0384 10.2689 10.2661 10.0393 10.5639 10.0393ZM13.437 10.0393C13.7348 10.0393 13.9626 10.2689 13.9626 10.5691V15.3557C13.9626 15.656 13.7348 15.8856 13.437 15.8856C13.1567 15.8679 12.929 15.6383 12.9115 15.3557V10.5691C12.929 10.2865 13.1567 10.0569 13.437 10.0393ZM13.5421 6.55975H10.4588C10.2661 6.55975 10.1084 6.71871 10.1084 6.913V7.42522H13.8925V6.913C13.8925 6.71871 13.7348 6.55975 13.5421 6.55975Z"
+          fill="currentColor"/>
+</svg>
diff --git a/libs/generic-view/ui/src/lib/interactive/conditional-renderer.tsx b/libs/generic-view/ui/src/lib/interactive/conditional-renderer.tsx
new file mode 100644
index 0000000000..b379943f1d
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/interactive/conditional-renderer.tsx
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { APIFC } from "generic-view/utils"
+import { ConditionalRendererData } from "generic-view/models"
+
+export const ConditionalRenderer: APIFC<ConditionalRendererData> = ({
+  children,
+  data,
+}) => {
+  if (data?.render) {
+    return children
+  }
+  return null
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/form/form.tsx b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
index 20b96a3a4c..264dcd39cf 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/form.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from "react"
-import { APIFC } from "generic-view/utils"
+import { APIFC, useViewFormRegister } from "generic-view/utils"
 import { FormProvider, useForm } from "react-hook-form"
 import { TextInput } from "./input/text-input"
 import { RadioInput } from "./input/radio-input"
@@ -12,6 +12,7 @@ import { CheckboxInput } from "./input/checkbox-input"
 import { SearchInput } from "./input/search-input"
 import { FormConfig } from "generic-view/models"
 import { FormConditionalRenderer } from "./helpers/form-conditional-renderer"
+import { useFormRegister } from "generic-view/store"
 
 export const Form: APIFC<undefined, FormConfig> & {
   TextInput: typeof TextInput
@@ -19,11 +20,18 @@ export const Form: APIFC<undefined, FormConfig> & {
   CheckboxInput: typeof CheckboxInput
   SearchInput: typeof SearchInput
   ConditionalRenderer: typeof FormConditionalRenderer
-} = ({ config, children }) => {
+} = ({ config, children, componentKey }) => {
   const methods = useForm({
     mode: "onTouched",
     ...config?.formOptions,
   })
+  useViewFormRegister(componentKey!, methods)
+  useFormRegister({
+    formName: componentKey!,
+    options: {
+      defaultValues: config?.defaultValues,
+    },
+  })
   return <FormProvider {...methods}>{children}</FormProvider>
 }
 Form.TextInput = TextInput
diff --git a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
index 98ddf01c49..96a124bc52 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
@@ -3,10 +3,9 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { useId } from "react"
-import { APIFC, IconType } from "generic-view/utils"
+import React, { useCallback, useEffect, useId, useMemo, useRef } from "react"
+import { APIFC, IconType, useViewFormContext } from "generic-view/utils"
 import styled from "styled-components"
-import { useFormContext } from "react-hook-form"
 import { Icon } from "../../../icon/icon"
 import { FormCheckboxInputConfig } from "generic-view/models"
 
@@ -21,14 +20,82 @@ export const CheckboxInput: APIFC<undefined, Config> = ({
   ...props
 }) => {
   const id = useId()
-  const { register } = useFormContext()
-  const { onChange, ...rest } = register(config.name, {
+  const getFormContext = useViewFormContext()
+  const { register, setValue, getValues, watch } = getFormContext()
+  const inputRef = useRef<HTMLInputElement | null>(null)
+
+  const inputName = config.multipleValues
+    ? `${config.name}-multiple`
+    : config.name
+
+  const fieldRegistrar = register(inputName, {
     ...config.validation,
   })
 
+  const multiSelectValues = config.multipleValues
+    ? watch(config.name)
+    : undefined
+
+  const multiSelect = useMemo(() => {
+    return config.multipleValues
+      ? {
+          allValues: config.multipleValues,
+          selectedValues: multiSelectValues,
+        }
+      : undefined
+  }, [config.multipleValues, multiSelectValues])
+
+  const handleChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const checked = e.target.checked
+      config.onToggle?.(checked)
+
+      if (multiSelect) {
+        if (
+          checked ||
+          (!checked &&
+            multiSelect.selectedValues.length < multiSelect.allValues.length)
+        ) {
+          setValue(config.name, multiSelect.allValues)
+        } else {
+          setValue(config.name, [])
+        }
+      } else {
+        const checkedValues = getValues(inputName)
+        if (checkedValues instanceof Array) {
+          setValue(
+            inputName,
+            checked
+              ? [config.value, ...checkedValues]
+              : checkedValues.filter((v: unknown) => v !== config.value)
+          )
+        } else {
+          void fieldRegistrar.onChange(e)
+        }
+      }
+    },
+    [config, fieldRegistrar, getValues, inputName, multiSelect, setValue]
+  )
+
+  useEffect(() => {
+    if (multiSelect) {
+      if (multiSelect.selectedValues.length === multiSelect.allValues.length) {
+        setValue(inputName, true)
+      } else {
+        setValue(inputName, false)
+      }
+      if (inputRef.current) {
+        inputRef.current.indeterminate =
+          multiSelect.selectedValues.length > 0 &&
+          multiSelect.selectedValues.length < multiSelect.allValues.length
+      }
+    }
+  }, [fieldRegistrar.ref, inputName, multiSelect, setValue])
+
   return (
     <Wrapper
       {...props}
+      $size={config.size}
       onClick={(e) => {
         e.stopPropagation()
       }}
@@ -38,16 +105,19 @@ export const CheckboxInput: APIFC<undefined, Config> = ({
         type={"checkbox"}
         value={config.value}
         checked={config.checked}
-        onChange={(e) => {
-          config.onToggle?.(e.target.checked)
-          void onChange(e)
-        }}
         disabled={config.disabled}
-        {...rest}
+        {...fieldRegistrar}
+        onChange={handleChange}
+        ref={(e) => {
+          inputRef.current = e
+          fieldRegistrar.ref(e)
+        }}
       />
       <Label htmlFor={"checkbox-" + id}>
         <InputBox>
+          <HitArea htmlFor={"checkbox-" + id} />
           <CheckIcon />
+          <IndeterminateIcon />
         </InputBox>
         {children || (config.label ? <span>{config.label}</span> : null)}
       </Label>
@@ -55,59 +125,99 @@ export const CheckboxInput: APIFC<undefined, Config> = ({
   )
 }
 
-const Wrapper = styled.div`
+const Wrapper = styled.div<{ $size: Config["size"] }>`
   display: flex;
   flex-direction: row;
   align-items: center;
-  width: 100%;
-  min-height: 3.2rem;
+  width: min-content;
+  height: min-content;
+  ${({ $size }) => {
+    switch ($size) {
+      case "small":
+        return `
+        ${InputBox} {
+          min-width: 1.6rem;
+          min-height: 1.6rem;
+          width: 1.6rem;
+          height: 1.6rem;
+        }
+        ${CheckIcon} {
+          width: 1.2rem;
+          height: 1.2rem;
+        }
+      `
+      default:
+        return `
+        ${InputBox} {
+          min-width: 2.2rem;
+          min-height: 2.2rem;
+          width: 2.2rem;
+          height: 2.2rem;`
+    }
+  }};
 `
 
 const Label = styled.label`
-  display: flex;
-  flex: 1;
-  align-items: center;
-  flex-direction: row;
   color: ${({ theme }) => theme.color.grey1};
   letter-spacing: 0.02em;
   font-size: ${({ theme }) => theme.fontSize.paragraph1};
-  line-height: ${({ theme }) => theme.lineHeight.paragraph1};
+  line-height: 2.2rem;
   cursor: pointer;
   user-select: none;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: max-content;
 `
 
 const CheckIcon = styled(Icon).attrs({ data: { type: IconType.Check } })`
   width: 1.8rem;
   height: 1.8rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 `
 
+const IndeterminateIcon = styled(CheckIcon).attrs({
+  data: { type: IconType.Minus },
+})``
+
 const InputBox = styled.div`
   min-width: 2.2rem;
   min-height: 2.2rem;
   width: 2.2rem;
   height: 2.2rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  align-self: baseline;
   border-radius: ${({ theme }) => theme.radius.xs};
   border: 0.1rem solid ${({ theme }) => theme.color.grey4};
   margin: 0;
   transition: background-color 0.2s ease-in-out;
-  overflow: hidden;
   box-sizing: border-box;
+  position: relative;
 
   & + * {
     margin-left: 1.4rem;
   }
 
   ${CheckIcon} {
+    display: flex;
     opacity: 0;
     visibility: hidden;
     transition: opacity 0.2s ease-in-out, visibility 0.2s ease-in-out;
   }
 `
 
+const HitArea = styled.label`
+  width: 3.2rem;
+  height: 3.2rem;
+  position: absolute;
+  opacity: 0.1;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  cursor: pointer;
+`
+
 const Input = styled.input<{ $withError?: boolean }>`
   display: none;
 
@@ -120,6 +230,28 @@ const Input = styled.input<{ $withError?: boolean }>`
         opacity: 1;
         visibility: visible;
       }
+
+      ${IndeterminateIcon} {
+        opacity: 0;
+        visibility: hidden;
+      }
+    }
+  }
+
+  &:indeterminate + ${Label} {
+    ${InputBox} {
+      border-color: ${({ theme }) => theme.color.grey1};
+      background-color: ${({ theme }) => theme.color.grey1};
+
+      ${CheckIcon} {
+        opacity: 0;
+        visibility: hidden;
+      }
+
+      ${IndeterminateIcon} {
+        opacity: 1;
+        visibility: visible;
+      }
     }
   }
 
diff --git a/libs/generic-view/ui/src/lib/interactive/format-message.tsx b/libs/generic-view/ui/src/lib/interactive/format-message.tsx
new file mode 100644
index 0000000000..f64c27e3df
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/interactive/format-message.tsx
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { useId } from "react"
+import { APIFC } from "generic-view/utils"
+import { FormatMessageConfig, FormatMessageData } from "generic-view/models"
+import { createIntl, createIntlCache, RawIntlProvider } from "react-intl"
+import { useSelector } from "react-redux"
+import { selectActiveDeviceConfiguration } from "generic-view/store"
+
+export const FormatMessage: APIFC<FormatMessageData, FormatMessageConfig> = ({
+  data,
+  config,
+}) => {
+  const id = useId()
+  const deviceConfig = useSelector(selectActiveDeviceConfiguration)
+
+  if (!data || !deviceConfig) {
+    return null
+  }
+  const locale = deviceConfig.apiConfig.lang || "en-US"
+  const cache = createIntlCache()
+  const intl = createIntl(
+    { locale, messages: { [id]: config.messageTemplate } },
+    cache
+  )
+  return (
+    <RawIntlProvider value={intl}>
+      {intl.formatMessage({ id }, data.fields)}
+    </RawIntlProvider>
+  )
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/interactive.ts b/libs/generic-view/ui/src/lib/interactive/interactive.ts
index 0cb6c30873..f8a160460e 100644
--- a/libs/generic-view/ui/src/lib/interactive/interactive.ts
+++ b/libs/generic-view/ui/src/lib/interactive/interactive.ts
@@ -8,8 +8,12 @@ import { TextModal } from "./modal/text-modal"
 import { ProgressBar } from "./progress-bar/progress-bar"
 import Form from "./form/form"
 import Tooltip from "./tooltip/tooltip"
+import { Toast } from "./toast/toast"
+import { ConditionalRenderer } from "./conditional-renderer"
 import {
+  conditionalRenderer,
   form,
+  formatMessage,
   formCheckboxInput,
   formConditionalRenderer,
   formRadioInput,
@@ -25,10 +29,12 @@ import {
   modalVisibilityController,
   progressBar,
   textModal,
+  toast,
   tooltip,
   tooltipAnchor,
   tooltipContent,
 } from "generic-view/models"
+import { FormatMessage } from "./format-message"
 
 export const interactive = {
   [modal.key]: Modal,
@@ -50,4 +56,7 @@ export const interactive = {
   [tooltip.key]: Tooltip,
   [tooltipAnchor.key]: Tooltip.Anchor,
   [tooltipContent.key]: Tooltip.Content,
+  [formatMessage.key]: FormatMessage,
+  [toast.key]: Toast,
+  [conditionalRenderer.key]: ConditionalRenderer,
 }
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
index 590d9493df..fed49d0432 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-close-button.tsx
@@ -18,10 +18,10 @@ export const ModalCloseButton: APIFC<undefined, ModalCloseButtonConfig> = ({
   className = "",
   ...rest
 }) => {
-  if (!config?.action) return null
+  if (!config?.actions) return null
   return (
     <ModalClose
-      action={config.action}
+      actions={config.actions}
       data-testid={ModalCloseButtonTestIds.IconButton}
       className={"modal-close-icon-button " + className}
       {...rest}
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-title-icon.tsx b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-title-icon.tsx
index 41715a94aa..df994c48ce 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-title-icon.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-title-icon.tsx
@@ -6,22 +6,29 @@
 import React from "react"
 import styled from "styled-components"
 import { Icon } from "../../../icon/icon"
-import { APIFC } from "generic-view/utils"
+import { APIFC, IconType } from "generic-view/utils"
 import { ModalTitleIconConfig } from "generic-view/models"
+import { spinAnimation } from "../../../shared/spinner-loader"
 
 export const ModalTitleIcon: APIFC<undefined, ModalTitleIconConfig> = ({
+  data,
   config,
   children,
   ...rest
 }) => {
-  return <TitleIcon config={config} {...rest} />
+  if (!config?.type) return null
+  const spin =
+    config.type === IconType.Spinner || config.type === IconType.SpinnerDark
+  return <TitleIcon config={config} $spin={spin} {...rest} />
 }
 
-export const TitleIcon = styled(Icon)`
+export const TitleIcon = styled(Icon)<{ $spin?: boolean }>`
   width: 6.8rem;
   height: 6.8rem;
   padding: ${({ theme }) => theme.space.md};
   border-radius: 50%;
   background-color: ${({ theme }) => theme.color.grey5};
   align-self: center;
+
+  ${({ $spin }) => $spin && spinAnimation}
 `
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx b/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
index 28dbef35cc..f9f627c4c0 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/modal.tsx
@@ -47,7 +47,7 @@ export const Modal: BaseGenericComponent<
       modalLayer={config.modalLayer}
     >
       {config.closeButtonAction && (
-        <ModalCloseButton config={{ action: config.closeButtonAction }} />
+        <ModalCloseButton config={{ actions: [config.closeButtonAction] }} />
       )}
       <ModalContent
         className={"modal-content"}
diff --git a/libs/generic-view/ui/src/lib/interactive/modal/text-modal.tsx b/libs/generic-view/ui/src/lib/interactive/modal/text-modal.tsx
index 409c733d40..1d533f5fb7 100644
--- a/libs/generic-view/ui/src/lib/interactive/modal/text-modal.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/modal/text-modal.tsx
@@ -4,10 +4,10 @@
  */
 
 import React, { UIEventHandler, useState } from "react"
-import { BaseGenericComponent, ModalAction } from "generic-view/utils"
+import { BaseGenericComponent } from "generic-view/utils"
 import styled, { css } from "styled-components"
 import { Modal } from "./modal"
-import { TextModalConfig } from "generic-view/models"
+import { ModalAction, TextModalConfig } from "generic-view/models"
 
 export const TextModal: BaseGenericComponent<
   undefined,
@@ -35,7 +35,7 @@ export const TextModal: BaseGenericComponent<
       }}
     >
       <Header $active={contentScrolled}>
-        <Modal.CloseButton config={{ action: closeAction }} />
+        <Modal.CloseButton config={{ actions: [closeAction] }} />
       </Header>
       <ScrollContainer onScroll={handleScroll}>{children}</ScrollContainer>
     </Modal>
diff --git a/libs/generic-view/ui/src/lib/interactive/toast/toast.tsx b/libs/generic-view/ui/src/lib/interactive/toast/toast.tsx
new file mode 100644
index 0000000000..52d4370005
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/interactive/toast/toast.tsx
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { useEffect, useRef, useState } from "react"
+import { APIFC } from "generic-view/utils"
+import styled, { css, keyframes } from "styled-components"
+import { ToastConfig } from "generic-view/models"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { useDispatch, useSelector } from "react-redux"
+import { removeToast } from "generic-view/store"
+
+const toastAnimationDuration = 300
+
+export const Toast: APIFC<undefined, ToastConfig> = ({
+  config,
+  children,
+  ...props
+}) => {
+  const toastVisibilityDuration = config?.visibilityDuration ?? 2000
+
+  const dispatch = useDispatch<Dispatch>()
+  const toastsQueue = useSelector(
+    (state: ReduxRootState) => state.genericToasts.queue
+  )
+  const [opened, setOpened] = useState(false)
+  const [visible, setVisible] = useState(false)
+
+  const animationTimeoutRef = useRef<NodeJS.Timeout>()
+  const visibilityTimeoutRef = useRef<NodeJS.Timeout>()
+
+  useEffect(() => {
+    const toastOpened =
+      toastsQueue.length > 0 && toastsQueue[0].key === props.componentKey
+    setOpened(toastOpened)
+    if (toastOpened) {
+      setVisible(true)
+    }
+  }, [props.componentKey, toastsQueue])
+
+  useEffect(() => {
+    if (visible) {
+      visibilityTimeoutRef.current = setTimeout(() => {
+        setVisible(false)
+      }, toastVisibilityDuration + toastAnimationDuration)
+    } else {
+      animationTimeoutRef.current = setTimeout(() => {
+        setOpened(false)
+      }, toastAnimationDuration)
+    }
+    return () => {
+      clearTimeout(visibilityTimeoutRef.current)
+      clearTimeout(animationTimeoutRef.current)
+    }
+  }, [toastVisibilityDuration, visible])
+
+  useEffect(() => {
+    if (!opened) {
+      dispatch(removeToast())
+    }
+  }, [dispatch, opened])
+
+  if (!opened) return null
+  return (
+    <ToastWrapper
+      {...props}
+      $opened={visible}
+      $animationDuration={toastAnimationDuration}
+    >
+      {children}
+    </ToastWrapper>
+  )
+}
+
+const transitionIn = keyframes`
+  from {
+    transform: translateX(calc(100% + 7rem));
+  }
+  to {
+    transform: translateX(0);
+  }
+`
+
+const transitionOut = keyframes`
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(calc(100% + 7rem));
+  }
+`
+
+const ToastWrapper = styled.div<{
+  $opened?: boolean
+  $animationDuration: number
+}>`
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  padding: 2rem;
+  width: max-content;
+  background-color: ${({ theme }) => theme.color.white};
+  box-shadow: 0 0.2rem 3rem rgba(0, 0, 0, 0.0793816);
+  border-radius: ${({ theme }) => theme.radius.sm};
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 0.4rem;
+
+  p {
+    color: ${({ theme }) => theme.color.black};
+  }
+
+  ${({ $opened, $animationDuration }) =>
+    $opened
+      ? css`
+          animation: ${transitionIn} ${$animationDuration}ms ease-in-out;
+        `
+      : css`
+          animation: ${transitionOut} ${$animationDuration}ms ease-in-out;
+        `}
+`
diff --git a/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip-helpers.tsx b/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip-helpers.tsx
new file mode 100644
index 0000000000..4468346bb3
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip-helpers.tsx
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { TooltipPlacement } from "device/models"
+
+type PlacementMap = { [key in TooltipPlacement]: TooltipPlacement }
+
+const VERTICAL_FLIP_MAP: PlacementMap = {
+  "bottom-right": "top-right",
+  "bottom-left": "top-left",
+  "top-right": "bottom-right",
+  "top-left": "bottom-left",
+}
+
+const HORIZONTAL_FLIP_MAP: PlacementMap = {
+  "bottom-right": "bottom-left",
+  "bottom-left": "bottom-right",
+  "top-right": "top-left",
+  "top-left": "top-right",
+}
+
+export const flipVertical = (placement: TooltipPlacement): TooltipPlacement => {
+  return VERTICAL_FLIP_MAP[placement]
+}
+
+export const flipHorizontal = (
+  placement: TooltipPlacement
+): TooltipPlacement => {
+  return HORIZONTAL_FLIP_MAP[placement]
+}
+
+export const flipTooltipPlacement = (
+  placement: TooltipPlacement
+): TooltipPlacement => {
+  return flipHorizontal(flipVertical(placement))
+}
+
+export const getFlipStatus = (
+  original: TooltipPlacement,
+  current: TooltipPlacement
+): { isFlippedVertically: boolean; isFlippedHorizontally: boolean } => {
+  const isFlippedVertically = VERTICAL_FLIP_MAP[original] === current
+  const isFlippedHorizontally = HORIZONTAL_FLIP_MAP[original] === current
+
+  return { isFlippedVertically, isFlippedHorizontally }
+}
diff --git a/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip.tsx b/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip.tsx
index 73f4becc73..21887e65df 100644
--- a/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/tooltip/tooltip.tsx
@@ -4,28 +4,128 @@
  */
 
 import React, {
+  forwardRef,
+  useRef,
   MouseEvent,
   ReactElement,
   useCallback,
   useMemo,
   useState,
 } from "react"
-import { APIFC, BaseGenericComponent } from "generic-view/utils"
-import styled from "styled-components"
+import styled, { css } from "styled-components"
+import { BaseGenericComponent } from "generic-view/utils"
+import { TooltipOffsetType, TooltipPlacement } from "device/models"
+import {
+  flipHorizontal,
+  flipTooltipPlacement,
+  flipVertical,
+  getFlipStatus,
+} from "./tooltip-helpers"
 
-export const Tooltip: APIFC & {
+interface Position {
+  left: number
+  top: number
+}
+
+export const Tooltip: BaseGenericComponent<
+  undefined,
+  undefined,
+  { placement?: TooltipPlacement; offset?: TooltipOffsetType }
+> & {
   Anchor: typeof TooltipAnchor
   Content: typeof TooltipContent
-} = ({ children }) => {
-  const [anchorPosition, setAnchorPosition] = useState<{
-    top?: number
-    left?: number
-  }>({})
+} = ({ children, placement = "bottom-right", offset = { x: 0, y: 0 } }) => {
+  const [contentPosition, setContentPosition] = useState<Partial<Position>>({})
+  const originalPlacement = useRef<TooltipPlacement>(placement)
+
+  const contentRef = useRef<HTMLDivElement>(null)
+
+  const handleAnchorHover = useCallback(
+    (event: MouseEvent) => {
+      const anchorRect = event.currentTarget.getBoundingClientRect()
+      const contentRect = contentRef.current?.getBoundingClientRect()
+
+      if (!contentRect) return
+
+      const viewportWidth = window.innerWidth
+      const viewportHeight = window.innerHeight
+
+      const placements: TooltipPlacement[] = [
+        placement,
+        flipVertical(placement),
+        flipHorizontal(placement),
+        flipTooltipPlacement(placement),
+      ]
+
+      const calculatePosition = (placement: TooltipPlacement): Position => {
+        let top = 0
+        let left = 0
+
+        const adjustedOffset: TooltipOffsetType = { ...offset }
+        const { isFlippedVertically, isFlippedHorizontally } = getFlipStatus(
+          originalPlacement.current,
+          placement
+        )
+
+        if (isFlippedVertically) {
+          adjustedOffset.y = -offset.y
+        }
+        if (isFlippedHorizontally) {
+          adjustedOffset.x = -offset.x
+        }
+
+        switch (placement) {
+          case "bottom-right":
+            top = anchorRect.top + anchorRect.height + adjustedOffset.y
+            left = anchorRect.left + adjustedOffset.x
+            break
+          case "bottom-left":
+            top = anchorRect.top + anchorRect.height + adjustedOffset.y
+            left =
+              anchorRect.left -
+              contentRect.width +
+              anchorRect.width +
+              adjustedOffset.x
+            break
+          case "top-right":
+            top = anchorRect.top + adjustedOffset.y - contentRect.height
+            left = anchorRect.left + adjustedOffset.x
+            break
+          case "top-left":
+            top = anchorRect.top + adjustedOffset.y - contentRect.height
+            left =
+              anchorRect.left -
+              contentRect.width +
+              anchorRect.width +
+              adjustedOffset.x
+            break
+        }
+
+        return { top, left }
+      }
+
+      const isWithinViewport = (position: Position): boolean => {
+        return (
+          position.left >= 0 &&
+          position.top >= 0 &&
+          position.left + contentRect.width <= viewportWidth &&
+          position.top + contentRect.height <= viewportHeight
+        )
+      }
+
+      for (const placement of placements) {
+        const position = calculatePosition(placement)
+        if (isWithinViewport(position)) {
+          setContentPosition(position)
+          return
+        }
+      }
 
-  const handleAnchorHover = useCallback((event: MouseEvent) => {
-    const rect = event.currentTarget.getBoundingClientRect()
-    setAnchorPosition({ top: rect.top + rect.height, left: rect.left })
-  }, [])
+      const position = calculatePosition(placement)
+      setContentPosition(position)
+    },
+    [placement, offset]
+  )
 
   const anchor = useMemo(() => {
     return React.Children.map(children, (child) => {
@@ -53,17 +153,20 @@ export const Tooltip: APIFC & {
         return null
       }
       return React.cloneElement(child as ReactElement, {
-        $top: anchorPosition.top,
-        $left: anchorPosition.left,
+        ...child.props,
+        $top: contentPosition.top,
+        $left: contentPosition.left,
+        ref: contentRef,
+        $placement: placement,
       })
     })
-  }, [children, anchorPosition.left, anchorPosition.top])
+  }, [children, contentPosition.top, contentPosition.left, placement])
 
   return (
-    <>
+    <Container>
       {anchor}
       {content}
-    </>
+    </Container>
   )
 }
 
@@ -82,20 +185,38 @@ Tooltip.Anchor.defaultProps = {
   "data-tooltip-anchor": true,
 }
 
-const TooltipContent: BaseGenericComponent<
-  undefined,
-  undefined,
-  { viewKey?: string; "data-tooltip-content"?: boolean }
-> = ({ data, config, children, ...rest }) => {
-  return <Content {...rest}>{children}</Content>
-}
+const TooltipContent = forwardRef<
+  HTMLDivElement,
+  {
+    viewKey?: string
+    "data-tooltip-content"?: boolean
+    $defaultStyles?: boolean
+    $placement?: TooltipPlacement
+    children: React.ReactNode
+  }
+>(({ children, ...rest }, ref) => {
+  return (
+    <Content ref={ref} {...rest}>
+      {children}
+    </Content>
+  )
+})
 
 Tooltip.Content = TooltipContent
 Tooltip.Content.defaultProps = {
   "data-tooltip-content": true,
 }
 
-const Content = styled.div<{ $top?: number; $left?: number }>`
+const Container = styled.div`
+  display: inline-block;
+`
+
+const Content = styled.div<{
+  $top?: number
+  $left?: number
+  $placement?: TooltipPlacement
+  $defaultStyles?: boolean
+}>`
   position: fixed;
   z-index: 2;
   pointer-events: none;
@@ -105,6 +226,27 @@ const Content = styled.div<{ $top?: number; $left?: number }>`
 
   ${({ $top }) => ($top ? `top: ${$top}px;` : "")}
   ${({ $left }) => ($left ? `left: ${$left}px;` : "")}
+
+  ${({ $defaultStyles, theme, $placement }) =>
+    $defaultStyles &&
+    css`
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      padding: ${theme.space.xs} ${theme.space.sm};
+      background-color: ${theme.color.grey4};
+      border-radius: ${theme.radius.sm};
+      box-shadow: 0 1rem 5rem 0 rgba(0, 0, 0, 0.08);
+
+      && > p {
+        width: 100%;
+        color: ${theme.color.grey1};
+        white-space: pre-wrap;
+        text-align: ${$placement === "bottom-left" || $placement === "top-left"
+          ? "right"
+          : "left"};
+      }
+    `}
 `
 
 const Anchor = styled.div`
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-error.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-error.tsx
index 652c26d147..5f2d3b1eb5 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-error.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-error.tsx
@@ -4,11 +4,12 @@
  */
 
 import React, { FunctionComponent } from "react"
-import { ButtonAction, CustomModalError, IconType } from "generic-view/utils"
+import { CustomModalError, IconType } from "generic-view/utils"
 import { Modal } from "../../interactive/modal"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -49,7 +50,7 @@ export const BackupRestoreError: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-password.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-password.tsx
index 83d46690a3..fab696f361 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-password.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-password.tsx
@@ -5,7 +5,7 @@
 
 import React, { FunctionComponent } from "react"
 import styled from "styled-components"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonPrimary } from "../../buttons/button-primary"
 import { useFormContext } from "react-hook-form"
 import { Modal } from "../../interactive/modal"
@@ -15,6 +15,7 @@ import { useSelector } from "react-redux"
 import { secureBackupPasswordRequest } from "device/feature"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { Form } from "../../interactive/form/form"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -75,7 +76,7 @@ export const BackupRestorePassword: FunctionComponent<Props> = ({
         <ButtonPrimary
           config={{
             text: intl.formatMessage(messages.confirmButtonLabel),
-            action: nextAction,
+            actions: [nextAction],
             disabled: !password,
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-select.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-select.tsx
index 7920a5af7d..e67554b2b6 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-select.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-select.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent, useEffect } from "react"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { Modal } from "../../interactive/modal"
 import { useSelector } from "react-redux"
 import { selectDeviceBackups } from "generic-view/store"
@@ -15,6 +15,7 @@ import { useFormContext } from "react-hook-form"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { Form } from "../../interactive/form/form"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -90,13 +91,13 @@ export const BackupRestoreSelect: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.cancelButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
         <ButtonPrimary
           config={{
             text: intl.formatMessage(messages.restoreButtonLabel),
-            action: nextAction,
+            actions: [nextAction],
             disabled: !formState.isValid,
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-success.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-success.tsx
index 63d24edb99..0eb4b4defc 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-success.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore-success.tsx
@@ -45,10 +45,12 @@ export const BackupRestoreSuccess: FunctionComponent<Props> = ({ onClose }) => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.okButtonLabel),
-            action: {
-              type: "custom",
-              callback: onClose,
-            },
+            actions: [
+              {
+                type: "custom",
+                callback: onClose,
+              },
+            ],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
index 6130be0e5f..c302da9f0f 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent, useEffect, useRef, useState } from "react"
-import { APIFC, ButtonAction, CustomModalError } from "generic-view/utils"
+import { APIFC, CustomModalError } from "generic-view/utils"
 import { Form } from "../../interactive/form/form"
 import { Modal } from "../../interactive/modal"
 import {
@@ -24,7 +24,7 @@ import { BackupRestoreSuccess } from "./backup-restore-success"
 import { BackupRestoreError } from "./backup-restore-error"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
-import { BackupRestoreConfig } from "generic-view/models"
+import { BackupRestoreConfig, ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   cancellationErrorTitle: {
@@ -140,10 +140,10 @@ export const BackupRestoreForm: FunctionComponent<BackupRestoreConfig> = ({
   return (
     <>
       {closeButtonVisible && (
-        <Modal.CloseButton config={{ action: restoreCloseButtonAction }} />
+        <Modal.CloseButton config={{ actions: [restoreCloseButtonAction] }} />
       )}
       {abortButtonVisible && (
-        <Modal.CloseButton config={{ action: abortButtonAction }} />
+        <Modal.CloseButton config={{ actions: [abortButtonAction] }} />
       )}
       {step === Step.Select && (
         <BackupRestoreSelect
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
index 378a9ca2cd..7b5464976e 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent, useEffect, useRef, useState } from "react"
-import { APIFC, ButtonAction, CustomModalError } from "generic-view/utils"
+import { APIFC, CustomModalError } from "generic-view/utils"
 import { BackupFeatures } from "./backup-features"
 import { BackupPassword } from "./backup-password"
 import { useFormContext } from "react-hook-form"
@@ -23,7 +23,7 @@ import {
 } from "generic-view/store"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
-import { BackupCreateConfig } from "generic-view/models"
+import { BackupCreateConfig, ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   cancellationErrorTitle: {
@@ -147,10 +147,10 @@ const BackupCreateForm: FunctionComponent<BackupCreateConfig> = ({
   return (
     <>
       {closeButtonVisible && (
-        <Modal.CloseButton config={{ action: backupCloseButtonAction }} />
+        <Modal.CloseButton config={{ actions: [backupCloseButtonAction] }} />
       )}
       {abortButtonVisible && (
-        <Modal.CloseButton config={{ action: backupAbortButtonAction }} />
+        <Modal.CloseButton config={{ actions: [backupAbortButtonAction] }} />
       )}
       {step === Step.Features && (
         <>
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-error.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-error.tsx
index 797f568efd..734697e98c 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-error.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-error.tsx
@@ -4,11 +4,12 @@
  */
 
 import React, { FunctionComponent } from "react"
-import { ButtonAction, CustomModalError, IconType } from "generic-view/utils"
+import { CustomModalError, IconType } from "generic-view/utils"
 import { Modal } from "../../interactive/modal"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -49,7 +50,7 @@ export const BackupError: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
index 446a7b4ac9..46652dd037 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
@@ -5,13 +5,13 @@
 
 import React, { FunctionComponent } from "react"
 import styled from "styled-components"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { ButtonPrimary } from "../../buttons/button-primary"
 import { Modal } from "../../interactive/modal"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
-import { BackupFeature } from "generic-view/models"
+import { BackupFeature, ButtonAction } from "generic-view/models"
 import { BackupModalTestIds } from "e2e-test-ids"
 
 const messages = defineMessages({
@@ -92,14 +92,14 @@ export const BackupFeatures: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.cancelButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
           data-testid={BackupModalTestIds.CancelBackupAction}
         />
         <ButtonPrimary
           config={{
             text: intl.formatMessage(messages.createButtonLabel),
-            action: nextAction,
+            actions: [nextAction],
           }}
           data-testid={BackupModalTestIds.CreateBackupAction}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
index 15062b83ba..87f8f6673a 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx
@@ -5,7 +5,7 @@
 
 import React, { FunctionComponent } from "react"
 import styled from "styled-components"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonPrimary } from "../../buttons/button-primary"
 import { ButtonText } from "../../buttons/button-text"
 import { useFormContext } from "react-hook-form"
@@ -14,6 +14,7 @@ import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { Form } from "../../interactive/form/form"
 import { PredefinedBackupPasswordTestIds } from "e2e-test-ids"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -107,7 +108,7 @@ export const BackupPassword: FunctionComponent<Props> = ({
           data-testid={PredefinedBackupPasswordTestIds.ConfirmButton}
           config={{
             text: intl.formatMessage(messages.confirmButtonLabel),
-            action: nextAction,
+            actions: [nextAction],
             disabled: !password || !passwordsMatching,
           }}
         />
@@ -115,7 +116,7 @@ export const BackupPassword: FunctionComponent<Props> = ({
           data-testid={PredefinedBackupPasswordTestIds.SkipButton}
           config={{
             text: intl.formatMessage(messages.skipButtonLabel),
-            action: skipAction,
+            actions: [skipAction],
             modifiers: ["link", "uppercase"],
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-success.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-success.tsx
index 6f599cbfb3..bb44657191 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-success.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-success.tsx
@@ -57,7 +57,7 @@ export const BackupSuccess: FunctionComponent<Props> = ({ onClose }) => {
         <ButtonText
           config={{
             text: intl.formatMessage(messages.openBackupButtonLabel),
-            action: { type: "custom", callback: openBackupCallback },
+            actions: [{ type: "custom", callback: openBackupCallback }],
             modifiers: ["uppercase", "link"],
             icon: IconType.Folder,
           }}
@@ -67,10 +67,7 @@ export const BackupSuccess: FunctionComponent<Props> = ({ onClose }) => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: {
-              type: "custom",
-              callback: onClose,
-            },
+            actions: [{ type: "custom", callback: onClose }],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/cancel-confirm-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/cancel-confirm-modal.tsx
index dca6229967..82350c9ce1 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/cancel-confirm-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/cancel-confirm-modal.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent, useEffect, useState } from "react"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { defineMessages } from "react-intl"
 import { modalTransitionDuration } from "generic-view/theme"
@@ -12,6 +12,7 @@ import { ButtonSecondary } from "../../../buttons/button-secondary"
 import { ButtonPrimary } from "../../../buttons/button-primary"
 import { Modal } from "../../../interactive/modal"
 import styled, { keyframes } from "styled-components"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -84,13 +85,13 @@ export const CancelConfirmModal: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.backButtonLabel),
-            action: backButtonAction,
+            actions: [backButtonAction],
           }}
         />
         <ButtonPrimary
           config={{
             text: intl.formatMessage(messages.cancelButtonLabel),
-            action: cancelButtonAction,
+            actions: [cancelButtonAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
index f3e980b805..d4c694f890 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
@@ -46,7 +46,7 @@ export const DeviceCard: FunctionComponent<
       <SelectButton
         config={{
           text: intl.formatMessage(messages.selectButton),
-          action: { type: "custom", callback: onSelect },
+          actions: [{ type: "custom", callback: onSelect }],
         }}
       />
     </Wrapper>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/error-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/error-modal.tsx
index 7590ca0e96..3a23e83fd5 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/error-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/error-modal.tsx
@@ -5,9 +5,10 @@
 
 import React, { FunctionComponent, ReactElement } from "react"
 import { Modal } from "../../../interactive/modal/modal"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../../buttons/button-secondary"
 import { modalTransitionDuration } from "generic-view/theme"
+import { ButtonAction } from "generic-view/models"
 
 interface Props {
   modalIcon: IconType
@@ -42,7 +43,7 @@ export const ErrorModal: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: buttonLabel,
-            action: buttonAction,
+            actions: [buttonAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
index 151d724323..30035f0131 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
@@ -117,4 +117,8 @@ const List = styled.div`
   display: flex;
   flex-direction: column;
   gap: 0.4rem;
+
+  & > * {
+    min-height: 3.2rem;
+  }
 `
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/progress-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/progress-modal.tsx
index e393315524..ffd1803ab6 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/progress-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/progress-modal.tsx
@@ -6,14 +6,14 @@
 import React, { FunctionComponent, useMemo, useState } from "react"
 import { useSelector } from "react-redux"
 import { Modal } from "../../../interactive/modal/modal"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../../buttons/button-secondary"
 import { selectDataMigrationProgress } from "generic-view/store"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { ProgressBar } from "../../../interactive/progress-bar/progress-bar"
 import styled from "styled-components"
-import { DataMigrationFeature } from "generic-view/models"
+import { ButtonAction, DataMigrationFeature } from "generic-view/models"
 import { CancelConfirmModal } from "./cancel-confirm-modal"
 
 const messages = defineMessages({
@@ -85,7 +85,7 @@ export const ProgressModal: FunctionComponent<Props> = ({ onCancel }) => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.cancelButtonLabel),
-            action: cancelAction,
+            actions: [cancelAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/success-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/success-modal.tsx
index c4951dc87d..7eb08eb67d 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/success-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/success-modal.tsx
@@ -5,10 +5,11 @@
 
 import React, { FunctionComponent } from "react"
 import { Modal } from "../../../interactive/modal/modal"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../../buttons/button-secondary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -43,7 +44,7 @@ export const SuccessModal: FunctionComponent<Props> = ({ onButtonClick }) => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.buttonLabel),
-            action: buttonAction,
+            actions: [buttonAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/transfer-cancelled-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/transfer-cancelled-modal.tsx
index e25331bbb0..4a5c3f6c1e 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/transfer-cancelled-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/transfer-cancelled-modal.tsx
@@ -5,11 +5,12 @@
 
 import React, { FunctionComponent } from "react"
 import { Modal } from "../../../interactive/modal/modal"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../../buttons/button-secondary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { TransferFailMessage } from "./transfer-fail-message"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -45,7 +46,7 @@ export const CancelledModal: FunctionComponent<Props> = ({ onClose }) => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
index 3844991c7b..218011ea31 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
@@ -64,10 +64,12 @@ export const TransferSetup: FunctionComponent<Props> = ({
         <ButtonPrimary
           config={{
             text: intl.formatMessage(messages.transferButton),
-            action: {
-              type: "custom",
-              callback: onStartMigration,
-            },
+            actions: [
+              {
+                type: "custom",
+                callback: onStartMigration,
+              },
+            ],
             disabled: pureDbIndexing || selectedFeatures.length === 0,
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-error.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-error.tsx
index b2ed2488fe..c6e3ee27df 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-error.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-error.tsx
@@ -4,11 +4,12 @@
  */
 
 import React, { FunctionComponent } from "react"
-import { ButtonAction, CustomModalError, IconType } from "generic-view/utils"
+import { CustomModalError, IconType } from "generic-view/utils"
 import { Modal } from "../../interactive/modal"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -49,7 +50,7 @@ export const ImportContactsError: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-list.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-list.tsx
index 4e503dc108..93bb2b0f46 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-list.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-list.tsx
@@ -11,7 +11,7 @@ import React, {
 } from "react"
 import { defineMessages } from "react-intl"
 import { Modal } from "../../interactive/modal"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import styled from "styled-components"
 import { ButtonPrimary } from "../../buttons/button-primary"
@@ -22,6 +22,8 @@ import { getDisplayName, importContactsSelector } from "generic-view/store"
 import { useSelector } from "react-redux"
 import { Divider } from "../../helpers/divider"
 import { Form } from "../../interactive/form/form"
+import { ButtonAction } from "generic-view/models"
+import { Paragraph5 } from "../../texts/paragraphs"
 
 export const SELECTED_CONTACTS_FIELD = "selected-contacts"
 export const ALL_CONTACTS_FIELD = "all-contacts"
@@ -130,7 +132,7 @@ export const ImportContactsList: FunctionComponent<Props> = ({
             text: intl.formatMessage(messages.importButtonText, {
               count: selectedContacts?.length || 0,
             }),
-            action: nextAction,
+            actions: [nextAction],
             disabled: !selectedContacts || selectedContacts.length === 0,
           }}
         />
@@ -158,18 +160,21 @@ const ContactItem: React.FC<UnifiedContact> = ({
           <StyledPhoneInfoWrapper>
             {phoneNumbers.length > 0 && <p>{phoneNumbers[0].value}</p>}
             {phoneNumbers.length > 1 && (
-              <Tooltip>
+              <Tooltip
+                offset={{
+                  x: 0,
+                  y: 11,
+                }}
+              >
                 <Tooltip.Anchor>
                   <MoreNumbersButton>
                     {`+${phoneNumbers.length - 1}`}
                   </MoreNumbersButton>
                 </Tooltip.Anchor>
-                <Tooltip.Content>
-                  <MoreNumbersList>
-                    {phoneNumbers.slice(1).map((number) => (
-                      <p key={number.value}>{number.value}</p>
-                    ))}
-                  </MoreNumbersList>
+                <Tooltip.Content $defaultStyles $placement={"bottom-right"}>
+                  {phoneNumbers.slice(1).map((number) => (
+                    <Paragraph5 key={number.value}>{number.value}</Paragraph5>
+                  ))}
                 </Tooltip.Content>
               </Tooltip>
             )}
@@ -182,7 +187,12 @@ const ContactItem: React.FC<UnifiedContact> = ({
 
 const ContactItemWrapper = styled.div`
   width: 100%;
-  padding: 0 1.4rem;
+  padding: 0.4rem 1.4rem;
+
+  > *,
+  label {
+    width: 100%;
+  }
 `
 
 const ContactLabelWrapper = styled.div`
@@ -252,22 +262,6 @@ const MoreNumbersButton = styled.p`
   }
 `
 
-const MoreNumbersList = styled.div`
-  margin-top: 1rem;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  padding: ${({ theme }) => theme.space.sm};
-  background-color: ${({ theme }) => theme.color.grey4};
-  border-radius: ${({ theme }) => theme.radius.sm};
-  box-shadow: 0 1rem 5rem 0 rgba(0, 0, 0, 0.08);
-
-  && > p {
-    color: ${({ theme }) => theme.color.grey1};
-    text-align: left;
-  }
-`
-
 const CustomDivider = styled(Divider)`
   border-color: ${({ theme }) => theme.color.grey3};
   margin: 1.4rem calc(var(--modal-padding) * -1) 0;
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-progress.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-progress.tsx
index 9e27849b2a..c2e7cae45b 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-progress.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-progress.tsx
@@ -6,7 +6,7 @@
 import React, { useState } from "react"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import styled from "styled-components"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { ProgressBar } from "../../interactive/progress-bar/progress-bar"
 import { Modal } from "../../interactive/modal"
 import { defineMessages } from "react-intl"
@@ -15,6 +15,7 @@ import { useSelector } from "react-redux"
 import { importContactsProgress } from "generic-view/store"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { ButtonPrimary } from "../../buttons/button-primary"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -67,16 +68,18 @@ export const ImportContactsProgress: FunctionComponent<Props> = ({
         <Modal.Buttons>
           <ButtonSecondary
             config={{
-              action: {
-                type: "custom",
-                callback: () => setCancelRequested(false),
-              },
+              actions: [
+                {
+                  type: "custom",
+                  callback: () => setCancelRequested(false),
+                },
+              ],
               text: intl.formatMessage(messages.cancelBackButtonLabel),
             }}
           />
           <ButtonPrimary
             config={{
-              action: cancelAction,
+              actions: [cancelAction],
               text: intl.formatMessage(messages.cancelAbortButtonLabel),
             }}
           />
@@ -102,10 +105,12 @@ export const ImportContactsProgress: FunctionComponent<Props> = ({
       <Modal.Buttons config={{ vertical: true }}>
         <ButtonSecondary
           config={{
-            action: {
-              type: "custom",
-              callback: requestCancel,
-            },
+            actions: [
+              {
+                type: "custom",
+                callback: requestCancel,
+              },
+            ],
             text: intl.formatMessage(messages.cancelButtonLabel),
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-provider.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-provider.tsx
index da585c16ab..09a918ac24 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-provider.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-provider.tsx
@@ -54,12 +54,14 @@ export const ImportContactsProvider = () => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.googleButtonLabel),
-            action: {
-              type: "custom",
-              callback: () => {
-                dispatch(startImportAuthorization("GOOGLE"))
+            actions: [
+              {
+                type: "custom",
+                callback: () => {
+                  dispatch(startImportAuthorization("GOOGLE"))
+                },
               },
-            },
+            ],
           }}
         >
           <GoogleLogoWrapperStyled>
@@ -91,12 +93,14 @@ export const ImportContactsProvider = () => {
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.outlookButtonLabel),
-            action: {
-              type: "custom",
-              callback: () => {
-                dispatch(startImportAuthorization("OUTLOOK"))
+            actions: [
+              {
+                type: "custom",
+                callback: () => {
+                  dispatch(startImportAuthorization("OUTLOOK"))
+                },
               },
-            },
+            ],
           }}
         >
           <OutlookLogoWrapperStyled>
@@ -134,24 +138,28 @@ export const ImportContactsProvider = () => {
           config={{
             text: intl.formatMessage(messages.fileUploadButtonLabel),
             icon: IconType.Import,
-            action: {
-              type: "custom",
-              callback: () => {
-                dispatch(importContactsFromFile())
-                dispatch(setImportProcessStatus({ status: "FILE-SELECT" }))
+            actions: [
+              {
+                type: "custom",
+                callback: () => {
+                  dispatch(importContactsFromFile())
+                  dispatch(setImportProcessStatus({ status: "FILE-SELECT" }))
+                },
               },
-            },
+            ],
           }}
         />
         <HelpLink
           config={{
             text: intl.formatMessage(messages.needHelpButtonLabel),
-            action: {
-              type: "custom",
-              callback: () => {
-                openHelpShortcut("kompakt-contacts-import")
+            actions: [
+              {
+                type: "custom",
+                callback: () => {
+                  openHelpShortcut("kompakt-contacts-import")
+                },
               },
-            },
+            ],
             modifiers: ["link", "hover-underline"],
           }}
         />
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-success.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-success.tsx
index b7349bc3b2..1c809c57e8 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-success.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts-success.tsx
@@ -4,13 +4,14 @@
  */
 
 import React, { FunctionComponent } from "react"
-import { ButtonAction, IconType } from "generic-view/utils"
+import { IconType } from "generic-view/utils"
 import { Modal } from "../../interactive/modal"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { ButtonSecondary } from "../../buttons/button-secondary"
 import { useFormContext } from "react-hook-form"
 import { SELECTED_CONTACTS_FIELD } from "./import-contacts-list"
+import { ButtonAction } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -45,7 +46,7 @@ export const ImportContactsSuccess: FunctionComponent<Props> = ({
         <ButtonSecondary
           config={{
             text: intl.formatMessage(messages.closeButtonLabel),
-            action: closeAction,
+            actions: [closeAction],
           }}
         />
       </Modal.Buttons>
diff --git a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts.tsx b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts.tsx
index 9bb909e1fd..d3fe8729b4 100644
--- a/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/import-contacts/import-contacts.tsx
@@ -3,7 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { APIFC, ButtonAction, CustomModalError } from "generic-view/utils"
+import { APIFC, CustomModalError } from "generic-view/utils"
 import React, { FunctionComponent, useEffect, useRef, useState } from "react"
 import { Form } from "../../interactive/form/form"
 import { Modal } from "../../interactive/modal"
@@ -30,7 +30,7 @@ import { ImportContactsError } from "./import-contacts-error"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { defineMessages } from "react-intl"
 import { useFormContext } from "react-hook-form"
-import { ImportContactsConfig } from "generic-view/models"
+import { ButtonAction, ImportContactsConfig } from "generic-view/models"
 import { ApiFileTransferError } from "device/models"
 
 const messages = defineMessages({
@@ -135,7 +135,7 @@ const ImportContactsForm: FunctionComponent<ImportContactsConfig> = ({
   return (
     <>
       {closeButtonVisible && (
-        <Modal.CloseButton config={{ action: importCloseButtonAction }} />
+        <Modal.CloseButton config={{ actions: [importCloseButtonAction] }} />
       )}
       {(currentStatus === undefined || currentStatus === "INIT") && (
         <ImportContactsProvider />
diff --git a/libs/generic-view/ui/src/lib/predefined/predefined.ts b/libs/generic-view/ui/src/lib/predefined/predefined.ts
index c033c21aea..ecd2b3bdbb 100644
--- a/libs/generic-view/ui/src/lib/predefined/predefined.ts
+++ b/libs/generic-view/ui/src/lib/predefined/predefined.ts
@@ -12,6 +12,7 @@ import { BackupRestore } from "./backup-restore/backup-restore"
 import { ImportContacts } from "./import-contacts/import-contacts"
 import { DataMigration } from "./data-migration/data-migration"
 import { IncomingFeatureInfo } from "./incoming-feature-info"
+import { SelectionManager } from "./selection-manager"
 import {
   aboutDataBox,
   backupCreate,
@@ -22,6 +23,7 @@ import {
   lastBackupDate,
   mcDataMigration,
   overviewOsVersion,
+  selectionManager,
 } from "generic-view/models"
 
 export const predefinedComponents = {
@@ -34,4 +36,5 @@ export const predefinedComponents = {
   [importContacts.key]: ImportContacts,
   [mcDataMigration.key]: DataMigration,
   [incomingFeatureInfo.key]: IncomingFeatureInfo,
+  [selectionManager.key]: SelectionManager,
 }
diff --git a/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx b/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
index 14949f6221..68f3fe229d 100644
--- a/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
@@ -97,10 +97,12 @@ const RecoveryModeUI: FunctionComponent = () => {
             <ButtonPrimary
               config={{
                 text: intl.formatMessage(messages.button),
-                action: {
-                  type: "custom",
-                  callback: onStartRecovery,
-                },
+                actions: [
+                  {
+                    type: "custom",
+                    callback: onStartRecovery,
+                  },
+                ],
                 disabled: !isConfirmed,
               }}
             />
diff --git a/libs/generic-view/ui/src/lib/predefined/selection-manager.tsx b/libs/generic-view/ui/src/lib/predefined/selection-manager.tsx
new file mode 100644
index 0000000000..d2b2cafce5
--- /dev/null
+++ b/libs/generic-view/ui/src/lib/predefined/selection-manager.tsx
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React from "react"
+import { APIFC } from "generic-view/utils"
+import styled from "styled-components"
+import { SelectionManagerConfig } from "generic-view/models"
+
+export const SelectionManager: APIFC<undefined, SelectionManagerConfig> = ({
+  data,
+  config,
+  ...props
+}) => {
+  return <SelectionManagerWrapper {...props} />
+}
+
+const SelectionManagerWrapper = styled.div`
+  background: ${({ theme }) => theme.color.grey5};
+  border: solid 0.1rem ${({ theme }) => theme.color.grey4};
+  border-radius: ${({ theme }) => theme.radius.sm};
+`
diff --git a/libs/generic-view/ui/src/lib/shared/spinner-loader.tsx b/libs/generic-view/ui/src/lib/shared/spinner-loader.tsx
index f7c60c682e..4880b90016 100644
--- a/libs/generic-view/ui/src/lib/shared/spinner-loader.tsx
+++ b/libs/generic-view/ui/src/lib/shared/spinner-loader.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent } from "react"
-import styled, { keyframes } from "styled-components"
+import styled, { css, keyframes } from "styled-components"
 import { Icon } from "../icon/icon"
 import { IconType } from "generic-view/utils"
 
@@ -15,12 +15,14 @@ interface Props {
 export const SpinnerLoader: FunctionComponent<Props> = ({ dark, ...props }) => {
   return (
     <Wrapper {...props}>
-      <SpinnerIcon data={{ type: dark ? IconType.SpinnerDark : IconType.Spinner }} />
+      <SpinnerIcon
+        data={{ type: dark ? IconType.SpinnerDark : IconType.Spinner }}
+      />
     </Wrapper>
   )
 }
 
-const spinAnimation = keyframes({
+const spin = keyframes({
   "0%": {
     transform: "rotate(0deg)",
   },
@@ -29,11 +31,15 @@ const spinAnimation = keyframes({
   },
 })
 
+export const spinAnimation = css`
+  animation: ${spin} 1s steps(12) infinite;
+`
+
 const Wrapper = styled.div`
   display: block;
   width: 3.2rem;
   height: 3.2rem;
-  animation: ${spinAnimation} 1s steps(12) infinite;
+  ${spinAnimation};
 `
 
 const SpinnerIcon = styled(Icon)`
diff --git a/libs/generic-view/ui/src/lib/table/table-cell.tsx b/libs/generic-view/ui/src/lib/table/table-cell.tsx
index d21d31f05f..86af1b6ee0 100644
--- a/libs/generic-view/ui/src/lib/table/table-cell.tsx
+++ b/libs/generic-view/ui/src/lib/table/table-cell.tsx
@@ -35,9 +35,18 @@ export const TableCell: APIFC<undefined, TableCellConfig> = ({
 }
 
 export const Cell = styled.td<{
-  $width: number
+  $width?: number | string
 }>`
-  min-width: ${({ $width }) => $width}px;
-  max-width: ${({ $width }) => $width}px;
+  --cell-width: ${({ $width }) => {
+    return $width !== undefined
+      ? isNaN(Number($width))
+        ? $width
+        : `${$width}px`
+      : "auto"
+  }};
+
+  width: var(--cell-width);
+  max-width: var(--cell-width);
+  min-width: var(--cell-width);
   overflow: hidden;
 `
diff --git a/libs/generic-view/ui/src/lib/table/table.tsx b/libs/generic-view/ui/src/lib/table/table.tsx
index 1ec7dd1cdb..d86a17e8d6 100644
--- a/libs/generic-view/ui/src/lib/table/table.tsx
+++ b/libs/generic-view/ui/src/lib/table/table.tsx
@@ -13,23 +13,28 @@ import React, {
   useState,
 } from "react"
 import styled, { css } from "styled-components"
-import { APIFC } from "generic-view/utils"
+import { APIFC, useViewFormContext } from "generic-view/utils"
 import { TableConfig, TableData } from "generic-view/models"
 import { TableCell } from "./table-cell"
-import { useFormContext } from "react-hook-form"
 import { P1 } from "../texts/paragraphs"
+import { difference, intersection } from "lodash"
+import { useFormField } from "generic-view/store"
 
 const rowHeight = 64
 
 export const Table: APIFC<TableData, TableConfig> & {
   Cell: typeof TableCell
 } = ({ data = [], config, children, ...props }) => {
-  const formContext = useFormContext()
+  const getFormContext = useViewFormContext()
+  const formContext = getFormContext()
   const scrollWrapperRef = useRef<HTMLDivElement>(null)
   const [visibleRowsBounds, setVisibleRowsBounds] = useState<[number, number]>([
     -1, -1,
   ])
 
+  const { setValue: setAllIds } = useFormField({
+    formName: config.form.formName,
+  })
   const { formOptions, columnsNames } = config
   const { activeIdFieldName } = formOptions
 
@@ -48,6 +53,10 @@ export const Table: APIFC<TableData, TableConfig> & {
   const handleScroll = useCallback(() => {
     if (!scrollWrapperRef.current) return
     const { scrollTop, clientHeight } = scrollWrapperRef.current
+    if (clientHeight === 0) {
+      setTimeout(handleScroll, 10)
+      return
+    }
     const rowsPerPage = Math.ceil(clientHeight / rowHeight) || 0
     const currentRowIndex = Math.floor(scrollTop / rowHeight)
     const firstVisibleRowIndex = currentRowIndex - rowsPerPage
@@ -56,10 +65,26 @@ export const Table: APIFC<TableData, TableConfig> & {
   }, [])
 
   useEffect(() => {
-    if (formOptions.totalItemsFieldName) {
-      formContext.setValue(formOptions.totalItemsFieldName, data?.length)
+    if (formOptions.allIdsFieldName) {
+      formContext.setValue(formOptions.allIdsFieldName, data)
+      setAllIds(formOptions.allIdsFieldName, data)
+    }
+  }, [data, formContext, formOptions.allIdsFieldName, setAllIds])
+
+  useEffect(() => {
+    if (formOptions.selectedIdsFieldName) {
+      const selectedIds = formContext.getValues(
+        formOptions.selectedIdsFieldName
+      )
+      const unavailableIds = difference(selectedIds, data)
+      if (unavailableIds.length > 0) {
+        formContext.setValue(
+          formOptions.selectedIdsFieldName,
+          intersection(data, unavailableIds)
+        )
+      }
     }
-  }, [formOptions.totalItemsFieldName, data?.length, formContext])
+  }, [data, formContext, formOptions.selectedIdsFieldName])
 
   useEffect(() => {
     const scrollWrapper = scrollWrapperRef.current
@@ -149,7 +174,7 @@ const TableWrapper = styled.table`
   position: absolute;
   top: 0;
   left: 0;
-  width: min-content;
+  width: 100%;
   max-height: 100%;
   border-collapse: collapse;
   border-spacing: 0;
@@ -179,21 +204,17 @@ const TableBody = styled.tbody`
 
 // TODO: Add proper styles for the table row
 const Row = styled.tr<{ $active?: boolean }>`
+  height: ${rowHeight / 10}rem;
+  border-bottom: solid 0.1rem ${({ theme }) => theme.color.grey5};
+  border-left: 0.2rem solid transparent;
   ${({ $active }) =>
     $active &&
     css`
       border-left: 0.2rem solid #000;
     `}
-  height: ${rowHeight / 10}rem;
 `
 
 const RowPlaceholder = styled.tr`
   height: ${rowHeight / 10}rem;
-
-  div {
-    display: block;
-    height: 2.4rem;
-    border-radius: ${({ theme }) => theme.radius.md};
-    background: ${({ theme }) => theme.color.grey6};
-  }
+  border-bottom: solid 0.1rem ${({ theme }) => theme.color.grey5};
 `
diff --git a/libs/generic-view/ui/src/lib/texts/index.ts b/libs/generic-view/ui/src/lib/texts/index.ts
index 20f618dfb3..77e66fc497 100644
--- a/libs/generic-view/ui/src/lib/texts/index.ts
+++ b/libs/generic-view/ui/src/lib/texts/index.ts
@@ -4,7 +4,13 @@
  */
 
 import { Header3, Header4, Header5 } from "./headers"
-import { Paragraph1, Paragraph2, Paragraph3 } from "./paragraphs"
+import {
+  Paragraph1,
+  Paragraph2,
+  Paragraph3,
+  Paragraph4,
+  Paragraph5,
+} from "./paragraphs"
 import {
   h3Component,
   h4Component,
@@ -12,6 +18,8 @@ import {
   p1Component,
   p2Component,
   p3Component,
+  p4Component,
+  p5Component,
 } from "generic-view/models"
 
 export const texts = {
@@ -21,4 +29,6 @@ export const texts = {
   [p1Component.key]: Paragraph1,
   [p2Component.key]: Paragraph2,
   [p3Component.key]: Paragraph3,
+  [p4Component.key]: Paragraph4,
+  [p5Component.key]: Paragraph5,
 }
diff --git a/libs/generic-view/ui/src/lib/texts/paragraphs.tsx b/libs/generic-view/ui/src/lib/texts/paragraphs.tsx
index fd72d414c9..7f831c2e55 100644
--- a/libs/generic-view/ui/src/lib/texts/paragraphs.tsx
+++ b/libs/generic-view/ui/src/lib/texts/paragraphs.tsx
@@ -8,11 +8,15 @@ import { APIFC } from "generic-view/utils"
 import styled, { css } from "styled-components"
 import { ParagraphConfig } from "generic-view/models"
 import { isEmpty } from "lodash"
+import { Content } from "../data-rows/text-formatted"
 
-const commonStyles = css`
+type Color = NonNullable<ParagraphConfig>["color"]
+
+const commonStyles = css<{ $color?: Color }>`
   white-space: pre-wrap;
   margin: 0;
-  color: ${({ theme }) => theme.color.grey2};
+  color: ${({ theme, $color = "grey2" }) => theme.color[$color]};
+  font-weight: ${({ theme }) => theme.fontWeight.regular};
 `
 
 export const Paragraph1: APIFC<undefined, ParagraphConfig> = ({
@@ -20,14 +24,21 @@ export const Paragraph1: APIFC<undefined, ParagraphConfig> = ({
   children,
   ...props
 }) => {
-  return <P1 {...props}>{isEmpty(children) ? config.text : children}</P1>
+  return (
+    <P1 {...props} $color={config?.color}>
+      {isEmpty(children) ? config?.text : children}
+    </P1>
+  )
 }
 
-export const P1 = styled.p`
-  font-size: ${({ theme }) => theme.fontSize.paragraph1};
-  line-height: ${({ theme }) => theme.lineHeight.paragraph1};
-  letter-spacing: 0.02em;
-  ${commonStyles};
+export const P1 = styled.p<{ $color?: Color }>`
+  &,
+  ${Content} p {
+    font-size: ${({ theme }) => theme.fontSize.paragraph1};
+    line-height: ${({ theme }) => theme.lineHeight.paragraph1};
+    letter-spacing: 0.02em;
+    ${commonStyles};
+  }
 `
 
 export const Paragraph2: APIFC<undefined, ParagraphConfig> = ({
@@ -35,14 +46,18 @@ export const Paragraph2: APIFC<undefined, ParagraphConfig> = ({
   children,
   ...props
 }) => {
-  return <P2 {...props}>{isEmpty(children) ? config.text : children}</P2>
+  return (
+    <P2 {...props} $color={config?.color}>
+      {isEmpty(children) ? config?.text : children}
+    </P2>
+  )
 }
 
-export const P2 = styled.p`
+export const P2 = styled.p<{ $color?: Color }>`
   font-size: ${({ theme }) => theme.fontSize.paragraph2};
   line-height: ${({ theme }) => theme.lineHeight.paragraph2};
   letter-spacing: 0.02em;
-  font-weight: 300;
+  font-weight: ${({ theme }) => theme.fontWeight.light};
   ${commonStyles};
 `
 
@@ -51,12 +66,55 @@ export const Paragraph3: APIFC<undefined, ParagraphConfig> = ({
   children,
   ...props
 }) => {
-  return <P3 {...props}>{isEmpty(children) ? config.text : children}</P3>
+  return (
+    <P3 {...props} $color={config?.color}>
+      {isEmpty(children) ? config?.text : children}
+    </P3>
+  )
 }
 
-export const P3 = styled.p`
+export const P3 = styled.p<{ $color?: Color }>`
   font-size: ${({ theme }) => theme.fontSize.paragraph3};
   line-height: ${({ theme }) => theme.lineHeight.paragraph3};
   letter-spacing: 0.02em;
   ${commonStyles};
 `
+
+export const Paragraph4: APIFC<undefined, ParagraphConfig> = ({
+  config,
+  children,
+  ...props
+}) => {
+  return (
+    <P4 {...props} $color={config?.color}>
+      {isEmpty(children) ? config?.text : children}
+    </P4>
+  )
+}
+
+export const P4 = styled.p<{ $color?: Color }>`
+  font-size: ${({ theme }) => theme.fontSize.paragraph4};
+  line-height: ${({ theme }) => theme.lineHeight.paragraph4};
+  font-weight: ${({ theme }) => theme.fontWeight.light};
+  letter-spacing: 0.02em;
+  ${commonStyles};
+`
+
+export const Paragraph5: APIFC<undefined, ParagraphConfig> = ({
+  config,
+  children,
+  ...props
+}) => {
+  return (
+    <P5 {...props} $color={config?.color}>
+      {isEmpty(children) ? config?.text : children}
+    </P5>
+  )
+}
+
+export const P5 = styled.p<{ $color?: Color }>`
+  ${commonStyles};
+  font-size: ${({ theme }) => theme.fontSize.paragraph5};
+  line-height: ${({ theme }) => theme.lineHeight.paragraph5};
+  letter-spacing: 0.04em;
+`
diff --git a/libs/generic-view/utils/src/index.ts b/libs/generic-view/utils/src/index.ts
index c9d9f25a0f..70050a1567 100644
--- a/libs/generic-view/utils/src/index.ts
+++ b/libs/generic-view/utils/src/index.ts
@@ -7,8 +7,10 @@ export * from "./lib/generate-menu/generate-menu"
 export * from "./lib/models/api-fc.types"
 export * from "./lib/models/api-views.types"
 export * from "./lib/models/icons.types"
-export * from "./lib/models/button.types"
 export * from "./lib/view-generators/generate-view-config"
 export * from "./lib/map-layout-sizes/map-layout-sizes"
 export * from "./lib/models/modal.types"
 export * from "./lib/data-provider-helpers"
+export * from "./lib/forms-provider/forms-provider"
+export * from "./lib/data-provider-helpers/string-to-regex"
+export * from "./lib/use-current-view-key"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
index bfc8e351c1..8bed873e86 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
@@ -4,6 +4,7 @@
  */
 
 import { dataProviderFilter } from "./data-provider-filter"
+import { DataProviderFiltersConfig } from "device/models"
 
 describe("dataProviderFilter", () => {
   it("returns all data when no filters are provided", () => {
@@ -14,21 +15,27 @@ describe("dataProviderFilter", () => {
 
   it("filters data based on single field with single pattern", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const filters = { name: ["/Alice/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/Alice/"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([{ name: "Alice" }])
   })
 
   it("filters data based on nested field with single pattern", () => {
     const data = [{ user: { name: "Alice" } }, { user: { name: "Bob" } }]
-    const filters = { "user.name": ["/Alice/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "user.name", patterns: ["/Alice/"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([{ user: { name: "Alice" } }])
   })
 
   it("filters data based on single field with multiple patterns", () => {
     const data = [{ name: "Alice" }, { name: "Anastasia" }, { name: "Charlie" }]
-    const filters = { name: ["/^A/m", "/.+e$/m"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/^A/m", "/.+e$/m"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([{ name: "Alice" }])
   })
@@ -39,7 +46,10 @@ describe("dataProviderFilter", () => {
       { name: "Anastasia", age: "29" },
       { name: "Agnes", age: "30" },
     ]
-    const filters = { name: ["/^A/m"], age: ["/2[\\d]/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/^A/m"] },
+      { providerField: "age", patterns: ["/2[\\d]/"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([
       { name: "Alice", age: "25" },
@@ -49,20 +59,26 @@ describe("dataProviderFilter", () => {
 
   it("returns empty array when no data matches the filters", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const filters = { name: ["/Charlie/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/Charlie/"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([])
   })
 
   it("handles empty data array", () => {
     const data: Record<string, unknown>[] = []
-    const filters = { name: ["/Alice/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/Alice/"] },
+    ]
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual([])
   })
 
   it("handles undefined data", () => {
-    const filters = { name: ["/Alice/"] }
+    const filters: DataProviderFiltersConfig = [
+      { providerField: "name", patterns: ["/Alice/"] },
+    ]
     const result = dataProviderFilter(undefined, filters)
     expect(result).toEqual([])
   })
@@ -75,7 +91,7 @@ describe("dataProviderFilter", () => {
 
   it("handles empty filters", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const filters = {}
+    const filters = [] as DataProviderFiltersConfig
     const result = dataProviderFilter(data, filters)
     expect(result).toEqual(data)
   })
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
index 33022cb6c8..6d47a7e8cc 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
@@ -3,19 +3,19 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { DataProviderFilterConfig } from "device/models"
+import { DataProviderFiltersConfig } from "device/models"
 import { stringToRegex } from "./string-to-regex"
-import { get } from "lodash"
+import { cloneDeep, get } from "lodash"
 
 export const dataProviderFilter = (
   data: Record<string, unknown>[] = [],
-  filters?: DataProviderFilterConfig
+  filters?: DataProviderFiltersConfig
 ) => {
   if (!filters || !data) return data
 
   return data.filter((item) => {
-    return Object.entries(filters).every(([key, patterns]) => {
-      const field = get(item, key) as string
+    return cloneDeep(filters).every(({ providerField, patterns }) => {
+      const field = get(item, providerField) as string
       return patterns.every((pattern) => {
         const regex = stringToRegex(pattern)
         return regex.test(field || "")
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
index 26663baf19..c3d8e5e2d2 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
@@ -15,9 +15,9 @@ describe("dataProviderSort", () => {
 
   it("sorts data based on single field in ascending order", () => {
     const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
-    const sort = {
-      name: { direction: "asc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort = [
+      { providerField: "name", direction: "asc", priority: 1 },
+    ] as DataProviderSortConfig
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       { name: "Alice" },
@@ -32,9 +32,9 @@ describe("dataProviderSort", () => {
       { user: { name: "Alice" } },
       { user: { name: "Bob" } },
     ]
-    const sort = {
-      "user.name": { direction: "asc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "user.name", direction: "asc", priority: 1 },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       { user: { name: "Alice" } },
@@ -45,9 +45,9 @@ describe("dataProviderSort", () => {
 
   it("sorts data based on single field in descending order", () => {
     const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
-    const sort = {
-      name: { direction: "desc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "name", direction: "desc", priority: 1 },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       { name: "Charlie" },
@@ -62,10 +62,10 @@ describe("dataProviderSort", () => {
       { name: "Alice", age: "25" },
       { name: "Bob", age: "20" },
     ]
-    const sort = {
-      name: { direction: "asc", priority: 1 },
-      age: { direction: "asc", priority: 2 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "name", direction: "asc", priority: 1 },
+      { providerField: "age", direction: "asc", priority: 2 },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       { name: "Alice", age: "25" },
@@ -80,10 +80,10 @@ describe("dataProviderSort", () => {
       { name: "Alice" },
       { name: "Alice", surname: "Smith" },
     ]
-    const sort = {
-      name: { direction: "asc", priority: 2 },
-      surname: { direction: "asc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "name", direction: "asc", priority: 2 },
+      { providerField: "surname", direction: "asc", priority: 1 },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       {
@@ -107,9 +107,14 @@ describe("dataProviderSort", () => {
       { name: "Alice" },
       { name: "Beatrice" },
     ]
-    const sort = {
-      name: { direction: "asc", priority: 1, orderingPatterns: ["/^B/m"] },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      {
+        providerField: "name",
+        direction: "asc",
+        priority: 1,
+        orderingPatterns: ["/^B/m"],
+      },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([
       { name: "Beatrice" },
@@ -121,17 +126,17 @@ describe("dataProviderSort", () => {
 
   it("returns empty array when data is empty", () => {
     const data: Record<string, unknown>[] = []
-    const sort = {
-      name: { direction: "asc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "name", direction: "asc", priority: 1 },
+    ]
     const result = dataProviderSort(data, sort)
     expect(result).toEqual([])
   })
 
   it("handles undefined data", () => {
-    const sort = {
-      name: { direction: "asc", priority: 1 },
-    } as DataProviderSortConfig
+    const sort: DataProviderSortConfig = [
+      { providerField: "name", direction: "asc", priority: 1 },
+    ]
     const result = dataProviderSort(undefined, sort)
     expect(result).toEqual([])
   })
@@ -144,7 +149,7 @@ describe("dataProviderSort", () => {
 
   it("handles empty sort configuration", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const sort = {}
+    const sort = [] as DataProviderSortConfig
     const result = dataProviderSort(data, sort)
     expect(result).toEqual(data)
   })
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
index 156e57e29c..e31c54feb2 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
+++ b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
@@ -5,30 +5,26 @@
 
 import { DataProviderSortConfig } from "device/models"
 import { stringToRegex } from "./string-to-regex"
-import { get } from "lodash"
+import { cloneDeep, get } from "lodash"
 
 export const dataProviderSort = (
   data: Record<string, unknown>[] = [],
   sort?: DataProviderSortConfig
 ) => {
   if (!sort || !data) return data
-  const fieldsSortedByPriority = Object.entries(sort)
-    .sort((a, b) => a[1].priority - b[1].priority)
-    .map(([key, { direction, orderingPatterns }]) => ({
-      key,
-      direction,
-      orderingPatterns,
-    }))
+  const fieldsSortedByPriority = cloneDeep(sort).sort(
+    (a, b) => a.priority - b.priority
+  )
 
   return data.sort((a, b) => {
     let score = 0
     for (const {
-      key,
+      providerField,
       direction,
       orderingPatterns = [],
     } of fieldsSortedByPriority) {
-      const fieldA = get(a, key) as string
-      const fieldB = get(b, key) as string
+      const fieldA = get(a, providerField) as string
+      const fieldB = get(b, providerField) as string
       if (!fieldA || !fieldB) {
         continue
       }
diff --git a/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx b/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
new file mode 100644
index 0000000000..7d803fa1fe
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+} from "react"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { UseFormReturn } from "react-hook-form/dist/types"
+import { useFormContext } from "react-hook-form"
+
+interface FormsContextValue {
+  registerForm: (formKey: string, form: UseFormReturn) => void
+  getFormContext: (formKey?: string) => UseFormReturn | undefined
+}
+
+const FormsContext = createContext<FormsContextValue>({
+  registerForm: () => {},
+  getFormContext: () => undefined,
+})
+
+export const FormsProvider: FunctionComponent = ({ children }) => {
+  const formContext = useFormContext()
+  const forms = useMemo(() => {
+    return new Map<string, UseFormReturn>()
+  }, [])
+
+  const registerForm = useCallback(
+    (formKey: string, form: UseFormReturn) => {
+      forms.set(formKey, form)
+    },
+    [forms]
+  )
+
+  const getFormContext = useCallback(
+    (formKey?: string) => {
+      if (formKey) {
+        const form = forms.get(formKey)
+        if (!form) {
+          throw new Error(`Form with key ${formKey} not found`)
+        }
+        return form
+      }
+      return formContext
+    },
+    [formContext, forms]
+  )
+
+  useEffect(() => {
+    return () => {
+      forms.clear()
+    }
+  }, [forms])
+
+  return (
+    <FormsContext.Provider value={{ registerForm, getFormContext }}>
+      {children}
+    </FormsContext.Provider>
+  )
+}
+
+export const useViewFormRegister = (formKey: string, form: UseFormReturn) => {
+  const { registerForm } = useContext(FormsContext)
+  registerForm(formKey, form)
+}
+
+export const useViewFormContext = () => {
+  const defaultFormContext = useFormContext()
+  const formsContext = useContext(FormsContext)
+
+  return (formKey?: string) => {
+    const formContext = formsContext.getFormContext(formKey)
+    return formContext ?? defaultFormContext
+  }
+}
diff --git a/libs/generic-view/utils/src/lib/models/api-views.types.ts b/libs/generic-view/utils/src/lib/models/api-views.types.ts
index 61912ea586..f34822a742 100644
--- a/libs/generic-view/utils/src/lib/models/api-views.types.ts
+++ b/libs/generic-view/utils/src/lib/models/api-views.types.ts
@@ -5,7 +5,7 @@
 
 import { z } from "zod"
 import componentsValidators from "generic-view/models"
-import { DataProviderConfig, Layout } from "device/models"
+import { DataProviderConfig, ExtraConfig, Layout } from "device/models"
 
 type ComponentConfigProp<T> = T extends undefined
   ? { config?: T }
@@ -21,6 +21,7 @@ type ComponentProps<T> = T extends {
       layout?: Layout
       childrenKeys?: string[]
       dataProvider?: DataProviderConfig
+      extra?: ExtraConfig
     } & ComponentConfigProp<z.infer<T["configValidator"]>>
   : never
 
diff --git a/libs/generic-view/utils/src/lib/models/button.types.ts b/libs/generic-view/utils/src/lib/models/button.types.ts
deleted file mode 100644
index 5b1a15355f..0000000000
--- a/libs/generic-view/utils/src/lib/models/button.types.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-export type ModalAction =
-  | {
-      type: "open-modal" | "replace-modal"
-      domain?: string
-      modalKey: string
-      permanent?: boolean
-    }
-  | {
-      type: "close-modal"
-      domain?: string
-      modalKey: string
-    }
-  | {
-      type: "close-domain-modals"
-      domain: string
-    }
-  | {
-      type: "close-all-modals"
-    }
-
-export interface NavigateAction {
-  type: "navigate"
-  viewKey: string
-}
-
-export type FormAction =
-  | {
-      type: "form-set-field"
-      key: string
-      value?: string | number | boolean
-    }
-  | {
-      type: "form-toggle-field"
-      key: string
-    }
-  | {
-      type: "form-reset"
-    }
-
-export interface CustomAction {
-  type: "custom"
-  callback: VoidFunction
-}
-
-export type ButtonAction =
-  | ModalAction
-  | NavigateAction
-  | FormAction
-  | CustomAction
diff --git a/libs/generic-view/utils/src/lib/models/icons.types.ts b/libs/generic-view/utils/src/lib/models/icons.types.ts
index 09629a95a5..5a9244b15c 100644
--- a/libs/generic-view/utils/src/lib/models/icons.types.ts
+++ b/libs/generic-view/utils/src/lib/models/icons.types.ts
@@ -50,4 +50,5 @@ export enum IconType {
   Support = "support",
   Exclamation = "exclamation",
   Namaste = "namaste",
+  Delete = "delete",
 }
diff --git a/libs/generic-view/utils/src/lib/use-current-view-key.ts b/libs/generic-view/utils/src/lib/use-current-view-key.ts
new file mode 100644
index 0000000000..c8fc794045
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/use-current-view-key.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useParams } from "react-router"
+
+export const useCurrentViewKey = () => {
+  const { viewKey, subviewKey } = useParams<{
+    viewKey: string
+    subviewKey?: string
+  }>()
+  return subviewKey || viewKey
+}
diff --git a/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.test.ts b/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.test.ts
index d038572b23..d47ac25c78 100644
--- a/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.test.ts
+++ b/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.test.ts
@@ -26,10 +26,12 @@ describe("generateMcAboutListModalLayout", () => {
       "keymodal-button": {
         config: {
           text: "press me",
-          action: {
-            type: "open-modal",
-            modalKey: "keymodal",
-          },
+          actions: [
+            {
+              type: "open-modal",
+              modalKey: "keymodal",
+            },
+          ],
         },
       },
       keymodal: {
diff --git a/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.ts b/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.ts
index 7a1fa993f7..b5751f599e 100644
--- a/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.ts
+++ b/libs/generic-view/views/src/lib/mc-about/list-modal/list-modal.ts
@@ -28,11 +28,13 @@ export const generateMcAboutListModalLayout: ViewGenerator<
       component: "button-text",
       config: {
         text: config.buttonText,
-        action: {
-          type: "open-modal",
-          modalKey: config.dataKey + ListModalKeys.Modal,
-        },
-        modifiers: ["hover-underline"]
+        actions: [
+          {
+            type: "open-modal",
+            modalKey: config.dataKey + ListModalKeys.Modal,
+          },
+        ],
+        modifiers: ["hover-underline"],
       },
     },
     [config.dataKey + ListModalKeys.Modal]: {
diff --git a/libs/generic-view/views/src/lib/mc-overview/section-backup/section-backup.ts b/libs/generic-view/views/src/lib/mc-overview/section-backup/section-backup.ts
index 473b74a692..142dcda682 100644
--- a/libs/generic-view/views/src/lib/mc-overview/section-backup/section-backup.ts
+++ b/libs/generic-view/views/src/lib/mc-overview/section-backup/section-backup.ts
@@ -97,11 +97,13 @@ export const generateMcOverviewBackupLayout: ViewGenerator<
               text: intl.formatMessage({
                 id: "module.genericBackup.restoreButtonLabel",
               }),
-              action: {
-                type: "open-modal",
-                modalKey: config.dataKey + BackupRestoreModalsKeys.Restore,
-                domain: BackupRestoreModalsKeys.Domain,
-              },
+              actions: [
+                {
+                  type: "open-modal",
+                  modalKey: config.dataKey + BackupRestoreModalsKeys.Restore,
+                  domain: BackupRestoreModalsKeys.Domain,
+                },
+              ],
             },
           },
           ...generateBackupRestoreModalLayout({
@@ -118,11 +120,13 @@ export const generateMcOverviewBackupLayout: ViewGenerator<
               text: intl.formatMessage({
                 id: "module.genericBackup.createButtonLabel",
               }),
-              action: {
-                type: "open-modal",
-                modalKey: config.dataKey + BackupModalsKeys.Create,
-                domain: BackupModalsKeys.Domain,
-              },
+              actions: [
+                {
+                  type: "open-modal",
+                  modalKey: config.dataKey + BackupModalsKeys.Create,
+                  domain: BackupModalsKeys.Domain,
+                },
+              ],
             },
           },
           ...generateBackupCreateModalLayout({
diff --git a/libs/generic-view/views/src/lib/mc-overview/summary/summary.ts b/libs/generic-view/views/src/lib/mc-overview/summary/summary.ts
index 57941fbac2..de756cce14 100644
--- a/libs/generic-view/views/src/lib/mc-overview/summary/summary.ts
+++ b/libs/generic-view/views/src/lib/mc-overview/summary/summary.ts
@@ -83,10 +83,12 @@ export const generateMcOverviewSummaryLayout: ViewGenerator<
             config: {
               text: config.aboutTitle!,
               icon: config.aboutIcon,
-              action: {
-                type: "navigate",
-                viewKey: "mc-overview/mc-about",
-              },
+              actions: [
+                {
+                  type: "navigate",
+                  viewKey: "mc-overview/mc-about",
+                },
+              ],
               modifiers: ["uppercase"],
             },
           },
diff --git a/libs/help/ui/src/lib/components/article-content.tsx b/libs/help/ui/src/lib/components/article-content.tsx
index 1141323307..00e0894849 100644
--- a/libs/help/ui/src/lib/components/article-content.tsx
+++ b/libs/help/ui/src/lib/components/article-content.tsx
@@ -74,10 +74,12 @@ export const ArticleContent: FunctionComponent = () => {
           <ButtonText
             config={
               {
-                action: {
-                  type: "custom",
-                  callback: openContactSupportFlow,
-                },
+                actions: [
+                  {
+                    type: "custom",
+                    callback: openContactSupportFlow,
+                  },
+                ],
                 modifiers: ["link", "hover-underline"],
               } as ButtonTextConfig
             }
diff --git a/libs/help/ui/src/lib/components/article-footer.tsx b/libs/help/ui/src/lib/components/article-footer.tsx
index a90b97dc14..d7c3063a41 100644
--- a/libs/help/ui/src/lib/components/article-footer.tsx
+++ b/libs/help/ui/src/lib/components/article-footer.tsx
@@ -32,10 +32,12 @@ export const ArticleFooter: FunctionComponent = () => {
       <ButtonPrimary
         config={{
           text: intl.formatMessage(messages.buttonLabel),
-          action: {
-            type: "custom",
-            callback: openSupportWebsite,
-          },
+          actions: [
+            {
+              type: "custom",
+              callback: openSupportWebsite,
+            },
+          ],
         }}
         data-testid={HelpTestId.ArticleFooterButton}
       />
diff --git a/libs/help/ui/src/lib/components/article-header.tsx b/libs/help/ui/src/lib/components/article-header.tsx
index 6162e42532..fbdbe8c697 100644
--- a/libs/help/ui/src/lib/components/article-header.tsx
+++ b/libs/help/ui/src/lib/components/article-header.tsx
@@ -24,10 +24,12 @@ export const ArticleHeader: FunctionComponent<Props> = ({ title }) => {
         data-testid={HelpTestId.ArticleBackButton}
         config={{
           text: "Back",
-          action: {
-            type: "custom",
-            callback: goBack,
-          },
+          actions: [
+            {
+              type: "custom",
+              callback: goBack,
+            },
+          ],
           icon: IconType.ArrowBack,
           modifiers: ["uppercase"],
         }}
diff --git a/libs/help/ui/src/lib/components/help-footer.tsx b/libs/help/ui/src/lib/components/help-footer.tsx
index 415e588065..fc26ae166a 100644
--- a/libs/help/ui/src/lib/components/help-footer.tsx
+++ b/libs/help/ui/src/lib/components/help-footer.tsx
@@ -45,10 +45,12 @@ export const HelpFooter: FunctionComponent = () => {
         }}
         config={{
           text: intl.formatMessage(messages.buttonLabel),
-          action: {
-            type: "custom",
-            callback: openContactSupportFlow,
-          },
+          actions: [
+            {
+              type: "custom",
+              callback: openContactSupportFlow,
+            },
+          ],
           icon: IconType.Support,
           modifiers: ["link", "uppercase"],
         }}
diff --git a/package-lock.json b/package-lock.json
index 10ca251a71..31e7496767 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,6 +115,7 @@
         "@wdio/reporter": "^8.40.3",
         "@wdio/spec-reporter": "^8.40.3",
         "@wdio/types": "^8.40.3",
+        "@welldone-software/why-did-you-render": "^8.0.3",
         "archiver": "^5.3.1",
         "async-mutex": "^0.4.0",
         "axios": "^0.27.2",
@@ -184,7 +185,7 @@
         "react-beautiful-dnd": "^13.1.1",
         "react-dom": "^18.2.0",
         "react-google-button": "^0.7.2",
-        "react-hook-form": "~7.50.1",
+        "react-hook-form": "~7.53.0",
         "react-intersection-observer": "^9.4.0",
         "react-intl": "6.4.7",
         "react-modal": "^3.15.1",
@@ -14676,6 +14677,18 @@
         }
       }
     },
+    "node_modules/@welldone-software/why-did-you-render": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@welldone-software/why-did-you-render/-/why-did-you-render-8.0.3.tgz",
+      "integrity": "sha512-bb5bKPMStYnocyTBVBu4UTegZdBqzV1mPhxc0UIV/S43KFUSRflux9gvzJfu2aM4EWLJ3egTvdjOi+viK+LKGA==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4"
+      },
+      "peerDependencies": {
+        "react": "^18"
+      }
+    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
@@ -38985,19 +38998,19 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.50.1",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.50.1.tgz",
-      "integrity": "sha512-3PCY82oE0WgeOgUtIr3nYNNtNvqtJ7BZjsbxh6TnYNbXButaD5WpjOmTjdxZfheuHKR68qfeFnEDVYoSSFPMTQ==",
+      "version": "7.53.0",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.0.tgz",
+      "integrity": "sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==",
       "dev": true,
       "engines": {
-        "node": ">=12.22.0"
+        "node": ">=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/react-hook-form"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17 || ^18"
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
       }
     },
     "node_modules/react-intersection-observer": {
diff --git a/package.json b/package.json
index c768938d4b..15af3d5607 100644
--- a/package.json
+++ b/package.json
@@ -144,6 +144,7 @@
     "@wdio/reporter": "^8.40.3",
     "@wdio/spec-reporter": "^8.40.3",
     "@wdio/types": "^8.40.3",
+    "@welldone-software/why-did-you-render": "^8.0.3",
     "archiver": "^5.3.1",
     "async-mutex": "^0.4.0",
     "axios": "^0.27.2",
@@ -213,7 +214,7 @@
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^18.2.0",
     "react-google-button": "^0.7.2",
-    "react-hook-form": "~7.50.1",
+    "react-hook-form": "~7.53.0",
     "react-intersection-observer": "^9.4.0",
     "react-intl": "6.4.7",
     "react-modal": "^3.15.1",

From f5c664ba2af675db3275740cc0a12ed6294739a8 Mon Sep 17 00:00:00 2001
From: MateuszMudita <165778944+MateuszMudita@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:38:37 +0200
Subject: [PATCH 29/64] [CP-3026] [CP-3027] Download image and script and
 unpack it for Msc Harmony - Linux and Mac (#2059)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 .../mudita-center-server-routes.ts            |   1 +
 .../renderer/locales/default/en-US.json       |  13 +-
 .../__deprecated__/renderer/store/reducers.ts |   2 +
 .../apps/base-app/base-app-routes.tsx         |  17 +-
 libs/core/core/styles/theming/theme.ts        |   2 +
 .../settings/static/app-configuration.json    |   5 +-
 .../update/reducers/update-os.reducer.test.ts |  18 +-
 .../store/src/lib/action-names.ts             |   3 +
 libs/generic-view/ui/src/index.ts             |   2 +-
 .../interactive/form/input/checkbox-input.tsx |   1 +
 .../recovery-mode/recovery-mode.tsx           | 188 ------------
 libs/msc-flash/msc-flash-harmony/.babelrc     |  20 ++
 .../msc-flash-harmony/.eslintrc.json          |  18 ++
 libs/msc-flash/msc-flash-harmony/README.md    |   7 +
 .../msc-flash-harmony/jest.config.ts          |  11 +
 libs/msc-flash/msc-flash-harmony/project.json |  20 ++
 libs/msc-flash/msc-flash-harmony/src/index.ts |  11 +
 .../get-msc-flashing-files-details.action.ts  |  32 ++
 .../src/lib/actions/index.ts                  |   7 +
 .../set-flashing-process-state.action.ts      |  12 +
 .../flashing-process-state.constant.ts        |  15 +
 .../src/lib/constants/index.ts                |   9 +
 .../lib/constants/os-environment.constant.ts  |  10 +
 .../src/lib/constants/platform.constant.ts    |  10 +
 .../src/lib/constants/product.constant.ts     |   8 +
 .../msc-flash-harmony/src/lib/dto/index.ts    |   6 +
 .../src/lib/dto/msc-flash-details.object.ts   |  21 ++
 .../src/lib/reducers/flashing.interface.ts    |  13 +
 .../src/lib/reducers/flashing.reducer.ts      |  28 ++
 .../src/lib/reducers/index.ts                 |   7 +
 .../download-flashing-file.request.ts         |  36 +++
 .../src/lib/requests/index.ts                 |   6 +
 .../src/lib/selectors/index.ts                |   6 +
 .../src/lib/selectors/msc-flash.selector.ts   |  13 +
 .../device-flash/device-flash.factory.ts      |  21 ++
 .../device-flash/device-flash.interface.ts    |  12 +
 .../linux-device-flash.service.ts             |  88 ++++++
 .../linux-partition-parser.test.ts            |  79 +++++
 .../device-flash/linux-partition-parser.ts    |  45 +++
 .../lib/services/flash-msc-device.service.ts  | 120 ++++++++
 .../src/lib/services/index.ts                 |   9 +
 .../lib/services/msc-flash-details.service.ts |  28 ++
 .../remove-downloaded-msc-files.service.ts    |  24 ++
 .../src/lib/services/unpack-flashing-image.ts |  28 ++
 .../msc-flash-harmony/src/lib/ui/index.ts     |   6 +
 .../recovery-mode-modal.component.tsx         |  93 ++++++
 .../recovery-mode-modal.styled.tsx            |  46 +++
 .../src/lib/ui/recovery-mode.tsx              | 283 ++++++++++++++++++
 .../restarting-device-modal.component.tsx     |  39 +++
 .../msc-flash/msc-flash-harmony/tsconfig.json |  20 ++
 .../msc-flash-harmony/tsconfig.lib.json       |  24 ++
 .../msc-flash-harmony/tsconfig.spec.json      |  20 ++
 libs/shared/utils/src/index.ts                |   1 +
 .../utils/src/lib/exec-command-with-sudo.ts   |  31 ++
 tsconfig.base.json                            |   1 +
 55 files changed, 1384 insertions(+), 212 deletions(-)
 delete mode 100644 libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/.babelrc
 create mode 100644 libs/msc-flash/msc-flash-harmony/.eslintrc.json
 create mode 100644 libs/msc-flash/msc-flash-harmony/README.md
 create mode 100644 libs/msc-flash/msc-flash-harmony/jest.config.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/project.json
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/actions/set-flashing-process-state.action.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/constants/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/constants/os-environment.constant.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/constants/platform.constant.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/constants/product.constant.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/dto/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/dto/msc-flash-details.object.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/reducers/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/requests/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/remove-downloaded-msc-files.service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.component.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.styled.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/tsconfig.json
 create mode 100644 libs/msc-flash/msc-flash-harmony/tsconfig.lib.json
 create mode 100644 libs/msc-flash/msc-flash-harmony/tsconfig.spec.json
 create mode 100644 libs/shared/utils/src/lib/exec-command-with-sudo.ts

diff --git a/libs/core/__deprecated__/api/mudita-center-server/mudita-center-server-routes.ts b/libs/core/__deprecated__/api/mudita-center-server/mudita-center-server-routes.ts
index 7e7aa5189a..6e845e328a 100644
--- a/libs/core/__deprecated__/api/mudita-center-server/mudita-center-server-routes.ts
+++ b/libs/core/__deprecated__/api/mudita-center-server/mudita-center-server-routes.ts
@@ -8,4 +8,5 @@ export enum MuditaCenterServerRoutes {
   GetReleaseV2 = "v2-get-release",
   AppConfigurationV2 = "v2-app-configuration",
   ExternalUsageDevice = "external-usage-device",
+  GetMscFlashDetails = "msc-flash",
 }
diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index a75cfdc989..27135417b5 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -998,13 +998,24 @@
   "module.genericViews.dataMigration.success.buttonLabel": "Ok",
   "module.recoveryMode.harmony.title": "Recovery Mode",
   "module.recoveryMode.harmony.header": "Harmony is Ready for Recovery",
-  "module.recoveryMode.harmony.description": "Please read the instructions carefully. Not following the instructions may void the\nwarrenty!",
+  "module.recoveryMode.harmony.description": "Please read the instructions carefully. Not following the instructions may void the\nwarranty!",
   "module.recoveryMode.harmony.warning1": "Make sure your device is running <b>OS 1.9.0 or later.</b>",
   "module.recoveryMode.harmony.warning2": "Once you start the recovery, it must not be cancelled or interrupted.",
   "module.recoveryMode.harmony.warning3": "Do not disconnect your Harmony during the recovery process.",
   "module.recoveryMode.harmony.warning4": "Before starting the recovery, charge your device for 1 hour (or more) from a suitable power outlet.",
+  "module.recoveryMode.harmony.warningLinux": "Make sure your computer is running <b>Ubuntu 22.04 or later.</b>",
   "module.recoveryMode.harmony.confirmation": "I understand that not following these instructions may void the warranty",
   "module.recoveryMode.harmony.action": "Start Recovery",
+  "module.recoveryMode.modal.message": "Recovery mode in progress...",
+  "module.recoveryMode.modal.warning": "Warning!",
+  "module.recoveryMode.modal.warningMessage": "Do not disconnect Harmony or interrupt the process!",
+  "module.recoveryMode.modal.step0": "Initializing...",
+  "module.recoveryMode.modal.step1": "Configuration downloading... (1 of 4)",
+  "module.recoveryMode.modal.step2": "Image downloading... (2 of 4)",
+  "module.recoveryMode.modal.step3": "Image unpacking... (3 of 4)",
+  "module.recoveryMode.modal.step4": "Flashing process... (4 of 4)",
+  "module.recoveryMode.modal.restarting.subtitle": "Restarting Harmony...",
+  "module.recoveryMode.modal.restarting.message": "Please do not disconnect your Harmony.",
   "module.genericViews.dataMigration.cancelConfirm.title": "Cancel data transfer?",
   "module.genericViews.dataMigration.cancelConfirm.description": "We’ll stop the transfer but some data may already be on your Kompakt.",
   "module.genericViews.dataMigration.cancelConfirm.cancelButtonLabel": "Cancel transfer",
diff --git a/libs/core/__deprecated__/renderer/store/reducers.ts b/libs/core/__deprecated__/renderer/store/reducers.ts
index ab36d034c1..efb00e5d2d 100644
--- a/libs/core/__deprecated__/renderer/store/reducers.ts
+++ b/libs/core/__deprecated__/renderer/store/reducers.ts
@@ -38,6 +38,7 @@ import {
 import { appStateReducer } from "shared/app-state"
 import { activeDeviceRegistryReducer } from "active-device-registry/feature"
 import { helpReducer } from "help/store"
+import { flashingReducer } from "msc-flash-harmony"
 
 export const reducers = {
   device: deviceReducer,
@@ -70,6 +71,7 @@ export const reducers = {
   dataMigration: dataMigrationReducer,
   genericDataTransfer: genericDataTransferReducer,
   helpV2: helpReducer,
+  flashing: flashingReducer,
   genericEntities: genericEntitiesReducer,
   genericToasts: genericToastsReducer,
 }
diff --git a/libs/core/core/components/apps/base-app/base-app-routes.tsx b/libs/core/core/components/apps/base-app/base-app-routes.tsx
index 6ffa8f0216..982cb1673b 100644
--- a/libs/core/core/components/apps/base-app/base-app-routes.tsx
+++ b/libs/core/core/components/apps/base-app/base-app-routes.tsx
@@ -32,12 +32,9 @@ import AvailableDeviceListContainer from "Core/discovery-device/components/avail
 import DeviceConnecting from "Core/discovery-device/components/device-connecting.component"
 import ManageSounds from "Core/files-manager/components/manage-sounds.component"
 import { GenericView } from "generic-view/feature"
-import {
-  APIConnectionDemo,
-  DataMigrationPage,
-  RecoveryModePage,
-} from "generic-view/ui"
+import { APIConnectionDemo, DataMigrationPage } from "generic-view/ui"
 import { ArticlePage, HelpPage } from "help/ui"
+import { RecoveryModePage } from "msc-flash-harmony"
 
 // AUTO DISABLED - fix me if you like :)
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
@@ -134,17 +131,15 @@ export default () => (
               key="help-category-article"
               path={`${URL_MAIN.help}/:categoryId/:articleId`}
               component={ArticlePage}
-            />,
+            />
+            ,
             <Route
               key="help-category"
               path={`${URL_MAIN.help}/:categoryId`}
               component={HelpPage}
-            />,
-            <Route
-              key="help-root"
-              path={URL_MAIN.help}
-              component={HelpPage}
             />
+            ,
+            <Route key="help-root" path={URL_MAIN.help} component={HelpPage} />
             <Route
               path={`${URL_MAIN.settings}${URL_TABS.about}`}
               component={AboutContainer}
diff --git a/libs/core/core/styles/theming/theme.ts b/libs/core/core/styles/theming/theme.ts
index 368c882a9d..0afb1dde30 100644
--- a/libs/core/core/styles/theming/theme.ts
+++ b/libs/core/core/styles/theming/theme.ts
@@ -26,6 +26,7 @@ const transparentBlack3 = "rgba(0, 0, 0, 0.3)"
 const red = "#e96a6a"
 const green = "#dfefde"
 const orange = "#FD9900"
+const darkOrange = "#DD802A"
 
 const white = "#ffffff"
 
@@ -78,6 +79,7 @@ const theme = {
       tetheringSeparator: blue3,
       deviceListSeparator: grey5,
       deviceListSeparatorHover: grey4,
+      warning: darkOrange,
     },
     boxShadow: {
       full: transparentBlack2,
diff --git a/libs/core/settings/static/app-configuration.json b/libs/core/settings/static/app-configuration.json
index 93d2062e87..56fe0f1dfc 100644
--- a/libs/core/settings/static/app-configuration.json
+++ b/libs/core/settings/static/app-configuration.json
@@ -1 +1,4 @@
-{"centerVersion": "2.3.1", "productVersions": {"MuditaPure": "1.12.0", "MuditaHarmony": "2.8.0"}}
+{
+  "centerVersion": "2.3.1",
+  "productVersions": { "MuditaPure": "1.12.0", "MuditaHarmony": "2.8.0" }
+}
diff --git a/libs/core/update/reducers/update-os.reducer.test.ts b/libs/core/update/reducers/update-os.reducer.test.ts
index a957e9eb44..5102111e64 100644
--- a/libs/core/update/reducers/update-os.reducer.test.ts
+++ b/libs/core/update/reducers/update-os.reducer.test.ts
@@ -24,17 +24,15 @@ import {
 } from "Core/__deprecated__/renderer/store"
 import { CheckForUpdateState } from "../constants/check-for-update-state.constant"
 
-const mockHistory = {
-  push: jest.fn(),
-  replace: jest.fn(),
-  go: jest.fn(),
-  block: jest.fn(),
-  listen: jest.fn(),
-  location: { pathname: "", search: "", hash: "", state: null },
-}
-
 jest.mock("history", () => ({
-  createHashHistory: jest.fn(() => mockHistory),
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
 }))
 
 const exampleError = new AppError(
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index dbac0d8c57..265f550458 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -89,6 +89,9 @@ export enum ActionName {
   HelpSetData = "help/set-data",
   HelpRateArticle = "help/rate-article",
 
+  MscFlashingGetFilesDetails = "msc-flashing/get-files-details",
+  MscFlashingSetProcessState = "msc-flashing/set-process-state",
+
   GetEntitiesConfig = "entities/get-entities-config",
   SetEntitiesConfig = "entities/set-entities-config",
   SetEntitiesData = "entities/set-entities-data",
diff --git a/libs/generic-view/ui/src/index.ts b/libs/generic-view/ui/src/index.ts
index 932b0da6ef..64a1074858 100644
--- a/libs/generic-view/ui/src/index.ts
+++ b/libs/generic-view/ui/src/index.ts
@@ -27,7 +27,7 @@ export * from "./lib/predefined/backup-restore/backup-restore-error"
 export * from "./lib/predefined/import-contacts/import-contacts-error"
 export * from "./lib/predefined/data-migration/components/transfer-error-modal"
 export { DataMigrationPage } from "./lib/predefined/data-migration/data-migration"
-export { RecoveryModePage } from "./lib/predefined/recovery-mode/recovery-mode"
+export { RecoveryModePage } from "msc-flash-harmony"
 export * from "./lib/buttons/button-text"
 export * from "./lib/buttons/button-primary"
 export * from "./lib/texts/paragraphs"
diff --git a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
index 96a124bc52..28371eb0a1 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/input/checkbox-input.tsx
@@ -131,6 +131,7 @@ const Wrapper = styled.div<{ $size: Config["size"] }>`
   align-items: center;
   width: min-content;
   height: min-content;
+  max-width: 100%;
   ${({ $size }) => {
     switch ($size) {
       case "small":
diff --git a/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx b/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
deleted file mode 100644
index 68f3fe229d..0000000000
--- a/libs/generic-view/ui/src/lib/predefined/recovery-mode/recovery-mode.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import React, { useState } from "react"
-import { FunctionComponent } from "Core/core/types/function-component.interface"
-import styled from "styled-components"
-import { defineMessages } from "react-intl"
-import { intl, textFormatters } from "Core/__deprecated__/renderer/utils/intl"
-import { GenericThemeProvider } from "generic-view/theme"
-import { H3 } from "../../texts/headers"
-import { P3 } from "../../texts/paragraphs"
-import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
-import Icon, {
-  IconSize,
-} from "Core/__deprecated__/renderer/components/core/icon/icon.component"
-import { Form } from "../../interactive/form/form"
-import { WarrningBox } from "../../shared/shared"
-import { ButtonPrimary } from "../../buttons/button-primary"
-
-const messages = defineMessages({
-  header: {
-    id: "module.recoveryMode.harmony.header",
-  },
-  description: {
-    id: "module.recoveryMode.harmony.description",
-  },
-  warning1: {
-    id: "module.recoveryMode.harmony.warning1",
-  },
-  warning2: {
-    id: "module.recoveryMode.harmony.warning2",
-  },
-  warning3: {
-    id: "module.recoveryMode.harmony.warning3",
-  },
-  warning4: {
-    id: "module.recoveryMode.harmony.warning4",
-  },
-  confirmation: {
-    id: "module.recoveryMode.harmony.confirmation",
-  },
-  button: {
-    id: "module.recoveryMode.harmony.action",
-  },
-})
-
-const RecoveryModeUI: FunctionComponent = () => {
-  const [isConfirmed, setIsConfirmed] = useState(false)
-
-  const handleCheckboxChange = () => {
-    setIsConfirmed((prevIsConfirmed) => !prevIsConfirmed)
-  }
-
-  const onStartRecovery = () => {
-    // will be finished in next PR
-  }
-
-  return (
-    <Wrapper>
-      <Header>
-        <Icon type={IconType.RecoveryModeBlack} size={IconSize.ExtraLarge} />
-        <H3>{intl.formatMessage(messages.header)}</H3>
-        <P3>{intl.formatMessage(messages.description)}</P3>
-      </Header>
-      <WarrningBox>
-        <Warning>
-          <ul>
-            <li>
-              <P3>{intl.formatMessage(messages.warning1, textFormatters)}</P3>
-            </li>
-            <li>
-              <P3>{intl.formatMessage(messages.warning2)}</P3>
-            </li>
-            <li>
-              <P3>{intl.formatMessage(messages.warning3)}</P3>
-            </li>
-            <li>
-              <P3>{intl.formatMessage(messages.warning4)}</P3>
-            </li>
-          </ul>
-          <Form>
-            <Confirmation>
-              <Form.CheckboxInput
-                config={{
-                  name: "confirmation",
-                  value: "confirmation",
-                  label: intl.formatMessage(messages.confirmation),
-                  checked: isConfirmed,
-                  onToggle: handleCheckboxChange,
-                }}
-              />
-            </Confirmation>
-          </Form>
-          <Footer>
-            <ButtonPrimary
-              config={{
-                text: intl.formatMessage(messages.button),
-                actions: [
-                  {
-                    type: "custom",
-                    callback: onStartRecovery,
-                  },
-                ],
-                disabled: !isConfirmed,
-              }}
-            />
-          </Footer>
-        </Warning>
-      </WarrningBox>
-    </Wrapper>
-  )
-}
-
-export const RecoveryModePage: FunctionComponent = () => {
-  return (
-    <GenericThemeProvider>
-      <RecoveryModeUI />
-    </GenericThemeProvider>
-  )
-}
-
-const Wrapper = styled.div`
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 2.4rem;
-  align-items: center;
-  padding-top: 4.7rem;
-  background: ${({ theme }) => theme.color.white};
-`
-
-const Header = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  gap: 1.4rem;
-
-  p {
-    text-align: center;
-  }
-`
-
-const Warning = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 2.4rem;
-
-  ul {
-    display: flex;
-    flex-direction: column;
-    gap: 0.8rem;
-    margin: 0;
-    padding-left: 1rem;
-  }
-`
-
-const Confirmation = styled.div`
-  display: flex;
-  align-items: center;
-
-  label {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    font-size: 1.4rem;
-    font-weight: 700;
-  }
-
-  input + label {
-    align-items: center;
-  }
-
-  input + label div:first-child {
-    align-self: center;
-  }
-`
-
-const Footer = styled.div`
-  display: flex;
-  justify-content: center;
-
-  button {
-    width: 18rem;
-  }
-`
diff --git a/libs/msc-flash/msc-flash-harmony/.babelrc b/libs/msc-flash/msc-flash-harmony/.babelrc
new file mode 100644
index 0000000000..ef4889c1ab
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/.babelrc
@@ -0,0 +1,20 @@
+{
+  "presets": [
+    [
+      "@nx/react/babel",
+      {
+        "runtime": "automatic",
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
+  "plugins": [
+    [
+      "styled-components",
+      {
+        "pure": true,
+        "ssr": true
+      }
+    ]
+  ]
+}
diff --git a/libs/msc-flash/msc-flash-harmony/.eslintrc.json b/libs/msc-flash/msc-flash-harmony/.eslintrc.json
new file mode 100644
index 0000000000..cacbe26215
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../.eslintrc.js"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/msc-flash/msc-flash-harmony/README.md b/libs/msc-flash/msc-flash-harmony/README.md
new file mode 100644
index 0000000000..4cbb589ae7
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/README.md
@@ -0,0 +1,7 @@
+# msc-flash-harmony
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test msc-flash-harmony` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/msc-flash/msc-flash-harmony/jest.config.ts b/libs/msc-flash/msc-flash-harmony/jest.config.ts
new file mode 100644
index 0000000000..7d1948792a
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: "msc-flash-harmony",
+  preset: "../../../jest.preset.js",
+  transform: {
+    "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "@nx/react/plugins/jest",
+    "^.+\\.[tj]sx?$": ["babel-jest", { presets: ["@nx/react/babel"] }],
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx"],
+  coverageDirectory: "../../../coverage/libs/msc-flash/msc-flash-harmony",
+}
diff --git a/libs/msc-flash/msc-flash-harmony/project.json b/libs/msc-flash/msc-flash-harmony/project.json
new file mode 100644
index 0000000000..d73250f78e
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/project.json
@@ -0,0 +1,20 @@
+{
+  "name": "msc-flash-harmony",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/msc-flash/msc-flash-harmony/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/msc-flash/msc-flash-harmony/jest.config.ts"
+      }
+    }
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/index.ts b/libs/msc-flash/msc-flash-harmony/src/index.ts
new file mode 100644
index 0000000000..7c6b288621
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./lib/actions"
+export * from "./lib/constants"
+export * from "./lib/dto"
+export * from "./lib/reducers"
+export * from "./lib/services"
+export * from "./lib/ui"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
new file mode 100644
index 0000000000..1de77fe514
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { MscFlashDetails } from "../dto"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { ActionName } from "generic-view/store"
+import { OsEnvironment, SupportedPlatform, Product } from "../constants"
+import { MscFlashDetailsService } from "../services/msc-flash-details.service"
+
+export const getMscFlashingFilesDetails = createAsyncThunk<
+  MscFlashDetails,
+  { product: Product; environment: OsEnvironment; platform: SupportedPlatform },
+  { state: ReduxRootState }
+>(
+  ActionName.MscFlashingGetFilesDetails,
+  async ({ product, environment, platform }, { rejectWithValue }) => {
+    try {
+      const filesDetails = await MscFlashDetailsService.getMscFlashDetails(
+        product,
+        environment,
+        platform
+      )
+
+      return filesDetails
+    } catch (error) {
+      return rejectWithValue(error || "Failed to fetch flashing files")
+    }
+  }
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
new file mode 100644
index 0000000000..959991a805
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./get-msc-flashing-files-details.action"
+export * from "./set-flashing-process-state.action"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/set-flashing-process-state.action.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/set-flashing-process-state.action.ts
new file mode 100644
index 0000000000..b9f6c5c1d2
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/set-flashing-process-state.action.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction } from "@reduxjs/toolkit"
+import { ActionName } from "generic-view/store"
+import { FlashingProcessState } from "../constants"
+
+export const setFlashingProcessState = createAction<FlashingProcessState>(
+  ActionName.MscFlashingSetProcessState
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
new file mode 100644
index 0000000000..6ab8de0ea3
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum FlashingProcessState {
+  Idle = "idle",
+  GettingFilesDetails = "getting-files-details",
+  DownloadingFiles = "downloading-files",
+  UnpackingFiles = "unpacking-files",
+  FlashingProcess = "flashing-process",
+  Restarting = "restarting-device",
+  Completed = "completed",
+  Failed = "failed",
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/index.ts
new file mode 100644
index 0000000000..90e02393cf
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/index.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./platform.constant"
+export * from "./product.constant"
+export * from "./os-environment.constant"
+export * from "./flashing-process-state.constant"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/os-environment.constant.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/os-environment.constant.ts
new file mode 100644
index 0000000000..e77db28b2b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/os-environment.constant.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum OsEnvironment {
+  Production = "production",
+  TestProduction = "test-production",
+  Daily = "daily",
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/platform.constant.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/platform.constant.ts
new file mode 100644
index 0000000000..d1a55d5480
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/platform.constant.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum SupportedPlatform {
+  MacOs = "macos",
+  Linux = "linux",
+  Windows = "windows",
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/product.constant.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/product.constant.ts
new file mode 100644
index 0000000000..cb5a47abf0
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/product.constant.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum Product {
+  MscHarmony = "MscHarmony",
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/dto/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/dto/index.ts
new file mode 100644
index 0000000000..2a04371444
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/dto/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./msc-flash-details.object"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/dto/msc-flash-details.object.ts b/libs/msc-flash/msc-flash-harmony/src/lib/dto/msc-flash-details.object.ts
new file mode 100644
index 0000000000..fb99b9471e
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/dto/msc-flash-details.object.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { Product } from "Core/update/constants"
+import { SupportedPlatform } from "Libs/msc-flash/msc-flash-harmony/src/lib/constants"
+
+interface File {
+  url: string
+  name: string
+  size?: number
+}
+
+export interface MscFlashDetails {
+  version: string
+  product: Product
+  platform: SupportedPlatform
+  image: File
+  scripts: File[]
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
new file mode 100644
index 0000000000..cc6d7baf0a
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { FlashingProcessState } from "../constants"
+import { MscFlashDetails } from "../dto"
+
+export interface FlashingState {
+  processState: FlashingProcessState
+  mscFlashDetails?: MscFlashDetails
+  error: string | undefined
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
new file mode 100644
index 0000000000..ea9c2d323b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createReducer } from "@reduxjs/toolkit"
+import { FlashingState } from "./flashing.interface"
+import { getMscFlashingFilesDetails, setFlashingProcessState } from "../actions"
+import { FlashingProcessState } from "../constants"
+
+const initialState: FlashingState = {
+  processState: FlashingProcessState.Idle,
+  mscFlashDetails: undefined,
+  error: undefined,
+}
+
+export const flashingReducer = createReducer<FlashingState>(
+  initialState,
+  (builder) => {
+    builder
+      .addCase(getMscFlashingFilesDetails.fulfilled, (state, action) => {
+        state.mscFlashDetails = action.payload
+      })
+      .addCase(setFlashingProcessState, (state, action) => {
+        state.processState = action.payload
+      })
+  }
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/index.ts
new file mode 100644
index 0000000000..455a6c3765
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./flashing.interface"
+export * from "./flashing.reducer"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts b/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
new file mode 100644
index 0000000000..3247972cd6
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { Result, ResultObject } from "Core/core/builder"
+import { AppError } from "Core/core/errors"
+import { PureOsDownloadChannels } from "Core/__deprecated__/main/functions/register-pure-os-download-listener"
+import {
+  DownloadFinished,
+  DownloadStatus,
+} from "Core/__deprecated__/renderer/interfaces/file-download.interface"
+import { ipcRenderer } from "electron-better-ipc"
+
+// AUTO DISABLED - fix me if you like :)
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const cancelFileDownload = (interrupt = false) => {
+  ipcRenderer.send(PureOsDownloadChannels.cancel, interrupt)
+}
+
+export const downloadFlashingFileRequest = async (props: {
+  url: string
+  fileName: string
+}): Promise<
+  | ResultObject<DownloadFinished>
+  | ResultObject<DownloadStatus.Cancelled | DownloadStatus.Interrupted>
+> => {
+  const data: DownloadFinished = await ipcRenderer.callMain(
+    PureOsDownloadChannels.start,
+    props
+  )
+
+  return data.status === DownloadStatus.Completed
+    ? Result.success(data)
+    : Result.failed(new AppError("", ""), data.status)
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/requests/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/requests/index.ts
new file mode 100644
index 0000000000..0e47a7829b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/requests/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./download-flashing-file.request"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
new file mode 100644
index 0000000000..582f1c40a5
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./msc-flash.selector"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts
new file mode 100644
index 0000000000..61dfee9a74
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { FlashingProcessState } from "../constants"
+
+export const selectFlashingProcessState = createSelector(
+  (state: ReduxRootState) => state.flashing.processState,
+  (processState: FlashingProcessState) => processState
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
new file mode 100644
index 0000000000..086a30a03b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import IDeviceFlash from "./device-flash.interface"
+import LinuxDeviceFlashService from "./linux-device-flash.service"
+
+class DeviceFlashFactory {
+  static createDeviceFlashService(): IDeviceFlash {
+    const platform = process.platform
+
+    if (platform === "linux") {
+      return new LinuxDeviceFlashService()
+    } else {
+      throw new Error(`Unsupported platform: ${platform}`)
+    }
+  }
+}
+
+export default DeviceFlashFactory
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
new file mode 100644
index 0000000000..39f0662094
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+interface IDeviceFlash {
+  findDeviceByDeviceName(deviceName?: string): Promise<string>
+
+  execute(device: string, imagePath: string, scriptPath: string): Promise<void>
+}
+
+export default IDeviceFlash
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts
new file mode 100644
index 0000000000..6ab60d2401
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+import { execPromise, execCommandWithSudo } from "shared/utils"
+import IDeviceFlash from "./device-flash.interface"
+import LinuxPartitionParser from "./linux-partition-parser"
+
+class LinuxDeviceFlashService implements IDeviceFlash {
+  async findDeviceByDeviceName(deviceName: string): Promise<string> {
+    console.log(`Searching for device with model name: ${deviceName}`)
+    const devices = await this.getDevices()
+
+    for (const device of devices) {
+      if (device.includes(deviceName)) {
+        return device.split(" ")[0]
+      }
+    }
+    console.error(`${deviceName} device model not found`)
+    process.exit(1)
+  }
+
+  async execute(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<void> {
+    const unmountDeviceCommand = await this.getUnmountDeviceCommand(device)
+    const flashImageToDeviceCommand = await this.getFlashImageToDeviceCommand(
+      device,
+      imagePath,
+      scriptPath
+    )
+    const ejectDeviceCommand = await this.getEjectDeviceCommand(device)
+
+    const command = `${unmountDeviceCommand} && ${flashImageToDeviceCommand} && ${ejectDeviceCommand}`
+    await execCommandWithSudo(command, { name: "Mudita Auto Flash" })
+
+    console.log("Flash process completed successfully")
+  }
+
+  private async getUnmountDeviceCommand(device: string): Promise<string> {
+    const partitions = await this.getPartitions(device)
+    const partitionsString = partitions
+      .map((partition) => `/dev/${partition}`)
+      .join(" ")
+
+    return `umount ${partitionsString} 2>/dev/null || true`
+  }
+
+  private async getFlashImageToDeviceCommand(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<string> {
+    const [path, scriptBasename] =
+      this.splitPathToDirnameAndBasename(scriptPath)
+    const [, imageBasename] = this.splitPathToDirnameAndBasename(imagePath)
+    return `chmod +x ${scriptPath} && cd ${path} && ./${scriptBasename} ${imageBasename} /dev/${device}`
+  }
+
+  private async getEjectDeviceCommand(device: string): Promise<string> {
+    return `eject /dev/${device} 2>/dev/null || true`
+  }
+
+  private async getDevices(): Promise<string[]> {
+    const devices = await execPromise("lsblk -o NAME,MODEL")
+
+    return devices?.split("\n") ?? []
+  }
+
+  private async getPartitions(device: string): Promise<string[]> {
+    const partitions = await execPromise(
+      `lsblk /dev/${device} -o NAME,MOUNTPOINT`
+    )
+    return LinuxPartitionParser.parsePartitions(partitions ?? "")
+  }
+
+  private splitPathToDirnameAndBasename(currentPath: string) {
+    const dirname = path.dirname(currentPath)
+    const basename = path.basename(currentPath)
+    return [dirname, basename]
+  }
+}
+
+export default LinuxDeviceFlashService
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts
new file mode 100644
index 0000000000..2cb77414c0
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import LinuxPartitionParser from "./linux-partition-parser"
+
+describe("LinuxPartitionParser", () => {
+  test("correctly parses partitions from 'sdb' device output", () => {
+    const execOutput = `
+NAME   MOUNTPOINT
+sdb
+├─sdb1 /media/system_a
+├─sdb2 /media/system_b
+└─sdb3 /media/user
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual(["sdb1", "sdb2", "sdb3"])
+  })
+
+  test("correctly parses partitions from a device with a custom name", () => {
+    const execOutput = `
+NAME        MOUNTPOINT
+nvme0n1
+├─nvme0n1p1 /boot
+├─nvme0n1p2 /
+└─nvme0n1p3 /home
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual(["nvme0n1p1", "nvme0n1p2", "nvme0n1p3"])
+  })
+
+  test("returns an empty array when no partitions are found", () => {
+    const execOutput = `
+NAME   MOUNTPOINT
+sdb
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual([])
+  })
+
+  test("correctly handles irregular formatting", () => {
+    const execOutput = `
+NAME   MOUNTPOINT
+  sdb
+├─   sdb1   /media/system_a
+├─sdb2       /media/system_b
+└─sdb3       /media/user
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual(["sdb1", "sdb2", "sdb3"])
+  })
+
+  test("correctly parses partitions when mountpoints are missing", () => {
+    const execOutput = `
+NAME   MOUNTPOINT
+sdb
+├─sdb1
+├─sdb2
+└─sdb3
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual(["sdb1", "sdb2", "sdb3"])
+  })
+
+  test('ignores non-partition lines like "NAME" and "MOUNTPOINT"', () => {
+    const execOutput = `
+NAME   MOUNTPOINT
+sdb
+├─sdb1 /media/system_a
+├─sdb2 /media/system_b
+NAME
+MOUNTPOINT
+└─sdb3 /media/user
+`
+    const result = LinuxPartitionParser.parsePartitions(execOutput)
+    expect(result).toEqual(["sdb1", "sdb2", "sdb3"])
+  })
+})
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts
new file mode 100644
index 0000000000..061d91eaad
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export class LinuxPartitionParser {
+  public static parsePartitions(execOutput: string): string[] {
+    const partitions: string[] = [];
+    const lines = execOutput.split("\n");
+
+    let deviceName: string | null = null;
+
+    for (const rawLine of lines) {
+      const line = rawLine.trim();
+
+      if (!line || line.startsWith("NAME") || line.startsWith("MOUNTPOINT")) {
+        continue;
+      }
+
+      const name = LinuxPartitionParser.extractName(line);
+
+      if (!name) {
+        continue;
+      }
+
+      if (!deviceName) {
+        deviceName = name;
+        continue;
+      }
+
+      if (name !== deviceName) {
+        partitions.push(name);
+      }
+    }
+
+    return partitions;
+  }
+
+  private static extractName(line: string): string | null {
+    const match = /^\W*(\w+)/.exec(line);
+    return match ? match[1] : null;
+  }
+}
+
+export default LinuxPartitionParser;
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
new file mode 100644
index 0000000000..97f1c48277
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { FlashingProcessState, SupportedPlatform, Product } from "../constants"
+import { setFlashingProcessState } from "../actions/set-flashing-process-state.action"
+import { getMscFlashingFilesDetails } from "../actions/get-msc-flashing-files-details.action"
+import { MscFlashDetails } from "../dto"
+import { downloadFlashingFileRequest } from "../requests"
+import { unpackFlashingImageService } from "./unpack-flashing-image"
+import DeviceFlashFactory from "./device-flash/device-flash.factory"
+import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
+
+const IMAGE_FILE_NAME = "BellHybrid.img"
+import { RELEASE_SPACE } from "Core/update/constants/release-space.constant"
+import { removeDownloadedMscFiles } from "./remove-downloaded-msc-files.service"
+
+export const flashMscDeviceService =
+  () => async (dispatch: Dispatch, getState: () => ReduxRootState) => {
+    try {
+      await getFlashingImageDetails(dispatch)
+
+      const mscFlashingFiles = getState().flashing.mscFlashDetails
+
+      if (mscFlashingFiles) {
+        await downloadFlashingFiles(dispatch, mscFlashingFiles)
+        await unpackFlashingImage(dispatch, mscFlashingFiles)
+        await startFlashingProcess(dispatch, mscFlashingFiles)
+        await removeDownloadedMscFiles()
+      }
+    } catch (error) {
+      console.error("Error during flashing process:", error)
+      dispatch(setFlashingProcessState(FlashingProcessState.Failed))
+      await removeDownloadedMscFiles()
+    }
+  }
+
+const getFlashingImageDetails = async (dispatch: Dispatch) => {
+  dispatch(setFlashingProcessState(FlashingProcessState.GettingFilesDetails))
+
+  let platform: SupportedPlatform
+
+  if (process.platform === "darwin") {
+    platform = SupportedPlatform.MacOs
+  } else if (process.platform === "linux") {
+    platform = SupportedPlatform.Linux
+  } else if (process.platform === "win32") {
+    platform = SupportedPlatform.Windows
+  } else {
+    throw new Error(`Unsupported platform: ${process.platform}`)
+  }
+
+  await dispatch(
+    getMscFlashingFilesDetails({
+      product: Product.MscHarmony,
+      environment: RELEASE_SPACE,
+      platform: platform,
+    })
+  )
+}
+
+const downloadFlashingFiles = async (
+  dispatch: Dispatch,
+  mscFlashingFiles: MscFlashDetails
+) => {
+  dispatch(setFlashingProcessState(FlashingProcessState.DownloadingFiles))
+
+  for (const file of [mscFlashingFiles.image, ...mscFlashingFiles.scripts]) {
+    const downloadResult = await downloadFlashingFileRequest({
+      url: file.url,
+      fileName: file.name,
+    })
+    if (!downloadResult.ok) {
+      throw new Error(`Failed to download file: ${file.name}`)
+    }
+  }
+}
+
+const unpackFlashingImage = async (
+  dispatch: Dispatch,
+  mscFlashingFiles: MscFlashDetails | undefined
+) => {
+  dispatch(setFlashingProcessState(FlashingProcessState.UnpackingFiles))
+
+  const flashingImageName = mscFlashingFiles ? mscFlashingFiles.image.name : ""
+
+  await unpackFlashingImageService(flashingImageName)
+}
+
+const startFlashingProcess = async (
+  dispatch: Dispatch,
+  flashingFiles: MscFlashDetails | undefined
+) => {
+  try {
+    dispatch(setFlashingProcessState(FlashingProcessState.FlashingProcess))
+
+    const deviceFlash = DeviceFlashFactory.createDeviceFlashService()
+
+    const device = await deviceFlash.findDeviceByDeviceName("HARMONY")
+
+    const { osDownloadLocation } = await getAppSettingsMain()
+    const flashingScriptName = flashingFiles
+      ? flashingFiles.scripts[0].name
+      : ""
+
+    const imageFilePath = path.join(osDownloadLocation, IMAGE_FILE_NAME)
+    const scriptFilePath = path.join(osDownloadLocation, flashingScriptName)
+
+    await deviceFlash.execute(device, imageFilePath, scriptFilePath)
+
+    dispatch(setFlashingProcessState(FlashingProcessState.Restarting))
+    // AUTO DISABLED - fix me if you like :)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } catch (error: any) {
+    throw new Error(`Flash process failed with error: ${error}`)
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/index.ts
new file mode 100644
index 0000000000..f0d87b4e5e
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/index.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./msc-flash-details.service"
+export * from "./flash-msc-device.service"
+export * from "./unpack-flashing-image"
+export * from "./remove-downloaded-msc-files.service"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
new file mode 100644
index 0000000000..241d00e027
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import axios from "axios"
+import { MuditaCenterServerRoutes } from "Core/__deprecated__/api/mudita-center-server/mudita-center-server-routes"
+import { Product, SupportedPlatform, OsEnvironment } from "../constants"
+import { MscFlashDetails } from "../dto"
+
+const API_BASE_URL = process.env.MUDITA_CENTER_SERVER_V2_URL as string
+
+export class MscFlashDetailsService {
+  static async getMscFlashDetails(
+    product: Product,
+    environment: OsEnvironment,
+    platform: SupportedPlatform
+  ): Promise<MscFlashDetails> {
+    const response = await axios.get<MscFlashDetails>(
+      `${API_BASE_URL}/${MuditaCenterServerRoutes.GetMscFlashDetails}`,
+      {
+        params: { product, environment, platform },
+      }
+    )
+
+    return response.data as MscFlashDetails
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/remove-downloaded-msc-files.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/remove-downloaded-msc-files.service.ts
new file mode 100644
index 0000000000..96948a8f0f
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/remove-downloaded-msc-files.service.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
+import logger from "Core/__deprecated__/main/utils/logger"
+import fs from "fs-extra"
+import path from "path"
+
+export const removeDownloadedMscFiles = async () => {
+  const { osDownloadLocation } = await getAppSettingsMain()
+
+  try {
+    const files = await fs.readdir(osDownloadLocation)
+
+    files.forEach((file) => {
+      const fileDir = path.join(osDownloadLocation, file)
+      fs.unlinkSync(fileDir)
+    })
+  } catch (error) {
+    logger.error(error)
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
new file mode 100644
index 0000000000..084b51e70f
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
+import path from "path"
+import { execPromise } from "shared/utils"
+
+export const unpackFlashingImageService = async (
+  fileName: string
+): Promise<void> => {
+  let command: string = ""
+
+  const { osDownloadLocation } = await getAppSettingsMain()
+
+  if (process.platform === "darwin" || process.platform === "linux") {
+    const imageFilePath = path.join(osDownloadLocation, fileName)
+    command = `tar -xf "${imageFilePath}" -C "${osDownloadLocation}"`
+  }
+
+  try {
+    await execPromise(command)
+  } catch (error) {
+    console.error("Failed to unpack files", error)
+    throw error
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
new file mode 100644
index 0000000000..0393f3bada
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./recovery-mode"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.component.tsx
new file mode 100644
index 0000000000..d2aeb41f9c
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.component.tsx
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import React from "react"
+import { defineMessages } from "react-intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+import {
+  ProgressBar,
+  Percentage,
+  WarningBox,
+} from "./recovery-mode-modal.styled"
+
+interface RecoveryModeModalProps {
+  open: boolean
+  percent: number
+  progressMessage: { id: string }
+}
+
+const messages = defineMessages({
+  recoveryModeModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  recoveryModeModalMessage: {
+    id: "module.recoveryMode.modal.message",
+  },
+  recoveryModeModalWarning: {
+    id: "module.recoveryMode.modal.warning",
+  },
+  recoveryModeModalWarningMessage: {
+    id: "module.recoveryMode.modal.warningMessage",
+  },
+})
+
+export const RecoveryModeModal: FunctionComponent<RecoveryModeModalProps> = ({
+  open,
+  percent,
+  progressMessage,
+}) => {
+  return (
+    <>
+      <ModalDialog
+        open={open}
+        title={intl.formatMessage(messages.recoveryModeModalTitle)}
+        size={ModalSize.Small}
+        closeable={false}
+        closeButton={false}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.RecoveryModeBlack} width={4.8} />
+          </RoundIconWrapper>
+          <Text
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.recoveryModeModalMessage}
+          />
+          <WarningBox>
+            <Text
+              displayStyle={TextDisplayStyle.Headline4}
+              message={messages.recoveryModeModalWarning}
+            />
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.recoveryModeModalWarningMessage}
+            />
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph4}
+              message={intl.formatMessage(progressMessage)}
+            />
+            <ProgressBar>
+              <span style={{ width: `${percent}%` }} />
+            </ProgressBar>
+            <Percentage
+              displayStyle={TextDisplayStyle.Paragraph4}
+              color="primary"
+            >
+              {percent}%
+            </Percentage>
+          </WarningBox>
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.styled.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.styled.tsx
new file mode 100644
index 0000000000..5e4f395c89
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode-modal/recovery-mode-modal.styled.tsx
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  backgroundColor,
+  borderColor,
+  borderRadius,
+  transitionTime,
+} from "Core/core/styles/theming/theme-getters"
+import styled from "styled-components"
+import Text from "Core/__deprecated__/renderer/components/core/text/text.component"
+
+export const WarningBox = styled.div`
+  max-width: 100%;
+  border-radius: ${borderRadius("medium")};
+  border: 0.2rem solid ${borderColor("deviceListSeparator")};
+  border-top: 0.8rem solid ${borderColor("warning")};
+  margin-top: 2.4rem;
+  padding: 1.6rem 1rem 2.4rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+`
+
+export const ProgressBar = styled.div`
+  width: 22rem;
+  margin-top: 0.8rem;
+  height: 0.4rem;
+  position: relative;
+  border-radius: ${borderRadius("medium")};
+  background-color: ${backgroundColor("minor")};
+
+  span {
+    display: block;
+    height: inherit;
+    border-radius: inherit;
+    background-color: ${backgroundColor("activity")};
+    transition: width ${transitionTime("faster")} ease-in-out;
+  }
+`
+export const Percentage = styled(Text)`
+  margin-top: 0.8rem;
+`
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
new file mode 100644
index 0000000000..6fdfac4d31
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
@@ -0,0 +1,283 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React, { useState } from "react"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import styled, { ThemeProvider } from "styled-components"
+import { defineMessages } from "react-intl"
+import { intl, textFormatters } from "Core/__deprecated__/renderer/utils/intl"
+import { GenericThemeProvider } from "generic-view/theme"
+import { H3 } from "../../../../../generic-view/ui/src/lib/texts/headers"
+import { P3 } from "../../../../../generic-view/ui/src/lib/texts/paragraphs"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Icon, {
+  IconSize,
+} from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { Form } from "../../../../../generic-view/ui/src/lib/interactive/form/form"
+import { WarrningBox } from "../../../../../generic-view/ui/src/lib/shared/shared"
+import { ButtonPrimary } from "../../../../../generic-view/ui/src/lib/buttons/button-primary"
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { flashMscDeviceService } from "../services"
+import { RecoveryModeModal } from "./recovery-mode-modal/recovery-mode-modal.component"
+import { selectFlashingProcessState } from "../selectors"
+import { FlashingProcessState } from "../constants"
+import theme from "Core/core/styles/theming/theme"
+import { RestartingDeviceModal } from "./restarting-device-modal/restarting-device-modal.component"
+
+const messages = defineMessages({
+  header: {
+    id: "module.recoveryMode.harmony.header",
+  },
+  description: {
+    id: "module.recoveryMode.harmony.description",
+  },
+  warning1: {
+    id: "module.recoveryMode.harmony.warning1",
+  },
+  warning2: {
+    id: "module.recoveryMode.harmony.warning2",
+  },
+  warning3: {
+    id: "module.recoveryMode.harmony.warning3",
+  },
+  warning4: {
+    id: "module.recoveryMode.harmony.warning4",
+  },
+  warningLinux: {
+    id: "module.recoveryMode.harmony.warningLinux",
+  },
+  confirmation: {
+    id: "module.recoveryMode.harmony.confirmation",
+  },
+  button: {
+    id: "module.recoveryMode.harmony.action",
+  },
+  flashingProcessStep0: {
+    id: "module.recoveryMode.modal.step0",
+  },
+  flashingProcessStep1: {
+    id: "module.recoveryMode.modal.step1",
+  },
+  flashingProcessStep2: {
+    id: "module.recoveryMode.modal.step2",
+  },
+  flashingProcessStep3: {
+    id: "module.recoveryMode.modal.step3",
+  },
+  flashingProcessStep4: {
+    id: "module.recoveryMode.modal.step4",
+  },
+})
+
+const RecoveryModeUI: FunctionComponent = () => {
+  const [isConfirmed, setIsConfirmed] = useState(false)
+  const dispatch = useDispatch<Dispatch>()
+  const flashingProcessState = useSelector(selectFlashingProcessState)
+
+  const handleCheckboxChange = () => {
+    setIsConfirmed((prevIsConfirmed) => !prevIsConfirmed)
+  }
+
+  const onStartRecovery = () => {
+    dispatch(flashMscDeviceService())
+  }
+
+  const isFlashingModalVisible = (): boolean => {
+    return (
+      flashingProcessState === FlashingProcessState.GettingFilesDetails ||
+      flashingProcessState === FlashingProcessState.DownloadingFiles ||
+      flashingProcessState === FlashingProcessState.UnpackingFiles ||
+      flashingProcessState === FlashingProcessState.FlashingProcess
+    )
+  }
+
+  const getProgressPercent = (): number => {
+    switch (flashingProcessState) {
+      case FlashingProcessState.GettingFilesDetails:
+        return 12
+      case FlashingProcessState.DownloadingFiles:
+        return 37
+      case FlashingProcessState.UnpackingFiles:
+        return 62
+      case FlashingProcessState.FlashingProcess:
+        return 87
+      default:
+        return 0
+    }
+  }
+
+  const getProgressMessage = (): { id: string } => {
+    switch (flashingProcessState) {
+      case FlashingProcessState.GettingFilesDetails:
+        return messages.flashingProcessStep1
+      case FlashingProcessState.DownloadingFiles:
+        return messages.flashingProcessStep2
+      case FlashingProcessState.UnpackingFiles:
+        return messages.flashingProcessStep3
+      case FlashingProcessState.FlashingProcess:
+        return messages.flashingProcessStep4
+      default:
+        return messages.flashingProcessStep0
+    }
+  }
+
+  const isRestartingModalVisible = (): boolean => {
+    return flashingProcessState === FlashingProcessState.Restarting
+    // return true
+  }
+
+  return (
+    <>
+      <Wrapper>
+        <Header>
+          <Icon type={IconType.RecoveryModeBlack} size={IconSize.ExtraLarge} />
+          <H3>{intl.formatMessage(messages.header)}</H3>
+          <P3>{intl.formatMessage(messages.description)}</P3>
+        </Header>
+        <WarrningBox>
+          <Warning>
+            <ul>
+              <li>
+                <P3>{intl.formatMessage(messages.warning1, textFormatters)}</P3>
+              </li>
+              {process.platform === "linux" && (
+                <li>
+                  <P3>
+                    {intl.formatMessage(messages.warningLinux, textFormatters)}
+                  </P3>
+                </li>
+              )}
+              <li>
+                <P3>{intl.formatMessage(messages.warning2)}</P3>
+              </li>
+              <li>
+                <P3>{intl.formatMessage(messages.warning3)}</P3>
+              </li>
+              <li>
+                <P3>{intl.formatMessage(messages.warning4)}</P3>
+              </li>
+            </ul>
+            <Form>
+              <Confirmation>
+                <Form.CheckboxInput
+                  config={{
+                    name: "confirmation",
+                    value: "confirmation",
+                    label: intl.formatMessage(messages.confirmation),
+                    checked: isConfirmed,
+                    onToggle: handleCheckboxChange,
+                  }}
+                />
+              </Confirmation>
+            </Form>
+            <Footer>
+              <ButtonPrimary
+                config={{
+                  text: intl.formatMessage(messages.button),
+                  actions: [
+                    {
+                      type: "custom",
+                      callback: onStartRecovery,
+                    },
+                  ],
+                  disabled: !isConfirmed,
+                }}
+              />
+            </Footer>
+          </Warning>
+        </WarrningBox>
+      </Wrapper>
+      <ThemeProvider theme={theme}>
+        <RecoveryModeModal
+          open={isFlashingModalVisible()}
+          percent={getProgressPercent()}
+          progressMessage={getProgressMessage()}
+        />
+        <RestartingDeviceModal open={isRestartingModalVisible()} />
+      </ThemeProvider>
+    </>
+  )
+}
+
+export const RecoveryModePage: FunctionComponent = () => {
+  return (
+    <GenericThemeProvider>
+      <RecoveryModeUI />
+    </GenericThemeProvider>
+  )
+}
+
+const Wrapper = styled.div`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 2.4rem;
+  align-items: center;
+  padding-top: 4.7rem;
+  background: ${({ theme }) => {
+    // AUTO DISABLED - fix me if you like :)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return theme.color.white
+  }};
+`
+
+const Header = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 1.4rem;
+
+  p {
+    text-align: center;
+  }
+`
+
+const Warning = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 2.4rem;
+
+  ul {
+    display: flex;
+    flex-direction: column;
+    gap: 0.8rem;
+    margin: 0;
+    padding-left: 1rem;
+  }
+`
+
+const Confirmation = styled.div`
+  display: flex;
+  align-items: center;
+  width: 100%;
+
+  label {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 1.4rem;
+    font-weight: 700;
+    max-width: 100%;
+  }
+
+  input + label {
+    align-items: center;
+  }
+
+  input + label div:first-child {
+    align-self: center;
+  }
+`
+
+const Footer = styled.div`
+  display: flex;
+  justify-content: center;
+
+  button {
+    width: 18rem;
+  }
+`
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
new file mode 100644
index 0000000000..10c5e3c3f0
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import React from "react"
+import { defineMessages } from "react-intl"
+import LoaderModal from "Core/ui/components/loader-modal/loader-modal.component"
+
+interface RestartingDeviceModalProps {
+  open: boolean
+}
+
+const messages = defineMessages({
+  restartingDeviceModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  restartingDeviceModalSubitle: {
+    id: "module.recoveryMode.modal.restarting.subtitle",
+  },
+  restartingDeviceModalMessage: {
+    id: "module.recoveryMode.modal.restarting.message",
+  },
+})
+
+export const RestartingDeviceModal: FunctionComponent<
+  RestartingDeviceModalProps
+> = ({ open }) => {
+  return (
+    <LoaderModal
+      open={open}
+      title={intl.formatMessage(messages.restartingDeviceModalTitle)}
+      subtitle={intl.formatMessage(messages.restartingDeviceModalSubitle)}
+      body={intl.formatMessage(messages.restartingDeviceModalMessage)}
+    ></LoaderModal>
+  )
+}
diff --git a/libs/msc-flash/msc-flash-harmony/tsconfig.json b/libs/msc-flash/msc-flash-harmony/tsconfig.json
new file mode 100644
index 0000000000..4daaf45cd3
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json"
+}
diff --git a/libs/msc-flash/msc-flash-harmony/tsconfig.lib.json b/libs/msc-flash/msc-flash-harmony/tsconfig.lib.json
new file mode 100644
index 0000000000..21799b3e6b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/tsconfig.lib.json
@@ -0,0 +1,24 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "types": [
+      "node",
+
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
+  },
+  "exclude": [
+    "jest.config.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.js",
+    "src/**/*.test.js",
+    "src/**/*.spec.jsx",
+    "src/**/*.test.jsx"
+  ],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/libs/msc-flash/msc-flash-harmony/tsconfig.spec.json b/libs/msc-flash/msc-flash-harmony/tsconfig.spec.json
new file mode 100644
index 0000000000..25b7af8f6d
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/shared/utils/src/index.ts b/libs/shared/utils/src/index.ts
index 83045c16ac..67e83a60b3 100644
--- a/libs/shared/utils/src/index.ts
+++ b/libs/shared/utils/src/index.ts
@@ -15,4 +15,5 @@ export * from "./lib/routes-history.context"
 export * from "./lib/settings-service.interface"
 export * from "./lib/use-debounced-events-handler"
 export * from "./lib/exec-command"
+export * from "./lib/exec-command-with-sudo"
 export * from "./lib/use-filtered-routes-history"
diff --git a/libs/shared/utils/src/lib/exec-command-with-sudo.ts b/libs/shared/utils/src/lib/exec-command-with-sudo.ts
new file mode 100644
index 0000000000..7046f3b818
--- /dev/null
+++ b/libs/shared/utils/src/lib/exec-command-with-sudo.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import sudoPrompt from "@vscode/sudo-prompt"
+
+export const execCommandWithSudo = (
+  command: string,
+  options: { name?: string; icns?: string; env?: { [key: string]: string } }
+): Promise<string | void> => {
+  return new Promise((resolve, reject) => {
+    sudoPrompt.exec(command, options, (error, stdout, stderr) => {
+      if (error) {
+        console.error(`Command failed with error: ${error.message}`);
+        return reject(`Error: ${error.message}`);
+      }
+
+      if (stderr && !stdout) {
+        const output = stderr?.toString().trim();
+        console.error(`Command stderr output: ${output}`);
+        return reject(`Error: ${stderr.toString().trim()}`);
+      }
+
+      const output = stdout?.toString().trim() || "Command executed successfully but produced no output.";
+
+      console.log(`Command output: ${output}`);
+      resolve(output);
+    })
+  })
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 1a11ab9e48..735a100bef 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -61,6 +61,7 @@
       "help/models": ["libs/help/models/src/index.ts"],
       "help/store": ["libs/help/store/src/index.ts"],
       "help/ui": ["libs/help/ui/src/index.ts"],
+      "msc-flash-harmony": ["libs/msc-flash/msc-flash-harmony/src/index.ts"],
       "shared/app-state": ["libs/shared/app-state/src/index.ts"],
       "shared/feature": ["libs/shared/feature/src/index.ts"],
       "shared/http-client": ["libs/shared/http-client/src/index.ts"],

From 9dc3d7c58335303368b6f35c5a762b71853d20ec Mon Sep 17 00:00:00 2001
From: robertmudi <158469469+robertmudi@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:24:31 +0200
Subject: [PATCH 30/64] CP-2747 [E2E][HomePage] More news (#2117)

---
 .../src/page-objects/news.page.ts             |  4 +++
 .../src/specs/news/more-news.e2e.ts           | 31 +++++++++++++++++++
 .../consts/test-filenames.const.ts            |  1 +
 apps/mudita-center-e2e/wdio.conf.ts           |  3 ++
 4 files changed, 39 insertions(+)
 create mode 100644 apps/mudita-center-e2e/src/specs/news/more-news.e2e.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/news.page.ts b/apps/mudita-center-e2e/src/page-objects/news.page.ts
index a85e660248..832baaeeed 100644
--- a/apps/mudita-center-e2e/src/page-objects/news.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/news.page.ts
@@ -14,6 +14,10 @@ class NewsPage extends Page {
     return $("p*=More news")
   }
 
+  public get moreNewsButtonHref() {
+    return $('a[href="https://www.mudita.com/#news"]')
+  }
+
   public get newsCardElements() {
     return $$('[data-testid="news-card"]')
   }
diff --git a/apps/mudita-center-e2e/src/specs/news/more-news.e2e.ts b/apps/mudita-center-e2e/src/specs/news/more-news.e2e.ts
new file mode 100644
index 0000000000..c24909d9c2
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/news/more-news.e2e.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HomePage from "../../page-objects/home.page"
+import NewsPage from "../../page-objects/news.page"
+
+describe("Check more news button", () => {
+  it("Click Not Now and Open Mudita News", async () => {
+    const notNowButton = await HomePage.notNowButton
+    await expect(notNowButton).toBeClickable()
+    await notNowButton.click()
+    const muditaNewsTab = NavigationTabs.muditaNewsTab
+    await expect(muditaNewsTab).toBeDisplayed()
+  })
+
+  it("Check Mudita News Header, check More News button href", async () => {
+    const newsHeader = NewsPage.newsHeader
+    await expect(newsHeader).toBeDisplayed()
+    await expect(newsHeader).toHaveText("Mudita News")
+
+    const moreNewsButton = await NewsPage.moreNewsButton
+    await expect(moreNewsButton).toBeDisplayed()
+
+    const moreNewsButtonHref = NewsPage.moreNewsButtonHref
+    const checkHref = await moreNewsButtonHref.getAttribute("href")
+    await expect(checkHref).toBe("https://www.mudita.com/#news")
+  })
+})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index c93795b1ee..4e5d168a41 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -11,6 +11,7 @@ export enum TestFilesPaths {
   e2eMockSample = "src/specs/overview/e2e-mock-sample.e2e.ts",
   mcCheckForUpdatesTest = "src/specs/settings/mc-version-check-for-updates.e2e.ts",
   newsPageOnlineTest = "src/specs/news/news-check-online.e2e.ts",
+  newsMoreNews = "src/specs/news/more-news.e2e.ts",
   newsPageOfflineTest = "src/specs/news/news-check-offline.e2e.ts",
   termsOfServiceTest = "src/specs/settings/terms-of-service.e2e.ts",
   backupLocationTest = "src/specs/settings/backup-location.e2e.ts",
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 1d39370a45..4818b46fce 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -61,6 +61,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
     toRelativePath(TestFilesPaths.newsPageOnlineTest),
     toRelativePath(TestFilesPaths.newsPageOfflineTest),
+    toRelativePath(TestFilesPaths.newsMoreNews),
     toRelativePath(TestFilesPaths.termsOfServiceTest),
     toRelativePath(TestFilesPaths.backupLocationTest),
     toRelativePath(TestFilesPaths.mcCheckForUpdatesOfflineTest),
@@ -84,6 +85,7 @@ export const config: Options.Testrunner = {
       //toRelativePath(TestFilesPaths.helpSectionCheckTest),
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
+      toRelativePath(TestFilesPaths.newsMoreNews),
       toRelativePath(TestFilesPaths.termsOfServiceTest),
       toRelativePath(TestFilesPaths.backupLocationTest),
       toRelativePath(TestFilesPaths.privacyPolicyTest),
@@ -123,6 +125,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.termsOfServiceTest),
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
+      toRelativePath(TestFilesPaths.newsMoreNews),
     ],
     cicdMock: [
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),

From f371cafe3dfcba2f09d9b2806f274a563099c644 Mon Sep 17 00:00:00 2001
From: robertmudi <158469469+robertmudi@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:55:00 +0200
Subject: [PATCH 31/64] CP-3072 Q4 2024 Change - Verify Help Contents, Search
 and Contact button (offline) (#2113)

---
 .../help/help-section-check-offline.e2e.ts    | 249 ++++++++++++++++++
 .../src/specs/help/help-section-check.e2e.ts  | 133 +++++++---
 .../help/help-window-check-offline.e2e.ts     | 111 --------
 .../consts/test-filenames.const.ts            |   2 +-
 apps/mudita-center-e2e/wdio.conf.ts           |  10 +-
 5 files changed, 346 insertions(+), 159 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/specs/help/help-section-check-offline.e2e.ts
 delete mode 100644 apps/mudita-center-e2e/src/specs/help/help-window-check-offline.e2e.ts

diff --git a/apps/mudita-center-e2e/src/specs/help/help-section-check-offline.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-section-check-offline.e2e.ts
new file mode 100644
index 0000000000..589664404a
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/help-section-check-offline.e2e.ts
@@ -0,0 +1,249 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import dns from "node:dns"
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpPage from "../../page-objects/help.page"
+import HelpArticlePage from "../../page-objects/help-article.page"
+import HomePage from "../../page-objects/home.page"
+import testsHelper from "../../helpers/tests.helper"
+
+describe("Check Help window", () => {
+  before(async () => {
+    dns.setDefaultResultOrder("ipv4first")
+    await browser.throttle("offline")
+
+    // Switch to offline mode before starting the tests
+    await browser.setNetworkConditions({
+      offline: true,
+      latency: 0,
+      download_throughput: 0,
+      upload_throughput: 0,
+    })
+
+    // Add a small delay to ensure network conditions are applied
+    await browser.pause(1000)
+
+    // Verify network conditions
+    const isOnline = await testsHelper.isOnline()
+    await expect(isOnline).toBeFalsy()
+
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+  })
+
+  it("Open Help window", async () => {
+    const helpTab = await NavigationTabs.helpTab
+    await helpTab.waitForDisplayed({ timeout: 15000 })
+    await helpTab.click()
+
+    //Check window title
+    const helpTabTitle = await HelpPage.helpTabTitle
+    await helpTabTitle.waitForDisplayed({ timeout: 15000 })
+    await expect(helpTabTitle).toHaveText("Mudita Help Center")
+
+    //Verify welcome message
+    const helpMainHeader = await HelpPage.helpMainHeader
+    await expect(helpMainHeader).toHaveText("Welcome! How can we help you?")
+
+    //Verify welcome paragraph
+    const helpMainSubHeader = await HelpPage.helpMainSubHeader
+    await expect(helpMainSubHeader).toHaveText(
+      "Browse our selection of how-to and troubleshooting guides"
+    )
+
+    //Verify search bar
+    const iconSearch = await HelpPage.iconSearch
+    await expect(iconSearch).toBeDisplayed()
+
+    //Verify search bar icon
+    const helpSearchInput = await HelpPage.helpSearchInput
+    await expect(helpSearchInput).toBeDisplayed()
+
+    //Verify placeholder
+    await expect(helpSearchInput).toHaveAttrContaining(
+      "placeholder",
+      "Search topics"
+    )
+
+    //Verify main section title
+    const helpCategoriesTitle = await HelpPage.helpCategoriesTitle
+    await expect(helpCategoriesTitle).toHaveText(
+      "Which device are you using with Mudita Center?"
+    )
+
+    //Section tabs
+    const helpCategoriesList = await HelpPage.helpCategoriesList
+    await expect(helpCategoriesList).toBeDisplayed()
+
+    const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
+    await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+
+    //Active section tab
+    await expect(helpCategoriesListItems[0]).toBeDisplayed() // Added this line to ensure the first element is displayed
+
+    await expect(helpCategoriesListItems[0]).toHaveElementClassContaining(
+      "active"
+    )
+
+    const activeTabColor = await helpCategoriesListItems[0].getCSSProperty(
+      "color"
+    )
+    await expect(activeTabColor.value).toBe("rgba(0,0,0,1)")
+
+    const activeTabBackground = await helpCategoriesListItems[0].getCSSProperty(
+      "background-color"
+    )
+    await expect(activeTabBackground.value).toBe("rgba(237,237,237,1)")
+
+    //Hover on section tabs
+    await helpCategoriesListItems[1].moveTo()
+    const hoverTabColor = await helpCategoriesListItems[0].getCSSProperty(
+      "color"
+    )
+    await expect(hoverTabColor.value).toBe("rgba(0,0,0,1)")
+    const hoverTabBackground = await helpCategoriesListItems[0].getCSSProperty(
+      "background-color"
+    )
+    await expect(hoverTabBackground.value).toBe("rgba(237,237,237,1)")
+  })
+
+  it("Verify Harmony Section titles", async () => {
+    //Verify all items
+    const helpSubCategoriesListItems = await HelpPage.helpSubCategoriesListItems
+    await expect(helpSubCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+
+    //Verify left column
+    const helpSubCategoriesListItemsLeftColumn =
+      await HelpPage.helpSubCategoriesListItemsLeftColumn
+    await expect(helpSubCategoriesListItemsLeftColumn).toBeElementsArrayOfSize({
+      gte: 1,
+    })
+
+    //Verify right column
+    const helpSubCategoriesListItemsRightColumn =
+      await HelpPage.helpSubCategoriesListItemsRightColumn
+    await expect(helpSubCategoriesListItemsRightColumn).toBeElementsArrayOfSize(
+      { gte: 1 }
+    )
+
+    //Every sub category should not be empty
+    const helpSubCategoryArticlesListItemTitles =
+      await helpSubCategoriesListItems.map((element) => {
+        return element
+          .$('[data-testid="help-subcategories-list-item-title"]')
+          .getText()
+      })
+    await expect(
+      helpSubCategoryArticlesListItemTitles.length
+    ).toBeGreaterThanOrEqual(1)
+
+    //List of articles should not be empty in any of the categories
+    let helpSubCategoriesListItem
+    for await (helpSubCategoriesListItem of helpSubCategoriesListItems) {
+      await expect(
+        helpSubCategoriesListItem.$$(
+          '[data-testid="help-subcategory-articles-list-item"]'
+        )
+      ).toBeElementsArrayOfSize({ gte: 1 })
+    }
+  })
+  it("Search for questions and verify results", async () => {
+    const helpSearchInput = await HelpPage.helpSearchInput
+    await helpSearchInput.setValue("How to do factory reset on Pure")
+
+    //Verify quick search results
+    const helpSearchResults = await HelpPage.helpSearchResults
+    await expect(helpSearchResults).toBeDisplayed()
+    const helpSearchResultsParagraph = await HelpPage.helpSearchResultsParagraph
+    await expect(helpSearchResultsParagraph).toBeDisplayed()
+    await expect(helpSearchResultsParagraph).toHaveText("Quick Links")
+    //List should not be empty, bigger than 1
+    const helpSearchResultsItems = await HelpPage.helpSearchResultsItems
+    await expect(helpSearchResultsItems).toBeElementsArrayOfSize({ gte: 1 })
+    //Click first article
+    helpSearchResultsItems[0].click()
+  })
+  it("Check first article", async () => {
+    //Check window title
+    const helpTabTitle = await HelpPage.helpTabTitle
+    await helpTabTitle.waitForDisplayed({ timeout: 15000 })
+    await expect(helpTabTitle).toHaveText("Mudita Help Center")
+
+    //Check back button
+    const helpArticleBackButton = await HelpArticlePage.helpArticleBackButton
+    await expect(helpArticleBackButton).toBeClickable()
+
+    //Check article title
+    const helpArticleTitle = await HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toHaveText("How to do factory reset on Pure")
+
+    //Check article warning
+    const helpArticleWarningIcon = await HelpArticlePage.helpArticleWarningIcon
+    await expect(helpArticleWarningIcon).toBeDisplayed()
+
+    const helpArticleWarning = await HelpArticlePage.helpArticleWarning
+    await expect(helpArticleWarning).toHaveTextContaining(
+      "This will delete everything on your phone!"
+    )
+
+    //Check article content
+    const helpArticleContent = await HelpArticlePage.helpArticleContent
+    await expect(helpArticleContent).toBeDisplayed()
+    const helpArticleContentBlocks =
+      await HelpArticlePage.helpArticleContentBlocks
+    await expect(helpArticleContentBlocks).toBeElementsArrayOfSize({ gte: 2 })
+    await expect(
+      HelpArticlePage.getHelpArticleContentBlockTitle(0)
+    ).toHaveTextContaining("If your Pure is locked:")
+    await expect(
+      HelpArticlePage.getHelpArticleContentBlockText(0)
+    ).toHaveTextContaining(
+      "Turn off your Pure, hold down the right selection key > select Yes"
+    )
+
+    //Check article helpful section
+    const helpArticleFeedbackYesButton =
+      await HelpArticlePage.helpArticleFeedbackYesButton
+    await expect(helpArticleFeedbackYesButton).toBeDisplayed()
+    await expect(helpArticleFeedbackYesButton).toBeClickable()
+
+    const helpArticleFeedbackNoButton =
+      await HelpArticlePage.helpArticleFeedbackNoButton
+    await expect(helpArticleFeedbackNoButton).toBeDisplayed()
+    await expect(helpArticleFeedbackNoButton).toBeClickable()
+
+    const helpArticleFooter = await HelpArticlePage.helpArticleFooter
+    await helpArticleFooter.scrollIntoView()
+
+    const helpArticleFooterTitle = await HelpArticlePage.helpArticleFooterTitle
+    await expect(helpArticleFooterTitle).toHaveText(
+      "Need more help?\nVisit our Support Website"
+    )
+
+    const helpArticleFooterVisitSupportButton =
+      await HelpArticlePage.helpArticleFooterVisitSupportButton
+    await expect(helpArticleFooterVisitSupportButton).toHaveText(
+      "VISIT SUPPORT WEBSITE"
+    )
+
+    helpArticleBackButton.click()
+  })
+  it("Verify you are back in active first category", async () => {
+    const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
+
+    // Ensure that the helpCategoriesListItems array has at least one element
+    await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
+
+    // Check if the first category item is displayed
+    await expect(helpCategoriesListItems[0]).toBeDisplayed()
+
+    // Verify the first item has the 'active' class
+    await expect(helpCategoriesListItems[0]).toHaveElementClassContaining(
+      "active"
+    )
+  })
+})
diff --git a/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
index 7b66bbdaef..a659a415d7 100644
--- a/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
+++ b/apps/mudita-center-e2e/src/specs/help/help-section-check.e2e.ts
@@ -31,7 +31,9 @@ describe("Check Help window", () => {
 
     //Verify welcome paragraph
     const helpMainSubHeader = await HelpPage.helpMainSubHeader
-    await expect(helpMainSubHeader).toHaveText("Browse our selection of how-to and troubleshooting guides")
+    await expect(helpMainSubHeader).toHaveText(
+      "Browse our selection of how-to and troubleshooting guides"
+    )
 
     //Verify search bar
     const iconSearch = await HelpPage.iconSearch
@@ -42,66 +44,91 @@ describe("Check Help window", () => {
     await expect(helpSearchInput).toBeDisplayed()
 
     //Verify placeholder
-    await expect(helpSearchInput).toHaveAttrContaining("placeholder", "Search topics")
-    
+    await expect(helpSearchInput).toHaveAttrContaining(
+      "placeholder",
+      "Search topics"
+    )
+
     //Verify main section title
     const helpCategoriesTitle = await HelpPage.helpCategoriesTitle
-    await expect(helpCategoriesTitle).toHaveText("Which device are you using with Mudita Center?")
+    await expect(helpCategoriesTitle).toHaveText(
+      "Which device are you using with Mudita Center?"
+    )
 
     //Section tabs
     const helpCategoriesList = await HelpPage.helpCategoriesList
     await expect(helpCategoriesList).toBeDisplayed()
+
     const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
     await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
-    await expect(helpCategoriesListItems).toBeDisplayed()
-    
+
     //Active section tab
-    expect(helpCategoriesListItems[0]).toHaveElementClassContaining("active")
-    const activeTabColor = await helpCategoriesListItems[0].getCSSProperty("color")
+    await expect(helpCategoriesListItems[0]).toBeDisplayed() // Added this line to ensure the first element is displayed
+
+    await expect(helpCategoriesListItems[0]).toHaveElementClassContaining(
+      "active"
+    )
+
+    const activeTabColor = await helpCategoriesListItems[0].getCSSProperty(
+      "color"
+    )
     await expect(activeTabColor.value).toBe("rgba(0,0,0,1)")
+
     const activeTabBackground = await helpCategoriesListItems[0].getCSSProperty(
       "background-color"
     )
-    await expect(activeTabBackground.value).toBe(
-      "rgba(237,237,237,1)"
-    )
+    await expect(activeTabBackground.value).toBe("rgba(237,237,237,1)")
 
     //Hover on section tabs
     await helpCategoriesListItems[1].moveTo()
-    const hoverTabColor = await helpCategoriesListItems[0].getCSSProperty("color")
+    const hoverTabColor = await helpCategoriesListItems[0].getCSSProperty(
+      "color"
+    )
     await expect(hoverTabColor.value).toBe("rgba(0,0,0,1)")
     const hoverTabBackground = await helpCategoriesListItems[0].getCSSProperty(
       "background-color"
     )
-    await expect(hoverTabBackground.value).toBe(
-      "rgba(237,237,237,1)"
-    )
+    await expect(hoverTabBackground.value).toBe("rgba(237,237,237,1)")
   })
 
   it("Verify Harmony Section titles", async () => {
-
     //Verify all items
     const helpSubCategoriesListItems = await HelpPage.helpSubCategoriesListItems
     await expect(helpSubCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
 
     //Verify left column
-    const helpSubCategoriesListItemsLeftColumn = await HelpPage.helpSubCategoriesListItemsLeftColumn
-    await expect(helpSubCategoriesListItemsLeftColumn).toBeElementsArrayOfSize({ gte: 1 })
+    const helpSubCategoriesListItemsLeftColumn =
+      await HelpPage.helpSubCategoriesListItemsLeftColumn
+    await expect(helpSubCategoriesListItemsLeftColumn).toBeElementsArrayOfSize({
+      gte: 1,
+    })
 
     //Verify right column
-    const helpSubCategoriesListItemsRightColumn = await HelpPage.helpSubCategoriesListItemsRightColumn
-    await expect(helpSubCategoriesListItemsRightColumn).toBeElementsArrayOfSize({ gte: 1 })
+    const helpSubCategoriesListItemsRightColumn =
+      await HelpPage.helpSubCategoriesListItemsRightColumn
+    await expect(helpSubCategoriesListItemsRightColumn).toBeElementsArrayOfSize(
+      { gte: 1 }
+    )
 
     //Every sub category should not be empty
-    const helpSubCategoryArticlesListItemTitles = await helpSubCategoriesListItems.map((element) => {
-       return element.$('[data-testid="help-subcategories-list-item-title"]').getText()
-    })
-    await expect(helpSubCategoryArticlesListItemTitles.length).toBeGreaterThanOrEqual(1)
+    const helpSubCategoryArticlesListItemTitles =
+      await helpSubCategoriesListItems.map((element) => {
+        return element
+          .$('[data-testid="help-subcategories-list-item-title"]')
+          .getText()
+      })
+    await expect(
+      helpSubCategoryArticlesListItemTitles.length
+    ).toBeGreaterThanOrEqual(1)
 
     //List of articles should not be empty in any of the categories
     let helpSubCategoriesListItem
     for await (helpSubCategoriesListItem of helpSubCategoriesListItems) {
-      await expect(helpSubCategoriesListItem.$$('[data-testid="help-subcategory-articles-list-item"]')).toBeElementsArrayOfSize({ gte: 1 })
+      await expect(
+        helpSubCategoriesListItem.$$(
+          '[data-testid="help-subcategory-articles-list-item"]'
+        )
+      ).toBeElementsArrayOfSize({ gte: 1 })
     }
   })
   it("Search for questions and verify results", async () => {
@@ -134,27 +161,38 @@ describe("Check Help window", () => {
     const helpArticleTitle = await HelpArticlePage.helpArticleTitle
     await expect(helpArticleTitle).toHaveText("How to do factory reset on Pure")
 
-    //Check article warning 
+    //Check article warning
     const helpArticleWarningIcon = await HelpArticlePage.helpArticleWarningIcon
     await expect(helpArticleWarningIcon).toBeDisplayed()
 
     const helpArticleWarning = await HelpArticlePage.helpArticleWarning
-    await expect(helpArticleWarning).toHaveTextContaining("This will delete everything on your phone!")
+    await expect(helpArticleWarning).toHaveTextContaining(
+      "This will delete everything on your phone!"
+    )
 
     //Check article content
     const helpArticleContent = await HelpArticlePage.helpArticleContent
-    await expect(helpArticleContent).toBeDisplayed() 
-    const helpArticleContentBlocks = await HelpArticlePage.helpArticleContentBlocks
+    await expect(helpArticleContent).toBeDisplayed()
+    const helpArticleContentBlocks =
+      await HelpArticlePage.helpArticleContentBlocks
     await expect(helpArticleContentBlocks).toBeElementsArrayOfSize({ gte: 2 })
-    await expect(HelpArticlePage.getHelpArticleContentBlockTitle(0)).toHaveTextContaining("If your Pure is locked:")
-    await expect(HelpArticlePage.getHelpArticleContentBlockText(0)).toHaveTextContaining("Turn off your Pure, hold down the right selection key > select Yes")
-  
+    await expect(
+      HelpArticlePage.getHelpArticleContentBlockTitle(0)
+    ).toHaveTextContaining("If your Pure is locked:")
+    await expect(
+      HelpArticlePage.getHelpArticleContentBlockText(0)
+    ).toHaveTextContaining(
+      "Turn off your Pure, hold down the right selection key > select Yes"
+    )
+
     //Check article helpful section
-    const helpArticleFeedbackYesButton = await HelpArticlePage.helpArticleFeedbackYesButton
+    const helpArticleFeedbackYesButton =
+      await HelpArticlePage.helpArticleFeedbackYesButton
     await expect(helpArticleFeedbackYesButton).toBeDisplayed()
     await expect(helpArticleFeedbackYesButton).toBeClickable()
 
-    const helpArticleFeedbackNoButton = await HelpArticlePage.helpArticleFeedbackNoButton
+    const helpArticleFeedbackNoButton =
+      await HelpArticlePage.helpArticleFeedbackNoButton
     await expect(helpArticleFeedbackNoButton).toBeDisplayed()
     await expect(helpArticleFeedbackNoButton).toBeClickable()
 
@@ -162,19 +200,30 @@ describe("Check Help window", () => {
     await helpArticleFooter.scrollIntoView()
 
     const helpArticleFooterTitle = await HelpArticlePage.helpArticleFooterTitle
-    await expect(helpArticleFooterTitle).toHaveText("Need more help?\nVisit our Support Website")
-    
-    const helpArticleFooterVisitSupportButton = await HelpArticlePage.helpArticleFooterVisitSupportButton
-    await expect(helpArticleFooterVisitSupportButton).toHaveText("VISIT SUPPORT WEBSITE")
+    await expect(helpArticleFooterTitle).toHaveText(
+      "Need more help?\nVisit our Support Website"
+    )
+
+    const helpArticleFooterVisitSupportButton =
+      await HelpArticlePage.helpArticleFooterVisitSupportButton
+    await expect(helpArticleFooterVisitSupportButton).toHaveText(
+      "VISIT SUPPORT WEBSITE"
+    )
 
     helpArticleBackButton.click()
   })
   it("Verify you are back in active first category", async () => {
     const helpCategoriesListItems = await HelpPage.helpCategoriesListItems
+
+    // Ensure that the helpCategoriesListItems array has at least one element
     await expect(helpCategoriesListItems).toBeElementsArrayOfSize({ gte: 1 })
-    await expect(helpCategoriesListItems).toBeDisplayed()
-    
-    //Active section tab
-    expect(helpCategoriesListItems[0]).toHaveElementClassContaining("active")
+
+    // Check if the first category item is displayed
+    await expect(helpCategoriesListItems[0]).toBeDisplayed()
+
+    // Verify the first item has the 'active' class
+    await expect(helpCategoriesListItems[0]).toHaveElementClassContaining(
+      "active"
+    )
   })
 })
diff --git a/apps/mudita-center-e2e/src/specs/help/help-window-check-offline.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-window-check-offline.e2e.ts
deleted file mode 100644
index 6be150efc8..0000000000
--- a/apps/mudita-center-e2e/src/specs/help/help-window-check-offline.e2e.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import NavigationTabs from "../../page-objects/tabs.page"
-import HelpPage from "../../page-objects/help.page"
-import HomePage from "../../page-objects/home.page"
-import HelpModalPage from "../../page-objects/help-modal.page"
-import NewsPage from "../../page-objects/news.page"
-import dns from "node:dns"
-
-describe("Check Help window in offline mode", () => {
-  before(async function () {
-    dns.setDefaultResultOrder("ipv4first")
-    await browser.throttle("offline")
-
-    const notNowButton = await HomePage.notNowButton
-    await notNowButton.waitForDisplayed()
-    await notNowButton.click()
-  })
-
-  it("Open Help window", async () => {
-    const helpTab = await NavigationTabs.helpTab
-    await helpTab.waitForDisplayed({ timeout: 15000 })
-    await helpTab.click()
-
-    await browser.switchWindow("#/help")
-
-    // Check window title
-    const helpTitle = await HelpPage.windowTitle
-    await helpTitle.waitForDisplayed({ timeout: 15000 })
-    await expect(helpTitle).toHaveText("Mudita Center Help")
-  })
-
-  it("Check contents of Mudita Help", async () => {
-    // Check presence of the search engine
-    const searchIcon = await HelpPage.searchIcon
-    await expect(searchIcon).toBeDisplayed()
-
-    const searchPlaceholder = await HelpPage.searchPlaceholder
-    await expect(searchPlaceholder).toHaveAttributeContaining(
-      "placeholder",
-      "Search"
-    )
-
-    // Check presence of Contact support button
-    const contactSupportButton = await HelpPage.contactSupportButton
-    await expect(contactSupportButton).toBeDisplayed()
-    await expect(contactSupportButton).toBeClickable()
-
-    const contactSupportButtonTooltip =
-      await HelpPage.contactSupportButtonTooltip
-    contactSupportButton.moveTo()
-    await expect(contactSupportButtonTooltip).toBeDisplayed()
-    await expect(contactSupportButtonTooltip).toHaveText("Contact support")
-
-    // Check accordion
-    const helpTopic = await HelpPage.listElement
-
-    await expect(helpTopic).toBeDisplayed()
-    const noOfArticles = await HelpPage.listElements
-    await expect(noOfArticles).toBeElementsArrayOfSize({ gte: 25 })
-  })
-
-  it("Check content of first article", async () => {
-    const helpTopic = await HelpPage.listElement
-    await expect(helpTopic).toHaveText(
-      "How to import my iCloud contacts into Mudita Pure by using .vcf file?"
-    )
-    await helpTopic.click()
-    const helpTopicContent = await HelpPage.topicContent
-    await expect(helpTopicContent).toBeDisplayed()
-    await expect(helpTopicContent).toHaveTextContaining(
-      "Click on the “Import” button."
-    )
-    const backLink = await HelpPage.articleBackLink
-    await backLink.click()
-    const helpTitle = await HelpPage.windowTitle
-    await expect(helpTitle).toHaveText("Mudita Center Help")
-  })
-
-  it("Search for questions & check search results", async () => {
-    const searchPlaceholder = await HelpPage.searchPlaceholder
-    searchPlaceholder.setValue("fail")
-    browser.keys("\uE007")
-    const helpTopic = await HelpPage.listElement
-    await expect(helpTopic).toHaveText("OS update failed")
-    searchPlaceholder.setValue("harMony")
-    await helpTopic.waitForDisplayed({ timeout: 15000 })
-    await expect(helpTopic).toHaveText(
-      "How to connect my Mudita Harmony to Center?"
-    )
-    const noOfArticles = await HelpPage.listElements
-    await expect(noOfArticles).toBeElementsArrayOfSize({ gte: 4 })
-  })
-
-  it("Check Contact support modal", async () => {
-    const contactSupportButton = await HelpPage.contactSupportButton
-    await contactSupportButton.click()
-    const modalHeader = await HelpModalPage.modalHeader
-    await expect(modalHeader).toBeDisplayed
-    const closeButton = await HelpModalPage.closeModalButton
-    await closeButton.click()
-
-    await browser.switchWindow("#/news")
-    const newsHeader = await NewsPage.newsHeader
-    await expect(newsHeader).toBeDisplayed
-    await expect(newsHeader).toHaveText("Mudita News")
-  })
-})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index 4e5d168a41..c25c5cf9aa 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -7,6 +7,7 @@
 export enum TestFilesPaths {
   messagesInAppNavigationTest = "src/specs/messages/messages-in-app-navigation.e2e.ts",
   helpSectionCheckTest = "src/specs/help/help-section-check.e2e.ts",
+  helpSectionCheckTestOffline = "src/specs/help/help-section-check-offline.e2e.ts",
   homePageTestDeviceNotConnectedTest = "src/specs/overview/home-page-device-not-connecting.e2e.ts",
   e2eMockSample = "src/specs/overview/e2e-mock-sample.e2e.ts",
   mcCheckForUpdatesTest = "src/specs/settings/mc-version-check-for-updates.e2e.ts",
@@ -18,7 +19,6 @@ export enum TestFilesPaths {
   mcCheckForUpdatesOfflineTest = "src/specs/settings/mc-version-check-for-updates-offline.e2e.ts",
   privacyPolicyTest = "src/specs/settings/privacy-policy.e2e.ts",
   licenseTest = "src/specs/settings/license.e2e.ts",
-  helpWindowCheckOfflineTest = "src/specs/help/help-window-check-offline.e2e.ts",
   mcHomePageForceUpdateTest = "src/specs/overview/e2e-mock-mc-force-update-available.e2e.ts",
   mcHomePageForceUpdateErrorTest = "src/specs/overview/e2e-mock-mc-force-update-error.e2e.ts",
   mcHomePageSoftUpdateTest = "src/specs/overview/e2e-mock-mc-soft-update-available.e2e.ts",
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 4818b46fce..24db87b84e 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -57,6 +57,7 @@ export const config: Options.Testrunner = {
   specs: [
     toRelativePath(TestFilesPaths.messagesInAppNavigationTest),
     toRelativePath(TestFilesPaths.helpSectionCheckTest),
+    toRelativePath(TestFilesPaths.helpSectionCheckTestOffline),
     toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
     toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
     toRelativePath(TestFilesPaths.newsPageOnlineTest),
@@ -67,7 +68,6 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.mcCheckForUpdatesOfflineTest),
     toRelativePath(TestFilesPaths.privacyPolicyTest),
     toRelativePath(TestFilesPaths.licenseTest),
-    toRelativePath(TestFilesPaths.helpWindowCheckOfflineTest),
     toRelativePath(TestFilesPaths.kompaktOverview),
     toRelativePath(TestFilesPaths.kompaktSwitchingDevices),
     toRelativePath(TestFilesPaths.mcHomePageForceUpdateTest),
@@ -82,7 +82,8 @@ export const config: Options.Testrunner = {
   ],
   suites: {
     standalone: [
-      //toRelativePath(TestFilesPaths.helpSectionCheckTest),
+      toRelativePath(TestFilesPaths.helpSectionCheckTest),
+      toRelativePath(TestFilesPaths.helpSectionCheckTestOffline),
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.newsMoreNews),
@@ -96,7 +97,6 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
       toRelativePath(TestFilesPaths.mcCheckForUpdatesOfflineTest),
       toRelativePath(TestFilesPaths.newsPageOfflineTest),
-      //toRelativePath(TestFilesPaths.helpWindowCheckOfflineTest),
       toRelativePath(TestFilesPaths.mcHomePageSoftUpdateTest),
       toRelativePath(TestFilesPaths.mcHomePageSoftUpdateErrorTest),
       toRelativePath(TestFilesPaths.mcHomePageForceUpdateTest),
@@ -120,7 +120,8 @@ export const config: Options.Testrunner = {
     kompakt: [],
     deviceUpdate: [],
     cicdStandalone: [
-      //toRelativePath(TestFilesPaths.helpSectionCheckTest),
+      toRelativePath(TestFilesPaths.helpSectionCheckTest),
+      toRelativePath(TestFilesPaths.helpSectionCheckTestOffline),
       //toRelativePath(TestFilesPaths.homePageTestDeviceNotConnectedTest),
       toRelativePath(TestFilesPaths.newsPageOnlineTest),
       toRelativePath(TestFilesPaths.termsOfServiceTest),
@@ -132,7 +133,6 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
       toRelativePath(TestFilesPaths.mcCheckForUpdatesOfflineTest),
       toRelativePath(TestFilesPaths.newsPageOfflineTest),
-      //toRelativePath(TestFilesPaths.helpWindowCheckOfflineTest),
       toRelativePath(TestFilesPaths.mcHomePageForceUpdateTest),
       toRelativePath(TestFilesPaths.mcHomePageForceUpdateErrorTest),
       toRelativePath(TestFilesPaths.mcHomePageSoftUpdateTest),

From 64b5be005ab82456d0e6917c989bf8e851d4ea12 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Fri, 11 Oct 2024 16:32:53 +0200
Subject: [PATCH 32/64] CP-3182 added new test, updated help-article-page with
 new selectors, updated wdio.conf.ts and test-filenames.const.ts

---
 .../src/page-objects/help-article.page.ts     | 125 ++++++++++--------
 .../src/specs/help/help-verify-feedback.ts    |  89 +++++++++++++
 .../consts/test-filenames.const.ts            |   1 +
 apps/mudita-center-e2e/wdio.conf.ts           |   3 +
 4 files changed, 161 insertions(+), 57 deletions(-)
 create mode 100644 apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/help-article.page.ts b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
index 2276653183..3b1023f8d4 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
@@ -7,63 +7,74 @@ import { ChainablePromiseElement } from "webdriverio"
 import Page from "./page"
 
 class HelpArticlePage extends Page {
-    public get helpTabTitle() { 
-        return $('[data-testid="location"]')
-    }
-    public get helpArticleBackButton() {
-        return $('[data-testid="help-article-back-button"]')
-    }
-    public get helpArticleTitle() {
-        return $('[data-testid="help-article-title"]')
-    }
-    public get helpArticleWarningIcon() {
-        return $('[data-testid="help-article-warning-icon"]')
-    }
-    public get helpArticleWarning() {
-        return $('[data-testid="help-article-warning"]')
-    }
-    public get helpArticleContent() {
-        return $('[data-testid="help-article-content"]')
-    }
-    public get helpArticleContentBlocks() {
-        return $$('[data-testid="help-article-content-block"]')
-    }
-    getHelpArticleContentBlock(index: number) {
-        return $$('[data-testid="help-article-content-block"]')[index]
-    }
-    getHelpArticleContentBlockTitle(index: number) {
-        return $$('[data-testid="help-article-content-block-title"]')[index]
-    }
-    public get helpArticleContentBlockText() {
-        return $$('[data-testid="help-article-content-block-text"]')
-    }
-    getHelpArticleContentBlockText(index: number) {
-        return $$('[data-testid="help-article-content-block"]')[index].$('[data-testid="help-article-content-block-text"]')
-    }
-    public get helpArticleFeedback() {
-        return $('[data-testid="help-article-feedback"]')
-    }
-    public get helpArticleFeedbackTitle() {
-        return $('[data-testid="help-article-feedback-title"]')
-    }
-    public get helpArticleFeedbackYesButton() {
-        return $('[data-testid="help-article-feedback-yes-button"]')
-    }
-    public get helpArticleFeedbackNoButton() {
-        return $('[data-testid="help-article-feedback-no-button"]')
-    }
-    public get helpArticleFooter() {
-        return $('[data-testid="help-article-footer"]')
-    }
-    public get helpArticleFooterTitle() {
-        return $('[data-testid="help-article-footer-title"]')
-    }
-    public get helpArticleFooterButton() {
-        return $('[data-testid="help-article-footer-button"]')
-    }
-    public get helpArticleFooterVisitSupportButton() {
-        return $('[data-testid="help-article-footer-button"]')
-    }
+  public get helpTabTitle() {
+    return $('[data-testid="location"]')
+  }
+  public get helpArticleBackButton() {
+    return $('[data-testid="help-article-back-button"]')
+  }
+  public get helpArticleItems() {
+    return $$('[data-testid="help-subcategory-articles-list-item"]')
+  }
+  public get helpArticleTitle() {
+    return $('[data-testid="help-article-title"]')
+  }
+  public get helpArticleWarningIcon() {
+    return $('[data-testid="help-article-warning-icon"]')
+  }
+  public get helpArticleWarning() {
+    return $('[data-testid="help-article-warning"]')
+  }
+  public get helpArticleContent() {
+    return $('[data-testid="help-article-content"]')
+  }
+  public get helpArticleContentBlocks() {
+    return $$('[data-testid="help-article-content-block"]')
+  }
+  getHelpArticleContentBlock(index: number) {
+    return $$('[data-testid="help-article-content-block"]')[index]
+  }
+  getHelpArticleContentBlockTitle(index: number) {
+    return $$('[data-testid="help-article-content-block-title"]')[index]
+  }
+  public get helpArticleContentBlockText() {
+    return $$('[data-testid="help-article-content-block-text"]')
+  }
+  getHelpArticleContentBlockText(index: number) {
+    return $$('[data-testid="help-article-content-block"]')[index].$(
+      '[data-testid="help-article-content-block-text"]'
+    )
+  }
+  public get helpArticleFeedback() {
+    return $('[data-testid="help-article-feedback"]')
+  }
+  public get helpArticleFeedbackTitle() {
+    return $('[data-testid="help-article-feedback-title"]')
+  }
+  public get helpArticleFeedbackYesButton() {
+    return $('[data-testid="help-article-feedback-yes-button"]')
+  }
+  public get helpArticleFeedbackNoButton() {
+    return $('[data-testid="help-article-feedback-no-button"]')
+  }
+  public get iconNamaste() {
+    return $('[data-testid="icon-namaste"]')
+  }
+  public get feedbackThanksText() {
+    return $('[data-testid="help-article-feedback-thanks"]')
+  }
+  public get helpArticleFooter() {
+    return $('[data-testid="help-article-footer"]')
+  }
+  public get helpArticleFooterTitle() {
+    return $('[data-testid="help-article-footer-title"]')
+  }
+  public get helpArticleFooterButton() {
+    return $('[data-testid="help-article-footer-button"]')
+  }
+  public get helpArticleFooterVisitSupportButton() {
+    return $('[data-testid="help-article-footer-button"]')
+  }
 }
 
 export default new HelpArticlePage()
diff --git a/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts b/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts
new file mode 100644
index 0000000000..74aaf54e75
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpPage from "../../page-objects/help.page"
+import HelpArticlePage from "../../page-objects/help-article.page"
+import HomePage from "../../page-objects/home.page"
+import helpArticlePage from "../../page-objects/help-article.page"
+import { icon } from "Libs/generic-view/models/src"
+
+describe("Help - Verify Feedback", () => {
+  before(async () => {
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+  })
+
+  it("Open Help window", async () => {
+    const helpTab = await NavigationTabs.helpTab
+    await helpTab.waitForDisplayed({ timeout: 15000 })
+    await helpTab.click()
+  })
+
+  it("Check first article and give feedback as YES", async () => {
+    const firstArticle = HelpArticlePage.helpArticleItems[0]
+    await expect(firstArticle).toBeDisplayed()
+    await firstArticle.click()
+
+    //Check article title
+    const helpArticleTitle = await HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toHaveText(
+      "How to add music files to Harmony"
+    )
+
+    //Check article helpful section and vote YES
+    const helpArticleFeedbackYesButton =
+      await HelpArticlePage.helpArticleFeedbackYesButton
+    await expect(helpArticleFeedbackYesButton).toBeDisplayed()
+    await expect(helpArticleFeedbackYesButton).toBeClickable()
+    await helpArticleFeedbackYesButton.click()
+
+    //Verify if "YES" vote was sent
+    await expect(helpArticleFeedbackYesButton).not.toBeDisplayed()
+    const iconNamaste = HelpArticlePage.iconNamaste
+    const feedbackThanksText = HelpArticlePage.feedbackThanksText
+    await expect(iconNamaste).toBeDisplayed()
+    await expect(feedbackThanksText).toBeDisplayed()
+    await expect(feedbackThanksText).toHaveText("Thank you for your opinion!")
+
+    //Check back button and return from article
+    const helpArticleBackButton = await HelpArticlePage.helpArticleBackButton
+    await expect(helpArticleBackButton).toBeClickable()
+    helpArticleBackButton.click()
+  })
+
+  it("Check second article and give feedback as NO", async () => {
+    const secondArticle = HelpArticlePage.helpArticleItems[1]
+    await expect(secondArticle).toBeDisplayed()
+    await secondArticle.click()
+
+    //Check article title
+    const helpArticleTitle = await HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toHaveText(
+      "How to delete music files from Harmony"
+    )
+
+    //Check article helpful section and vote NO
+    const helpArticleFeedbackNoButton =
+      await HelpArticlePage.helpArticleFeedbackNoButton
+    await expect(helpArticleFeedbackNoButton).toBeDisplayed()
+    await expect(helpArticleFeedbackNoButton).toBeClickable()
+    await helpArticleFeedbackNoButton.click()
+
+    //Verify if "NO" vote was sent
+    await expect(helpArticleFeedbackNoButton).not.toBeDisplayed()
+    const iconNamaste = HelpArticlePage.iconNamaste
+    const feedbackThanksText = HelpArticlePage.feedbackThanksText
+    await expect(iconNamaste).toBeDisplayed()
+    await expect(feedbackThanksText).toBeDisplayed()
+    await expect(feedbackThanksText).toHaveText("Thank you for your opinion!")
+  })
+})
+
+// const helpArticleFeedbackNoButton =
+//   await HelpArticlePage.helpArticleFeedbackNoButton
+// await expect(helpArticleFeedbackNoButton).toBeDisplayed()
+// await expect(helpArticleFeedbackNoButton).toBeClickable()
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index c25c5cf9aa..5997064b0d 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -30,5 +30,6 @@ export enum TestFilesPaths {
   kompaktDrawerStressTest = "src/specs/stress-tests/device-drawer-stress-test.ts",
   contactSupportUnhappyPath = "src/specs/help/contact-support-unhappy-path.ts",
   kompaktBackupModalGettingInitialInfo = "src/specs/overview/kompakt-backup-getting-initial-info.ts",
+  helpVerifyFeedback = "src/specs/help/help-verify-feedback.ts",
 }
 export const toRelativePath = (path: string) => `./${path}`
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 24db87b84e..bcae9fba68 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -79,6 +79,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.kompaktDrawerStressTest),
     toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
     toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
+    toRelativePath(TestFilesPaths.helpVerifyFeedback),
   ],
   suites: {
     standalone: [
@@ -92,6 +93,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.privacyPolicyTest),
       toRelativePath(TestFilesPaths.licenseTest),
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
+      toRelativePath(TestFilesPaths.helpVerifyFeedback),
     ],
     mock: [
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
@@ -127,6 +129,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.termsOfServiceTest),
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
       toRelativePath(TestFilesPaths.newsMoreNews),
+      toRelativePath(TestFilesPaths.helpVerifyFeedback),
     ],
     cicdMock: [
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),

From af09b754e66d544e6ac3c95d787d2cbf0db66719 Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 14 Oct 2024 08:55:50 +0200
Subject: [PATCH 33/64] CP-3182 deleted unused import and comments

---
 .../src/specs/help/help-verify-feedback.ts                | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts b/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts
index 74aaf54e75..d1205ddf72 100644
--- a/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts
+++ b/apps/mudita-center-e2e/src/specs/help/help-verify-feedback.ts
@@ -4,11 +4,8 @@
  */
 
 import NavigationTabs from "../../page-objects/tabs.page"
-import HelpPage from "../../page-objects/help.page"
 import HelpArticlePage from "../../page-objects/help-article.page"
 import HomePage from "../../page-objects/home.page"
-import helpArticlePage from "../../page-objects/help-article.page"
-import { icon } from "Libs/generic-view/models/src"
 
 describe("Help - Verify Feedback", () => {
   before(async () => {
@@ -82,8 +79,3 @@ describe("Help - Verify Feedback", () => {
     await expect(feedbackThanksText).toHaveText("Thank you for your opinion!")
   })
 })
-
-// const helpArticleFeedbackNoButton =
-//   await HelpArticlePage.helpArticleFeedbackNoButton
-// await expect(helpArticleFeedbackNoButton).toBeDisplayed()
-// await expect(helpArticleFeedbackNoButton).toBeClickable()

From fd973d7f506daea2363080be3b3ba90f8c112f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Wed, 16 Oct 2024 15:42:17 +0200
Subject: [PATCH 34/64] [CP-3191] Fix for displaying search results in help
 (#2130)

---
 libs/help/feature/src/lib/helpers/use-help-search.ts | 10 +++++++---
 libs/help/ui/src/lib/components/search-results.tsx   |  4 +++-
 libs/help/ui/src/lib/components/search.tsx           | 10 ++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libs/help/feature/src/lib/helpers/use-help-search.ts b/libs/help/feature/src/lib/helpers/use-help-search.ts
index 863699519e..046df86ecc 100644
--- a/libs/help/feature/src/lib/helpers/use-help-search.ts
+++ b/libs/help/feature/src/lib/helpers/use-help-search.ts
@@ -6,19 +6,23 @@
 import { useEffect, useState } from "react"
 import { HelpSearchResult } from "help/models"
 import { helpDatabase } from "../database/help-database"
+import { cleanSearchPhrase } from "./clean-search-phrase"
 
 export const useHelpSearch = (searchPhrase?: string) => {
   const [searchResults, setSearchResults] = useState<HelpSearchResult>()
+  const { search: cleanedSearchPhrase } = cleanSearchPhrase(searchPhrase)
 
   useEffect(() => {
     void (async () => {
-      if (searchPhrase && searchPhrase?.length > 1) {
+      if (cleanedSearchPhrase && cleanedSearchPhrase?.length > 1) {
         const db = await helpDatabase
-        const searchResults = await db.search(searchPhrase)
+        const searchResults = await db.search(cleanedSearchPhrase)
         setSearchResults(searchResults)
+      } else {
+        setSearchResults(undefined)
       }
     })()
-  }, [searchPhrase])
+  }, [cleanedSearchPhrase])
 
   return searchResults
 }
diff --git a/libs/help/ui/src/lib/components/search-results.tsx b/libs/help/ui/src/lib/components/search-results.tsx
index a33090ad7c..5b1126e829 100644
--- a/libs/help/ui/src/lib/components/search-results.tsx
+++ b/libs/help/ui/src/lib/components/search-results.tsx
@@ -17,6 +17,7 @@ import { useFormContext } from "react-hook-form"
 import { IconType } from "generic-view/utils"
 import { Icon, P3 } from "generic-view/ui"
 import { HelpTestId } from "../test-ids"
+import { cleanSearchPhrase } from "help/feature"
 
 const messages = defineMessages({
   description: {
@@ -37,6 +38,7 @@ const SearchResultsFC: FunctionComponent<
 > = ({ results, phrase = "", innerRef }) => {
   const { watch, setValue } = useFormContext()
   const categories = useSelector(selectHelpCategories)
+  const { highlight: cleanedHighlightPhrase } = cleanSearchPhrase(phrase)
   const activeIndex = watch("activeResultIndex")
 
   const handleMouseEnter = (index: number) => {
@@ -64,7 +66,7 @@ const SearchResultsFC: FunctionComponent<
                     <ArticleTitle>
                       <HighlightText
                         text={result.document.title}
-                        phrase={phrase}
+                        phrase={cleanedHighlightPhrase}
                       />
                     </ArticleTitle>
                   </ListItemLink>
diff --git a/libs/help/ui/src/lib/components/search.tsx b/libs/help/ui/src/lib/components/search.tsx
index 310516eda4..be70973fe9 100644
--- a/libs/help/ui/src/lib/components/search.tsx
+++ b/libs/help/ui/src/lib/components/search.tsx
@@ -14,7 +14,7 @@ import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { defineMessages } from "react-intl"
 import styled, { css } from "styled-components"
 import { useFormContext } from "react-hook-form"
-import { cleanSearchPhrase, useHelpSearch } from "help/feature"
+import { useHelpSearch } from "help/feature"
 import { SearchResults, SearchResultsWrapper } from "./search-results"
 import { H3, P3, SearchInput } from "generic-view/ui"
 import { useHistory } from "react-router"
@@ -40,9 +40,7 @@ export const Search: FunctionComponent = () => {
   }>()
   const history = useHistory()
   const deferredSearchPhrase = useDeferredValue(watch("search") || "")
-  const { search: cleanedSearchPhrase, highlight: cleanedHighlightPhrase } =
-    cleanSearchPhrase(deferredSearchPhrase)
-  const results = useHelpSearch(cleanedSearchPhrase)
+  const results = useHelpSearch(deferredSearchPhrase)
   const activeResultIndex = watch("activeResultIndex")
   const searchResultsRef = useRef<HTMLDivElement>(null)
 
@@ -116,7 +114,7 @@ export const Search: FunctionComponent = () => {
       </P3>
       <InputWrapper
         onKeyDown={handleKeyDown}
-        dropdownActive={cleanedSearchPhrase.length > 1}
+        dropdownActive={deferredSearchPhrase.length > 1}
         data-testid={HelpTestId.SearchInputWrapper}
       >
         <Input
@@ -128,7 +126,7 @@ export const Search: FunctionComponent = () => {
         />
         <SearchResults
           results={results}
-          phrase={cleanedHighlightPhrase}
+          phrase={deferredSearchPhrase}
           ref={searchResultsRef}
         />
       </InputWrapper>

From 9ef6302e7d66f723fd679f25283994018315257a Mon Sep 17 00:00:00 2001
From: milenaniebrzydowska00 <milena.niebrzydowska@mudita.com>
Date: Thu, 17 Oct 2024 10:48:59 +0200
Subject: [PATCH 35/64] CP-3181 [Help Section] Example of no results in search
 bar of Help Section (#2131)

Co-authored-by: Milena Niebrzydowska <milena.niebrzydowska@mmiquido.com>
---
 .../src/page-objects/help.page.ts             |  3 ++
 .../help/help-section-search-noresults.e2e.ts | 34 +++++++++++++++++++
 .../consts/test-filenames.const.ts            |  1 +
 apps/mudita-center-e2e/wdio.conf.ts           |  3 ++
 4 files changed, 41 insertions(+)
 create mode 100644 apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index 97ae9e1d94..6ded29f834 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -24,6 +24,9 @@ class HelpPage extends Page {
   public get helpSearchResults() {
     return $('[data-testid="help-search-results"]')
   }
+  public get iconSearchHelpSearchResults() {
+    return $('[data-testid="help-search-results"] [data-testid="icon-search"]')
+  }
   public get helpSearchResultsParagraph() {
     return $('[data-testid="help-search-results"] p')
   }
diff --git a/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts
new file mode 100644
index 0000000000..cc38130cc5
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpPage from "../../page-objects/help.page"
+import HomePage from "../../page-objects/home.page"
+
+describe("Check Help search for no results", () => {
+  before(async () => {
+    //Click Not Now button
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+    //Open Help page
+    const helpTab = await NavigationTabs.helpTab
+    await helpTab.waitForDisplayed({ timeout: 15000 })
+    await helpTab.click()
+  })
+
+  it("Search for not existing article and verify no results information", async () => {
+    //Search for not existing article by entering not findable string (special characters)
+    const helpSearchInput = await HelpPage.helpSearchInput
+    await helpSearchInput.setValue("!@#$%^&*()")
+
+    //Verify quick search: no results information
+    const helpSearchResults = await HelpPage.helpSearchResults
+    await expect(helpSearchResults).toBeDisplayed()
+    const iconSearchHelpSearchResults = await HelpPage.iconSearchHelpSearchResults
+    await expect(iconSearchHelpSearchResults).toBeDisplayed()
+    await expect(helpSearchResults).toHaveText("We couldn't find any topics...")
+  })
+})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index 5997064b0d..647efd2904 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -31,5 +31,6 @@ export enum TestFilesPaths {
   contactSupportUnhappyPath = "src/specs/help/contact-support-unhappy-path.ts",
   kompaktBackupModalGettingInitialInfo = "src/specs/overview/kompakt-backup-getting-initial-info.ts",
   helpVerifyFeedback = "src/specs/help/help-verify-feedback.ts",
+  helpSectionSearchNoResults = "src/specs/help/help-section-search-noresults.e2e.ts",
 }
 export const toRelativePath = (path: string) => `./${path}`
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index bcae9fba68..4ebc32ee65 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -80,6 +80,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
     toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
     toRelativePath(TestFilesPaths.helpVerifyFeedback),
+    toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
   ],
   suites: {
     standalone: [
@@ -94,6 +95,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.licenseTest),
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
       toRelativePath(TestFilesPaths.helpVerifyFeedback),
+      toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
     ],
     mock: [
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
@@ -130,6 +132,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
       toRelativePath(TestFilesPaths.newsMoreNews),
       toRelativePath(TestFilesPaths.helpVerifyFeedback),
+      toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
     ],
     cicdMock: [
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),

From eeba5fc49568fdc6255942691e90ca75c12473ae Mon Sep 17 00:00:00 2001
From: MateuszMudita <165778944+MateuszMudita@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:14:28 +0200
Subject: [PATCH 36/64] [CP-3128] Flashing Harmony on MacOS (#2111)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 .../components/core/icon/icon-type.ts         |   2 +
 .../components/core/icon/icon.config.ts       |   8 +
 .../renderer/locales/default/en-US.json       |  12 +-
 .../renderer/svg/back-arrow-icon.svg          |   4 +
 .../renderer/svg/check-circle-black.svg       |   4 +
 .../apps/base-app/base-app.component.tsx      |   4 +
 .../core/hooks/use-device-detached-effect.ts  |   1 -
 .../hooks/use-msc-device-detached-effect.ts   |  66 +++
 .../usb-devices-mac.helper.test.ts            |  94 ----
 .../usb-devices/usb-devices-mac.helper.ts     |  88 +---
 .../components/modals-manager.component.tsx   |   2 +
 .../store/src/lib/action-names.ts             |   3 +
 libs/msc-flash/msc-flash-harmony/src/index.ts |   1 +
 .../src/lib/actions/abort-msc-flashing.ts     |  32 ++
 .../src/lib/actions/actions.ts                |  15 +
 .../get-msc-flashing-files-details.action.ts  |  12 +-
 .../src/lib/actions/index.ts                  |   2 +
 .../flashing-process-state.constant.ts        |   3 +
 .../src/lib/reducers/flashing.interface.ts    |   1 +
 .../src/lib/reducers/flashing.reducer.ts      |  13 +-
 .../download-flashing-file.request.ts         |  19 +-
 .../src/lib/selectors/index.ts                |   6 +-
 .../select-flashing-abort-controller.ts       |  12 +
 ...or.ts => select-flashing-process-state.ts} |   7 +-
 .../lib/selectors/select-flashing-state.ts    |  10 +
 .../select-is-flashing-in-active-phases.ts    |  21 +
 .../selectors/select-is-flashing-in-state.ts  |  14 +
 .../device-flash/device-flash.factory.ts      |  12 +-
 .../device-flash/device-flash.interface.ts    |   8 +
 .../device-flash/flash-exec-command-name.ts   |   6 +
 .../{ => linux}/linux-device-flash.service.ts |  23 +-
 .../linux-partition-parser.test.ts            |   0
 .../{ => linux}/linux-partition-parser.ts     |   0
 .../macos/macos-device-flash-service.ts       | 136 ++++++
 .../windows/windows-device-flash.service.ts   |  72 +++
 .../lib/services/flash-msc-device.service.ts  | 155 +++++--
 .../lib/services/msc-flash-details.service.ts |   4 +-
 .../src/lib/services/unpack-flashing-image.ts |   6 +
 .../flashing-error-modal.component.tsx        |  69 +++
 .../msc-flash-harmony/src/lib/ui/index.ts     |   1 +
 .../mac-terminal-info-modal.component.tsx     | 109 +++++
 .../src/lib/ui/recovery-mode.tsx              |  23 +-
 .../restarting-device-modal.component.tsx     |  24 +-
 ...aiting-for-back-button-modal.component.tsx |  82 ++++
 libs/shared/utils/src/index.ts                |   3 +
 .../utils/src/lib/exec-command-with-sudo.ts   |  27 +-
 .../macos-usb-port-device-parser.interface.ts |  23 +
 .../macos-usb-port-device-parser.test.ts      | 423 ++++++++++++++++++
 .../macos-usb-port-device-parser.ts           |  96 ++++
 .../split-path-to-dir-name-and-base-name.ts   |  14 +
 50 files changed, 1525 insertions(+), 247 deletions(-)
 create mode 100644 libs/core/__deprecated__/renderer/svg/back-arrow-icon.svg
 create mode 100644 libs/core/__deprecated__/renderer/svg/check-circle-black.svg
 create mode 100644 libs/core/core/hooks/use-msc-device-detached-effect.ts
 delete mode 100644 libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.test.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/actions/abort-msc-flashing.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/actions/actions.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-abort-controller.ts
 rename libs/msc-flash/msc-flash-harmony/src/lib/selectors/{msc-flash.selector.ts => select-flashing-process-state.ts} (52%)
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-state.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-active-phases.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/flash-exec-command-name.ts
 rename libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/{ => linux}/linux-device-flash.service.ts (80%)
 rename libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/{ => linux}/linux-partition-parser.test.ts (100%)
 rename libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/{ => linux}/linux-partition-parser.ts (100%)
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/windows/windows-device-flash.service.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/flashing-error-modal/flashing-error-modal.component.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/waiting-for-back-button-modal.component.tsx
 create mode 100644 libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
 create mode 100644 libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
 create mode 100644 libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
 create mode 100644 libs/shared/utils/src/lib/split-path-to-dir-name-and-base-name.ts

diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
index 0ff97b9c54..f6c47920e3 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
@@ -8,6 +8,7 @@ export enum IconType {
   ArrowLongLeft,
   ArrowLongRight,
   AttachContact,
+  BackArrowIcon,
   BackupFolder,
   Battery,
   BorderCheckIcon,
@@ -16,6 +17,7 @@ export enum IconType {
   ChargingBattery,
   Check,
   CheckCircle,
+  CheckCircleBlack,
   CheckIndeterminate,
   Cloud,
   Close,
diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
index 495c2f9a15..1921070d38 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
@@ -8,12 +8,14 @@ import Arrow from "Core/__deprecated__/renderer/svg/arrow.svg"
 import ArrowLongLeft from "Core/__deprecated__/renderer/svg/arrow-long-left.svg"
 import ArrowLongRight from "Core/__deprecated__/renderer/svg/arrow-long-right.svg"
 import AttachContact from "Core/__deprecated__/renderer/svg/attach-contact.svg"
+import BackArrowIcon from "Core/__deprecated__/renderer/svg/back-arrow-icon.svg"
 import BackupFolder from "Core/__deprecated__/renderer/svg/backup-folder.svg"
 import Battery from "Core/__deprecated__/renderer/svg/battery.svg"
 import BorderCheck from "Core/__deprecated__/renderer/svg/border-check-icon.svg"
 import ChargingBattery from "Core/__deprecated__/renderer/svg/charging-battery.svg"
 import Check from "Core/__deprecated__/renderer/svg/check-icon.svg"
 import CheckCircle from "Core/__deprecated__/renderer/svg/check-circle.svg"
+import CheckCircleBlack from "Core/__deprecated__/renderer/svg/check-circle-black.svg"
 import CheckIndeterminate from "Core/__deprecated__/renderer/svg/check-indeterminate.svg"
 import Close from "Core/__deprecated__/renderer/svg/close.svg"
 import CloseWhite from "Core/__deprecated__/renderer/svg/close-white.svg"
@@ -146,6 +148,9 @@ const typeToIcon: Partial<Record<IconType, typeof Arrow>> = {
   [IconType.AttachContact]: AttachContact,
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  [IconType.BackArrowIcon]: BackArrowIcon,
+  // AUTO DISABLED - fix me if you like :)
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   [IconType.BackupFolder]: BackupFolder,
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -170,6 +175,9 @@ const typeToIcon: Partial<Record<IconType, typeof Arrow>> = {
   [IconType.CheckCircle]: CheckCircle,
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  [IconType.CheckCircleBlack]: CheckCircleBlack,
+  // AUTO DISABLED - fix me if you like :)
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   [IconType.CheckIndeterminate]: CheckIndeterminate,
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index 27135417b5..c3ad6c7152 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -1001,7 +1001,7 @@
   "module.recoveryMode.harmony.description": "Please read the instructions carefully. Not following the instructions may void the\nwarranty!",
   "module.recoveryMode.harmony.warning1": "Make sure your device is running <b>OS 1.9.0 or later.</b>",
   "module.recoveryMode.harmony.warning2": "Once you start the recovery, it must not be cancelled or interrupted.",
-  "module.recoveryMode.harmony.warning3": "Do not disconnect your Harmony during the recovery process.",
+  "module.recoveryMode.harmony.warning3": "Connect your Harmony directly to your computer using the USB C cable and do not disconnect it until the process is complete.",
   "module.recoveryMode.harmony.warning4": "Before starting the recovery, charge your device for 1 hour (or more) from a suitable power outlet.",
   "module.recoveryMode.harmony.warningLinux": "Make sure your computer is running <b>Ubuntu 22.04 or later.</b>",
   "module.recoveryMode.harmony.confirmation": "I understand that not following these instructions may void the warranty",
@@ -1016,6 +1016,16 @@
   "module.recoveryMode.modal.step4": "Flashing process... (4 of 4)",
   "module.recoveryMode.modal.restarting.subtitle": "Restarting Harmony...",
   "module.recoveryMode.modal.restarting.message": "Please do not disconnect your Harmony.",
+  "module.recoveryMode.modal.error.subtitle": "Recovery failed",
+  "module.recoveryMode.modal.error.message": "The process was interrupted. Please try again.",
+  "module.recoveryMode.modal.waitingForBackButton.subtitle": "Almost finished...",
+  "module.recoveryMode.modal.waitingForBackButton.description": "Press the back button on your device to complete the recovery process.",
+  "module.recoveryMode.mocal.terminalInfo.subtitle": "Just a few more steps...",
+  "module.recoveryMode.mocal.terminalInfo.description": "The Terminal was opened in the background",
+  "module.recoveryMode.mocal.terminalInfo.step1": "1. Switch to the open terminal",
+  "module.recoveryMode.mocal.terminalInfo.step2": "2. Press enter to start the process",
+  "module.recoveryMode.mocal.terminalInfo.step3": "3. Enter your computer password when prompted",
+  "module.recoveryMode.mocal.terminalInfo.step4": "4. Repeat your computer password when prompted",
   "module.genericViews.dataMigration.cancelConfirm.title": "Cancel data transfer?",
   "module.genericViews.dataMigration.cancelConfirm.description": "We’ll stop the transfer but some data may already be on your Kompakt.",
   "module.genericViews.dataMigration.cancelConfirm.cancelButtonLabel": "Cancel transfer",
diff --git a/libs/core/__deprecated__/renderer/svg/back-arrow-icon.svg b/libs/core/__deprecated__/renderer/svg/back-arrow-icon.svg
new file mode 100644
index 0000000000..f4d4d9c916
--- /dev/null
+++ b/libs/core/__deprecated__/renderer/svg/back-arrow-icon.svg
@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="24" cy="24" r="23.5" stroke="black" fill="transparent"/>
+    <path d="M17.9356 20.5946C17.3467 20.299 17.3843 19.7979 17.9356 19.5152L22.6468 17.125V19.2196H26.8944C28.2236 19.2196 29.4984 19.7612 30.4383 20.7251C31.3782 21.6891 31.9062 22.9965 31.9062 24.3598C31.9062 25.723 31.3782 27.0304 30.4383 27.9944C29.4984 28.9583 28.2236 29.4999 26.8944 29.4999H16.8706C16.7692 29.5016 16.6684 29.4826 16.5743 29.444C16.4801 29.4053 16.3943 29.3479 16.322 29.2749C16.2497 29.2019 16.1923 29.1149 16.1531 29.019C16.1139 28.923 16.0937 28.8201 16.0938 28.716C16.0938 28.5047 16.1756 28.3021 16.3213 28.1527C16.467 28.0032 16.6646 27.9193 16.8706 27.9193H26.8944C27.8149 27.9193 28.6976 27.5443 29.3485 26.8767C29.9994 26.2092 30.3651 25.3038 30.3651 24.3598C30.3651 23.4157 29.9994 22.5103 29.3485 21.8428C28.6976 21.1752 27.8149 20.8002 26.8944 20.8002H22.6468V22.882L17.9356 20.5946Z" fill="black"/>
+</svg>
diff --git a/libs/core/__deprecated__/renderer/svg/check-circle-black.svg b/libs/core/__deprecated__/renderer/svg/check-circle-black.svg
new file mode 100644
index 0000000000..ec0c92a278
--- /dev/null
+++ b/libs/core/__deprecated__/renderer/svg/check-circle-black.svg
@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 24C8 15.156 15.1573 8 24 8C32.8441 8 40 15.1572 40 24C40 32.8441 32.8429 40 24 40C15.156 40 8 32.8428 8 24ZM13.6291 34.3708C19.3616 40.1033 28.6393 40.1025 34.371 34.3708C40.0895 28.6524 40.0895 19.3476 34.371 13.629C28.6385 7.89651 19.3607 7.89738 13.6291 13.629C7.91055 19.3476 7.91055 28.6524 13.6291 34.3708Z" fill="black"/>
+<path d="M21.4296 30.0743C21.4957 30.1477 21.5823 30.1846 21.669 30.1846C21.7557 30.1846 21.8424 30.1477 21.9084 30.0743L31.5948 18.3642C31.7272 18.217 31.7272 17.979 31.5948 17.8318C31.4624 17.6846 31.2484 17.6846 31.116 17.8318L21.669 29.2758L16.8843 23.9563C16.7519 23.8091 16.5379 23.8091 16.4055 23.9563C16.2731 24.1035 16.2731 24.3414 16.4055 24.4886L21.4296 30.0743Z" fill="black" stroke="black"/>
+</svg>
diff --git a/libs/core/core/components/apps/base-app/base-app.component.tsx b/libs/core/core/components/apps/base-app/base-app.component.tsx
index fefad0f7dc..84910a147f 100644
--- a/libs/core/core/components/apps/base-app/base-app.component.tsx
+++ b/libs/core/core/components/apps/base-app/base-app.component.tsx
@@ -16,6 +16,7 @@ import { useDeviceLockedEffect } from "Core/core/hooks/use-device-locked-effect"
 import { useDeviceDetachedEffect } from "Core/core/hooks/use-device-detached-effect"
 import { useDeviceConnectFailedEffect } from "Core/core/hooks/use-device-connect-failed-effect"
 import { useDiscoveryRedirectEffect } from "Core/core/hooks/use-discovery-redirect-effect"
+import { useMscDeviceDetachedEffect } from "Core/core/hooks/use-msc-device-detached-effect"
 import { useRouterListener } from "Core/core/hooks"
 import {
   OutboxWrapper,
@@ -46,6 +47,9 @@ const BaseApp: FunctionComponent = () => {
   useFileDialogEventListener()
   useHelp()
 
+  // MSC
+  useMscDeviceDetachedEffect()
+
   return (
     <>
       <OutboxWrapper />
diff --git a/libs/core/core/hooks/use-device-detached-effect.ts b/libs/core/core/hooks/use-device-detached-effect.ts
index f217180fc8..cae52f25c5 100644
--- a/libs/core/core/hooks/use-device-detached-effect.ts
+++ b/libs/core/core/hooks/use-device-detached-effect.ts
@@ -39,7 +39,6 @@ export const useDeviceDetachedEffect = () => {
 }
 
 const useHandleDevicesDetached = () => {
-  const dispatch = useDispatch<Dispatch>()
   const processActiveDevicesDetachment = useProcessActiveDevicesDetachment()
   const processSingleDeviceRemaining = useProcessSingleDeviceRemaining()
 
diff --git a/libs/core/core/hooks/use-msc-device-detached-effect.ts b/libs/core/core/hooks/use-msc-device-detached-effect.ts
new file mode 100644
index 0000000000..bbc452f0db
--- /dev/null
+++ b/libs/core/core/hooks/use-msc-device-detached-effect.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { useCallback, useEffect } from "react"
+import { useDispatch, useSelector } from "react-redux"
+import { answerMain, useDebouncedEventsHandler } from "shared/utils"
+import {
+  DeviceBaseProperties,
+  DeviceProtocolMainEvent,
+  DeviceType,
+} from "device-protocol/models"
+import {
+  abortMscFlashing,
+  FlashingProcessState,
+  selectIsFlashingInActivePhases,
+  selectIsFlashingInState,
+  setMscFlashingInitialState,
+} from "msc-flash-harmony"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+
+export const useMscDeviceDetachedEffect = () => {
+  const handleDevicesDetached = useHandleDevicesDetached()
+
+  const batchDeviceDetachedEvents =
+    useDebouncedEventsHandler<DeviceBaseProperties>(handleDevicesDetached)
+
+  useEffect(() => {
+    return answerMain(
+      DeviceProtocolMainEvent.DeviceDetached,
+      batchDeviceDetachedEvents
+    )
+  }, [batchDeviceDetachedEvents])
+}
+
+const useHandleDevicesDetached = () => {
+  const dispatch = useDispatch<Dispatch>()
+  const flashingInActivePhases = useSelector(selectIsFlashingInActivePhases)
+  const flashingInWaitingForBackButtonState = useSelector(
+    selectIsFlashingInState(FlashingProcessState.WaitingForBackButton)
+  )
+
+  return useCallback(
+    (deviceDetachedEvents: DeviceBaseProperties[]) => {
+      const mscEvents = deviceDetachedEvents.filter(
+        ({ deviceType }) => deviceType === DeviceType.MuditaHarmonyMsc
+      )
+
+      if (mscEvents.length === 0) {
+        return
+      }
+
+      if (flashingInWaitingForBackButtonState) {
+        dispatch(setMscFlashingInitialState())
+        return
+      }
+
+      const reason = flashingInActivePhases
+        ? FlashingProcessState.Failed
+        : undefined
+      dispatch(abortMscFlashing({ reason }))
+    },
+    [dispatch, flashingInActivePhases, flashingInWaitingForBackButtonState]
+  )
+}
diff --git a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.test.ts b/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.test.ts
deleted file mode 100644
index ebdbcb5926..0000000000
--- a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { getHarmonyMSCDevice, parseToPortInfo } from "./usb-devices-mac.helper"
-import { PortInfo } from "serialport"
-
-describe("getHarmonyMSCDevice", () => {
-  it("should return the correct device details", () => {
-    const output = `
-      Mudita Harmony (MSC mode):
-        Product ID: 0x0103
-        Vendor ID: 0x3310
-        Version: 1.01
-        Serial Number: 0123456789ABCDEF
-        Speed: Up to 480 Mb/s
-        Manufacturer: Mudita
-        Location ID: 0x00140000 / 4
-        Current Available (mA): 500
-        Current Required (mA): 100
-        Extra Operating Current (mA): 0
-      Mudita Pure:
-        Product ID: 0x0102
-        Vendor ID: 0x3310
-        Version: 1.12
-        Serial Number: 25878580214921
-        Speed: Up to 480 Mb/s
-        Manufacturer: Mudita
-        Location ID: 0x00120000 / 5
-        Current Available (mA): 500
-        Current Required (mA): 500
-        Extra Operating Current (mA): 0
-    `
-
-    const device = getHarmonyMSCDevice(output)
-
-    expect(device).toEqual({
-      name: "Mudita Harmony (MSC mode)",
-      VendorID: "0x3310",
-      ProductID: "0x0103",
-      SerialNumber: "0123456789ABCDEF",
-      Manufacturer: "Mudita",
-      LocationID: "0x00140000 / 4",
-      Version: "1.01",
-      Speed: "Up to 480 Mb/s",
-      "CurrentAvailable(mA)": "500",
-      "CurrentRequired(mA)": "100",
-      "ExtraOperatingCurrent(mA)": "0",
-    })
-  })
-
-  it("should return null if no matching device is found", () => {
-    const output = `
-      Mudita Pure:
-        Product ID: 0x0102
-        Vendor ID: 0x3310
-        Version: 1.12
-        Serial Number: 25878580214921
-        Speed: Up to 480 Mb/s
-        Manufacturer: Mudita
-        Location ID: 0x00120000 / 5
-        Current Available (mA): 500
-        Current Required (mA): 500
-        Extra Operating Current (mA): 0
-    `
-    const device = getHarmonyMSCDevice(output)
-    expect(device).toBeNull()
-  })
-})
-
-describe("parseToPortInfo", () => {
-  it("should parse DeviceDetails to PortInfo correctly", () => {
-    const deviceDetails = {
-      name: "Mudita Harmony (MSC mode)",
-      VendorID: "0x3310",
-      ProductID: "0x0103",
-      SerialNumber: "0123456789ABCDEF",
-      Manufacturer: "Mudita",
-      LocationID: "0x00140000 / 3",
-    }
-
-    const portInfo: PortInfo = parseToPortInfo(deviceDetails)
-
-    expect(portInfo).toEqual({
-      path: "3310/0103/0123456789ABCDEF",
-      manufacturer: "Mudita",
-      serialNumber: "0123456789ABCDEF",
-      productId: "0103",
-      vendorId: "3310",
-      locationId: "0x00140000",
-    })
-  })
-})
diff --git a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts b/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
index 17014949fa..035183a934 100644
--- a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
+++ b/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
@@ -3,86 +3,22 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ProductID, VendorID } from "Core/device/constants"
-import { execPromise } from "shared/utils"
 import { PortInfo } from "serialport"
-
-interface DeviceDetails {
-  [key: string]: string | undefined
-  name?: string
-  ProductID?: string
-  VendorID?: string
-  Version?: string
-  SerialNumber?: string
-  Speed?: string
-  Manufacturer?: string
-  LocationID?: string
-  "CurrentAvailable(mA)"?: string
-  "CurrentRequired(mA)"?: string
-  "ExtraOperatingCurrent(mA)"?: string
-}
-
-export const getHarmonyMSCDevice = (output: string): DeviceDetails | null => {
-  const devices: Array<DeviceDetails> = []
-  const lines = output.trim().split("\n")
-  let currentDevice: DeviceDetails = {}
-  let currentKey = ""
-
-  lines.forEach((line) => {
-    if (line.trim() && !line.trim().endsWith(":")) {
-      const [keyParts, ...valueParts] = line.trim().split(":")
-      const key = keyParts.replaceAll(" ", "")
-      const value = valueParts.join(":").trim()
-      currentDevice[key] = value
-    } else if (line.trim().endsWith(":")) {
-      if (Object.keys(currentDevice).length) {
-        devices.push({ name: currentKey, ...currentDevice })
-        currentDevice = {}
-      }
-      currentKey = line.trim().slice(0, -1)
-    }
-  })
-
-  if (Object.keys(currentDevice).length) {
-    devices.push({ name: currentKey, ...currentDevice })
-  }
-
-  return (
-    devices.find((device) => {
-      if (device.VendorID && device.ProductID) {
-        return (
-          device.VendorID.includes(VendorID.MuditaHarmony) &&
-          device.ProductID.includes(ProductID.MuditaHarmonyMsc)
-        )
-      }
-      return null
-    }) || null
-  )
-}
-
-export const parseToPortInfo = (device: DeviceDetails): PortInfo => {
-  const vendorId = device.VendorID!.replace("0x", "")
-  const productId = device.ProductID!.replace("0x", "")
-  const serialNumber = device.SerialNumber
-
-  return {
-    path: `${vendorId}/${productId}/${serialNumber}`,
-    manufacturer: device.Manufacturer,
-    serialNumber: device.SerialNumber,
-    productId,
-    vendorId,
-    locationId: device.LocationID?.split(" ")[0],
-  }
-}
+import { MacosUSBPortDeviceParser } from "shared/utils"
+import { ProductID, VendorID } from "Core/device/constants"
 
 export const getUsbDevicesMacOS = async (): Promise<PortInfo | void> => {
   try {
-    const stdout = await execPromise("system_profiler SPUSBDataType")
-    if (stdout) {
-      const harmonyDevice = getHarmonyMSCDevice(stdout)
-      if (harmonyDevice) {
-        return parseToPortInfo(harmonyDevice)
-      }
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    const device = devices.find((device) => {
+      return (
+        device.vendorId?.includes(VendorID.MuditaHarmony) &&
+        device.productId?.includes(ProductID.MuditaHarmonyMsc)
+      )
+    })
+
+    if (device !== undefined) {
+      return device
     }
   } catch (error) {
     console.error(error)
diff --git a/libs/core/modals-manager/components/modals-manager.component.tsx b/libs/core/modals-manager/components/modals-manager.component.tsx
index 2a0053019f..80323d4262 100644
--- a/libs/core/modals-manager/components/modals-manager.component.tsx
+++ b/libs/core/modals-manager/components/modals-manager.component.tsx
@@ -5,6 +5,7 @@
 
 import React from "react"
 import { useSelector } from "react-redux"
+import { FlashingErrorModal } from "msc-flash-harmony"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import ContactSupportFlow from "Core/contact-support/containers/contact-support-flow.container"
 import { UpdateOsInterruptedFlowContainer } from "Core/update/components/update-os-interrupted-flow"
@@ -25,6 +26,7 @@ const ModalsManager: FunctionComponent = () => {
       <UpdateOsInterruptedFlowContainer />
       <ConnectingLoaderModal />
       <DetachedDuringUploadErrorModal />
+      <FlashingErrorModal />
       {appUpdateVisible && <AppUpdateFlow />}
     </>
   )
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index 265f550458..8c8d258cad 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -91,6 +91,9 @@ export enum ActionName {
 
   MscFlashingGetFilesDetails = "msc-flashing/get-files-details",
   MscFlashingSetProcessState = "msc-flashing/set-process-state",
+  MscFlashingSetAbort = "msc-flashing/set-abort",
+  MscFlashingAbort = "msc-flashing/abort",
+  MscFlashingSetInitialState = "msc-flashing/set-initial-state",
 
   GetEntitiesConfig = "entities/get-entities-config",
   SetEntitiesConfig = "entities/set-entities-config",
diff --git a/libs/msc-flash/msc-flash-harmony/src/index.ts b/libs/msc-flash/msc-flash-harmony/src/index.ts
index 7c6b288621..4747ed7978 100644
--- a/libs/msc-flash/msc-flash-harmony/src/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/index.ts
@@ -7,5 +7,6 @@ export * from "./lib/actions"
 export * from "./lib/constants"
 export * from "./lib/dto"
 export * from "./lib/reducers"
+export * from "./lib/selectors"
 export * from "./lib/services"
 export * from "./lib/ui"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/abort-msc-flashing.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/abort-msc-flashing.ts
new file mode 100644
index 0000000000..919e84c492
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/abort-msc-flashing.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "generic-view/store"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { FlashingProcessState } from "../constants"
+import { selectFlashingAbortController } from "../selectors"
+import { setFlashingProcessState } from "./set-flashing-process-state.action"
+import { setMscFlashingAbort } from "./actions"
+
+export const abortMscFlashing = createAsyncThunk<
+  void,
+  { reason?: Extract<FlashingProcessState, "canceled" | "failed"> } | undefined,
+  { state: ReduxRootState }
+>(
+  ActionName.MscFlashingAbort,
+  async ({ reason } = {}, { dispatch, getState }) => {
+    const abortController = selectFlashingAbortController(getState())
+
+    abortController?.abort?.()
+    dispatch(setMscFlashingAbort(undefined))
+
+    if (reason) {
+      dispatch(setFlashingProcessState(reason))
+    }
+
+    return
+  }
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/actions.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/actions.ts
new file mode 100644
index 0000000000..b703d50862
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/actions.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction } from "@reduxjs/toolkit"
+import { ActionName } from "generic-view/store"
+
+export const setMscFlashingAbort = createAction<AbortController | undefined>(
+  ActionName.MscFlashingSetAbort
+)
+
+export const setMscFlashingInitialState = createAction(
+  ActionName.MscFlashingSetInitialState
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
index 1de77fe514..1c3c544edf 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/get-msc-flashing-files-details.action.ts
@@ -12,16 +12,22 @@ import { MscFlashDetailsService } from "../services/msc-flash-details.service"
 
 export const getMscFlashingFilesDetails = createAsyncThunk<
   MscFlashDetails,
-  { product: Product; environment: OsEnvironment; platform: SupportedPlatform },
+  {
+    product: Product
+    environment: OsEnvironment
+    platform: SupportedPlatform
+    signal?: AbortSignal
+  },
   { state: ReduxRootState }
 >(
   ActionName.MscFlashingGetFilesDetails,
-  async ({ product, environment, platform }, { rejectWithValue }) => {
+  async ({ product, environment, platform, signal }, { rejectWithValue }) => {
     try {
       const filesDetails = await MscFlashDetailsService.getMscFlashDetails(
         product,
         environment,
-        platform
+        platform,
+        signal
       )
 
       return filesDetails
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
index 959991a805..2ea39d36a6 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/actions/index.ts
@@ -5,3 +5,5 @@
 
 export * from "./get-msc-flashing-files-details.action"
 export * from "./set-flashing-process-state.action"
+export * from "./abort-msc-flashing"
+export * from "./actions"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts b/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
index 6ab8de0ea3..0b43614583 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/constants/flashing-process-state.constant.ts
@@ -9,7 +9,10 @@ export enum FlashingProcessState {
   DownloadingFiles = "downloading-files",
   UnpackingFiles = "unpacking-files",
   FlashingProcess = "flashing-process",
+  TerminalOpened = "terminal-opened",
+  WaitingForBackButton = "waiting-for-back-button",
   Restarting = "restarting-device",
   Completed = "completed",
+  Canceled = "canceled",
   Failed = "failed",
 }
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
index cc6d7baf0a..938f5d2963 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.interface.ts
@@ -7,6 +7,7 @@ import { FlashingProcessState } from "../constants"
 import { MscFlashDetails } from "../dto"
 
 export interface FlashingState {
+  abortController?: AbortController
   processState: FlashingProcessState
   mscFlashDetails?: MscFlashDetails
   error: string | undefined
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
index ea9c2d323b..8fb794cee7 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/reducers/flashing.reducer.ts
@@ -5,8 +5,13 @@
 
 import { createReducer } from "@reduxjs/toolkit"
 import { FlashingState } from "./flashing.interface"
-import { getMscFlashingFilesDetails, setFlashingProcessState } from "../actions"
+import {
+  getMscFlashingFilesDetails,
+  setFlashingProcessState,
+  setMscFlashingInitialState,
+} from "../actions"
 import { FlashingProcessState } from "../constants"
+import { setMscFlashingAbort } from "../actions/actions"
 
 const initialState: FlashingState = {
   processState: FlashingProcessState.Idle,
@@ -24,5 +29,11 @@ export const flashingReducer = createReducer<FlashingState>(
       .addCase(setFlashingProcessState, (state, action) => {
         state.processState = action.payload
       })
+      .addCase(setMscFlashingAbort, (state, action) => {
+        state.abortController = action.payload
+      })
+      .addCase(setMscFlashingInitialState, () => {
+        return { ...initialState }
+      })
   }
 )
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts b/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
index 3247972cd6..8cc94d2f7a 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/requests/download-flashing-file.request.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import { ipcRenderer } from "electron-better-ipc"
 import { Result, ResultObject } from "Core/core/builder"
 import { AppError } from "Core/core/errors"
 import { PureOsDownloadChannels } from "Core/__deprecated__/main/functions/register-pure-os-download-listener"
@@ -10,7 +11,6 @@ import {
   DownloadFinished,
   DownloadStatus,
 } from "Core/__deprecated__/renderer/interfaces/file-download.interface"
-import { ipcRenderer } from "electron-better-ipc"
 
 // AUTO DISABLED - fix me if you like :)
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
@@ -18,13 +18,22 @@ export const cancelFileDownload = (interrupt = false) => {
   ipcRenderer.send(PureOsDownloadChannels.cancel, interrupt)
 }
 
-export const downloadFlashingFileRequest = async (props: {
-  url: string
-  fileName: string
-}): Promise<
+export const downloadFlashingFileRequest = async (
+  props: {
+    url: string
+    fileName: string
+  },
+  signal: AbortSignal
+): Promise<
   | ResultObject<DownloadFinished>
   | ResultObject<DownloadStatus.Cancelled | DownloadStatus.Interrupted>
 > => {
+  const abortHandler = () => {
+    signal.removeEventListener("abort", abortHandler)
+    cancelFileDownload(true)
+  }
+  signal.addEventListener("abort", abortHandler)
+
   const data: DownloadFinished = await ipcRenderer.callMain(
     PureOsDownloadChannels.start,
     props
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
index 582f1c40a5..e523005240 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
@@ -3,4 +3,8 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-export * from "./msc-flash.selector"
+export * from "./select-flashing-state"
+export * from "./select-flashing-abort-controller"
+export * from "./select-flashing-process-state"
+export * from "./select-is-flashing-in-active-phases"
+export * from "./select-is-flashing-in-state"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-abort-controller.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-abort-controller.ts
new file mode 100644
index 0000000000..5b585cf88b
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-abort-controller.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { flashingState } from "./select-flashing-state"
+
+export const selectFlashingAbortController = createSelector(
+  flashingState,
+  (flashingState) => flashingState.abortController
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-process-state.ts
similarity index 52%
rename from libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts
rename to libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-process-state.ts
index 61dfee9a74..297389ddf5 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/msc-flash.selector.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-process-state.ts
@@ -4,10 +4,9 @@
  */
 
 import { createSelector } from "@reduxjs/toolkit"
-import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { FlashingProcessState } from "../constants"
+import { flashingState } from "./select-flashing-state"
 
 export const selectFlashingProcessState = createSelector(
-  (state: ReduxRootState) => state.flashing.processState,
-  (processState: FlashingProcessState) => processState
+  flashingState,
+  (flashingState) => flashingState.processState
 )
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-state.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-state.ts
new file mode 100644
index 0000000000..00f214d6dd
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-flashing-state.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { FlashingState } from "msc-flash-harmony"
+
+export const flashingState = (state: ReduxRootState): FlashingState =>
+  state.flashing
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-active-phases.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-active-phases.ts
new file mode 100644
index 0000000000..ac9db03139
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-active-phases.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { FlashingProcessState } from "../constants"
+import { selectFlashingProcessState } from "./select-flashing-process-state"
+
+const flashingActivePhases: FlashingProcessState[] = [
+  FlashingProcessState.GettingFilesDetails,
+  FlashingProcessState.DownloadingFiles,
+  FlashingProcessState.UnpackingFiles,
+  FlashingProcessState.FlashingProcess,
+  FlashingProcessState.TerminalOpened,
+]
+
+export const selectIsFlashingInActivePhases = createSelector(
+  selectFlashingProcessState,
+  (flashingProcessState) => flashingActivePhases.includes(flashingProcessState)
+)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
new file mode 100644
index 0000000000..fb799f00c0
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { FlashingProcessState } from "../constants"
+import { selectFlashingProcessState } from "./select-flashing-process-state"
+
+export const selectIsFlashingInState = (targetState: FlashingProcessState) =>
+  createSelector(
+    selectFlashingProcessState,
+    (flashingProcessState) => flashingProcessState === targetState
+  )
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
index 086a30a03b..c4f22c9f8f 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.factory.ts
@@ -4,14 +4,22 @@
  */
 
 import IDeviceFlash from "./device-flash.interface"
-import LinuxDeviceFlashService from "./linux-device-flash.service"
+import LinuxDeviceFlashService from "./linux/linux-device-flash.service"
+import MacDeviceFlashService from "./macos/macos-device-flash-service"
+import WindowsDeviceFlashService from "./windows/windows-device-flash.service"
 
 class DeviceFlashFactory {
-  static createDeviceFlashService(): IDeviceFlash {
+  static createDeviceFlashService(
+    temporaryDirectoryPath: string
+  ): IDeviceFlash {
     const platform = process.platform
 
     if (platform === "linux") {
       return new LinuxDeviceFlashService()
+    } else if (platform === "darwin") {
+      return new MacDeviceFlashService(temporaryDirectoryPath)
+    } else if (platform === "win32") {
+      return new WindowsDeviceFlashService()
     } else {
       throw new Error(`Unsupported platform: ${platform}`)
     }
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
index 39f0662094..9b11e52654 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/device-flash.interface.ts
@@ -3,10 +3,18 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export interface waitForFlashCompletionOption {
+  intervalAttemptsLeft?: number
+  intervalTime?: number
+  signal?: AbortSignal
+}
+
 interface IDeviceFlash {
   findDeviceByDeviceName(deviceName?: string): Promise<string>
 
   execute(device: string, imagePath: string, scriptPath: string): Promise<void>
+
+  waitForFlashCompletion?(option?: waitForFlashCompletionOption): Promise<boolean>
 }
 
 export default IDeviceFlash
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/flash-exec-command-name.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/flash-exec-command-name.ts
new file mode 100644
index 0000000000..0f2439e804
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/flash-exec-command-name.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export const flashExecCommandName = "MSC Mudita Device Flash"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-device-flash.service.ts
similarity index 80%
rename from libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts
rename to libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-device-flash.service.ts
index 6ab60d2401..5e11ca5bbe 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-device-flash.service.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-device-flash.service.ts
@@ -3,10 +3,14 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import path from "path"
-import { execPromise, execCommandWithSudo } from "shared/utils"
-import IDeviceFlash from "./device-flash.interface"
+import {
+  execPromise,
+  execCommandWithSudo,
+  splitPathToDirNameAndBaseName,
+} from "shared/utils"
+import IDeviceFlash from "../device-flash.interface"
 import LinuxPartitionParser from "./linux-partition-parser"
+import { flashExecCommandName } from "../flash-exec-command-name"
 
 class LinuxDeviceFlashService implements IDeviceFlash {
   async findDeviceByDeviceName(deviceName: string): Promise<string> {
@@ -36,7 +40,7 @@ class LinuxDeviceFlashService implements IDeviceFlash {
     const ejectDeviceCommand = await this.getEjectDeviceCommand(device)
 
     const command = `${unmountDeviceCommand} && ${flashImageToDeviceCommand} && ${ejectDeviceCommand}`
-    await execCommandWithSudo(command, { name: "Mudita Auto Flash" })
+    await execCommandWithSudo(command, {name: flashExecCommandName})
 
     console.log("Flash process completed successfully")
   }
@@ -55,9 +59,8 @@ class LinuxDeviceFlashService implements IDeviceFlash {
     imagePath: string,
     scriptPath: string
   ): Promise<string> {
-    const [path, scriptBasename] =
-      this.splitPathToDirnameAndBasename(scriptPath)
-    const [, imageBasename] = this.splitPathToDirnameAndBasename(imagePath)
+    const [path, scriptBasename] = splitPathToDirNameAndBaseName(scriptPath)
+    const [, imageBasename] = splitPathToDirNameAndBaseName(imagePath)
     return `chmod +x ${scriptPath} && cd ${path} && ./${scriptBasename} ${imageBasename} /dev/${device}`
   }
 
@@ -77,12 +80,6 @@ class LinuxDeviceFlashService implements IDeviceFlash {
     )
     return LinuxPartitionParser.parsePartitions(partitions ?? "")
   }
-
-  private splitPathToDirnameAndBasename(currentPath: string) {
-    const dirname = path.dirname(currentPath)
-    const basename = path.basename(currentPath)
-    return [dirname, basename]
-  }
 }
 
 export default LinuxDeviceFlashService
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-partition-parser.test.ts
similarity index 100%
rename from libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.test.ts
rename to libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-partition-parser.test.ts
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-partition-parser.ts
similarity index 100%
rename from libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux-partition-parser.ts
rename to libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/linux/linux-partition-parser.ts
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
new file mode 100644
index 0000000000..c8d6bae770
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+import fs from "fs"
+import {
+  delay,
+  execPromise,
+  MacosUSBPortDeviceParser,
+  USBPortDevice,
+} from "shared/utils"
+import IDeviceFlash, {
+  waitForFlashCompletionOption,
+} from "../device-flash.interface"
+
+type FlashStatusType =
+  | "FLASH_STATUS_COMPLETED"
+  | "FLASH_STATUS_FAILED"
+  | "FLASH_STATUS_IDLE"
+
+class MacDeviceFlashService implements IDeviceFlash {
+  private readonly flashStatusTempFilePath: string
+
+  constructor(temporaryDirectoryPath: string) {
+    this.flashStatusTempFilePath = path.join(
+      temporaryDirectoryPath,
+      "flash-status.txt"
+    )
+  }
+
+  async findDeviceByDeviceName(): Promise<string> {
+    console.log(`Searching for device...`)
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+
+    const device = devices.find((device) => {
+      return (
+        device.vendorId?.includes("3310") &&
+        device.name?.includes("Mudita Harmony (MSC mode)")
+      )
+    })
+
+    if (!device) {
+      console.error(
+        `Device with VendorID: 3310 and name: "Mudita Harmony (MSC mode)" not found.`
+      )
+      throw new Error(
+        `Device with VendorID: 3310 and name: "Mudita Harmony (MSC mode)" not found.`
+      )
+    }
+
+    console.log(
+      `Device found: VendorID=${device.vendorId}, ProductID=${device.productId}, Version=${device.version}}`
+    )
+    console.log("Device details:", JSON.stringify(device, null, 2))
+
+    return await this.getDiskIdentifier(device)
+  }
+
+  async execute(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<void> {
+    console.log("flashing process starting")
+    await this.flashImageToDevice(device, imagePath, scriptPath)
+    console.log("Flash process completed successfully")
+  }
+
+  async flashImageToDevice(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<void> {
+    await execPromise(`
+      chmod +x "${scriptPath}"
+    `)
+    await execPromise(
+      `osascript -e 'tell application "Terminal" to do script "\\"${scriptPath}\\" -i \\"${imagePath}\\" -d \\"${device}\\" -s \\"${this.flashStatusTempFilePath}\\""'`
+    )
+  }
+
+  async waitForFlashCompletion(
+    option: waitForFlashCompletionOption = {}
+  ): Promise<boolean> {
+    let flashStatus: FlashStatusType = "FLASH_STATUS_IDLE"
+    const { intervalAttemptsLeft = 60, intervalTime = 5000, signal } = option
+
+    if (intervalAttemptsLeft <= 0 || signal?.aborted) {
+      throw new Error()
+    }
+
+    try {
+      const buffer = fs.readFileSync(this.flashStatusTempFilePath)
+      flashStatus = buffer.toString().trim() as FlashStatusType
+    } catch (error) {
+      console.error(`Error reading file: ${JSON.stringify(error)}. Retrying...`)
+    }
+
+    if (flashStatus === "FLASH_STATUS_COMPLETED") {
+      return true
+    } else if (flashStatus === "FLASH_STATUS_FAILED") {
+      throw new Error()
+    }
+
+    await delay(intervalTime)
+
+    return this.waitForFlashCompletion({
+      intervalAttemptsLeft: intervalAttemptsLeft - 1,
+      intervalTime,
+      signal,
+    })
+  }
+
+  private async getDiskIdentifier(device: USBPortDevice): Promise<string> {
+    const bsdName = device.bsdName
+    if (!bsdName) {
+      throw new Error("BSD Name not found in device details.")
+    }
+
+    const diskUtilOutput = (await execPromise("diskutil list")) ?? ""
+    const lines = diskUtilOutput.trim().split("\n")
+
+    for (const line of lines) {
+      const trimmedLine = line.trim()
+      if (trimmedLine.startsWith("/dev/") && trimmedLine.includes(bsdName)) {
+        return trimmedLine.split(" ")[0]
+      }
+    }
+
+    throw new Error(`Disk identifier for BSD Name ${bsdName} not found.`)
+  }
+}
+
+export default MacDeviceFlashService
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/windows/windows-device-flash.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/windows/windows-device-flash.service.ts
new file mode 100644
index 0000000000..ab49f47ef2
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/windows/windows-device-flash.service.ts
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  execCommandWithSudo,
+  execPromise,
+  splitPathToDirNameAndBaseName,
+} from "shared/utils"
+import IDeviceFlash from "../device-flash.interface"
+import { flashExecCommandName } from "../flash-exec-command-name"
+
+interface DiskInformation {
+  DiskNumber: number
+  FriendlyName: string
+  Size: string
+  OperationalStatus: string
+}
+
+class WindowsDeviceFlashService implements IDeviceFlash {
+  async findDeviceByDeviceName(deviceName: string): Promise<string> {
+    console.log(
+      `Searching for the device with the friendly name: ${deviceName}`
+    )
+
+    const getDiskResult = await execPromise(
+      `powershell.exe -Command "Get-Disk | Where-Object { $_.FriendlyName -eq '${deviceName}' }| ConvertTo-Json"`
+    )
+
+    if (!getDiskResult) {
+      throw new Error(`Disk not found for friendly name: ${deviceName}`)
+    }
+
+    const diskInformation: DiskInformation = JSON.parse(getDiskResult)
+
+    console.log(
+      `Disk information retrieved successfully: Disk Number - ${diskInformation.DiskNumber}, Size - ${diskInformation.Size} bytes, Status - ${diskInformation.OperationalStatus}`
+    )
+
+    return String(diskInformation.DiskNumber)
+  }
+
+  async execute(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<void> {
+    await this.flashDevice(device, imagePath, scriptPath)
+    console.log("Flash process completed successfully")
+  }
+
+  private async flashDevice(
+    device: string,
+    imagePath: string,
+    scriptPath: string
+  ): Promise<void> {
+    const [path, scriptBasename] = splitPathToDirNameAndBaseName(scriptPath)
+    const [, imageBasename] = splitPathToDirNameAndBaseName(imagePath)
+    const command = `cd ${path} && powershell.exe -ExecutionPolicy Bypass -File ${scriptBasename} -file ${imageBasename} -diskid ${device} -force`
+
+    try {
+      await execCommandWithSudo(command, { name: flashExecCommandName })
+    } catch (error) {
+      throw new Error(
+        `An error occurred during flashing: ${JSON.stringify(error)}`
+      )
+    }
+  }
+}
+
+export default WindowsDeviceFlashService
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
index 97f1c48277..19be13f84f 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/flash-msc-device.service.ts
@@ -5,40 +5,69 @@
 
 import path from "path"
 import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
+import logger from "Core/__deprecated__/main/utils/logger"
+import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
+import { RELEASE_SPACE } from "Core/update/constants/release-space.constant"
 import { FlashingProcessState, SupportedPlatform, Product } from "../constants"
 import { setFlashingProcessState } from "../actions/set-flashing-process-state.action"
 import { getMscFlashingFilesDetails } from "../actions/get-msc-flashing-files-details.action"
 import { MscFlashDetails } from "../dto"
 import { downloadFlashingFileRequest } from "../requests"
+import { setMscFlashingAbort } from "../actions/actions"
+import { selectIsFlashingInActivePhases } from "../selectors"
 import { unpackFlashingImageService } from "./unpack-flashing-image"
 import DeviceFlashFactory from "./device-flash/device-flash.factory"
-import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
+import MacDeviceFlashService from "./device-flash/macos/macos-device-flash-service"
+import IDeviceFlash from "./device-flash/device-flash.interface"
+import { removeDownloadedMscFiles } from "./remove-downloaded-msc-files.service"
 
 const IMAGE_FILE_NAME = "BellHybrid.img"
-import { RELEASE_SPACE } from "Core/update/constants/release-space.constant"
-import { removeDownloadedMscFiles } from "./remove-downloaded-msc-files.service"
 
 export const flashMscDeviceService =
   () => async (dispatch: Dispatch, getState: () => ReduxRootState) => {
     try {
-      await getFlashingImageDetails(dispatch)
+      const abortController = new AbortController()
+      dispatch(setMscFlashingAbort(abortController))
+
+      await getFlashingImageDetails(dispatch, abortController.signal)
 
       const mscFlashingFiles = getState().flashing.mscFlashDetails
 
       if (mscFlashingFiles) {
-        await downloadFlashingFiles(dispatch, mscFlashingFiles)
-        await unpackFlashingImage(dispatch, mscFlashingFiles)
-        await startFlashingProcess(dispatch, mscFlashingFiles)
-        await removeDownloadedMscFiles()
+        await downloadFlashingFiles(
+          dispatch,
+          mscFlashingFiles,
+          abortController.signal
+        )
+        await unpackFlashingImage(
+          dispatch,
+          mscFlashingFiles,
+          abortController.signal
+        )
+        await startFlashingProcess(
+          dispatch,
+          mscFlashingFiles,
+          abortController.signal
+        )
       }
     } catch (error) {
-      console.error("Error during flashing process:", error)
-      dispatch(setFlashingProcessState(FlashingProcessState.Failed))
       await removeDownloadedMscFiles()
+
+      const flashingInActivePhases = selectIsFlashingInActivePhases(getState())
+      if (flashingInActivePhases) {
+        logger.error("Error during flashing process:", error)
+        dispatch(setFlashingProcessState(FlashingProcessState.Failed))
+      }
     }
   }
 
-const getFlashingImageDetails = async (dispatch: Dispatch) => {
+const getFlashingImageDetails = async (
+  dispatch: Dispatch,
+  signal: AbortSignal
+) => {
+  if (signal.aborted) {
+    return
+  }
   dispatch(setFlashingProcessState(FlashingProcessState.GettingFilesDetails))
 
   let platform: SupportedPlatform
@@ -55,24 +84,32 @@ const getFlashingImageDetails = async (dispatch: Dispatch) => {
 
   await dispatch(
     getMscFlashingFilesDetails({
+      signal,
+      platform,
       product: Product.MscHarmony,
       environment: RELEASE_SPACE,
-      platform: platform,
     })
   )
 }
 
 const downloadFlashingFiles = async (
   dispatch: Dispatch,
-  mscFlashingFiles: MscFlashDetails
+  mscFlashingFiles: MscFlashDetails,
+  signal: AbortSignal
 ) => {
+  if (signal.aborted) {
+    return
+  }
   dispatch(setFlashingProcessState(FlashingProcessState.DownloadingFiles))
 
   for (const file of [mscFlashingFiles.image, ...mscFlashingFiles.scripts]) {
-    const downloadResult = await downloadFlashingFileRequest({
-      url: file.url,
-      fileName: file.name,
-    })
+    const downloadResult = await downloadFlashingFileRequest(
+      {
+        url: file.url,
+        fileName: file.name,
+      },
+      signal
+    )
     if (!downloadResult.ok) {
       throw new Error(`Failed to download file: ${file.name}`)
     }
@@ -81,8 +118,12 @@ const downloadFlashingFiles = async (
 
 const unpackFlashingImage = async (
   dispatch: Dispatch,
-  mscFlashingFiles: MscFlashDetails | undefined
+  mscFlashingFiles: MscFlashDetails | undefined,
+  signal: AbortSignal
 ) => {
+  if (signal.aborted) {
+    return
+  }
   dispatch(setFlashingProcessState(FlashingProcessState.UnpackingFiles))
 
   const flashingImageName = mscFlashingFiles ? mscFlashingFiles.image.name : ""
@@ -92,29 +133,79 @@ const unpackFlashingImage = async (
 
 const startFlashingProcess = async (
   dispatch: Dispatch,
-  flashingFiles: MscFlashDetails | undefined
+  flashingFiles: MscFlashDetails | undefined,
+  signal: AbortSignal
 ) => {
   try {
+    if (signal.aborted) {
+      return
+    }
+
     dispatch(setFlashingProcessState(FlashingProcessState.FlashingProcess))
+    const { osDownloadLocation } = await getAppSettingsMain()
+    if (signal.aborted) {
+      return
+    }
 
-    const deviceFlash = DeviceFlashFactory.createDeviceFlashService()
+    const deviceFlash =
+      DeviceFlashFactory.createDeviceFlashService(osDownloadLocation)
+    const deviceName = getDeviceName()
+    const device = await deviceFlash.findDeviceByDeviceName(deviceName)
 
-    const device = await deviceFlash.findDeviceByDeviceName("HARMONY")
+    const { imageFilePath, scriptFilePath } = buildFlashingFilePaths(
+      flashingFiles,
+      osDownloadLocation
+    )
 
-    const { osDownloadLocation } = await getAppSettingsMain()
-    const flashingScriptName = flashingFiles
-      ? flashingFiles.scripts[0].name
-      : ""
+    await deviceFlash.execute(device, imageFilePath, scriptFilePath)
 
-    const imageFilePath = path.join(osDownloadLocation, IMAGE_FILE_NAME)
-    const scriptFilePath = path.join(osDownloadLocation, flashingScriptName)
+    if (signal.aborted) {
+      return
+    }
 
-    await deviceFlash.execute(device, imageFilePath, scriptFilePath)
+    await handlePostExecutingTasks(deviceFlash, dispatch, signal)
+
+    if (signal.aborted) {
+      return
+    }
 
+    await removeDownloadedMscFiles()
+  } catch (error) {
+    throw new Error(`Flash process failed with error: ${JSON.stringify(error)}`)
+  }
+}
+
+const getDeviceName = () => {
+  return process.platform === "win32" ? "MUDITA HARMONY MSC" : "HARMONY"
+}
+
+const buildFlashingFilePaths = (
+  flashingFiles: MscFlashDetails | undefined,
+  osDownloadLocation: string
+) => {
+  const flashingFilesScripts =
+    process.platform === "win32"
+      ? flashingFiles?.scripts[1]
+      : flashingFiles?.scripts[0]
+  const flashingScriptName = flashingFilesScripts?.name ?? ""
+  const imageFilePath = path.join(osDownloadLocation, IMAGE_FILE_NAME)
+  const scriptFilePath = path.join(osDownloadLocation, flashingScriptName)
+
+  return { imageFilePath, scriptFilePath }
+}
+
+const handlePostExecutingTasks = async (
+  deviceFlash: IDeviceFlash,
+  dispatch: Dispatch,
+  signal: AbortSignal
+) => {
+  if (deviceFlash instanceof MacDeviceFlashService) {
+    dispatch(setFlashingProcessState(FlashingProcessState.TerminalOpened))
+    await deviceFlash.waitForFlashCompletion({ signal })
+    dispatch(setFlashingProcessState(FlashingProcessState.Restarting))
+  } else if (process.platform === "win32") {
+    dispatch(setFlashingProcessState(FlashingProcessState.WaitingForBackButton))
+  } else {
     dispatch(setFlashingProcessState(FlashingProcessState.Restarting))
-    // AUTO DISABLED - fix me if you like :)
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error: any) {
-    throw new Error(`Flash process failed with error: ${error}`)
   }
 }
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
index 241d00e027..66d157de19 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/msc-flash-details.service.ts
@@ -14,12 +14,14 @@ export class MscFlashDetailsService {
   static async getMscFlashDetails(
     product: Product,
     environment: OsEnvironment,
-    platform: SupportedPlatform
+    platform: SupportedPlatform,
+    signal?: AbortSignal
   ): Promise<MscFlashDetails> {
     const response = await axios.get<MscFlashDetails>(
       `${API_BASE_URL}/${MuditaCenterServerRoutes.GetMscFlashDetails}`,
       {
         params: { product, environment, platform },
+        signal,
       }
     )
 
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
index 084b51e70f..2cba1c2e47 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
@@ -18,6 +18,12 @@ export const unpackFlashingImageService = async (
     const imageFilePath = path.join(osDownloadLocation, fileName)
     command = `tar -xf "${imageFilePath}" -C "${osDownloadLocation}"`
   }
+  if (process.platform === "win32") {
+    const imageFilePathTarGz = path.join(osDownloadLocation, fileName)
+    const baseName = path.basename(fileName, ".tar.gz");
+    const imageFilePathTar = path.join(osDownloadLocation, `${baseName}.tar`, `${baseName}.tar`)
+    command = `tar -xzvf "${imageFilePathTarGz}" -C "${osDownloadLocation}" && tar -xvf "${imageFilePathTar}" -C "${osDownloadLocation}" `
+  }
 
   try {
     await execPromise(command)
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/flashing-error-modal/flashing-error-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/flashing-error-modal/flashing-error-modal.component.tsx
new file mode 100644
index 0000000000..d6b6e8aa08
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/flashing-error-modal/flashing-error-modal.component.tsx
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React from "react"
+import { useDispatch, useSelector } from "react-redux"
+import { defineMessages } from "react-intl"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+import { selectFlashingProcessState } from "../../selectors"
+import { FlashingProcessState } from "../../constants"
+import { setFlashingProcessState } from "../../actions"
+
+const messages = defineMessages({
+  errorHandlingModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  errorHandlingModalSubtitle: {
+    id: "module.recoveryMode.modal.error.subtitle",
+  },
+  errorHandlingModalMessage: {
+    id: "module.recoveryMode.modal.error.message",
+  },
+})
+
+export const FlashingErrorModal: FunctionComponent = () => {
+  const dispatch = useDispatch()
+  const flashingProcessState = useSelector(selectFlashingProcessState)
+  const opened = flashingProcessState === FlashingProcessState.Failed
+
+  const onClose = () => {
+    dispatch(setFlashingProcessState(FlashingProcessState.Idle))
+  }
+
+  return (
+    <>
+      <ModalDialog
+        open={opened}
+        title={intl.formatMessage(messages.errorHandlingModalTitle)}
+        size={ModalSize.Small}
+        closeable={true}
+        onCloseButton={onClose}
+        onClose={onClose}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.RecoveryModeBlack} width={4.8} />
+          </RoundIconWrapper>
+          <Text
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.errorHandlingModalSubtitle}
+          />
+          <Text
+            displayStyle={TextDisplayStyle.Paragraph4}
+            message={messages.errorHandlingModalMessage}
+          />
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
index 0393f3bada..780f62c731 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
@@ -4,3 +4,4 @@
  */
 
 export * from "./recovery-mode"
+export * from "./flashing-error-modal/flashing-error-modal.component"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
new file mode 100644
index 0000000000..5582e12570
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import styled from "styled-components"
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import React from "react"
+import { defineMessages } from "react-intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+
+interface MacTerminalInfoModalProps {
+  open: boolean
+  onClose: () => void
+}
+
+const messages = defineMessages({
+  macTerminalInfoModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  macTerminalInfoModalSubtitle: {
+    id: "module.recoveryMode.mocal.terminalInfo.subtitle",
+  },
+  macTerminalInfoModalDescription: {
+    id: "module.recoveryMode.mocal.terminalInfo.description",
+  },
+  macTerminalInfoModalStep1: {
+    id: "module.recoveryMode.mocal.terminalInfo.step1",
+  },
+  macTerminalInfoModalStep2: {
+    id: "module.recoveryMode.mocal.terminalInfo.step2",
+  },
+  macTerminalInfoModalStep3: {
+    id: "module.recoveryMode.mocal.terminalInfo.step3",
+  },
+  macTerminalInfoModalStep4: {
+    id: "module.recoveryMode.mocal.terminalInfo.step4",
+  },
+})
+
+export const MacTerminalInfoModal: FunctionComponent<
+  MacTerminalInfoModalProps
+> = ({ open, onClose }) => {
+  return (
+    <>
+      <ModalDialog
+        open={open}
+        title={intl.formatMessage(messages.macTerminalInfoModalTitle)}
+        size={ModalSize.Small}
+        closeable={true}
+        closeButton={false}
+        closeModal={onClose}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.CheckCircleBlack} width={4.8} />
+          </RoundIconWrapper>
+          <Text
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.macTerminalInfoModalSubtitle}
+          />
+          <Descrption>
+            <Text
+              displayStyle={TextDisplayStyle.Headline5}
+              message={messages.macTerminalInfoModalDescription}
+            />
+          </Descrption>
+          <StepsInfo>
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.macTerminalInfoModalStep1}
+            />
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.macTerminalInfoModalStep2}
+            />
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.macTerminalInfoModalStep3}
+            />
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.macTerminalInfoModalStep4}
+            />
+          </StepsInfo>
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
+
+const StepsInfo = styled.div`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-top: 1.2rem;
+`
+
+const Descrption = styled.div`
+  margin-top: 0.8rem;
+`
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
index 6fdfac4d31..6720b93204 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-mode.tsx
@@ -26,6 +26,9 @@ import { selectFlashingProcessState } from "../selectors"
 import { FlashingProcessState } from "../constants"
 import theme from "Core/core/styles/theming/theme"
 import { RestartingDeviceModal } from "./restarting-device-modal/restarting-device-modal.component"
+import { MacTerminalInfoModal } from "./mac-terminal-info-modal/mac-terminal-info-modal.component"
+import { abortMscFlashing } from "../actions"
+import { WaitingForBackButtonModal } from "./waiting-for-back-button-modal.component"
 
 const messages = defineMessages({
   header: {
@@ -126,7 +129,17 @@ const RecoveryModeUI: FunctionComponent = () => {
 
   const isRestartingModalVisible = (): boolean => {
     return flashingProcessState === FlashingProcessState.Restarting
-    // return true
+  }
+  const isWaitingForBackButtonVisible = (): boolean => {
+    return flashingProcessState === FlashingProcessState.WaitingForBackButton
+  }
+
+  const isMacTerminalInfoModalVisible = (): boolean => {
+    return flashingProcessState === FlashingProcessState.TerminalOpened
+  }
+
+  const cancelMscFlashing = (): void => {
+    dispatch(abortMscFlashing({ reason: FlashingProcessState.Canceled }))
   }
 
   return (
@@ -197,6 +210,14 @@ const RecoveryModeUI: FunctionComponent = () => {
           progressMessage={getProgressMessage()}
         />
         <RestartingDeviceModal open={isRestartingModalVisible()} />
+        <MacTerminalInfoModal
+          open={isMacTerminalInfoModalVisible()}
+          onClose={cancelMscFlashing}
+        />
+        <WaitingForBackButtonModal
+          open={isWaitingForBackButtonVisible()}
+          onClose={cancelMscFlashing}
+        />
       </ThemeProvider>
     </>
   )
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
index 10c5e3c3f0..76912ce1a4 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/restarting-device-modal/restarting-device-modal.component.tsx
@@ -3,11 +3,15 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { FunctionComponent } from "Core/core/types/function-component.interface"
-import { intl } from "Core/__deprecated__/renderer/utils/intl"
-import React from "react"
+import React, { useEffect } from "react"
 import { defineMessages } from "react-intl"
+import { useDispatch } from "react-redux"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
 import LoaderModal from "Core/ui/components/loader-modal/loader-modal.component"
+import { setFlashingProcessState } from "../../actions"
+import { FlashingProcessState } from "../../constants"
 
 interface RestartingDeviceModalProps {
   open: boolean
@@ -28,6 +32,20 @@ const messages = defineMessages({
 export const RestartingDeviceModal: FunctionComponent<
   RestartingDeviceModalProps
 > = ({ open }) => {
+  const dispatch = useDispatch<Dispatch>()
+
+  useEffect(() => {
+    let timeoutId: NodeJS.Timeout
+
+    if (open) {
+      timeoutId = setTimeout(() => {
+        dispatch(setFlashingProcessState(FlashingProcessState.Failed))
+      }, 2 * 60 * 1000)
+    }
+
+    return () => clearTimeout(timeoutId)
+  }, [dispatch, open])
+
   return (
     <LoaderModal
       open={open}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/waiting-for-back-button-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/waiting-for-back-button-modal.component.tsx
new file mode 100644
index 0000000000..284aa7ea3d
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/waiting-for-back-button-modal.component.tsx
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React from "react"
+import { defineMessages } from "react-intl"
+import styled from "styled-components"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+
+interface CompletedInfoModalProps {
+  open: boolean
+  onClose: () => void
+}
+
+const messages = defineMessages({
+  waitingForBackButtonModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  waitingForBackButtonModalSubtitle: {
+    id: "module.recoveryMode.modal.waitingForBackButton.subtitle",
+  },
+  waitingForBackButtonModalDescription: {
+    id: "module.recoveryMode.modal.waitingForBackButton.description",
+  },
+})
+
+export const WaitingForBackButtonModal: FunctionComponent<
+  CompletedInfoModalProps
+> = ({ open, onClose }) => {
+  return (
+    <>
+      <ModalDialog
+        open={open}
+        title={intl.formatMessage(messages.waitingForBackButtonModalTitle)}
+        size={ModalSize.Small}
+        closeable={true}
+        closeButton={false}
+        closeModal={onClose}
+        onClose={onClose}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.CheckCircleBlack} width={4.8} />
+          </RoundIconWrapper>
+          <Text
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.waitingForBackButtonModalSubtitle}
+          />
+          <Descrption>
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph4}
+              message={messages.waitingForBackButtonModalDescription}
+            />
+          </Descrption>
+          <BackArrowIconWrapper>
+            <Icon type={IconType.BackArrowIcon} width={4.8} />
+          </BackArrowIconWrapper>
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
+
+const Descrption = styled.div`
+  margin-top: 0.8rem;
+`
+
+export const BackArrowIconWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.4rem;
+`
diff --git a/libs/shared/utils/src/index.ts b/libs/shared/utils/src/index.ts
index 67e83a60b3..651585bd5e 100644
--- a/libs/shared/utils/src/index.ts
+++ b/libs/shared/utils/src/index.ts
@@ -3,6 +3,8 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface"
+export * from "./lib/macos-usb-port-device-parser/macos-usb-port-device-parser"
 export * from "./lib/answer-main"
 export * from "./lib/call-renderer.helper"
 export * from "./lib/delay"
@@ -13,6 +15,7 @@ export * from "./lib/prevent-default-shortcuts"
 export * from "./lib/register-shortcuts"
 export * from "./lib/routes-history.context"
 export * from "./lib/settings-service.interface"
+export * from "./lib/split-path-to-dir-name-and-base-name"
 export * from "./lib/use-debounced-events-handler"
 export * from "./lib/exec-command"
 export * from "./lib/exec-command-with-sudo"
diff --git a/libs/shared/utils/src/lib/exec-command-with-sudo.ts b/libs/shared/utils/src/lib/exec-command-with-sudo.ts
index 7046f3b818..6d35049c86 100644
--- a/libs/shared/utils/src/lib/exec-command-with-sudo.ts
+++ b/libs/shared/utils/src/lib/exec-command-with-sudo.ts
@@ -5,27 +5,36 @@
 
 import sudoPrompt from "@vscode/sudo-prompt"
 
+// `name` is required for Linux and must not contain special characters, except spaces and alphanumeric characters.
+interface ExecCommandWithSudoOptions {
+  name: string;
+  icns?: string;
+  env?: { [key: string]: string };
+}
+
 export const execCommandWithSudo = (
   command: string,
-  options: { name?: string; icns?: string; env?: { [key: string]: string } }
+  options: ExecCommandWithSudoOptions
 ): Promise<string | void> => {
   return new Promise((resolve, reject) => {
     sudoPrompt.exec(command, options, (error, stdout, stderr) => {
       if (error) {
-        console.error(`Command failed with error: ${error.message}`);
-        return reject(`Error: ${error.message}`);
+        console.error(`Command failed with error: ${error.message}`)
+        return reject(`Error: ${error.message}`)
       }
 
       if (stderr && !stdout) {
-        const output = stderr?.toString().trim();
-        console.error(`Command stderr output: ${output}`);
-        return reject(`Error: ${stderr.toString().trim()}`);
+        const output = stderr?.toString().trim()
+        console.error(`Command stderr output: ${output}`)
+        return reject(`Error: ${stderr.toString().trim()}`)
       }
 
-      const output = stdout?.toString().trim() || "Command executed successfully but produced no output.";
+      const output =
+        stdout?.toString().trim() ||
+        "Command executed successfully but produced no output."
 
-      console.log(`Command output: ${output}`);
-      resolve(output);
+      console.log(`Command output: ${output}`)
+      resolve(output)
     })
   })
 }
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
new file mode 100644
index 0000000000..d72951e307
--- /dev/null
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { PortInfo } from "serialport"
+
+export interface USBDevice {
+  name?: string
+  version?: string
+  bsdName?: string
+
+  manufacturer?: string | undefined
+  serialNumber?: string | undefined
+  locationId?: string | undefined
+  productId?: string | undefined
+  vendorId?: string | undefined
+}
+
+export interface USBPortDevice extends USBDevice, PortInfo {
+  path: string
+  pnpId?: string | undefined
+}
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
new file mode 100644
index 0000000000..1d71c7453a
--- /dev/null
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
@@ -0,0 +1,423 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { execPromise } from "../exec-command"
+import { MacosUSBPortDeviceParser } from "./macos-usb-port-device-parser"
+
+jest.mock("../exec-command", () => ({
+  execPromise: jest.fn(),
+}))
+
+describe("`MacosUSBPortDeviceParser.getUSBPortDevices`", () => {
+  it("should correctly parse and return USB data with a single Mudita Harmony device", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00100000 / 1
+          Current Available (mA): 500
+          Current Required (mA): 100
+          Extra Operating Current (mA): 0
+          Media:
+            HARMONY MSC:
+              Capacity: 3,91 GB (3 909 091 328 bytes)
+              Removable Media: Yes
+              BSD Name: disk4
+              Logical Unit: 0
+              Partition Map Type: MBR (Master Boot Record)
+              S.M.A.R.T. status: Verified
+              USB Interface: 0
+              Volumes:
+                disk4s1:
+                  Capacity: 268,4 MB (268 435 456 bytes)
+                  BSD Name: disk4s1
+                  Content: Linux
+                disk4s2:
+                  Capacity: 268,4 MB (268 435 456 bytes)
+                  BSD Name: disk4s2
+                  Content: Linux
+                disk4s3:
+                  Capacity: 3,03 GB (3 028 286 976 bytes)
+                  BSD Name: disk4s3
+                  Content: Linux
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).not.toBe(0)
+    expect(devices).toEqual([
+      {
+        bsdName: "disk4",
+        locationId: "0x00100000",
+        manufacturer: "Mudita",
+        name: "Mudita Harmony (MSC mode)",
+        path: "3310/0103/0123456789ABCDEF",
+        productId: "0103",
+        serialNumber: "0123456789ABCDEF",
+        vendorId: "3310",
+        version: "1.01",
+      },
+    ])
+  })
+
+  it("should correctly parse and return details of multiple connected USB devices including Mudita Harmony", async () => {
+    const output = `
+USB:
+  USB 3.1 Bus:
+   Host Controller Driver: AppleT6000USBXHCI
+    USB3.2 Hub:
+     Product ID: 0x0411
+     Vendor ID: 0x0bda (Realtek Semiconductor Corp.)
+     Version: 1.11
+     Speed: Up to 5 Gb/s
+     Manufacturer: Generic
+     Location ID: 0x02200000 / 2
+     Current Available (mA): 900
+     Current Required (mA): 0
+     Extra Operating Current (mA): 0
+      AX88179A:
+       Product ID: 0x1790
+       Vendor ID: 0x0b95 (ASIX Electronics Corporation)
+       Version: 2.00
+       Serial Number: 007F8A99
+       Speed: Up to 5 Gb/s
+       Manufacturer: ASIX
+       Location ID: 0x02240000 / 6
+       Current Available (mA): 900
+       Current Required (mA): 184
+       Extra Operating Current (mA): 0
+    USB2.1 Hub:
+     Product ID: 0x5411
+     Vendor ID: 0x0bda (Realtek Semiconductor Corp.)
+     Version: 1.11
+     Speed: Up to 480 Mb/s
+     Manufacturer: Generic
+     Location ID: 0x02100000 / 1
+     Current Available (mA): 500
+     Current Required (mA): 0
+     Extra Operating Current (mA): 0
+      Mudita Harmony (MSC mode):
+       Product ID: 0x0103
+       Vendor ID: 0x3310
+       Version: 1.01
+       Serial Number: 0123456789ABCDEF
+       Speed: Up to 480 Mb/s
+       Manufacturer: Mudita
+       Location ID: 0x02120000 / 4
+       Current Available (mA): 500
+       Current Required (mA): 100
+       Extra Operating Current (mA): 0
+       Media:
+        HARMONY MSC:
+         Capacity: 3,91 GB (3 909 091 328 bytes)
+         Removable Media: Yes
+         BSD Name: disk8
+         Logical Unit: 0
+         Partition Map Type: MBR (Master Boot Record)
+         S.M.A.R.T. status: Verified
+         USB Interface: 0
+         Volumes:
+          disk8s1:
+           Capacity: 268,4 MB (268 435 456 bytes)
+           BSD Name: disk8s1
+           Content: Linux
+          disk8s2:
+           Capacity: 268,4 MB (268 435 456 bytes)
+           BSD Name: disk8s2
+           Content: Linux
+          disk8s3:
+           Capacity: 3,03 GB (3 028 286 976 bytes)
+           BSD Name: disk8s3
+           Content: Linux
+      Hub:
+       Product ID: 0x8091
+       Vendor ID: 0x1a86
+       Version: 2.20
+       Speed: Up to 480 Mb/s
+       Location ID: 0x02140000 / 3
+       Current Available (mA): 500
+       Current Required (mA): 100
+       Extra Operating Current (mA): 0
+        USB3.0 Card Reader:
+         Product ID: 0x0749
+         Vendor ID: 0x05e3 (Genesys Logic, Inc.)
+         Version: 15.38
+         Serial Number: 000000001538
+         Speed: Up to 480 Mb/s
+         Manufacturer: Generic
+         Location ID: 0x02143000 / 5
+         Current Available (mA): 500
+         Current Required (mA): 500
+         Extra Operating Current (mA): 0
+        USB C Video Adaptor   :
+         Product ID: 0x9311
+         Vendor ID: 0x25a4
+         Version: 2.01
+         Serial Number: 000000000001
+         Speed: Up to 12 Mb/s
+         Manufacturer: USB C
+         Location ID: 0x02142000 / 7
+         Current Available (mA): 500
+         Current Required (mA): 0
+         Extra Operating Current (mA): 0
+  USB 3.1 Bus:
+   Host Controller Driver: AppleT6000USBXHCI
+  USB 3.1 Bus:
+   Host Controller Driver: AppleT6000USBXHCI
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).not.toBe(0)
+    expect(devices).toEqual([
+      {
+        bsdName: "disk8",
+        locationId: "0x02120000",
+        manufacturer: "Mudita",
+        name: "Mudita Harmony (MSC mode)",
+        path: "3310/0103/0123456789ABCDEF",
+        productId: "0103",
+        serialNumber: "0123456789ABCDEF",
+        vendorId: "3310",
+        version: "1.01",
+      },
+    ])
+  })
+
+  it("should correctly handle and return multiple instances of Mudita Harmony devices", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00100000 / 1
+          Media:
+            HARMONY MSC:
+              BSD Name: disk4
+      Mudita Harmony (MSC mode):
+          Product ID: 0x0104
+          Vendor ID: 0x3310
+          Version: 1.02
+          Serial Number: 9876543210FEDCBA
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00200000 / 2
+          Media:
+            HARMONY MSC:
+              BSD Name: disk5
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).toBe(2)
+    expect(devices).toEqual([
+      {
+        bsdName: "disk4",
+        locationId: "0x00100000",
+        manufacturer: "Mudita",
+        name: "Mudita Harmony (MSC mode)",
+        path: "3310/0103/0123456789ABCDEF",
+        productId: "0103",
+        serialNumber: "0123456789ABCDEF",
+        vendorId: "3310",
+        version: "1.01",
+      },
+      {
+        bsdName: "disk5",
+        locationId: "0x00200000",
+        manufacturer: "Mudita",
+        name: "Mudita Harmony (MSC mode)",
+        path: "3310/0104/9876543210FEDCBA",
+        productId: "0104",
+        serialNumber: "9876543210FEDCBA",
+        vendorId: "3310",
+        version: "1.02",
+      },
+    ])
+  })
+
+  it("should correctly parse USB data when only BSD Name is provided for a device", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Media:
+            HARMONY MSC:
+              BSD Name: disk7
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).toBe(1)
+    expect(devices[0]).toEqual({
+      bsdName: "disk7",
+      name: "Mudita Harmony (MSC mode)",
+      path: "unknown",
+    })
+  })
+
+  it("should correctly handle devices connected through USB hubs", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        USB3.0 Hub:
+          Product ID: 0x0411
+          Vendor ID: 0x0bda (Realtek Semiconductor Corp.)
+          Version: 1.11
+          Speed: Up to 5 Gb/s
+          Manufacturer: Generic
+          Location ID: 0x02200000 / 2
+          Mudita Harmony (MSC mode):
+            Product ID: 0x0103
+            Vendor ID: 0x3310
+            Version: 1.01
+            Serial Number: 0123456789ABCDEF
+            Speed: Up to 480 Mb/s
+            Manufacturer: Mudita
+            Location ID: 0x02240000 / 6
+            Media:
+              HARMONY MSC:
+                BSD Name: disk6
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).toBe(1)
+    expect(devices[0]).toEqual({
+      bsdName: "disk6",
+      locationId: "0x02240000",
+      manufacturer: "Mudita",
+      name: "Mudita Harmony (MSC mode)",
+      path: "3310/0103/0123456789ABCDEF",
+      productId: "0103",
+      serialNumber: "0123456789ABCDEF",
+      vendorId: "3310",
+      version: "1.01",
+    })
+  })
+
+  it("should correctly parse a Mudita device without a BSD Name", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00100000 / 1
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).toBe(1)
+    expect(devices[0].bsdName).toBeUndefined()
+    expect(devices[0]).toEqual({
+      locationId: "0x00100000",
+      manufacturer: "Mudita",
+      name: "Mudita Harmony (MSC mode)",
+      path: "3310/0103/0123456789ABCDEF",
+      productId: "0103",
+      serialNumber: "0123456789ABCDEF",
+      vendorId: "3310",
+      version: "1.01",
+    })
+  })
+
+  it("should correctly parse a Mudita device without a BSD Name followed by another device", async () => {
+    const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00100000 / 1
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00200000 / 2
+          Media:
+            BELL MSC:
+              BSD Name: disk5
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+
+    expect(devices.length).toBe(2)
+
+    expect(devices[0]).toEqual({
+      locationId: "0x00100000",
+      manufacturer: "Mudita",
+      name: "Mudita Harmony (MSC mode)",
+      path: "3310/0103/0123456789ABCDEF",
+      productId: "0103",
+      serialNumber: "0123456789ABCDEF",
+      vendorId: "3310",
+      version: "1.01",
+      bsdName: undefined,
+    })
+
+    expect(devices[1]).toEqual({
+      bsdName: "disk5",
+      locationId: "0x00200000",
+      manufacturer: "Mudita",
+      name: "Mudita Bell",
+      path: "3311/0104/ABCDEF1234567890",
+      productId: "0104",
+      serialNumber: "ABCDEF1234567890",
+      vendorId: "3311",
+      version: "1.02",
+    })
+  })
+
+
+  it("should return an empty array if no Mudita devices are found", async () => {
+    const output = `
+USB:
+    USB 2.0 Bus:
+      Logitech USB Optical Mouse:
+        Product ID: 0xc52f
+        Vendor ID: 0x046d (Logitech)
+        Speed: Up to 12 Mb/s
+        Manufacturer: Logitech
+        Current Required (mA): 98
+`
+    ;(execPromise as jest.Mock).mockResolvedValue(output)
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+    expect(devices.length).toBe(0)
+  })
+})
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
new file mode 100644
index 0000000000..f3f02932cd
--- /dev/null
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { execPromise } from "../exec-command"
+import {
+  USBDevice,
+  USBPortDevice,
+} from "./macos-usb-port-device-parser.interface"
+
+const fieldPatterns: Partial<Record<keyof USBDevice, RegExp>> = {
+  version: /^\s*Version:\s*([\d.]+)$/,
+  bsdName: /^\s*BSD Name:\s*(disk[0-9a-zA-Z]+)$/,
+  manufacturer: /^\s*Manufacturer:\s*(.*)$/,
+  serialNumber: /^\s*Serial Number:\s*(\w+)$/,
+  locationId: /^\s*Location ID:\s*(0x[0-9a-fA-F]+ \/ \d+)$/,
+  productId: /^\s*Product ID:\s*(0x[0-9a-fA-F]+)$/,
+  vendorId: /^\s*Vendor ID:\s*(0x[0-9a-fA-F]+)$/,
+}
+
+export class MacosUSBPortDeviceParser {
+  static async getUSBPortDevices(): Promise<USBPortDevice[]> {
+    const usbDevices = await MacosUSBPortDeviceParser.getUSBDevice()
+    return usbDevices.map((usbDevice) => {
+      const vendorId = usbDevice.vendorId?.replace("0x", "")
+      const productId = usbDevice.productId?.replace("0x", "")
+      const serialNumber = usbDevice.serialNumber?.replace("0x", "")
+      const locationId = usbDevice.locationId?.split(" ")[0]
+      const path = vendorId && productId && serialNumber && `${vendorId}/${productId}/${serialNumber}`
+
+      return {
+        ...usbDevice,
+        productId,
+        vendorId,
+        serialNumber,
+        locationId,
+        path: path ?? "unknown",
+      }
+    })
+  }
+
+  private static async getUSBDevice(): Promise<USBDevice[]> {
+    const output = (await execPromise("system_profiler SPUSBDataType")) ?? ""
+    const devices: Array<USBDevice> = []
+
+    let currentDevice: USBDevice | null = null
+
+    const productNamePattern = /^\s*(Mudita.*?):$/
+    const lines = output.split("\n").filter((line) => line.trim() !== "")
+
+    lines.forEach((line) => {
+      const productNameMatch = productNamePattern.exec(line)
+      if (productNameMatch) {
+        if (currentDevice) {
+          devices.push(currentDevice)
+        }
+        currentDevice = { name: productNameMatch[1] }
+      }
+
+      if (
+        (currentDevice && line.includes("Media")) ||
+        line.includes("Volumes")
+      ) {
+        return
+      }
+
+      if (currentDevice) {
+        for (const [key, regex] of Object.entries(fieldPatterns) as [
+          keyof USBDevice,
+          RegExp
+        ][]) {
+          const match = regex.exec(line)
+          if (match) {
+            if (key === "bsdName" && !currentDevice.bsdName) {
+              currentDevice.bsdName = match[1]
+              devices.push(currentDevice)
+              currentDevice = null
+              break
+            } else if (key !== "bsdName") {
+              currentDevice[key] = match[1]
+            }
+          }
+        }
+      }
+    })
+
+    if (currentDevice) {
+      devices.push(currentDevice)
+    }
+
+    console.log("Devices in function: ", devices)
+
+    return devices
+  }
+}
diff --git a/libs/shared/utils/src/lib/split-path-to-dir-name-and-base-name.ts b/libs/shared/utils/src/lib/split-path-to-dir-name-and-base-name.ts
new file mode 100644
index 0000000000..6c0a7df413
--- /dev/null
+++ b/libs/shared/utils/src/lib/split-path-to-dir-name-and-base-name.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+
+export const splitPathToDirNameAndBaseName = (
+  currentPath: string
+): [string, string] => {
+  const dirName = path.dirname(currentPath)
+  const baseName = path.basename(currentPath)
+  return [dirName, baseName]
+}

From 355df307901efcc39af399248eca6f650b447b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Mon, 21 Oct 2024 15:31:41 +0200
Subject: [PATCH 37/64] [CP-2908] Harmony time sync (#2115)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
Co-authored-by: MateuszMudita <165778944+MateuszMudita@users.noreply.github.com>
Co-authored-by: robertmudi <158469469+robertmudi@users.noreply.github.com>
Co-authored-by: MateuszMudita <mateusz.bolewski@mudita.com>
Co-authored-by: Maciej Kupiec <115480562+MaciejMDDV@users.noreply.github.com>
Co-authored-by: robertmudi <robert.rosloniec@mudita.com>
Co-authored-by: Tomasz Malecki <135224481+tomaszmaleckimudita@users.noreply.github.com>
Co-authored-by: milenaniebrzydowska00 <milena.niebrzydowska@mudita.com>
Co-authored-by: Milena Niebrzydowska <milena.niebrzydowska@mmiquido.com>
---
 .../models/src/endpoint.constant.ts           |   1 +
 .../components/core/icon/icon-type.ts         |   1 +
 .../components/core/icon/icon.config.ts       |   2 +
 .../renderer/locales/default/en-US.json       |   8 +
 .../__deprecated__/renderer/store/reducers.ts |   2 +
 .../renderer/svg/button-success.svg           |   8 +
 libs/core/core/application.module.ts          |   2 +
 .../initialize-mudita-harmony.action.ts       |   3 +
 .../is-select-device-drawer-open.selector.ts  |   6 +-
 .../use-loader-skip-on-connect.hook.ts        |   6 +-
 ...=> harmony-overview-content.component.tsx} |  14 +-
 .../harmony-overview.component.interface.ts   |   1 +
 .../harmony-overview.component.test.tsx       |  40 +++
 .../harmony-overview.component.tsx            |   6 +-
 .../components/overview/overview.styles.tsx   |  13 +
 .../components/overview/overview.test.tsx     |   1 +
 .../time-synchronization-ids.enum.ts          |  10 +
 .../time-synchronization.component.tsx        | 234 ++++++++++++++++++
 libs/core/overview/overview.container.tsx     |   3 +
 .../actions/get-time.action.ts                |  21 ++
 .../reset-time-synchronization-status.ts      |  11 +
 .../actions/synchronize-time.action.ts        |  36 +++
 .../constants/controller.constant.ts          |   9 +
 .../constants/error.constant.ts               |   8 +
 .../constants/event.constant.ts               |  11 +
 .../time-synchronization.controller.ts        |  22 ++
 .../reducers/time-synchronization.reducer.ts  |  48 ++++
 .../requests/get-time.request.ts              |  15 ++
 .../requests/synchronize-time.request.ts      |  15 ++
 .../selectors/synchronized-time.selector.ts   |  12 +
 .../time-synchronization-status.selector.ts   |  12 +
 .../services/time-synchronization.service.ts  |  69 ++++++
 .../time-synchronization.module.ts            |  46 ++++
 33 files changed, 686 insertions(+), 10 deletions(-)
 create mode 100644 libs/core/__deprecated__/renderer/svg/button-success.svg
 rename libs/core/overview/components/overview-screens/harmony-overview/{overview-content.component.tsx => harmony-overview-content.component.tsx} (80%)
 create mode 100644 libs/core/overview/components/time-synchronization/time-synchronization-ids.enum.ts
 create mode 100644 libs/core/overview/components/time-synchronization/time-synchronization.component.tsx
 create mode 100644 libs/core/time-synchronization/actions/get-time.action.ts
 create mode 100644 libs/core/time-synchronization/actions/reset-time-synchronization-status.ts
 create mode 100644 libs/core/time-synchronization/actions/synchronize-time.action.ts
 create mode 100644 libs/core/time-synchronization/constants/controller.constant.ts
 create mode 100644 libs/core/time-synchronization/constants/error.constant.ts
 create mode 100644 libs/core/time-synchronization/constants/event.constant.ts
 create mode 100644 libs/core/time-synchronization/controllers/time-synchronization.controller.ts
 create mode 100644 libs/core/time-synchronization/reducers/time-synchronization.reducer.ts
 create mode 100644 libs/core/time-synchronization/requests/get-time.request.ts
 create mode 100644 libs/core/time-synchronization/requests/synchronize-time.request.ts
 create mode 100644 libs/core/time-synchronization/selectors/synchronized-time.selector.ts
 create mode 100644 libs/core/time-synchronization/selectors/time-synchronization-status.selector.ts
 create mode 100644 libs/core/time-synchronization/services/time-synchronization.service.ts
 create mode 100644 libs/core/time-synchronization/time-synchronization.module.ts

diff --git a/libs/core-device/models/src/endpoint.constant.ts b/libs/core-device/models/src/endpoint.constant.ts
index f1a4f6fc76..c69633650e 100644
--- a/libs/core-device/models/src/endpoint.constant.ts
+++ b/libs/core-device/models/src/endpoint.constant.ts
@@ -16,6 +16,7 @@ export enum Endpoint {
   CallLog = 9,
   Security = 13,
   Outbox = 14,
+  TimeSynchronization = 16,
 
   // api version (mocked)
   ApiVersion = 1000,
diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
index f6c47920e3..f5231feacb 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
@@ -132,4 +132,5 @@ export enum IconType {
   DataMigration,
   RecoveryModeWhite,
   RecoveryModeBlack,
+  ButtonSuccess
 }
diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
index 1921070d38..2558ed4f46 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
@@ -127,6 +127,7 @@ import Warning from "Core/__deprecated__/renderer/svg/warning.svg"
 import MarkAsUnread from "Core/__deprecated__/renderer/svg/mark-as-unread.svg"
 import Conversation from "Core/__deprecated__/renderer/svg/conversation.svg"
 import Exclamation from "Core/__deprecated__/renderer/svg/exclamation.svg"
+import ButtonSuccess from "Core/__deprecated__/renderer/svg/button-success.svg"
 import DataMigration from "../../../../../../generic-view/ui/src/lib/icon/svg/data-migration.svg"
 import RecoveryModeWhite from "../../../../../../generic-view/ui/src/lib/icon/svg/recovery-mode-white.svg"
 import RecoveryModeBlack from "../../../../../../generic-view/ui/src/lib/icon/svg/recovery-mode-black.svg"
@@ -506,6 +507,7 @@ const typeToIcon: Partial<Record<IconType, typeof Arrow>> = {
   [IconType.DataMigration]: DataMigration,
   [IconType.RecoveryModeWhite]: RecoveryModeWhite,
   [IconType.RecoveryModeBlack]: RecoveryModeBlack,
+  [IconType.ButtonSuccess]: ButtonSuccess,
 }
 
 export const getIconType = (
diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index c3ad6c7152..9230269ebf 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -717,6 +717,14 @@
   "module.overview.systemUpdateUpToDate": "You’re up to date.",
   "module.overview.systemVersion": "MuditaOS version",
   "module.overview.systemVersionTitle": "Current version:",
+  "module.overview.timeSynchronizationTitle": "Time and date",
+  "module.overview.timeSynchronizationDescription": "You can synchronize Harmony to match your computer’s date and time.",
+  "module.overview.timeSynchronizationButton": "Synchronize",
+  "module.overview.timeSynchronizationProgressButton": "Synchronizing...",
+  "module.overview.timeSynchronizationSuccessButton": "Synchronized",
+  "module.overview.timeSynchronizationFailedSubtitle": "Synchronization failed",
+  "module.overview.timeSynchronizationFailedDescription": "The process was interrupted.",
+  "module.overview.timeSynchronizationCurrentTimeLabel": "Time and date on device:",
   "module.overview.updateAvailableAboutOsVersionSubDescription": "the device will be upgraded to this version",
   "module.overview.updateAvailableAboutUpdatesTitle": "{num, plural, =1 {ABOUT UPDATE} other {ABOUT UPDATES}}",
   "module.overview.updateAvailableButton": "{num, plural, =1 {Download} other {Download all}}",
diff --git a/libs/core/__deprecated__/renderer/store/reducers.ts b/libs/core/__deprecated__/renderer/store/reducers.ts
index efb00e5d2d..d87c7d9eaa 100644
--- a/libs/core/__deprecated__/renderer/store/reducers.ts
+++ b/libs/core/__deprecated__/renderer/store/reducers.ts
@@ -38,6 +38,7 @@ import {
 import { appStateReducer } from "shared/app-state"
 import { activeDeviceRegistryReducer } from "active-device-registry/feature"
 import { helpReducer } from "help/store"
+import { timeSynchronizationReducer } from "Core/time-synchronization/reducers/time-synchronization.reducer"
 import { flashingReducer } from "msc-flash-harmony"
 
 export const reducers = {
@@ -55,6 +56,7 @@ export const reducers = {
   news: newsReducer,
   settings: settingsReducer,
   update: updateOsReducer,
+  timeSynchronization: timeSynchronizationReducer,
   discoveryDevice: discoveryDeviceReducer,
   deviceInitialization: deviceInitializationReducer,
   appInitialization: appInitializationReducer,
diff --git a/libs/core/__deprecated__/renderer/svg/button-success.svg b/libs/core/__deprecated__/renderer/svg/button-success.svg
new file mode 100644
index 0000000000..db74189fb2
--- /dev/null
+++ b/libs/core/__deprecated__/renderer/svg/button-success.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M7.24996 10.9167L9.12913 12.4201C9.17959 12.4616 9.23869 12.4914 9.30211 12.5073C9.36554 12.5231 9.4317 12.5247 9.49579 12.5117C9.56049 12.4996 9.62182 12.4737 9.6756 12.4357C9.72938 12.3978 9.77436 12.3486 9.80746 12.2917L12.75 7.25008M15.9583 10.0001C15.9583 13.2908 13.2907 15.9584 9.99996 15.9584C6.70926 15.9584 4.04163 13.2908 4.04163 10.0001C4.04163 6.70938 6.70926 4.04175 9.99996 4.04175C13.2907 4.04175 15.9583 6.70938 15.9583 10.0001Z"
+        stroke="black" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round"/>
+    <defs>
+        <rect width="13" height="13" fill="white" transform="translate(3.5 3.5)"/>
+    </defs>
+</svg>
diff --git a/libs/core/core/application.module.ts b/libs/core/core/application.module.ts
index 31eb7dc02a..54dcce5622 100644
--- a/libs/core/core/application.module.ts
+++ b/libs/core/core/application.module.ts
@@ -57,6 +57,7 @@ import { ApplicationUpdaterModule } from "electron/application-updater"
 import { CoreDeviceModule } from "core-device/feature"
 import { createSettingsService } from "Core/settings/containers"
 import { HelpModule } from "help/feature"
+import { TimeSynchronizationModule } from "Core/time-synchronization/time-synchronization.module"
 
 export class ApplicationModule {
   public modules: Module[] = [
@@ -75,6 +76,7 @@ export class ApplicationModule {
     DeviceFileSystemModule,
     DeviceLogModule,
     DeviceModule,
+    TimeSynchronizationModule
   ]
 
   public lateModules: Module[] = [
diff --git a/libs/core/device-initialization/actions/initialize-mudita-harmony.action.ts b/libs/core/device-initialization/actions/initialize-mudita-harmony.action.ts
index bb088cd197..b80b87a67c 100644
--- a/libs/core/device-initialization/actions/initialize-mudita-harmony.action.ts
+++ b/libs/core/device-initialization/actions/initialize-mudita-harmony.action.ts
@@ -16,6 +16,7 @@ import { isActiveDeviceAttachedSelector } from "device-manager/feature"
 import { isActiveDeviceProcessingSelector } from "Core/device/selectors/is-active-device-processing.selector"
 import { getCrashDump } from "Core/crash-dump"
 import { checkForForceUpdateNeed } from "Core/update/actions"
+import { getTime } from "Core/time-synchronization/actions/get-time.action"
 
 export const initializeMuditaHarmony = createAsyncThunk<
   DeviceInitializationStatus,
@@ -37,6 +38,8 @@ export const initializeMuditaHarmony = createAsyncThunk<
       )
     }
 
+    await dispatch(getTime())
+
     const activeDeviceProcessing = isActiveDeviceProcessingSelector(getState())
 
     if (!activeDeviceProcessing) {
diff --git a/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts b/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
index 2d39476d54..6148426d07 100644
--- a/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
+++ b/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
@@ -5,10 +5,12 @@
 
 import { createSelector } from "@reduxjs/toolkit"
 import { deviceManagerState } from "device-manager/feature"
+import { selectTimeSynchronizationStatus } from "Core/time-synchronization/selectors/time-synchronization-status.selector"
 
 export const isSelectDeviceDrawerOpenSelector = createSelector(
   deviceManagerState,
-  ({ selectDeviceDrawerOpen }): boolean => {
-    return selectDeviceDrawerOpen
+  selectTimeSynchronizationStatus,
+  ({ selectDeviceDrawerOpen }, timeSyncStatus): boolean => {
+    return selectDeviceDrawerOpen && timeSyncStatus === "idle"
   }
 )
diff --git a/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts b/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
index 4bf07d12ee..49df42ebfc 100644
--- a/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
+++ b/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
@@ -13,6 +13,7 @@ import { isInitializationDeviceInProgress } from "Core/device-initialization/sel
 import { isInitializationAppInProgress } from "Core/app-initialization/selectors/is-initialization-app-in-progress.selector"
 import { useNoNewDevicesDetectedHook } from "Core/discovery-device/hooks/use-no-new-devices-detected.hook"
 import { selectDialogOpenState } from "shared/app-state"
+import { selectTimeSynchronizationStatus } from "Core/time-synchronization/selectors/time-synchronization-status.selector"
 
 export const CONNECTING_LOADER_MODAL_ID = "connecting-loader-modal"
 
@@ -26,6 +27,7 @@ export const useLoaderSkipOnConnect = () => {
   )
   const initializationAppInProgress = useSelector(isInitializationAppInProgress)
   const dialogOpen = useSelector(selectDialogOpenState)
+  const timeSyncStatus = useSelector(selectTimeSynchronizationStatus)
 
   return useCallback(() => {
     return (
@@ -35,7 +37,8 @@ export const useLoaderSkipOnConnect = () => {
       activeDeviceProcessing ||
       checkIsAnyOtherModalPresent(CONNECTING_LOADER_MODAL_ID) ||
       !noNewDevicesDetectedState ||
-      dialogOpen
+      dialogOpen ||
+      timeSyncStatus !== "idle"
     )
   }, [
     history.location.pathname,
@@ -44,5 +47,6 @@ export const useLoaderSkipOnConnect = () => {
     activeDeviceProcessing,
     noNewDevicesDetectedState,
     dialogOpen,
+    timeSyncStatus,
   ])
 }
diff --git a/libs/core/overview/components/overview-screens/harmony-overview/overview-content.component.tsx b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview-content.component.tsx
similarity index 80%
rename from libs/core/overview/components/overview-screens/harmony-overview/overview-content.component.tsx
rename to libs/core/overview/components/overview-screens/harmony-overview/harmony-overview-content.component.tsx
index 968d2eac3c..9b62666129 100644
--- a/libs/core/overview/components/overview-screens/harmony-overview/overview-content.component.tsx
+++ b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview-content.component.tsx
@@ -9,9 +9,10 @@ import { DeviceType } from "device-protocol/models"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import {
   DeviceInfo,
+  OverviewHarmonyWrapper,
   StatusInfo,
   SystemInfo,
-  OverviewWrapper,
+  TimeSynchronizationInfo,
 } from "Core/overview/components/overview/overview.styles"
 
 interface OverviewProps {
@@ -23,9 +24,10 @@ interface OverviewProps {
   readonly batteryLevel: number
   readonly serialNumber: string | undefined
   readonly caseColour?: CaseColour
+  readonly synchronizeTime: () => void
 }
 
-const OverviewContent: FunctionComponent<OverviewProps> = ({
+const HarmonyOverviewContent: FunctionComponent<OverviewProps> = ({
   batteryLevel,
   onUpdateCheck,
   onUpdateDownload,
@@ -34,9 +36,10 @@ const OverviewContent: FunctionComponent<OverviewProps> = ({
   osVersion,
   serialNumber,
   caseColour,
+  synchronizeTime,
 }) => {
   return (
-    <OverviewWrapper>
+    <OverviewHarmonyWrapper>
       <DeviceInfo
         caseColour={caseColour}
         deviceType={DeviceType.MuditaHarmony}
@@ -54,7 +57,8 @@ const OverviewContent: FunctionComponent<OverviewProps> = ({
         onDownload={onUpdateDownload}
         onUpdate={onUpdateInstall}
       />
-    </OverviewWrapper>
+      <TimeSynchronizationInfo onSynchronize={synchronizeTime} />
+    </OverviewHarmonyWrapper>
   )
 }
-export default OverviewContent
+export default HarmonyOverviewContent
diff --git a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.interface.ts b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.interface.ts
index e638f67d2e..f828742bc4 100644
--- a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.interface.ts
+++ b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.interface.ts
@@ -44,5 +44,6 @@ export interface HarmonyOverviewProps {
   readonly abortDownload: () => void
   readonly forceUpdate: (releases: OsRelease[]) => void
   readonly closeForceUpdateFlow: () => void
+  readonly synchronizeTime: () => void
   readonly caseColour: CaseColour
 }
diff --git a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.test.tsx b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.test.tsx
index ec2bc26ded..cc1b06c409 100644
--- a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.test.tsx
+++ b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.test.tsx
@@ -15,6 +15,8 @@ import React, { ComponentProps } from "react"
 import { Provider } from "react-redux"
 import { CheckForUpdateState } from "Core/update/constants/check-for-update-state.constant"
 import { CaseColour } from "core-device/models"
+import { TimeSynchronizationTestIds } from "Core/overview/components/time-synchronization/time-synchronization-ids.enum"
+import { selectSynchronizedTime } from "Core/time-synchronization/selectors/synchronized-time.selector"
 
 jest.mock("Core/settings/store/schemas/generate-application-id", () => ({
   generateApplicationId: () => "123",
@@ -30,6 +32,15 @@ jest.mock("@electron/remote", () => ({
   MenuItem: () => jest.fn(),
 }))
 
+jest.mock(
+  "Core/time-synchronization/selectors/synchronized-time.selector",
+  () => {
+    return {
+      selectSynchronizedTime: jest.fn(() => undefined),
+    }
+  }
+)
+
 type Props = ComponentProps<typeof HarmonyOverview>
 
 const defaultProps: Props = {
@@ -57,6 +68,7 @@ const defaultProps: Props = {
   forceUpdate: jest.fn(),
   forceUpdateState: State.Initial,
   closeForceUpdateFlow: jest.fn(),
+  synchronizeTime: jest.fn(),
 }
 
 const render = (extraProps?: Partial<Props>) => {
@@ -78,4 +90,32 @@ test("Renders Mudita harmony data", () => {
   expect(queryByTestId(StatusTestIds.NetworkName)).not.toBeInTheDocument()
   queryByText(intl.formatMessage({ id: "module.overview.statusHarmonyTitle" }))
   expect(getByTestId(SystemTestIds.OsVersion)).toHaveTextContent("1.0.0")
+  expect(
+    queryByTestId(TimeSynchronizationTestIds.SynchronizeButton)
+  ).not.toBeInTheDocument()
+})
+
+test("Renders time synchronization box when feature is available", () => {
+  const mockDate = new Date("2021-12-31T13:45:00Z")
+  ;(selectSynchronizedTime as unknown as jest.Mock).mockReturnValue(mockDate)
+  const { queryByTestId, getByText } = render()
+
+  const time = Intl.DateTimeFormat(undefined, {
+    hour: "2-digit",
+    minute: "2-digit",
+    timeZone: "UTC",
+  }).format(mockDate)
+
+  const date = Intl.DateTimeFormat(undefined, {
+    day: "2-digit",
+    month: "2-digit",
+    year: "numeric",
+    timeZone: "UTC",
+  }).format(mockDate)
+
+  expect(
+    queryByTestId(TimeSynchronizationTestIds.SynchronizeButton)
+  ).toBeInTheDocument()
+  expect(getByText(date)).toBeInTheDocument()
+  expect(getByText(time)).toBeInTheDocument()
 })
diff --git a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.tsx b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.tsx
index 7ddb5c240d..009b2e4097 100644
--- a/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.tsx
+++ b/libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.tsx
@@ -6,7 +6,7 @@
 import { DeviceType } from "device-protocol/models"
 import { Feature, flags } from "Core/feature-flags"
 import { HarmonyOverviewProps } from "Core/overview/components/overview-screens/harmony-overview/harmony-overview.component.interface"
-import OverviewContent from "Core/overview/components/overview-screens/harmony-overview/overview-content.component"
+import HarmonyOverviewContent from "Core/overview/components/overview-screens/harmony-overview/harmony-overview-content.component"
 import { UpdateOsFlow } from "Core/overview/components/update-os-flow"
 import UpdatingForceModalFlow from "Core/overview/components/updating-force-modal-flow/updating-force-modal-flow.component"
 import { CheckForUpdateMode } from "Core/update/constants"
@@ -44,6 +44,7 @@ export const HarmonyOverview: FunctionComponent<HarmonyOverviewProps> = ({
   forceUpdateState,
   closeForceUpdateFlow,
   caseColour,
+  synchronizeTime,
 }) => {
   const openHelpShortcut = useHelpShortcut()
   const genericDeviceErrorModalOpened = useSelector(
@@ -136,7 +137,7 @@ export const HarmonyOverview: FunctionComponent<HarmonyOverviewProps> = ({
           )}
         </>
       )}
-      <OverviewContent
+      <HarmonyOverviewContent
         batteryLevel={batteryLevel}
         osVersion={osVersion}
         onUpdateCheck={checkForHarmonyUpdate}
@@ -144,6 +145,7 @@ export const HarmonyOverview: FunctionComponent<HarmonyOverviewProps> = ({
         onUpdateDownload={openCheckForUpdateModal}
         serialNumber={serialNumber}
         caseColour={caseColour}
+        synchronizeTime={synchronizeTime}
       />
     </>
   )
diff --git a/libs/core/overview/components/overview/overview.styles.tsx b/libs/core/overview/components/overview/overview.styles.tsx
index 7c2710da81..c18572fa85 100644
--- a/libs/core/overview/components/overview/overview.styles.tsx
+++ b/libs/core/overview/components/overview/overview.styles.tsx
@@ -9,6 +9,7 @@ import Status from "Core/overview/components/status/status.component"
 import System from "Core/overview/components/system/system.component"
 import FilesManager from "Core/overview/components/files-manager/files-manager.component"
 import Backup from "Core/overview/components/backup/backup.component"
+import TimeSynchronization from "../time-synchronization/time-synchronization.component"
 
 export const DeviceInfo = styled(DevicePreview)`
   grid-area: Device;
@@ -25,6 +26,10 @@ export const BackupInfo = styled(Backup)`
   grid-area: Backup;
 `
 
+export const TimeSynchronizationInfo = styled(TimeSynchronization)`
+  grid-area: TimeSynchronization;
+`
+
 const overviewWrapperWithBackup = css`
   grid-template-rows: repeat(3, minmax(20.4rem, 1fr));
   grid-template-areas:
@@ -49,6 +54,14 @@ export const OverviewPureWrapper = styled(OverviewWrapper)`
   ${overviewWrapperWithBackup};
 `
 
+export const OverviewHarmonyWrapper = styled(OverviewWrapper)`
+  grid-template-areas:
+    "Device Network"
+    "Device System"
+    "Device TimeSynchronization";
+  grid-template-rows: repeat(3, 1fr);
+`
+
 export const FileManagerInfo = styled(FilesManager)`
   grid-area: FilesManager;
   display: none; /* TODO: Remove when feature becomes available */
diff --git a/libs/core/overview/components/overview/overview.test.tsx b/libs/core/overview/components/overview/overview.test.tsx
index d4c63d8bbc..6ce6db58c6 100644
--- a/libs/core/overview/components/overview/overview.test.tsx
+++ b/libs/core/overview/components/overview/overview.test.tsx
@@ -150,6 +150,7 @@ const defaultProps: Props = {
   forceUpdate: jest.fn(),
   forceUpdateState: State.Initial,
   backupActionDisabled: false,
+  synchronizeTime: jest.fn(),
 }
 
 const render = (extraProps?: Partial<Props>) => {
diff --git a/libs/core/overview/components/time-synchronization/time-synchronization-ids.enum.ts b/libs/core/overview/components/time-synchronization/time-synchronization-ids.enum.ts
new file mode 100644
index 0000000000..ecf36146e4
--- /dev/null
+++ b/libs/core/overview/components/time-synchronization/time-synchronization-ids.enum.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum TimeSynchronizationTestIds {
+  SynchronizeButton = "time-synchronization-synchronize-button",
+  Time = "time-synchronization-time",
+  Date = "time-synchronization-date",
+}
diff --git a/libs/core/overview/components/time-synchronization/time-synchronization.component.tsx b/libs/core/overview/components/time-synchronization/time-synchronization.component.tsx
new file mode 100644
index 0000000000..2c2fb986cf
--- /dev/null
+++ b/libs/core/overview/components/time-synchronization/time-synchronization.component.tsx
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import Card, {
+  CardAction,
+  CardBody,
+  CardContent,
+  CardHeader,
+} from "Core/overview/components/card.elements"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import React, { useEffect, useMemo, useRef } from "react"
+import { defineMessages, FormattedMessage } from "react-intl"
+import { DisplayStyle } from "Core/__deprecated__/renderer/components/core/button/button.config"
+import ButtonComponent from "Core/__deprecated__/renderer/components/core/button/button.component"
+import { useDispatch, useSelector } from "react-redux"
+import { selectTimeSynchronizationStatus } from "Core/time-synchronization/selectors/time-synchronization-status.selector"
+import { resetTimeSynchronizationStatus } from "Core/time-synchronization/actions/reset-time-synchronization-status"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
+import styled from "styled-components"
+import { getTime } from "Core/time-synchronization/actions/get-time.action"
+import { selectSynchronizedTime } from "Core/time-synchronization/selectors/synchronized-time.selector"
+import { TimeSynchronizationTestIds } from "./time-synchronization-ids.enum"
+
+const messages = defineMessages({
+  timeSynchronizationTitle: {
+    id: "module.overview.timeSynchronizationTitle",
+  },
+  timeSynchronizationDescription: {
+    id: "module.overview.timeSynchronizationDescription",
+  },
+  timeSynchronizationButton: {
+    id: "module.overview.timeSynchronizationButton",
+  },
+  timeSynchronizationProgressButton: {
+    id: "module.overview.timeSynchronizationProgressButton",
+  },
+  timeSynchronizationSuccessButton: {
+    id: "module.overview.timeSynchronizationSuccessButton",
+  },
+  timeSynchronizationFailedSubtitle: {
+    id: "module.overview.timeSynchronizationFailedSubtitle",
+  },
+  timeSynchronizationFailedDescription: {
+    id: "module.overview.timeSynchronizationFailedDescription",
+  },
+  timeSynchronizationCurrentTimeLabel: {
+    id: "module.overview.timeSynchronizationCurrentTimeLabel",
+  },
+})
+
+interface Props {
+  onSynchronize?: () => void
+}
+
+const TimeSynchronization: FunctionComponent<Props> = ({
+  onSynchronize,
+  ...props
+}) => {
+  const dispatch = useDispatch<Dispatch>()
+  const status = useSelector(selectTimeSynchronizationStatus)
+  const time = useSelector(selectSynchronizedTime)
+  const syncTimeoutRef = useRef<NodeJS.Timeout>()
+  const getTimeoutRef = useRef<NodeJS.Timeout>()
+  const firstTimeSyncRef = useRef(false)
+
+  const hourCycle = new Intl.DateTimeFormat(undefined, {
+    timeStyle: "long",
+  }).resolvedOptions().hourCycle
+
+  const deviceTime = Intl.DateTimeFormat(undefined, {
+    hour: "2-digit",
+    minute: "2-digit",
+    timeZone: "UTC",
+  }).format(time)
+
+  const deviceDate = Intl.DateTimeFormat(undefined, {
+    day: "2-digit",
+    month: "2-digit",
+    year: "numeric",
+    timeZone: "UTC",
+  }).format(time)
+
+  const onModalClose = () => {
+    dispatch(resetTimeSynchronizationStatus())
+  }
+
+  const buttonMessage = useMemo(() => {
+    switch (status) {
+      case "loading":
+        return messages.timeSynchronizationProgressButton
+      case "success":
+        return messages.timeSynchronizationSuccessButton
+      default:
+        return messages.timeSynchronizationButton
+    }
+  }, [status])
+
+  useEffect(() => {
+    clearTimeout(syncTimeoutRef.current)
+    if (status === "success") {
+      syncTimeoutRef.current = setTimeout(() => {
+        dispatch(resetTimeSynchronizationStatus())
+      }, 3000)
+    }
+    return () => {
+      clearTimeout(syncTimeoutRef.current)
+    }
+  }, [dispatch, status])
+
+  useEffect(() => {
+    if (!time) return
+    if (!firstTimeSyncRef.current) {
+      dispatch(getTime())
+      firstTimeSyncRef.current = true
+      return
+    }
+    clearTimeout(getTimeoutRef.current)
+
+    const deviceSeconds = new Date(time).getSeconds()
+    const timeout = Math.max(1, 60 - deviceSeconds) + 1
+
+    getTimeoutRef.current = setTimeout(() => {
+      dispatch(getTime())
+    }, timeout * 1000)
+
+    return () => {
+      clearTimeout(getTimeoutRef.current)
+    }
+  }, [dispatch, time])
+
+  if (!time) return null
+
+  return (
+    <>
+      <Card {...props}>
+        <CardHeader>
+          <FormattedMessage {...messages.timeSynchronizationTitle} />
+          <Text displayStyle={TextDisplayStyle.Label} color="secondary">
+            <FormattedMessage {...messages.timeSynchronizationDescription} />
+          </Text>
+        </CardHeader>
+        <CardBody>
+          <Content>
+            <ContentLabel
+              displayStyle={TextDisplayStyle.Paragraph3}
+              message={messages.timeSynchronizationCurrentTimeLabel}
+              color={"secondary"}
+            />
+            <Time
+              displayStyle={TextDisplayStyle.Paragraph1}
+              $cycle12={hourCycle === "h11" || hourCycle === "h12"}
+              data-testid={TimeSynchronizationTestIds.Time}
+            >
+              {deviceTime}
+            </Time>
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph1}
+              data-testid={TimeSynchronizationTestIds.Date}
+            >
+              {deviceDate}
+            </Text>
+          </Content>
+          <CardAction>
+            <ButtonComponent
+              displayStyle={
+                status === "loading"
+                  ? DisplayStyle.Primary
+                  : DisplayStyle.Secondary
+              }
+              labelMessage={buttonMessage}
+              onClick={onSynchronize}
+              disabled={status === "loading"}
+              loading={status === "loading"}
+              Icon={status === "success" ? IconType.ButtonSuccess : undefined}
+              data-testid={TimeSynchronizationTestIds.SynchronizeButton}
+            />
+          </CardAction>
+        </CardBody>
+      </Card>
+      <ModalDialog
+        open={status === "error"}
+        title={intl.formatMessage(messages.timeSynchronizationTitle)}
+        size={ModalSize.Small}
+        onCloseButton={onModalClose}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.ThinFail} width={3.2} />
+          </RoundIconWrapper>
+          <ModalHeading
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.timeSynchronizationFailedSubtitle}
+          />
+          <Text
+            displayStyle={TextDisplayStyle.Paragraph4}
+            color="secondary"
+            message={messages.timeSynchronizationFailedDescription}
+          />
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
+
+export default TimeSynchronization
+
+const ContentLabel = styled(Text)`
+  width: 100%;
+`
+
+const Time = styled(Text)<{ $cycle12?: boolean }>`
+  width: ${({ $cycle12 }) => ($cycle12 ? "6.5rem" : "4.2rem")};
+`
+
+const Content = styled(CardContent)`
+  flex-direction: row;
+  flex-wrap: wrap;
+  row-gap: 0.4rem;
+  column-gap: 2rem;
+`
+
+const ModalHeading = styled(Text)`
+  margin-bottom: 0.8rem;
+`
diff --git a/libs/core/overview/overview.container.tsx b/libs/core/overview/overview.container.tsx
index 9d8eec781b..f91298283f 100644
--- a/libs/core/overview/overview.container.tsx
+++ b/libs/core/overview/overview.container.tsx
@@ -40,6 +40,7 @@ import { forceUpdate } from "Core/update/actions/force-update/force-update.actio
 import { CheckForUpdateState } from "Core/update/constants/check-for-update-state.constant"
 import { isDataSyncInProgressSelector } from "Core/data-sync/selectors/is-data-sync-in-progress.selector"
 import { deactivateDevice } from "device-manager/feature"
+import { synchronizeTime } from "Core/time-synchronization/actions/synchronize-time.action"
 
 const mapStateToProps = (state: RootModel & ReduxRootState) => {
   return {
@@ -137,6 +138,8 @@ const mapDispatchToProps = (dispatch: TmpDispatch) => ({
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
   forceUpdate: (releases: OsRelease[]) => dispatch(forceUpdate({ releases })),
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  synchronizeTime: () => dispatch(synchronizeTime()),
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(Overview)
diff --git a/libs/core/time-synchronization/actions/get-time.action.ts b/libs/core/time-synchronization/actions/get-time.action.ts
new file mode 100644
index 0000000000..113a90cb46
--- /dev/null
+++ b/libs/core/time-synchronization/actions/get-time.action.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { SynchronizeTimeEvent } from "../constants/event.constant"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getTimeRequest } from "Core/time-synchronization/requests/get-time.request"
+
+export const getTime = createAsyncThunk<
+  Date,
+  undefined,
+  { state: ReduxRootState }
+>(SynchronizeTimeEvent.Get, async (_, { rejectWithValue }) => {
+  const response = await getTimeRequest()
+  if (response.error) {
+    return rejectWithValue(response.error)
+  }
+  return new Date(response.data)
+})
diff --git a/libs/core/time-synchronization/actions/reset-time-synchronization-status.ts b/libs/core/time-synchronization/actions/reset-time-synchronization-status.ts
new file mode 100644
index 0000000000..0d3bde30c8
--- /dev/null
+++ b/libs/core/time-synchronization/actions/reset-time-synchronization-status.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction } from "@reduxjs/toolkit"
+import { SynchronizeTimeEvent } from "../constants/event.constant"
+
+export const resetTimeSynchronizationStatus = createAction(
+  SynchronizeTimeEvent.ResetStatus
+)
diff --git a/libs/core/time-synchronization/actions/synchronize-time.action.ts b/libs/core/time-synchronization/actions/synchronize-time.action.ts
new file mode 100644
index 0000000000..4ca1c543c9
--- /dev/null
+++ b/libs/core/time-synchronization/actions/synchronize-time.action.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAction, createAsyncThunk } from "@reduxjs/toolkit"
+import { SynchronizeTimeEvent } from "../constants/event.constant"
+import { synchronizeTimeRequest } from "Core/time-synchronization/requests/synchronize-time.request"
+import delayResponse from "@appnroll/delay-response"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getTime } from "./get-time.action"
+
+export const synchronizeTime = createAsyncThunk<
+  void,
+  undefined,
+  { state: ReduxRootState }
+>(
+  SynchronizeTimeEvent.Synchronize,
+  async (_, { rejectWithValue, abort, dispatch, getState }) => {
+    getState().timeSynchronization.abortController?.abort()
+
+    const abortController = new AbortController()
+    abortController.abort = abort
+    dispatch(setTimeSynchronizationAbortController(abortController))
+
+    const response = await delayResponse(synchronizeTimeRequest(), 3000)
+    if (response.error) {
+      return rejectWithValue(response.error)
+    }
+    dispatch(getTime())
+    return
+  }
+)
+
+export const setTimeSynchronizationAbortController =
+  createAction<AbortController>(SynchronizeTimeEvent.SetAbortController)
diff --git a/libs/core/time-synchronization/constants/controller.constant.ts b/libs/core/time-synchronization/constants/controller.constant.ts
new file mode 100644
index 0000000000..3de98b7f50
--- /dev/null
+++ b/libs/core/time-synchronization/constants/controller.constant.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum IpcSynchronizeTimeEvent {
+  SynchronizeTime = "time-synchronization_synchronize",
+  GetTime = "time-synchronization_get-time",
+}
diff --git a/libs/core/time-synchronization/constants/error.constant.ts b/libs/core/time-synchronization/constants/error.constant.ts
new file mode 100644
index 0000000000..506a9cfcdf
--- /dev/null
+++ b/libs/core/time-synchronization/constants/error.constant.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum TimeSynchronizationError {
+  SynchronizationFailed = "SYNCHRONIZATION_FAILED",
+}
diff --git a/libs/core/time-synchronization/constants/event.constant.ts b/libs/core/time-synchronization/constants/event.constant.ts
new file mode 100644
index 0000000000..0897408d6a
--- /dev/null
+++ b/libs/core/time-synchronization/constants/event.constant.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum SynchronizeTimeEvent {
+  Synchronize = "SYNCHRONIZE_TIME",
+  SetAbortController = "SYNCHRONIZE_TIME_SET_ABORT_CONTROLLER",
+  ResetStatus = "SYNCHRONIZE_TIME_RESET_STATUS",
+  Get = "SYNCHRONIZE_TIME_GET",
+}
diff --git a/libs/core/time-synchronization/controllers/time-synchronization.controller.ts b/libs/core/time-synchronization/controllers/time-synchronization.controller.ts
new file mode 100644
index 0000000000..bc6e0bbc94
--- /dev/null
+++ b/libs/core/time-synchronization/controllers/time-synchronization.controller.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { TimeSynchronizationService } from "../services/time-synchronization.service"
+import { IpcEvent } from "Core/core/decorators"
+import { IpcSynchronizeTimeEvent } from "Core/time-synchronization/constants/controller.constant"
+
+export class TimeSynchronizationController {
+  constructor(private timeSynchronizationService: TimeSynchronizationService) {}
+
+  @IpcEvent(IpcSynchronizeTimeEvent.SynchronizeTime)
+  async synchronizeTime() {
+    return this.timeSynchronizationService.synchronizeTime()
+  }
+
+  @IpcEvent(IpcSynchronizeTimeEvent.GetTime)
+  async getTime() {
+    return this.timeSynchronizationService.getTime()
+  }
+}
diff --git a/libs/core/time-synchronization/reducers/time-synchronization.reducer.ts b/libs/core/time-synchronization/reducers/time-synchronization.reducer.ts
new file mode 100644
index 0000000000..c12f4694aa
--- /dev/null
+++ b/libs/core/time-synchronization/reducers/time-synchronization.reducer.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createReducer } from "@reduxjs/toolkit"
+import {
+  setTimeSynchronizationAbortController,
+  synchronizeTime,
+} from "../actions/synchronize-time.action"
+import { resetTimeSynchronizationStatus } from "../actions/reset-time-synchronization-status"
+import { getTime } from "Core/time-synchronization/actions/get-time.action"
+
+interface TimeSynchronizationState {
+  status?: "idle" | "loading" | "success" | "error"
+  time?: Date
+  abortController?: AbortController
+}
+
+export const initialState: TimeSynchronizationState = {}
+
+export const timeSynchronizationReducer =
+  createReducer<TimeSynchronizationState>(initialState, (builder) => {
+    builder.addCase(getTime.fulfilled, (state, action) => {
+      state.time = action.payload
+    })
+    builder.addCase(getTime.rejected, (state) => {
+      delete state.time
+      delete state.status
+      delete state.abortController
+    })
+    builder.addCase(synchronizeTime.pending, (state) => {
+      state.status = "loading"
+    })
+    builder.addCase(synchronizeTime.fulfilled, (state) => {
+      state.status = "success"
+    })
+    builder.addCase(synchronizeTime.rejected, (state, action) => {
+      state.status = "error"
+    })
+    builder.addCase(resetTimeSynchronizationStatus, (state) => {
+      state.status = "idle"
+      delete state.abortController
+    })
+    builder.addCase(setTimeSynchronizationAbortController, (state, action) => {
+      state.abortController = action.payload
+    })
+  })
diff --git a/libs/core/time-synchronization/requests/get-time.request.ts b/libs/core/time-synchronization/requests/get-time.request.ts
new file mode 100644
index 0000000000..ee07705a6e
--- /dev/null
+++ b/libs/core/time-synchronization/requests/get-time.request.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject } from "Core/core/builder"
+import { IpcSynchronizeTimeEvent } from "../constants/controller.constant"
+import { TimeSynchronizationError } from "../constants/error.constant"
+
+export const getTimeRequest = async (): Promise<
+  ResultObject<number, TimeSynchronizationError>
+> => {
+  return ipcRenderer.callMain(IpcSynchronizeTimeEvent.GetTime)
+}
diff --git a/libs/core/time-synchronization/requests/synchronize-time.request.ts b/libs/core/time-synchronization/requests/synchronize-time.request.ts
new file mode 100644
index 0000000000..f2bf7db9b0
--- /dev/null
+++ b/libs/core/time-synchronization/requests/synchronize-time.request.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject } from "Core/core/builder"
+import { IpcSynchronizeTimeEvent } from "../constants/controller.constant"
+import { TimeSynchronizationError } from "../constants/error.constant"
+
+export const synchronizeTimeRequest = async (): Promise<
+  ResultObject<boolean, TimeSynchronizationError>
+> => {
+  return ipcRenderer.callMain(IpcSynchronizeTimeEvent.SynchronizeTime)
+}
diff --git a/libs/core/time-synchronization/selectors/synchronized-time.selector.ts b/libs/core/time-synchronization/selectors/synchronized-time.selector.ts
new file mode 100644
index 0000000000..648dfdf541
--- /dev/null
+++ b/libs/core/time-synchronization/selectors/synchronized-time.selector.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+
+export const selectSynchronizedTime = createSelector(
+  (state: ReduxRootState) => state.timeSynchronization,
+  (timeSynchronization) => timeSynchronization.time
+)
diff --git a/libs/core/time-synchronization/selectors/time-synchronization-status.selector.ts b/libs/core/time-synchronization/selectors/time-synchronization-status.selector.ts
new file mode 100644
index 0000000000..53527cca95
--- /dev/null
+++ b/libs/core/time-synchronization/selectors/time-synchronization-status.selector.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createSelector } from "@reduxjs/toolkit"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+
+export const selectTimeSynchronizationStatus = createSelector(
+  (state: ReduxRootState) => state.timeSynchronization,
+  (timeSynchronization) => timeSynchronization.status
+)
diff --git a/libs/core/time-synchronization/services/time-synchronization.service.ts b/libs/core/time-synchronization/services/time-synchronization.service.ts
new file mode 100644
index 0000000000..71ce55b6d6
--- /dev/null
+++ b/libs/core/time-synchronization/services/time-synchronization.service.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DeviceProtocol } from "device-protocol/feature"
+import { Endpoint, Method } from "core-device/models"
+import { Result } from "Core/core/builder"
+import { AppError } from "Core/core/errors"
+import { TimeSynchronizationError } from "Core/time-synchronization/constants/error.constant"
+import logger from "Core/__deprecated__/main/utils/logger"
+
+export class TimeSynchronizationService {
+  constructor(private deviceProtocol: DeviceProtocol) {}
+
+  public async synchronizeTime() {
+    const currentTime = Math.round(new Date().getTime() / 1000)
+    const timezoneOffset = new Date().getTimezoneOffset() * 60
+    const timestamp = currentTime - timezoneOffset
+    logger.info("Synchronizing time", { timestamp })
+
+    const response = await this.deviceProtocol.device.request({
+      endpoint: Endpoint.TimeSynchronization,
+      method: Method.Post,
+      body: {
+        timestamp,
+      },
+      options: {
+        connectionTimeOut: 5000,
+      },
+    })
+
+    if (!response.ok) {
+      return Result.failed(
+        new AppError(
+          TimeSynchronizationError.SynchronizationFailed,
+          "Time synchronization failed"
+        )
+      )
+    }
+
+    return Result.success(true)
+  }
+
+  public async getTime() {
+    const response = await this.deviceProtocol.device.request<{
+      timestamp: number
+    }>({
+      endpoint: Endpoint.TimeSynchronization,
+      method: Method.Get,
+      body: {
+        value: "timestamp",
+      },
+      options: {
+        connectionTimeOut: 5000,
+      },
+    })
+
+    if (!response.ok || !response.data?.timestamp) {
+      return Result.failed(
+        new AppError(
+          TimeSynchronizationError.SynchronizationFailed,
+          "Getting time failed"
+        )
+      )
+    }
+    return Result.success(response.data.timestamp * 1000)
+  }
+}
diff --git a/libs/core/time-synchronization/time-synchronization.module.ts b/libs/core/time-synchronization/time-synchronization.module.ts
new file mode 100644
index 0000000000..92033ae0d4
--- /dev/null
+++ b/libs/core/time-synchronization/time-synchronization.module.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { BaseModule } from "Core/core/module"
+import { IndexStorage } from "Core/index-storage/types"
+import { DeviceProtocol } from "device-protocol/feature"
+import { MetadataStore } from "Core/metadata"
+import { AppLogger } from "Core/__deprecated__/main/utils/logger"
+import { MainProcessIpc } from "electron-better-ipc"
+import { EventEmitter } from "events"
+import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
+import { TimeSynchronizationService } from "./services/time-synchronization.service"
+import { TimeSynchronizationController } from "./controllers/time-synchronization.controller"
+
+export class TimeSynchronizationModule extends BaseModule {
+  constructor(
+    public index: IndexStorage,
+    public deviceProtocol: DeviceProtocol,
+    public keyStorage: MetadataStore,
+    public logger: AppLogger,
+    public ipc: MainProcessIpc,
+    public eventEmitter: EventEmitter,
+    public fileSystem: FileSystemService
+  ) {
+    super(
+      index,
+      deviceProtocol,
+      keyStorage,
+      logger,
+      ipc,
+      eventEmitter,
+      fileSystem
+    )
+
+    const timeSynchronizationService = new TimeSynchronizationService(
+      this.deviceProtocol
+    )
+    const timeSynchronizationController = new TimeSynchronizationController(
+      timeSynchronizationService
+    )
+
+    this.controllers = [timeSynchronizationController]
+  }
+}

From 552722226a2f37fc8bc70c65a3ac7eca58edb3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Tue, 22 Oct 2024 10:17:17 +0200
Subject: [PATCH 38/64] [CP-3046] Data Migration refactor (#2023)

---
 libs/core/backup/backup.module.ts             |   1 +
 .../backup/controllers/backup.controller.ts   |   9 +-
 .../services/backup-create.service.test.ts    | 132 ++---
 .../backup/services/backup-create.service.ts  |  63 ++-
 .../services/backup-restore.service.test.ts   |  98 +++-
 .../backup/services/base-backup.service.ts    |  46 +-
 .../backup/types/create-device-backup.type.ts |   3 +
 .../actions/read-all-indexes.action.ts        |  14 +-
 .../controllers/data-sync.controller.ts       |   7 +-
 libs/core/data-sync/indexes/base.indexer.ts   |   9 +-
 .../core/data-sync/indexes/contact.indexer.ts |   4 +-
 .../core/data-sync/indexes/message.indexer.ts |   6 +-
 .../data-sync/indexes/template.indexer.ts     |   4 +-
 libs/core/data-sync/indexes/thread.indexer.ts |   6 +-
 .../data-sync/requests/get-index.request.ts   |  12 +-
 .../data-sync/services/data-sync.service.ts   |  30 +-
 libs/core/data-sync/types/get-index.type.ts   |  25 +
 libs/core/data-sync/types/index.ts            |   1 +
 .../types/initialize-options.type.ts          |   3 +-
 .../commands/retrieve-files.command.test.ts   |  13 +-
 .../commands/retrieve-files.command.ts        |   6 +-
 .../services/device-file-system.service.ts    |   5 +-
 .../files-manager/files-manager.module.ts     |   1 +
 .../services/file-manager.service.test.ts     |   9 +
 .../services/file-manager.service.ts          |  12 +-
 .../services/index-storage.service.ts         |  24 +-
 .../lib/modals/data-migration-error-modal.tsx |   8 +-
 libs/generic-view/models/src/lib/device.ts    |   7 +
 libs/generic-view/store/src/index.ts          |   7 +-
 .../store/src/lib/action-names.ts             |  15 +-
 .../data-migration/abort-data.migration.ts    |  17 +-
 .../store/src/lib/data-migration/actions.ts   |  32 +-
 .../data-migration/clear-migration-data.ts    |  21 +
 ...migration-percentage-progress.interface.ts |  11 -
 .../data-migration/perform-data.migration.ts  | 151 ------
 .../prepare-devices-for-data.migration.ts     |  83 ++++
 .../data-migration/process-pure-database.ts   |  96 ++++
 .../store/src/lib/data-migration/reducer.ts   |  71 +--
 .../data-migration/start-data.migration.ts    |  66 ---
 .../data-migration/transfer-migration-data.ts | 130 +++++
 .../hooks/use-api-serial-port-listeners.ts    |  22 +-
 .../lib/selectors/data-migration-devices.ts   |  45 +-
 .../lib/selectors/data-migration-progress.ts  |  45 +-
 ...ndexing.ts => data-migration-pure-busy.ts} |   6 +-
 .../data-migration-pure-restarting.ts         |  12 +
 .../store/src/lib/selectors/index.ts          |   3 +-
 .../data-migration/components/device-card.tsx |   9 +-
 .../components/device-selector.tsx            |  18 +-
 .../components/pure-error-modal.tsx           |   5 +-
 .../components/pure-passcode-modal.tsx        |   8 +-
 .../data-migration/data-migration.tsx         | 139 ++++--
 .../data-migration/target-selector.tsx        |   5 +-
 .../data-migration/transfer-setup.tsx         |  14 +-
 libs/generic-view/utils/src/index.ts          |   1 +
 .../utils/src/lib/get-base-device-info.ts     |  18 +
 .../lib/use-data-migration-device-selector.ts |   5 +-
 libs/system-utils/feature/src/index.ts        |   1 +
 .../src/lib/directory/directory.requests.ts   |  31 ++
 .../src/lib/directory/directory.service.ts    |  66 ++-
 .../src/lib/directory-service-events.ts       |   3 +
 package-lock.json                             | 460 ++++++++++++++----
 package.json                                  |   1 +
 62 files changed, 1522 insertions(+), 653 deletions(-)
 create mode 100644 libs/core/data-sync/types/get-index.type.ts
 create mode 100644 libs/generic-view/store/src/lib/data-migration/clear-migration-data.ts
 delete mode 100644 libs/generic-view/store/src/lib/data-migration/data-migration-percentage-progress.interface.ts
 delete mode 100644 libs/generic-view/store/src/lib/data-migration/perform-data.migration.ts
 create mode 100644 libs/generic-view/store/src/lib/data-migration/prepare-devices-for-data.migration.ts
 create mode 100644 libs/generic-view/store/src/lib/data-migration/process-pure-database.ts
 delete mode 100644 libs/generic-view/store/src/lib/data-migration/start-data.migration.ts
 create mode 100644 libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
 rename libs/generic-view/store/src/lib/selectors/{data-migration-pure-db-indexing.ts => data-migration-pure-busy.ts} (63%)
 create mode 100644 libs/generic-view/store/src/lib/selectors/data-migration-pure-restarting.ts
 create mode 100644 libs/generic-view/utils/src/lib/get-base-device-info.ts
 create mode 100644 libs/system-utils/feature/src/lib/directory/directory.requests.ts

diff --git a/libs/core/backup/backup.module.ts b/libs/core/backup/backup.module.ts
index 75a723a378..bd15fea22a 100644
--- a/libs/core/backup/backup.module.ts
+++ b/libs/core/backup/backup.module.ts
@@ -48,6 +48,7 @@ export class BackupModule extends BaseModule {
 
     const deviceFileSystem = new DeviceFileSystemService(this.deviceProtocol)
     const fileManagerService = new FileManagerService(
+      this.deviceProtocol,
       // AUTO DISABLED - fix me if you like :)
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       new FileDeleteCommand(this.deviceProtocol),
diff --git a/libs/core/backup/controllers/backup.controller.ts b/libs/core/backup/controllers/backup.controller.ts
index 19d8ffdb4a..9dbd9e4859 100644
--- a/libs/core/backup/controllers/backup.controller.ts
+++ b/libs/core/backup/controllers/backup.controller.ts
@@ -27,10 +27,11 @@ export class BackupController {
   }
 
   @IpcEvent(IpcBackupEvent.CreateBackup)
-  public async createBackup(
-    data: CreateDeviceBackup
-  ): Promise<ResultObject<string[] | undefined>> {
-    return this.backupCreateService.createBackup(data)
+  public async createBackup({
+    deviceId,
+    ...data
+  }: CreateDeviceBackup): Promise<ResultObject<string[] | undefined>> {
+    return this.backupCreateService.createBackup(data, deviceId)
   }
 
   @IpcEvent(IpcBackupEvent.RestoreBackup)
diff --git a/libs/core/backup/services/backup-create.service.test.ts b/libs/core/backup/services/backup-create.service.test.ts
index 680f45af28..25ec034d2e 100644
--- a/libs/core/backup/services/backup-create.service.test.ts
+++ b/libs/core/backup/services/backup-create.service.test.ts
@@ -29,6 +29,7 @@ const deviceProtocol = {
   device: {
     request: jest.fn(),
   },
+  request: jest.fn(),
 } as unknown as DeviceProtocol
 
 const deviceFileSystemAdapter = {
@@ -63,25 +64,27 @@ beforeEach(() => {
 
 describe("Backup process happy path", () => {
   test("Returns the `Result.success` object with backup data", async () => {
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
-      .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
-        if (
-          config.endpoint === Endpoint.Backup &&
-          config.method === Method.Post
-        ) {
-          return Result.success(true)
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Backup &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
         }
-
-        if (
-          config.endpoint === Endpoint.Security &&
-          config.method === Method.Get
-        ) {
-          return Result.success(true)
-        }
-
-        return Result.failed(new AppError("", ""))
-      })
+      )
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
       Result.success({
         backupFilePath: "/user/local/backup/fileBase.tar",
@@ -114,14 +117,14 @@ describe("Backup process happy path", () => {
     expect(result).toEqual(Result.success(["/user/backup/backup.tar"]))
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    expect(deviceProtocol.device.request).toHaveBeenNthCalledWith(1, {
+    expect(deviceProtocol.request).toHaveBeenNthCalledWith(1, undefined, {
       endpoint: Endpoint.Backup,
       method: Method.Post,
       body: { category: BackupCategory.Backup },
     })
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    expect(deviceProtocol.device.request).toHaveBeenNthCalledWith(2, {
+    expect(deviceProtocol.request).toHaveBeenNthCalledWith(2, undefined, {
       endpoint: Endpoint.Security,
       method: Method.Get,
       body: { category: PhoneLockCategory.Status },
@@ -129,16 +132,21 @@ describe("Backup process happy path", () => {
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(deviceFileSystemAdapter.downloadFile).toHaveBeenLastCalledWith(
-      "/user/local/recovery/updater_status.json"
+      "/user/local/recovery/updater_status.json",
+      undefined
     )
     expect(
       // AUTO DISABLED - fix me if you like :)
       // eslint-disable-next-line @typescript-eslint/unbound-method
       deviceFileSystemAdapter.downloadDeviceFilesLocally
-    ).toHaveBeenLastCalledWith(["/user/local/backup/fileBase.tar"], {
-      key: "1234",
-      cwd: "/User/documents/backup",
-    })
+    ).toHaveBeenLastCalledWith(
+      ["/user/local/backup/fileBase.tar"],
+      {
+        key: "1234",
+        cwd: "/User/documents/backup",
+      },
+      undefined
+    )
     // TODO: please remove custom timeout
   }, 10000)
 })
@@ -194,7 +202,7 @@ describe("Backup process failed path", () => {
   })
 
   test("Returns the `Result.failed` with `BackupError.CannotReachBackupLocation` if `DeviceInfo` endpoint return error status", async () => {
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
       .mockResolvedValue(Result.failed(new AppError("", "")))
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
@@ -226,7 +234,7 @@ describe("Backup process failed path", () => {
   })
 
   test("Returns the `Result.failed` with `BackupError.CannotReachBackupLocation` if `Backup` endpoint return error status", async () => {
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
       .mockResolvedValue(Result.failed(new AppError("", "")))
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
@@ -259,25 +267,27 @@ describe("Backup process failed path", () => {
   })
 
   test("Returns the `Result.failed` with `BackupError.BackupProcessFailed` if `deviceFileSystem.downloadFile` returns error status", async () => {
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
-      .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
-        if (
-          config.endpoint === Endpoint.Backup &&
-          config.method === Method.Post
-        ) {
-          return Result.success(true)
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Backup &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
         }
-
-        if (
-          config.endpoint === Endpoint.Security &&
-          config.method === Method.Get
-        ) {
-          return Result.success(true)
-        }
-
-        return Result.failed(new AppError("", ""))
-      })
+      )
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
       Result.success({
         backupFilePath: "/user/local/backup/backupFilePath",
@@ -312,25 +322,27 @@ describe("Backup process failed path", () => {
   }, 10000)
 
   test("Returns the `Result.failed` with `BackupError.BackupDownloadFailed` if `deviceFileSystem.downloadDeviceFilesLocally` returns error status", async () => {
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
-      .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
-        if (
-          config.endpoint === Endpoint.Backup &&
-          config.method === Method.Post
-        ) {
-          return Result.success(true)
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Backup &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
         }
-
-        if (
-          config.endpoint === Endpoint.Security &&
-          config.method === Method.Get
-        ) {
-          return Result.success(true)
-        }
-
-        return Result.failed(new AppError("", ""))
-      })
+      )
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
       Result.success({
         backupFilePath: "/user/local/backup/backupFilePath",
diff --git a/libs/core/backup/services/backup-create.service.ts b/libs/core/backup/services/backup-create.service.ts
index 27a5388f5a..30cdd48984 100644
--- a/libs/core/backup/services/backup-create.service.ts
+++ b/libs/core/backup/services/backup-create.service.ts
@@ -9,13 +9,15 @@ import { BackupCategory } from "Core/device/constants"
 import { Result, ResultObject } from "Core/core/builder"
 import { AppError } from "Core/core/errors"
 import { BackupError, Operation } from "Core/backup/constants"
-import { MetadataStore, MetadataKey } from "Core/metadata"
+import { MetadataKey, MetadataStore } from "Core/metadata"
 import { CreateDeviceBackup } from "Core/backup/types"
 import { DeviceFileSystemService } from "Core/device-file-system/services"
 import { BaseBackupService } from "Core/backup/services/base-backup.service"
 import { FileManagerService } from "Core/files-manager/services"
 import { DeviceDirectory } from "Core/files-manager/constants"
 import { DeviceInfoService } from "Core/device-info/services"
+import { extract } from "tar"
+import { remove } from "fs-extra"
 
 export class BackupCreateService extends BaseBackupService {
   constructor(
@@ -29,7 +31,8 @@ export class BackupCreateService extends BaseBackupService {
   }
 
   public async createBackup(
-    options: CreateDeviceBackup
+    options: CreateDeviceBackup,
+    deviceId = this.deviceProtocol.device.id
   ): Promise<ResultObject<string[] | undefined>> {
     if (this.keyStorage.getValue(MetadataKey.BackupInProgress)) {
       return Result.failed(
@@ -40,14 +43,14 @@ export class BackupCreateService extends BaseBackupService {
     this.keyStorage.setValue(MetadataKey.BackupInProgress, true)
 
     const validateRequiredBackupSpaceResult =
-      await this.validateRequiredBackupSpace()
+      await this.validateRequiredBackupSpace(deviceId)
 
     if (!validateRequiredBackupSpaceResult.ok) {
       this.keyStorage.setValue(MetadataKey.BackupInProgress, false)
       return validateRequiredBackupSpaceResult
     }
 
-    const runDeviceBackupResult = await this.runDeviceBackup()
+    const runDeviceBackupResult = await this.runDeviceBackup(deviceId)
 
     if (!runDeviceBackupResult.ok || !runDeviceBackupResult.data) {
       this.keyStorage.setValue(MetadataKey.BackupInProgress, false)
@@ -60,7 +63,7 @@ export class BackupCreateService extends BaseBackupService {
       )
     }
 
-    const operationStatus = await this.checkStatus(Operation.Backup)
+    const operationStatus = await this.checkStatus(Operation.Backup, deviceId)
 
     if (!operationStatus.ok) {
       this.keyStorage.setValue(MetadataKey.BackupInProgress, false)
@@ -78,7 +81,8 @@ export class BackupCreateService extends BaseBackupService {
     const backupFileResult =
       await this.deviceFileSystem.downloadDeviceFilesLocally(
         [filePath],
-        options
+        options,
+        deviceId
       )
 
     if (!backupFileResult.ok || !backupFileResult.data) {
@@ -90,15 +94,27 @@ export class BackupCreateService extends BaseBackupService {
     }
 
     // TODO: Moved removing backup logic to OS
-    await this.deviceFileSystem.removeDeviceFile(filePath)
+    await this.deviceFileSystem.removeDeviceFile(filePath, deviceId)
 
     this.keyStorage.setValue(MetadataKey.BackupInProgress, false)
 
+    if (options.extract) {
+      await extract({
+        file: backupFileResult.data[0],
+        cwd: options.cwd,
+      })
+      await remove(backupFileResult.data[0])
+    }
+
     return Result.success(backupFileResult.data)
   }
 
-  private async runDeviceBackup(): Promise<ResultObject<string | undefined>> {
-    const deviceInfoResult = await this.deviceInfoService.getDeviceInfo()
+  private async runDeviceBackup(
+    deviceId = this.deviceProtocol.device.id
+  ): Promise<ResultObject<string | undefined>> {
+    const deviceInfoResult = await this.deviceInfoService.getDeviceInfo(
+      deviceId
+    )
 
     if (!deviceInfoResult.ok || !deviceInfoResult.data) {
       return Result.failed(
@@ -109,7 +125,7 @@ export class BackupCreateService extends BaseBackupService {
       )
     }
 
-    const backupResponse = await this.deviceProtocol.device.request({
+    const backupResponse = await this.deviceProtocol.request(deviceId, {
       endpoint: Endpoint.Backup,
       method: Method.Post,
       body: {
@@ -126,7 +142,7 @@ export class BackupCreateService extends BaseBackupService {
       )
     }
 
-    const backupFinished = await this.waitUntilProcessFinished()
+    const backupFinished = await this.waitUntilProcessFinished(deviceId)
 
     if (!backupFinished.ok && backupFinished.error) {
       return Result.failed(
@@ -139,12 +155,15 @@ export class BackupCreateService extends BaseBackupService {
     return Result.success(filePath)
   }
 
-  private async validateRequiredBackupSpace(): Promise<
-    ResultObject<undefined, BackupError>
-  > {
-    const getDeviceFilesResult = await this.fileManagerService.getDeviceFiles({
-      directory: DeviceDirectory.DB,
-    })
+  private async validateRequiredBackupSpace(
+    deviceId = this.deviceProtocol.device.id
+  ): Promise<ResultObject<undefined, BackupError>> {
+    const getDeviceFilesResult = await this.fileManagerService.getDeviceFiles(
+      {
+        directory: DeviceDirectory.DB,
+      },
+      deviceId
+    )
 
     if (!getDeviceFilesResult.ok || getDeviceFilesResult.data === undefined) {
       return Result.failed(
@@ -160,8 +179,10 @@ export class BackupCreateService extends BaseBackupService {
     }, 0)
 
     // 100 MiB as buffer space
-    const backupSizeRequaired = backupSize * 2 + 100
-    const deviceInfoResult = await this.deviceInfoService.getDeviceInfo()
+    const backupSizeRequired = backupSize * 2 + 100
+    const deviceInfoResult = await this.deviceInfoService.getDeviceInfo(
+      deviceId
+    )
 
     if (!deviceInfoResult.ok || !deviceInfoResult.data) {
       return Result.failed(
@@ -175,14 +196,14 @@ export class BackupCreateService extends BaseBackupService {
       deviceInfoResult.data.memorySpace
     const free = total - usedUserSpace - reservedSpace
 
-    if (backupSizeRequaired <= free) {
+    if (backupSizeRequired <= free) {
       return Result.success(undefined)
     } else {
       return Result.failed(
         new AppError(
           BackupError.BackupSpaceIsNotEnough,
           `Backup space is not enough`,
-          backupSizeRequaired
+          backupSizeRequired
         )
       )
     }
diff --git a/libs/core/backup/services/backup-restore.service.test.ts b/libs/core/backup/services/backup-restore.service.test.ts
index aedd2b3297..d5ef5208b1 100644
--- a/libs/core/backup/services/backup-restore.service.test.ts
+++ b/libs/core/backup/services/backup-restore.service.test.ts
@@ -15,7 +15,6 @@ import { BackupError, Operation } from "Core/backup/constants"
 import { UpdaterStatus } from "Core/backup/dto"
 import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
 import { DeviceFileSystemService } from "Core/device-file-system/services"
-import { PhoneLockCategory } from "Core/device"
 import { DeviceInfoService } from "Core/device-info/services"
 
 const arrayBufferToBuffer = (unitArray: Uint8Array): Buffer => {
@@ -65,6 +64,7 @@ const deviceProtocol = {
   device: {
     request: jest.fn(),
   },
+  request: jest.fn(),
 } as unknown as DeviceProtocol
 
 const deviceFileSystemAdapter = {
@@ -111,6 +111,27 @@ describe("Restore process happy path", () => {
       .mockResolvedValueOnce(
         Result.success(JSON.stringify(updaterStatusSuccessMock))
       )
+    deviceProtocol.request = jest
+      .fn()
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Restore &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
+        }
+      )
     deviceProtocol.device.request = jest
       .fn()
       .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
@@ -169,10 +190,10 @@ describe("Restore process happy path", () => {
     })
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    expect(deviceProtocol.device.request).toHaveBeenNthCalledWith(2, {
-      endpoint: Endpoint.Security,
-      method: Method.Get,
-      body: { category: PhoneLockCategory.Status },
+    expect(deviceProtocol.request).toHaveBeenNthCalledWith(1, undefined, {
+      body: { category: "phoneLockStatus" },
+      endpoint: 13,
+      method: 1,
     })
     // TODO: please remove custom timeout
   }, 10000)
@@ -263,7 +284,7 @@ describe("Backup restoring failed path", () => {
     deviceFileSystemAdapter.uploadFile = jest
       .fn()
       .mockResolvedValueOnce(Result.success(true))
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = jest
       .fn()
       .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
         if (
@@ -275,7 +296,7 @@ describe("Backup restoring failed path", () => {
 
         return Result.failed(new AppError("", ""))
       })
-    deviceProtocol.device.request = jest
+    deviceProtocol.request = deviceProtocol.device.request = jest
       .fn()
       .mockResolvedValue(Result.failed(new AppError("", "")))
     deviceInfoService.getDeviceInfo = jest.fn().mockResolvedValue(
@@ -310,6 +331,27 @@ describe("Backup restoring failed path", () => {
     deviceFileSystemAdapter.downloadFile = jest
       .fn()
       .mockResolvedValueOnce(Result.failed(new AppError("", "")))
+    deviceProtocol.request = jest
+      .fn()
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Restore &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
+        }
+      )
     deviceProtocol.device.request = jest
       .fn()
       .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
@@ -371,6 +413,27 @@ describe("Backup restoring failed path", () => {
           JSON.stringify(updaterStatusSuccessForAnotherOperationMock)
         )
       )
+    deviceProtocol.request = jest
+      .fn()
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Restore &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
+        }
+      )
     deviceProtocol.device.request = jest
       .fn()
       .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
@@ -430,6 +493,27 @@ describe("Backup restoring failed path", () => {
       .mockResolvedValueOnce(
         Result.success(JSON.stringify(updaterStatusFailedMock))
       )
+    deviceProtocol.request = jest
+      .fn()
+      .mockImplementation(
+        (deviceId, config: { endpoint: Endpoint; method: Method }) => {
+          if (
+            config.endpoint === Endpoint.Restore &&
+            config.method === Method.Post
+          ) {
+            return Result.success(true)
+          }
+
+          if (
+            config.endpoint === Endpoint.Security &&
+            config.method === Method.Get
+          ) {
+            return Result.success(true)
+          }
+
+          return Result.failed(new AppError("", ""))
+        }
+      )
     deviceProtocol.device.request = jest
       .fn()
       .mockImplementation((config: { endpoint: Endpoint; method: Method }) => {
diff --git a/libs/core/backup/services/base-backup.service.ts b/libs/core/backup/services/base-backup.service.ts
index c8f862728c..b68f3a11df 100644
--- a/libs/core/backup/services/base-backup.service.ts
+++ b/libs/core/backup/services/base-backup.service.ts
@@ -24,9 +24,10 @@ export class BaseBackupService {
   ) {}
 
   public async checkStatus(
-    operation: Operation
+    operation: Operation,
+    deviceId = this.deviceProtocol.device.id
   ): Promise<ResultObject<boolean, BackupError>> {
-    const deviceResponse = await this.deviceInfoService.getDeviceInfo()
+    const deviceResponse = await this.deviceInfoService.getDeviceInfo(deviceId)
 
     if (!deviceResponse.ok || !deviceResponse.data) {
       return Result.failed(
@@ -38,7 +39,8 @@ export class BaseBackupService {
     }
 
     const response = await this.deviceFileSystem.downloadFile(
-      deviceResponse.data.recoveryStatusFilePath
+      deviceResponse.data.recoveryStatusFilePath,
+      deviceId
     )
 
     if (!response.ok || !response.data) {
@@ -73,10 +75,13 @@ export class BaseBackupService {
     }
   }
 
-  public async waitUntilProcessFinished(): Promise<
-    ResultObject<boolean | undefined>
-  > {
-    const wakeUpResponse = await this.waitUntilDeviceResponse()
+  public async waitUntilProcessFinished(
+    deviceId = this.deviceProtocol.device.id
+  ): Promise<ResultObject<boolean | undefined>> {
+    const wakeUpResponse = await this.waitUntilDeviceResponse(
+      undefined,
+      deviceId
+    )
 
     if (!wakeUpResponse) {
       return Result.failed(
@@ -84,7 +89,10 @@ export class BaseBackupService {
       )
     }
 
-    const unlockResponse = await this.waitUntilGetUnlockDeviceStatusResponse()
+    const unlockResponse = await this.waitUntilGetUnlockDeviceStatusResponse(
+      undefined,
+      deviceId
+    )
 
     if (unlockResponse) {
       return Result.success(true)
@@ -95,7 +103,10 @@ export class BaseBackupService {
     }
   }
 
-  private async waitUntilDeviceResponse(index = 0): Promise<boolean> {
+  private async waitUntilDeviceResponse(
+    index = 0,
+    deviceId = this.deviceProtocol.device.id
+  ): Promise<boolean> {
     if (index === this.MAX_WAKE_UP_RETRIES) {
       return false
     }
@@ -104,16 +115,18 @@ export class BaseBackupService {
       setTimeout(() => {
         void (async () => {
           try {
-            const response = await this.deviceInfoService.getDeviceInfo()
+            const response = await this.deviceInfoService.getDeviceInfo(
+              deviceId
+            )
 
             if (response.ok) {
               resolve(true)
               return
             }
 
-            resolve(this.waitUntilDeviceResponse(++index))
+            resolve(this.waitUntilDeviceResponse(++index, deviceId))
           } catch (e) {
-            resolve(this.waitUntilDeviceResponse(++index))
+            resolve(this.waitUntilDeviceResponse(++index, deviceId))
           }
         })()
       }, this.REQUEST_TIME_OUT)
@@ -121,13 +134,14 @@ export class BaseBackupService {
   }
 
   private async waitUntilGetUnlockDeviceStatusResponse(
-    index = 0
+    index = 0,
+    deviceId = this.deviceProtocol.device.id
   ): Promise<boolean> {
     if (index === this.REQUEST_TIME_OUT) {
       return false
     }
 
-    const response = await this.deviceProtocol.device.request({
+    const response = await this.deviceProtocol.request(deviceId, {
       endpoint: Endpoint.Security,
       method: Method.Get,
       body: { category: PhoneLockCategory.Status },
@@ -138,7 +152,9 @@ export class BaseBackupService {
     } else {
       return new Promise((resolve) => {
         setTimeout(() => {
-          resolve(this.waitUntilGetUnlockDeviceStatusResponse(++index))
+          resolve(
+            this.waitUntilGetUnlockDeviceStatusResponse(++index, deviceId)
+          )
         }, this.REQUEST_TIME_OUT)
       })
     }
diff --git a/libs/core/backup/types/create-device-backup.type.ts b/libs/core/backup/types/create-device-backup.type.ts
index 914eb2cd4a..36a90ddedd 100644
--- a/libs/core/backup/types/create-device-backup.type.ts
+++ b/libs/core/backup/types/create-device-backup.type.ts
@@ -3,10 +3,13 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import { DeviceId } from "Core/device/constants/device-id"
+
 export interface CreateDeviceBackup {
   cwd: string
   token?: string
   extract?: boolean
   fileBase?: string
   key?: string
+  deviceId?: DeviceId
 }
diff --git a/libs/core/data-sync/actions/read-all-indexes.action.ts b/libs/core/data-sync/actions/read-all-indexes.action.ts
index 4a335065b3..a2a82cb494 100644
--- a/libs/core/data-sync/actions/read-all-indexes.action.ts
+++ b/libs/core/data-sync/actions/read-all-indexes.action.ts
@@ -11,21 +11,15 @@ import {
   DataSyncEvent,
 } from "Core/data-sync/constants"
 import { getIndexRequest } from "Core/data-sync/requests"
-import {
-  ContactObject,
-  MessageObject,
-  TemplateObject,
-  ThreadObject,
-} from "Core/data-sync/types"
 import { AllIndexes } from "Core/data-sync/types/all-indexes.type"
 
 export const readAllIndexes = createAsyncThunk<AllIndexes, void>(
   DataSyncEvent.ReadAllIndexes,
   async (_, { rejectWithValue }) => {
-    const contacts = await getIndexRequest<ContactObject>(DataIndex.Contact)
-    const messages = await getIndexRequest<MessageObject>(DataIndex.Message)
-    const templates = await getIndexRequest<TemplateObject>(DataIndex.Template)
-    const threads = await getIndexRequest<ThreadObject>(DataIndex.Thread)
+    const contacts = await getIndexRequest(DataIndex.Contact)
+    const messages = await getIndexRequest(DataIndex.Message)
+    const templates = await getIndexRequest(DataIndex.Template)
+    const threads = await getIndexRequest(DataIndex.Thread)
 
     if (
       contacts === undefined ||
diff --git a/libs/core/data-sync/controllers/data-sync.controller.ts b/libs/core/data-sync/controllers/data-sync.controller.ts
index 025393bb2d..4fec9a10f1 100644
--- a/libs/core/data-sync/controllers/data-sync.controller.ts
+++ b/libs/core/data-sync/controllers/data-sync.controller.ts
@@ -3,12 +3,11 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { SerialisedIndexData } from "elasticlunr"
 import { IpcEvent } from "Core/core/decorators"
 import { IndexStorage } from "Core/index-storage/types"
 import { DataSyncService } from "Core/data-sync/services/data-sync.service"
 import { DataIndex, IpcDataSyncEvent } from "Core/data-sync/constants"
-import { InitializeOptions } from "Core/data-sync/types"
+import { GetIndex, InitializeOptions } from "Core/data-sync/types"
 
 export class DataSyncController {
   constructor(
@@ -17,9 +16,7 @@ export class DataSyncController {
   ) {}
 
   @IpcEvent(IpcDataSyncEvent.GetIndex)
-  // AUTO DISABLED - fix me if you like :)
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public getIndex(indexName: DataIndex): SerialisedIndexData<any> | undefined {
+  public getIndex<Name extends DataIndex>(indexName: Name): GetIndex<Name> {
     const index = this.index.get(indexName)
 
     if (index === undefined) {
diff --git a/libs/core/data-sync/indexes/base.indexer.ts b/libs/core/data-sync/indexes/base.indexer.ts
index 64777af700..ebf5edef89 100644
--- a/libs/core/data-sync/indexes/base.indexer.ts
+++ b/libs/core/data-sync/indexes/base.indexer.ts
@@ -21,12 +21,11 @@ export abstract class BaseIndexer {
     })
   }
 
-  public async getData(
-    filePath: string,
-    token: string
-  ): Promise<Buffer | undefined | null> {
+  public async getData(filePath: string, token?: string) {
     try {
-      return this.fileSystemService.readEncryptedFile(filePath, token)
+      return token
+        ? this.fileSystemService.readEncryptedFile(filePath, token)
+        : this.fileSystemService.readFile(filePath)
     } catch {
       return null
     }
diff --git a/libs/core/data-sync/indexes/contact.indexer.ts b/libs/core/data-sync/indexes/contact.indexer.ts
index d8ec983bfa..e0813d8d63 100644
--- a/libs/core/data-sync/indexes/contact.indexer.ts
+++ b/libs/core/data-sync/indexes/contact.indexer.ts
@@ -24,7 +24,7 @@ export class ContactIndexer extends BaseIndexer {
     super(fileSystemService)
   }
 
-  async index(fileDir: string, token: string): Promise<Index<ContactObject>> {
+  async index(fileDir: string, token?: string): Promise<Index<ContactObject>> {
     const db = await this.initTmpDatabase(fileDir, token)
     const object = this.dataPresenter.serializeToObject(this.loadTables(db))
     return this.createIndex(object)
@@ -75,7 +75,7 @@ export class ContactIndexer extends BaseIndexer {
 
   private async initTmpDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "contacts.db"), token)
     return new (await this.sql).Database(data)
diff --git a/libs/core/data-sync/indexes/message.indexer.ts b/libs/core/data-sync/indexes/message.indexer.ts
index 385fdc3f26..259b17ba15 100644
--- a/libs/core/data-sync/indexes/message.indexer.ts
+++ b/libs/core/data-sync/indexes/message.indexer.ts
@@ -24,7 +24,7 @@ export class MessageIndexer extends BaseIndexer {
     super(fileSystemService)
   }
 
-  async index(fileDir: string, token: string): Promise<Index<MessageObject>> {
+  async index(fileDir: string, token?: string): Promise<Index<MessageObject>> {
     const smsDb = await this.initTmpSmsDatabase(fileDir, token)
     const contactDb = await this.initTmpContactDatabase(fileDir, token)
     const object = this.dataPresenter.serializeToObject(
@@ -66,7 +66,7 @@ export class MessageIndexer extends BaseIndexer {
 
   private async initTmpSmsDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "sms.db"), token)
     return new (await this.sql).Database(data)
@@ -74,7 +74,7 @@ export class MessageIndexer extends BaseIndexer {
 
   private async initTmpContactDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "contacts.db"), token)
     return new (await this.sql).Database(data)
diff --git a/libs/core/data-sync/indexes/template.indexer.ts b/libs/core/data-sync/indexes/template.indexer.ts
index 12b86ebd9e..0fd0286f00 100644
--- a/libs/core/data-sync/indexes/template.indexer.ts
+++ b/libs/core/data-sync/indexes/template.indexer.ts
@@ -26,7 +26,7 @@ export class TemplateIndexer extends BaseIndexer {
 
   // AUTO DISABLED - fix me if you like :)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async index(fileDir: string, token: string): Promise<any> {
+  async index(fileDir: string, token?: string): Promise<any> {
     const db = await this.initTmpDatabase(fileDir, token)
     const object = this.dataPresenter.serializeToObject(this.loadTables(db))
     return this.createIndex(object)
@@ -57,7 +57,7 @@ export class TemplateIndexer extends BaseIndexer {
 
   private async initTmpDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "sms.db"), token)
     return new (await this.sql).Database(data)
diff --git a/libs/core/data-sync/indexes/thread.indexer.ts b/libs/core/data-sync/indexes/thread.indexer.ts
index 4e186a1551..71c84518c2 100644
--- a/libs/core/data-sync/indexes/thread.indexer.ts
+++ b/libs/core/data-sync/indexes/thread.indexer.ts
@@ -24,7 +24,7 @@ export class ThreadIndexer extends BaseIndexer {
     super(fileSystemService)
   }
 
-  async index(fileDir: string, token: string): Promise<Index<ThreadObject>> {
+  async index(fileDir: string, token?: string): Promise<Index<ThreadObject>> {
     const smsDb = await this.initTmpSmsDatabase(fileDir, token)
     const contactDb = await this.initTmpContactDatabase(fileDir, token)
     const object = this.dataPresenter.serializeToObject(
@@ -71,7 +71,7 @@ export class ThreadIndexer extends BaseIndexer {
 
   private async initTmpSmsDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "sms.db"), token)
     return new (await this.sql).Database(data)
@@ -79,7 +79,7 @@ export class ThreadIndexer extends BaseIndexer {
 
   private async initTmpContactDatabase(
     fileDir: string,
-    token: string
+    token?: string
   ): Promise<Database> {
     const data = await this.getData(path.join(fileDir, "contacts.db"), token)
     return new (await this.sql).Database(data)
diff --git a/libs/core/data-sync/requests/get-index.request.ts b/libs/core/data-sync/requests/get-index.request.ts
index c3d52d1ab8..0f12eacbf9 100644
--- a/libs/core/data-sync/requests/get-index.request.ts
+++ b/libs/core/data-sync/requests/get-index.request.ts
@@ -4,13 +4,11 @@
  */
 
 import { ipcRenderer } from "electron-better-ipc"
-import { SerialisedIndexData } from "elasticlunr"
-import { IpcDataSyncEvent, DataIndex } from "Core/data-sync/constants"
+import { DataIndex, IpcDataSyncEvent } from "Core/data-sync/constants"
+import { GetIndex } from "Core/data-sync/types"
 
-// AUTO DISABLED - fix me if you like :)
-// eslint-disable-next-line @typescript-eslint/ban-types
-export const getIndexRequest = async <Type extends {}>(
-  indexName: DataIndex
-): Promise<SerialisedIndexData<Type> | undefined> => {
+export const getIndexRequest = async <Name extends DataIndex>(
+  indexName: Name
+): Promise<GetIndex<Name>> => {
   return ipcRenderer.callMain(IpcDataSyncEvent.GetIndex, indexName)
 }
diff --git a/libs/core/data-sync/services/data-sync.service.ts b/libs/core/data-sync/services/data-sync.service.ts
index d3008cca10..2357c2efba 100644
--- a/libs/core/data-sync/services/data-sync.service.ts
+++ b/libs/core/data-sync/services/data-sync.service.ts
@@ -13,8 +13,8 @@ import { MetadataStore } from "Core/metadata/services"
 import {
   ContactIndexer,
   MessageIndexer,
-  ThreadIndexer,
   TemplateIndexer,
+  ThreadIndexer,
 } from "Core/data-sync/indexes"
 import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
 import {
@@ -66,6 +66,7 @@ export class DataSyncService {
   public async indexAll({
     token,
     serialNumber,
+    backupDirectory,
   }: InitializeOptions): Promise<boolean> {
     if (
       !this.contactIndexer ||
@@ -76,18 +77,23 @@ export class DataSyncService {
       return false
     }
 
-    const syncFileDir = path.join(getAppPath(), "sync", serialNumber)
-    const { ok } = await this.syncBackupCreateService.createSyncBackup(
-      {
-        token,
-        extract: true,
-        cwd: syncFileDir,
-      },
-      serialNumber
-    )
+    let syncFileDir = backupDirectory
 
-    if (!ok) {
-      return false
+    if (!syncFileDir) {
+      syncFileDir = path.join(getAppPath(), "sync", serialNumber)
+
+      const { ok } = await this.syncBackupCreateService.createSyncBackup(
+        {
+          token,
+          extract: true,
+          cwd: syncFileDir,
+        },
+        serialNumber
+      )
+
+      if (!ok) {
+        return false
+      }
     }
 
     const contactIndex = await this.contactIndexer.index(syncFileDir, token)
diff --git a/libs/core/data-sync/types/get-index.type.ts b/libs/core/data-sync/types/get-index.type.ts
new file mode 100644
index 0000000000..0ca986233a
--- /dev/null
+++ b/libs/core/data-sync/types/get-index.type.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { SerialisedIndexData } from "elasticlunr"
+import { ContactObject } from "./contact-object.type"
+import { MessageObject } from "./message-object.type"
+import { DataIndex } from "../constants/index.constant"
+import { TemplateObject } from "./template-object.type"
+import { ThreadObject } from "./thread-object.type"
+
+export type GetIndex<Name extends DataIndex> =
+  | SerialisedIndexData<
+      Name extends DataIndex.Contact
+        ? ContactObject
+        : Name extends DataIndex.Message
+        ? MessageObject
+        : Name extends DataIndex.Template
+        ? TemplateObject
+        : Name extends DataIndex.Thread
+        ? ThreadObject
+        : never
+    >
+  | undefined
diff --git a/libs/core/data-sync/types/index.ts b/libs/core/data-sync/types/index.ts
index e397204380..25dd0df0e2 100644
--- a/libs/core/data-sync/types/index.ts
+++ b/libs/core/data-sync/types/index.ts
@@ -10,3 +10,4 @@ export * from "./thread-object.type"
 export * from "./presenter.type"
 export * from "./template-object.type"
 export { InitializeOptions } from "Core/data-sync/types/initialize-options.type"
+export * from "./get-index.type"
diff --git a/libs/core/data-sync/types/initialize-options.type.ts b/libs/core/data-sync/types/initialize-options.type.ts
index f224096f17..d514484ad2 100644
--- a/libs/core/data-sync/types/initialize-options.type.ts
+++ b/libs/core/data-sync/types/initialize-options.type.ts
@@ -4,6 +4,7 @@
  */
 
 export interface InitializeOptions {
-  token: string
+  token?: string
   serialNumber: string
+  backupDirectory?: string
 }
diff --git a/libs/core/device-file-system/commands/retrieve-files.command.test.ts b/libs/core/device-file-system/commands/retrieve-files.command.test.ts
index 74d1bf35d4..33d590760c 100644
--- a/libs/core/device-file-system/commands/retrieve-files.command.test.ts
+++ b/libs/core/device-file-system/commands/retrieve-files.command.test.ts
@@ -15,6 +15,7 @@ const deviceProtocol = {
   device: {
     request: jest.fn(),
   },
+  request: jest.fn(),
 } as unknown as DeviceProtocol
 
 const subject = new RetrieveFilesCommand(deviceProtocol)
@@ -46,9 +47,7 @@ beforeEach(() => {
 
 describe("When `DeviceManager.device.request` returns success response", () => {
   beforeEach(() => {
-    deviceProtocol.device.request = jest
-      .fn()
-      .mockResolvedValueOnce(successResponse)
+    deviceProtocol.request = jest.fn().mockResolvedValueOnce(successResponse)
   })
 
   test("returns `ResultObject.success` with payload", async () => {
@@ -56,7 +55,7 @@ describe("When `DeviceManager.device.request` returns success response", () => {
 
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    expect(deviceProtocol.device.request).toHaveBeenCalledWith({
+    expect(deviceProtocol.request).toHaveBeenCalledWith(undefined, {
       endpoint: Endpoint.FileSystem,
       method: Method.Get,
       body: {
@@ -69,9 +68,7 @@ describe("When `DeviceManager.device.request` returns success response", () => {
 
 describe("When `DeviceManager.device.request` returns failed response", () => {
   beforeEach(() => {
-    deviceProtocol.device.request = jest
-      .fn()
-      .mockResolvedValueOnce(failedResponse)
+    deviceProtocol.request = jest.fn().mockResolvedValueOnce(failedResponse)
   })
 
   test("returns `ResultObject.failed` with payload", async () => {
@@ -79,7 +76,7 @@ describe("When `DeviceManager.device.request` returns failed response", () => {
 
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    expect(deviceProtocol.device.request).toHaveBeenCalledWith({
+    expect(deviceProtocol.request).toHaveBeenCalledWith(undefined, {
       endpoint: Endpoint.FileSystem,
       method: Method.Get,
       body: {
diff --git a/libs/core/device-file-system/commands/retrieve-files.command.ts b/libs/core/device-file-system/commands/retrieve-files.command.ts
index eb74f410e3..9e3d79a7d6 100644
--- a/libs/core/device-file-system/commands/retrieve-files.command.ts
+++ b/libs/core/device-file-system/commands/retrieve-files.command.ts
@@ -13,10 +13,12 @@ import { GetFileSystemDirectoryResponseBody } from "Core/device/types/mudita-os"
 
 export class RetrieveFilesCommand extends BaseCommand {
   public async exec(
-    directory: string
+    directory: string,
+    deviceId = this.deviceProtocol.device.id
   ): Promise<ResultObject<Record<string, DirectoryFile[]> | undefined>> {
     const result =
-      await this.deviceProtocol.device.request<GetFileSystemDirectoryResponseBody>(
+      await this.deviceProtocol.request<GetFileSystemDirectoryResponseBody>(
+        deviceId,
         {
           endpoint: Endpoint.FileSystem,
           method: Method.Get,
diff --git a/libs/core/device-file-system/services/device-file-system.service.ts b/libs/core/device-file-system/services/device-file-system.service.ts
index f72fedf7ef..ff6bf0240c 100644
--- a/libs/core/device-file-system/services/device-file-system.service.ts
+++ b/libs/core/device-file-system/services/device-file-system.service.ts
@@ -223,13 +223,14 @@ export class DeviceFileSystemService {
   }
 
   public async removeDeviceFile(
-    removeFile: string
+    removeFile: string,
+    deviceId = this.deviceProtocol.device.id
   ): Promise<ResultObject<boolean>> {
     if (!removeFile) {
       return Result.failed(new AppError("", ""))
     }
 
-    const { ok } = await this.deviceProtocol.device.request({
+    const { ok } = await this.deviceProtocol.request(deviceId, {
       endpoint: Endpoint.FileSystem,
       method: Method.Delete,
       body: {
diff --git a/libs/core/files-manager/files-manager.module.ts b/libs/core/files-manager/files-manager.module.ts
index 4a7e26ea98..0357ff9807 100644
--- a/libs/core/files-manager/files-manager.module.ts
+++ b/libs/core/files-manager/files-manager.module.ts
@@ -42,6 +42,7 @@ export class FilesManagerModule extends BaseModule {
     )
 
     const fileManagerService = new FileManagerService(
+      this.deviceProtocol,
       // AUTO DISABLED - fix me if you like :)
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       new FileDeleteCommand(this.deviceProtocol),
diff --git a/libs/core/files-manager/services/file-manager.service.test.ts b/libs/core/files-manager/services/file-manager.service.test.ts
index 773d8f2922..0a7f942582 100644
--- a/libs/core/files-manager/services/file-manager.service.test.ts
+++ b/libs/core/files-manager/services/file-manager.service.test.ts
@@ -14,6 +14,7 @@ import {
 } from "Core/device-file-system/commands"
 import { DeviceFileSystemError } from "Core/device-file-system/constants"
 import { FileDeleteCommand } from "Core/device-file-system/commands/file-delete.command"
+import { DeviceProtocol } from "device-protocol/feature"
 
 // AUTO DISABLED - fix me if you like :)
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -32,7 +33,15 @@ const fileUploadCommand = {
   exec: jest.fn(),
 } as unknown as FileUploadCommand
 
+const deviceProtocol = {
+  request: jest.fn(),
+  device: {
+    id: "abc123",
+  },
+} as unknown as DeviceProtocol
+
 const subject = new FileManagerService(
+  deviceProtocol,
   fileDeleteCommand,
   retrieveFilesCommand,
   fileUploadCommand
diff --git a/libs/core/files-manager/services/file-manager.service.ts b/libs/core/files-manager/services/file-manager.service.ts
index 1d83238dbd..c38277a07a 100644
--- a/libs/core/files-manager/services/file-manager.service.ts
+++ b/libs/core/files-manager/services/file-manager.service.ts
@@ -14,21 +14,23 @@ import {
 } from "Core/device-file-system/commands"
 import { DeviceFileSystemError } from "Core/device-file-system/constants"
 import { FileDeleteCommand } from "Core/device-file-system/commands/file-delete.command"
+import { DeviceProtocol } from "device-protocol/feature"
 
 export class FileManagerService {
   constructor(
+    protected deviceProtocol: DeviceProtocol,
     private fileDeleteCommand: FileDeleteCommand,
     private retrieveFilesCommand: RetrieveFilesCommand,
     private fileUploadCommand: FileUploadCommand
   ) {}
 
-  public async getDeviceFiles({
-    directory,
-    filter,
-  }: GetFilesInput): Promise<ResultObject<File[] | undefined>> {
+  public async getDeviceFiles(
+    { directory, filter }: GetFilesInput,
+    deviceId = this.deviceProtocol.device.id
+  ): Promise<ResultObject<File[] | undefined>> {
     // AUTO DISABLED - fix me if you like :)
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const result = await this.retrieveFilesCommand.exec(directory)
+    const result = await this.retrieveFilesCommand.exec(directory, deviceId)
 
     if (!result.ok || !result.data) {
       return Result.failed(
diff --git a/libs/core/index-storage/services/index-storage.service.ts b/libs/core/index-storage/services/index-storage.service.ts
index 9ec9fc05ee..a15950c0b9 100644
--- a/libs/core/index-storage/services/index-storage.service.ts
+++ b/libs/core/index-storage/services/index-storage.service.ts
@@ -46,10 +46,9 @@ export class IndexStorageService {
             return
           }
 
-          const data = await this.fileSystemService.readEncryptedFile(
-            filePath,
-            token
-          )
+          const data = token
+            ? await this.fileSystemService.readEncryptedFile(filePath, token)
+            : await this.fileSystemService.readFile(filePath)
 
           if (data === undefined) {
             resolve(false)
@@ -79,11 +78,18 @@ export class IndexStorageService {
     for (const [indexName, fileName] of Object.entries(cacheFileNames)) {
       const data = this.index.get(indexName as DataIndex)
 
-      await this.fileSystemService.writeEncryptedFile(
-        this.getCacheFilePath(fileName, serialNumber),
-        Buffer.from(JSON.stringify(data)),
-        token
-      )
+      if (token) {
+        await this.fileSystemService.writeEncryptedFile(
+          this.getCacheFilePath(fileName, serialNumber),
+          Buffer.from(JSON.stringify(data)),
+          token
+        )
+      } else {
+        await this.fileSystemService.writeFile(
+          this.getCacheFilePath(fileName, serialNumber),
+          Buffer.from(JSON.stringify(data))
+        )
+      }
     }
   }
 
diff --git a/libs/generic-view/feature/src/lib/modals/data-migration-error-modal.tsx b/libs/generic-view/feature/src/lib/modals/data-migration-error-modal.tsx
index f97332e9c1..5ecdb9c8a3 100644
--- a/libs/generic-view/feature/src/lib/modals/data-migration-error-modal.tsx
+++ b/libs/generic-view/feature/src/lib/modals/data-migration-error-modal.tsx
@@ -8,12 +8,10 @@ import { Modal, TransferErrorModal } from "generic-view/ui"
 import { useDispatch, useSelector } from "react-redux"
 import {
   clearDataTransfer,
-  DataMigrationPercentageProgress,
+  DataMigrationStatus,
   selectActiveApiDeviceId,
   selectDataMigrationStatus,
   setDataMigrationFeatures,
-  setDataMigrationProgress,
-  setDataMigrationPureDbIndexing,
   setDataMigrationSourceDevice,
   setDataMigrationStatus,
   setDeviceErrorModalOpened,
@@ -27,11 +25,9 @@ export const DataMigrationErrorModal: FunctionComponent = () => {
   const opened = dataMigrationStatus === "FAILED" && !activeDevice
 
   const onClose = () => {
-    dispatch(setDataMigrationStatus("IDLE"))
-    dispatch(setDataMigrationProgress(DataMigrationPercentageProgress.None))
+    dispatch(setDataMigrationStatus(DataMigrationStatus.Idle))
     dispatch(setDataMigrationFeatures([]))
     dispatch(setDataMigrationSourceDevice(undefined))
-    dispatch(setDataMigrationPureDbIndexing(false))
     dispatch(setDeviceErrorModalOpened(false))
     dispatch(clearDataTransfer())
   }
diff --git a/libs/generic-view/models/src/lib/device.ts b/libs/generic-view/models/src/lib/device.ts
index 96055219ae..dcb4d9895e 100644
--- a/libs/generic-view/models/src/lib/device.ts
+++ b/libs/generic-view/models/src/lib/device.ts
@@ -41,3 +41,10 @@ export interface Device extends DeviceProperties, Partial<DeviceConfiguration> {
 export interface ConfiguredDevice
   extends DeviceProperties,
     DeviceConfiguration {}
+
+export interface BaseDevice {
+  name?: string
+  image?: string
+  serialNumber: string
+  disconnected?: boolean
+}
diff --git a/libs/generic-view/store/src/index.ts b/libs/generic-view/store/src/index.ts
index 1aec393a46..64f6fabc7f 100644
--- a/libs/generic-view/store/src/index.ts
+++ b/libs/generic-view/store/src/index.ts
@@ -54,13 +54,14 @@ export * from "./lib/entities/update-entity-data.action"
 
 export * from "./lib/data-migration/reducer"
 export * from "./lib/data-migration/actions"
-export * from "./lib/data-migration/start-data.migration"
-export * from "./lib/data-migration/perform-data.migration"
+export * from "./lib/data-migration/prepare-devices-for-data.migration"
+export * from "./lib/data-migration/transfer-migration-data"
 export * from "./lib/data-migration/abort-data.migration"
 export * from "./lib/data-transfer/reducer"
 export * from "./lib/data-transfer/actions"
 export * from "./lib/data-transfer/abort-data-transfer.action"
-export * from "./lib/data-migration/data-migration-percentage-progress.interface"
+export * from "./lib/data-migration/process-pure-database"
+export * from "./lib/data-migration/clear-migration-data"
 
 export * from "./lib/toasts/reducer"
 export * from "./lib/toasts/actions"
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index 8c8d258cad..c4e05f6984 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -77,14 +77,17 @@ export enum ActionName {
 
   SetDataMigrationSourceDevice = "data-migration/set-source-device",
   SetDataMigrationFeatures = "data-migration/set-features",
-  setDataMigrationPureDbIndexing = "data-migration/set-pure-db-indexing",
-  ClearDataMigrationDevice = "data-migration/clear-device",
   SetDataMigrationStatus = "data-migration/set-status",
-  StartDataMigration = "data-migration/start",
-  PerformDataMigration = "data-migration/perform",
+  PrepareDataMigrationDevices = "data-migration/prepare-devices",
+  ProcessDataMigrationDatabase = "data-migration/process-database",
+  TransferMigrationData = "data-migration/transfer",
+  ClearMigrationData = "data-migration/clear-data",
   AbortDataMigration = "data-migration/abort",
-  SetDataMigrationTransferProgress = "data-migration/set-transfer-progress",
-  SetDataMigrationAbort = "data-migration/set-abort",
+  AddDataMigrationAbortController = "data-migration/add-abort-controller",
+  ClearDataMigrationAbortControllers = "data-migration/clear-abort-controllers",
+  SetDataMigrationPureDbTempDirectory = "data-migration/set-pure-db-temp-directory",
+  SetDataMigrationPureRestarting = "data-migration/set-pure-restarting",
+  SetDataMigrationPureBusy = "data-migration/set-pure-busy",
 
   HelpSetData = "help/set-data",
   HelpRateArticle = "help/rate-article",
diff --git a/libs/generic-view/store/src/lib/data-migration/abort-data.migration.ts b/libs/generic-view/store/src/lib/data-migration/abort-data.migration.ts
index 9bdaec2f46..d51bf69351 100644
--- a/libs/generic-view/store/src/lib/data-migration/abort-data.migration.ts
+++ b/libs/generic-view/store/src/lib/data-migration/abort-data.migration.ts
@@ -8,24 +8,25 @@ import { ActionName } from "../action-names"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { DataMigrationStatus } from "./reducer"
 import {
-  setDataMigrationAbort,
-  setDataMigrationProgress,
+  clearDataMigrationAbortControllers,
   setDataMigrationStatus,
 } from "./actions"
-import { DataMigrationPercentageProgress } from "./data-migration-percentage-progress.interface"
+import { clearMigrationData } from "./clear-migration-data"
 
 export const abortDataMigration = createAsyncThunk<
   void,
-  { reason?: Extract<DataMigrationStatus, "CANCELLED" | "FAILED"> } | undefined,
+  | { reason?: DataMigrationStatus.Cancelled | DataMigrationStatus.Failed }
+  | undefined,
   { state: ReduxRootState }
 >(
   ActionName.AbortDataMigration,
   async ({ reason } = {}, { dispatch, getState }) => {
     const { dataMigration } = getState()
-
-    dataMigration.abortController?.abort?.()
-    dispatch(setDataMigrationAbort(undefined))
-    dispatch(setDataMigrationProgress(DataMigrationPercentageProgress.None))
+    dataMigration.abortControllers.forEach((controller) => {
+      controller.abort()
+    })
+    dispatch(clearDataMigrationAbortControllers())
+    dispatch(clearMigrationData())
 
     if (reason) {
       dispatch(setDataMigrationStatus(reason))
diff --git a/libs/generic-view/store/src/lib/data-migration/actions.ts b/libs/generic-view/store/src/lib/data-migration/actions.ts
index 1a8db634d9..c955e9bfb3 100644
--- a/libs/generic-view/store/src/lib/data-migration/actions.ts
+++ b/libs/generic-view/store/src/lib/data-migration/actions.ts
@@ -5,13 +5,12 @@
 
 import { createAction } from "@reduxjs/toolkit"
 import { ActionName } from "../action-names"
-import { DataMigrationFeature } from "generic-view/models"
+import { BaseDevice, DataMigrationFeature } from "generic-view/models"
 import { DataMigrationStatus } from "./reducer"
-import { DataMigrationPercentageProgress } from "./data-migration-percentage-progress.interface"
 
-export const setDataMigrationSourceDevice = createAction<string | undefined>(
-  ActionName.SetDataMigrationSourceDevice
-)
+export const setDataMigrationSourceDevice = createAction<
+  BaseDevice | undefined
+>(ActionName.SetDataMigrationSourceDevice)
 
 export const setDataMigrationFeatures = createAction<DataMigrationFeature[]>(
   ActionName.SetDataMigrationFeatures
@@ -21,15 +20,22 @@ export const setDataMigrationStatus = createAction<DataMigrationStatus>(
   ActionName.SetDataMigrationStatus
 )
 
-export const setDataMigrationProgress =
-  createAction<DataMigrationPercentageProgress>(
-    ActionName.SetDataMigrationTransferProgress
-  )
+export const addDataMigrationAbortController = createAction<AbortController>(
+  ActionName.AddDataMigrationAbortController
+)
 
-export const setDataMigrationAbort = createAction<AbortController | undefined>(
-  ActionName.SetDataMigrationAbort
+export const clearDataMigrationAbortControllers = createAction(
+  ActionName.ClearDataMigrationAbortControllers
 )
 
-export const setDataMigrationPureDbIndexing = createAction<boolean>(
-  ActionName.setDataMigrationPureDbIndexing
+export const setDataMigrationPureDbTempDirectory = createAction<
+  string | undefined
+>(ActionName.SetDataMigrationPureDbTempDirectory)
+
+export const setDataMigrationPureRestarting = createAction<boolean>(
+  ActionName.SetDataMigrationPureRestarting
 )
+
+export const setDataMigrationPureBusy = createAction<
+  BaseDevice["serialNumber"] | undefined
+>(ActionName.SetDataMigrationPureBusy)
diff --git a/libs/generic-view/store/src/lib/data-migration/clear-migration-data.ts b/libs/generic-view/store/src/lib/data-migration/clear-migration-data.ts
new file mode 100644
index 0000000000..5be87bbd17
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/clear-migration-data.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { removeDirectory } from "system-utils/feature"
+
+export const clearMigrationData = createAsyncThunk<
+  void,
+  undefined,
+  { state: ReduxRootState }
+>(ActionName.ClearMigrationData, async (_, { getState }) => {
+  const { dataMigration } = getState()
+
+  if (dataMigration.pureDbTempDirectory) {
+    void removeDirectory(dataMigration.pureDbTempDirectory)
+  }
+})
diff --git a/libs/generic-view/store/src/lib/data-migration/data-migration-percentage-progress.interface.ts b/libs/generic-view/store/src/lib/data-migration/data-migration-percentage-progress.interface.ts
deleted file mode 100644
index 2778bb8fcf..0000000000
--- a/libs/generic-view/store/src/lib/data-migration/data-migration-percentage-progress.interface.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-export enum DataMigrationPercentageProgress {
-  None = 0,
-  CollectingData = 1,
-  TransferringData = 10,
-  Finished = 100,
-}
diff --git a/libs/generic-view/store/src/lib/data-migration/perform-data.migration.ts b/libs/generic-view/store/src/lib/data-migration/perform-data.migration.ts
deleted file mode 100644
index 200b5bf28d..0000000000
--- a/libs/generic-view/store/src/lib/data-migration/perform-data.migration.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { createAsyncThunk } from "@reduxjs/toolkit"
-import { ActionName } from "../action-names"
-import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { DataMigrationFeature } from "generic-view/models"
-import {
-  setDataMigrationAbort,
-  setDataMigrationPureDbIndexing,
-  setDataMigrationProgress,
-  setDataMigrationStatus,
-} from "./actions"
-import { readAllIndexes } from "Core/data-sync/actions"
-import { indexAllRequest } from "Core/data-sync/requests"
-import { getDeviceInfoRequest } from "Core/device-info/requests"
-import { isEmpty } from "lodash"
-import { AllIndexes } from "Core/data-sync/types"
-import { mapPureApi } from "../imports/contacts-mappers/pure/map-pure-api"
-import {
-  DomainData,
-  transferDataToDevice,
-} from "../data-transfer/transfer-data-to-device.action"
-import logger from "Core/__deprecated__/main/utils/logger"
-import { DataMigrationPercentageProgress } from "./data-migration-percentage-progress.interface"
-import { abortDataTransfer } from "../data-transfer/abort-data-transfer.action"
-import { delay } from "shared/utils"
-
-export const performDataMigration = createAsyncThunk<
-  void,
-  undefined,
-  { state: ReduxRootState }
->(
-  ActionName.PerformDataMigration,
-  async (_, { dispatch, getState, signal, abort, rejectWithValue }) => {
-    const { dataMigration } = getState()
-
-    const dataMigrationAbortController = new AbortController()
-    dataMigrationAbortController.abort = abort
-    dispatch(setDataMigrationAbort(dataMigrationAbortController))
-
-    const abortListener = async () => {
-      dispatch(abortDataTransfer())
-      signal.removeEventListener("abort", abortListener)
-    }
-    signal.addEventListener("abort", abortListener)
-
-    const handleError = (message: string) => {
-      logger.error(message)
-      dispatch(setDataMigrationStatus("FAILED"))
-      dispatch(abortDataTransfer())
-      return rejectWithValue(undefined)
-    }
-
-    const sourceDeviceId = dataMigration.sourceDevice
-    if (!sourceDeviceId) {
-      return handleError("Source device not selected")
-    }
-
-    const features = dataMigration.selectedFeatures
-    if (isEmpty(features)) {
-      return handleError("No features selected")
-    }
-
-    if (signal.aborted) {
-      return rejectWithValue(undefined)
-    }
-    dispatch(
-      setDataMigrationProgress(DataMigrationPercentageProgress.CollectingData)
-    )
-
-    const deviceInfo = await getDeviceInfoRequest(sourceDeviceId)
-    if (
-      !deviceInfo.ok ||
-      !deviceInfo.data.serialNumber ||
-      !deviceInfo.data.token
-    ) {
-      return handleError("Error getting device info")
-    }
-
-    if (signal.aborted) {
-      return rejectWithValue(undefined)
-    }
-    dispatch(setDataMigrationPureDbIndexing(true))
-    const deviceDatabaseIndexed = await indexAllRequest({
-      serialNumber: deviceInfo.data.serialNumber,
-      token: deviceInfo.data.token,
-    })
-    dispatch(setDataMigrationPureDbIndexing(false))
-
-    if (signal.aborted) {
-      return rejectWithValue(undefined)
-    }
-    if (!deviceDatabaseIndexed) {
-      return handleError("Error indexing device database")
-    }
-    const databaseResponse = await dispatch(readAllIndexes())
-
-    if (
-      !databaseResponse.payload ||
-      databaseResponse.payload instanceof Error
-    ) {
-      return handleError("Error reading device database")
-    }
-
-    const domainsData: DomainData[] = []
-
-    for (const feature of features) {
-      if (signal.aborted) {
-        return rejectWithValue(undefined)
-      }
-
-      switch (feature) {
-        case DataMigrationFeature.Contacts: {
-          const { contacts } = databaseResponse.payload as AllIndexes
-          const transformedData = mapPureApi(Object.values(contacts))
-
-          domainsData.push({
-            domain: "contacts-v1", // FIXME: The domain should be returned from Data Migration configuration
-            data: transformedData,
-          })
-          break
-        }
-      }
-    }
-
-    dispatch(
-      setDataMigrationProgress(DataMigrationPercentageProgress.TransferringData)
-    )
-
-    if (signal.aborted) {
-      return rejectWithValue(undefined)
-    }
-    const transferResponse = await dispatch(transferDataToDevice(domainsData))
-
-    if (transferResponse.meta.requestStatus === "rejected") {
-      return signal.aborted
-        ? rejectWithValue(undefined)
-        : handleError("Error transferring data")
-    }
-    dispatch(setDataMigrationProgress(DataMigrationPercentageProgress.Finished))
-
-    await delay(500)
-
-    dispatch(setDataMigrationStatus("COMPLETED"))
-
-    return
-  }
-)
diff --git a/libs/generic-view/store/src/lib/data-migration/prepare-devices-for-data.migration.ts b/libs/generic-view/store/src/lib/data-migration/prepare-devices-for-data.migration.ts
new file mode 100644
index 0000000000..d823e22ae0
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/prepare-devices-for-data.migration.ts
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { DeviceCommunicationError } from "core-device/models"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getDeviceInfoRequest } from "Core/device-info/requests"
+import { unlockDeviceStatusRequest } from "Core/device/requests"
+import { versionFormatter } from "Core/update/helpers"
+import isVersionGreaterOrEqual from "Core/utils/is-version-greater-or-equal"
+import { ActionName } from "../action-names"
+import { setDataMigrationStatus } from "./actions"
+import { DataMigrationStatus } from "./reducer"
+
+export const prepareDevicesForDataMigration = createAsyncThunk<
+  void,
+  { onSuccess: VoidFunction },
+  { state: ReduxRootState }
+>(
+  ActionName.PrepareDataMigrationDevices,
+  async ({ onSuccess }, { dispatch, getState }) => {
+    const { dataMigration, settings } = getState()
+
+    const { error } = await unlockDeviceStatusRequest(
+      dataMigration.sourceDevice?.serialNumber
+    )
+
+    if (error) {
+      switch (error.type) {
+        case DeviceCommunicationError.DeviceLocked:
+          dispatch(
+            setDataMigrationStatus(DataMigrationStatus.PurePasswordRequired)
+          )
+          return
+        case DeviceCommunicationError.BatteryCriticalLevel:
+          dispatch(
+            setDataMigrationStatus(DataMigrationStatus.PureCriticalBattery)
+          )
+          return
+        case DeviceCommunicationError.DeviceOnboardingNotFinished:
+          dispatch(
+            setDataMigrationStatus(DataMigrationStatus.PureOnboardingRequired)
+          )
+          return
+        default:
+          dispatch(
+            setDataMigrationStatus(DataMigrationStatus.PureConnectionFailed)
+          )
+          return
+      }
+    }
+
+    const deviceInfo = await getDeviceInfoRequest(
+      dataMigration.sourceDevice?.serialNumber
+    )
+
+    if (deviceInfo.ok) {
+      const osVersion = versionFormatter(deviceInfo.data.osVersion)
+      const lowestSupportedProductVersion =
+        settings.lowestSupportedVersions?.lowestSupportedProductVersion
+
+      if (!osVersion || !lowestSupportedProductVersion) {
+        onSuccess()
+        return
+      }
+
+      const osVersionSupported = isVersionGreaterOrEqual(
+        osVersion,
+        lowestSupportedProductVersion["MuditaPure"]
+      )
+      if (!osVersionSupported) {
+        dispatch(setDataMigrationStatus(DataMigrationStatus.PureUpdateRequired))
+        return
+      }
+
+      onSuccess()
+    } else {
+      dispatch(setDataMigrationStatus(DataMigrationStatus.PureConnectionFailed))
+    }
+  }
+)
diff --git a/libs/generic-view/store/src/lib/data-migration/process-pure-database.ts b/libs/generic-view/store/src/lib/data-migration/process-pure-database.ts
new file mode 100644
index 0000000000..8d5dc088bb
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/process-pure-database.ts
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import {
+  addDataMigrationAbortController,
+  setDataMigrationPureBusy,
+  setDataMigrationPureDbTempDirectory,
+  setDataMigrationPureRestarting,
+  setDataMigrationStatus,
+} from "./actions"
+import logger from "Core/__deprecated__/main/utils/logger"
+import { checkPath, getAppPath } from "system-utils/feature"
+import { DataMigrationStatus } from "./reducer"
+import { createBackupRequest } from "Core/backup/requests"
+import { indexAllRequest } from "Core/data-sync/requests"
+import { clearMigrationData } from "./clear-migration-data"
+
+export const processPureDatabase = createAsyncThunk<
+  void,
+  undefined,
+  { state: ReduxRootState }
+>(
+  ActionName.ProcessDataMigrationDatabase,
+  async (_, { dispatch, getState, signal, abort, rejectWithValue }) => {
+    const { dataMigration } = getState()
+    const { sourceDevice } = dataMigration
+
+    const tempBackupDirectory = (await getAppPath("pureBackupTemp")).data
+    await checkPath(tempBackupDirectory, true)
+    dispatch(setDataMigrationPureDbTempDirectory(tempBackupDirectory))
+
+    const abortController = new AbortController()
+    abortController.abort = abort
+    dispatch(addDataMigrationAbortController(abortController))
+
+    const abortListener = async () => {
+      signal.removeEventListener("abort", abortListener)
+      dispatch(clearMigrationData())
+      dispatch(setDataMigrationPureRestarting(false))
+    }
+    signal.addEventListener("abort", abortListener)
+
+    const handleError = (message: string) => {
+      logger.error(message)
+      dispatch(setDataMigrationStatus(DataMigrationStatus.Failed))
+      dispatch(clearMigrationData())
+      return rejectWithValue(undefined)
+    }
+
+    if (!sourceDevice) {
+      return handleError("Source device not selected")
+    }
+
+    if (signal.aborted) {
+      return rejectWithValue(undefined)
+    }
+
+    dispatch(setDataMigrationPureBusy(sourceDevice.serialNumber))
+    const downloadDeviceBackupResponse = await createBackupRequest({
+      deviceId: sourceDevice.serialNumber,
+      fileBase: "backup.tar",
+      cwd: tempBackupDirectory,
+      extract: true,
+    })
+    dispatch(setDataMigrationPureBusy(undefined))
+
+    if (signal.aborted) {
+      dispatch(clearMigrationData())
+      return rejectWithValue(undefined)
+    }
+
+    if (downloadDeviceBackupResponse.error) {
+      return handleError("Failed to download device backup")
+    }
+
+    dispatch(setDataMigrationPureBusy(sourceDevice.serialNumber))
+    await indexAllRequest({
+      serialNumber: sourceDevice.serialNumber,
+      backupDirectory: tempBackupDirectory,
+    })
+    dispatch(setDataMigrationPureBusy(undefined))
+
+    if (signal.aborted) {
+      dispatch(clearMigrationData())
+      return rejectWithValue(undefined)
+    }
+
+    dispatch(setDataMigrationStatus(DataMigrationStatus.DataTransferring))
+    return
+  }
+)
diff --git a/libs/generic-view/store/src/lib/data-migration/reducer.ts b/libs/generic-view/store/src/lib/data-migration/reducer.ts
index ddfecb585c..d06cfea9a7 100644
--- a/libs/generic-view/store/src/lib/data-migration/reducer.ts
+++ b/libs/generic-view/store/src/lib/data-migration/reducer.ts
@@ -5,42 +5,47 @@
 
 import { createReducer } from "@reduxjs/toolkit"
 import {
-  setDataMigrationAbort,
+  addDataMigrationAbortController,
+  clearDataMigrationAbortControllers,
   setDataMigrationFeatures,
-  setDataMigrationProgress,
-  setDataMigrationPureDbIndexing,
-  setDataMigrationStatus,
+  setDataMigrationPureBusy,
+  setDataMigrationPureDbTempDirectory,
+  setDataMigrationPureRestarting,
   setDataMigrationSourceDevice,
+  setDataMigrationStatus,
 } from "./actions"
-import { DeviceId } from "Core/device/constants/device-id"
-import { DataMigrationFeature } from "generic-view/models"
+import { BaseDevice, DataMigrationFeature } from "generic-view/models"
 
-export type DataMigrationStatus =
-  | "IDLE"
-  | "PURE-PASSWORD-REQUIRED"
-  | "PURE-CRITICAL-BATTERY"
-  | "PURE-ONBOARDING-REQUIRED"
-  | "PURE-UPDATE-REQUIRED"
-  | "PURE-CONNECTION-FAILED"
-  | "IN-PROGRESS"
-  | "COMPLETED"
-  | "FAILED"
-  | "CANCELLED"
+export enum DataMigrationStatus {
+  Idle = "IDLE",
+  PurePasswordRequired = "PURE-PASSWORD-REQUIRED",
+  PureCriticalBattery = "PURE-CRITICAL-BATTERY",
+  PureOnboardingRequired = "PURE-ONBOARDING-REQUIRED",
+  PureUpdateRequired = "PURE-UPDATE-REQUIRED",
+  PureConnectionFailed = "PURE-CONNECTION-FAILED",
+  PureDatabaseCreating = "PURE-DB-CREATING",
+  PureDatabaseIndexing = "PURE-DB-INDEXING",
+  DataTransferring = "DATA-TRANSFERRING",
+  DataTransferred = "DATA-TRANSFERRED",
+  Completed = "COMPLETED",
+  Failed = "FAILED",
+  Cancelled = "CANCELLED",
+}
 
 interface DataMigrationState {
-  sourceDevice?: DeviceId
+  sourceDevice?: BaseDevice
   selectedFeatures: DataMigrationFeature[]
   status: DataMigrationStatus
-  transferProgress: number
-  abortController?: AbortController
-  pureDbIndexing: boolean
+  abortControllers: AbortController[]
+  pureDbTempDirectory?: string
+  pureRestarting?: boolean
+  pureBusy?: BaseDevice["serialNumber"]
 }
 
 const initialState: DataMigrationState = {
   selectedFeatures: [],
-  status: "IDLE",
-  transferProgress: 0,
-  pureDbIndexing: false,
+  status: DataMigrationStatus.Idle,
+  abortControllers: [],
 }
 
 export const dataMigrationReducer = createReducer(initialState, (builder) => {
@@ -53,13 +58,19 @@ export const dataMigrationReducer = createReducer(initialState, (builder) => {
   builder.addCase(setDataMigrationStatus, (state, action) => {
     state.status = action.payload
   })
-  builder.addCase(setDataMigrationProgress, (state, action) => {
-    state.transferProgress = action.payload ?? 0
+  builder.addCase(addDataMigrationAbortController, (state, action) => {
+    state.abortControllers = [...state.abortControllers, action.payload]
+  })
+  builder.addCase(clearDataMigrationAbortControllers, (state) => {
+    state.abortControllers = []
+  })
+  builder.addCase(setDataMigrationPureDbTempDirectory, (state, action) => {
+    state.pureDbTempDirectory = action.payload
   })
-  builder.addCase(setDataMigrationAbort, (state, action) => {
-    state.abortController = action.payload
+  builder.addCase(setDataMigrationPureRestarting, (state, action) => {
+    state.pureRestarting = action.payload
   })
-  builder.addCase(setDataMigrationPureDbIndexing, (state, action) => {
-    state.pureDbIndexing = action.payload
+  builder.addCase(setDataMigrationPureBusy, (state, action) => {
+    state.pureBusy = action.payload
   })
 })
diff --git a/libs/generic-view/store/src/lib/data-migration/start-data.migration.ts b/libs/generic-view/store/src/lib/data-migration/start-data.migration.ts
deleted file mode 100644
index 2ae8c9dd5d..0000000000
--- a/libs/generic-view/store/src/lib/data-migration/start-data.migration.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { createAsyncThunk } from "@reduxjs/toolkit"
-import { DeviceCommunicationError } from "core-device/models"
-import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { getDeviceInfoRequest } from "Core/device-info/requests"
-import { unlockDeviceStatusRequest } from "Core/device/requests"
-import { versionFormatter } from "Core/update/helpers"
-import isVersionGreaterOrEqual from "Core/utils/is-version-greater-or-equal"
-import { ActionName } from "../action-names"
-import { setDataMigrationStatus } from "./actions"
-
-export const startDataMigration = createAsyncThunk<
-  void,
-  undefined,
-  { state: ReduxRootState }
->(ActionName.StartDataMigration, async (_, { dispatch, getState }) => {
-  const { dataMigration, settings } = getState()
-
-  const { error } = await unlockDeviceStatusRequest(dataMigration.sourceDevice)
-  if (error) {
-    switch (error.type) {
-      case DeviceCommunicationError.DeviceLocked:
-        dispatch(setDataMigrationStatus("PURE-PASSWORD-REQUIRED"))
-        return
-      case DeviceCommunicationError.BatteryCriticalLevel:
-        dispatch(setDataMigrationStatus("PURE-CRITICAL-BATTERY"))
-        return
-      case DeviceCommunicationError.DeviceOnboardingNotFinished:
-        dispatch(setDataMigrationStatus("PURE-ONBOARDING-REQUIRED"))
-        return
-      default:
-        dispatch(setDataMigrationStatus("PURE-CONNECTION-FAILED"))
-        return
-    }
-  }
-
-  const deviceInfo = await getDeviceInfoRequest(dataMigration.sourceDevice)
-
-  if (deviceInfo.ok) {
-    const osVersion = versionFormatter(deviceInfo.data.osVersion)
-    const lowestSupportedProductVersion =
-      settings.lowestSupportedVersions?.lowestSupportedProductVersion
-
-    if (!osVersion || !lowestSupportedProductVersion) {
-      dispatch(setDataMigrationStatus("IN-PROGRESS"))
-      return
-    }
-
-    const osVersionSupported = isVersionGreaterOrEqual(
-      osVersion,
-      lowestSupportedProductVersion["MuditaPure"]
-    )
-    if (!osVersionSupported) {
-      dispatch(setDataMigrationStatus("PURE-UPDATE-REQUIRED"))
-      return
-    }
-
-    dispatch(setDataMigrationStatus("IN-PROGRESS"))
-  } else {
-    dispatch(setDataMigrationStatus("PURE-CONNECTION-FAILED"))
-  }
-})
diff --git a/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
new file mode 100644
index 0000000000..ebda102b1d
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { DataMigrationFeature } from "generic-view/models"
+import {
+  addDataMigrationAbortController,
+  setDataMigrationStatus,
+} from "./actions"
+import { readAllIndexes } from "Core/data-sync/actions"
+import { isEmpty } from "lodash"
+import { AllIndexes } from "Core/data-sync/types"
+import { mapPureApi } from "../imports/contacts-mappers/pure/map-pure-api"
+import {
+  DomainData,
+  transferDataToDevice,
+} from "../data-transfer/transfer-data-to-device.action"
+import logger from "Core/__deprecated__/main/utils/logger"
+import { abortDataTransfer } from "../data-transfer/abort-data-transfer.action"
+import { delay } from "shared/utils"
+import { removeDirectory } from "system-utils/feature"
+import { DataMigrationStatus } from "./reducer"
+import { clearMigrationData } from "./clear-migration-data"
+
+export const transferMigrationData = createAsyncThunk<
+  void,
+  undefined,
+  { state: ReduxRootState }
+>(
+  ActionName.TransferMigrationData,
+  async (_, { dispatch, getState, signal, abort, rejectWithValue }) => {
+    try {
+      const { dataMigration } = getState()
+
+      const abortController = new AbortController()
+      abortController.abort = abort
+      dispatch(addDataMigrationAbortController(abortController))
+
+      const abortListener = async () => {
+        dispatch(abortDataTransfer())
+        dispatch(clearMigrationData())
+        signal.removeEventListener("abort", abortListener)
+      }
+      signal.addEventListener("abort", abortListener)
+
+      const handleError = (message: string) => {
+        logger.error(message)
+        dispatch(setDataMigrationStatus(DataMigrationStatus.Failed))
+        dispatch(abortDataTransfer())
+        dispatch(clearMigrationData())
+        return rejectWithValue(undefined)
+      }
+
+      const sourceDeviceId = dataMigration.sourceDevice
+      if (!sourceDeviceId) {
+        return handleError("Source device not selected")
+      }
+
+      const features = dataMigration.selectedFeatures
+      if (isEmpty(features)) {
+        return handleError("No features selected")
+      }
+
+      if (signal.aborted) {
+        return rejectWithValue(undefined)
+      }
+
+      const databaseResponse = await dispatch(readAllIndexes())
+      await removeDirectory(dataMigration.pureDbTempDirectory!)
+
+      if (
+        !databaseResponse.payload ||
+        databaseResponse.payload instanceof Error
+      ) {
+        return handleError("Error reading device database")
+      }
+
+      const domainsData: DomainData[] = []
+
+      for (const feature of features) {
+        if (signal.aborted) {
+          return rejectWithValue(undefined)
+        }
+
+        switch (feature) {
+          case DataMigrationFeature.Contacts: {
+            const { contacts } = databaseResponse.payload as AllIndexes
+            const transformedData = mapPureApi(Object.values(contacts))
+
+            if (!isEmpty(transformedData)) {
+              domainsData.push({
+                domain: "contacts-v1", // FIXME: The domain should be returned from Data Migration configuration
+                data: transformedData,
+              })
+            }
+            break
+          }
+        }
+      }
+
+      if (signal.aborted) {
+        return rejectWithValue(undefined)
+      }
+      if (!isEmpty(domainsData)) {
+        const transferResponse = await dispatch(
+          transferDataToDevice(domainsData)
+        )
+        if (transferResponse.meta.requestStatus === "rejected") {
+          return signal.aborted
+            ? rejectWithValue(undefined)
+            : handleError("Error transferring data")
+        }
+      }
+      dispatch(setDataMigrationStatus(DataMigrationStatus.DataTransferred))
+
+      await delay(500)
+
+      dispatch(setDataMigrationStatus(DataMigrationStatus.Completed))
+
+      return
+    } catch (error) {
+      console.error(error)
+      return rejectWithValue(undefined)
+    }
+  }
+)
diff --git a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
index d6cddc56bd..b92925fdde 100644
--- a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
@@ -6,9 +6,12 @@
 import { useCallback, useEffect } from "react"
 import { useDispatch, useSelector } from "react-redux"
 import { answerMain, useDebouncedEventsHandler } from "shared/utils"
-import { DeviceProtocolMainEvent, DeviceType } from "device-protocol/models"
+import {
+  DeviceBaseProperties,
+  DeviceProtocolMainEvent,
+  DeviceType,
+} from "device-protocol/models"
 import { DeviceState } from "device-manager/models"
-import { DeviceBaseProperties } from "device-protocol/models"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { addDevice, removeDevice } from "../views/actions"
 import { getAPIConfig } from "../get-api-config"
@@ -22,6 +25,7 @@ import {
   selectDataMigrationTargetDevice,
 } from "../selectors/data-migration-devices"
 import { clearEntities } from "../entities/actions"
+import { DataMigrationStatus } from "../data-migration/reducer"
 
 export const useAPISerialPortListeners = () => {
   const dispatch = useDispatch<Dispatch>()
@@ -76,11 +80,21 @@ const useHandleDevicesDetached = () => {
     async (deviceDetachedEvents: DeviceBaseProperties[]) => {
       for (const event of deviceDetachedEvents) {
         if (
-          migrationStatus === "IN-PROGRESS" &&
+          migrationStatus === DataMigrationStatus.DataTransferring &&
           (sourceDevice?.serialNumber === event.serialNumber ||
             targetDevice?.serialNumber === event.serialNumber)
         ) {
-          dispatch(abortDataMigration({ reason: "FAILED" }))
+          dispatch(abortDataMigration({ reason: DataMigrationStatus.Failed }))
+        }
+        if (
+          event.deviceType === "MuditaPure" &&
+          event.serialNumber === sourceDevice?.serialNumber &&
+          [
+            DataMigrationStatus.PureDatabaseCreating,
+            DataMigrationStatus.PureDatabaseIndexing,
+          ].includes(migrationStatus)
+        ) {
+          return
         }
       }
 
diff --git a/libs/generic-view/store/src/lib/selectors/data-migration-devices.ts b/libs/generic-view/store/src/lib/selectors/data-migration-devices.ts
index 99422833f2..690384460c 100644
--- a/libs/generic-view/store/src/lib/selectors/data-migration-devices.ts
+++ b/libs/generic-view/store/src/lib/selectors/data-migration-devices.ts
@@ -7,11 +7,12 @@ import { createSelector } from "@reduxjs/toolkit"
 import { kompaktImg } from "Root/demo-data/kompakt-img"
 import { getCoreDevicesSelector } from "core-device/feature"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import pureBlackImage from "Core/__deprecated__/renderer/images/pure-black-render.png"
-import pureGreyImage from "Core/__deprecated__/renderer/images/pure-gray-render.png"
-import { getDeviceTypeName } from "Core/discovery-device/utils/get-device-type-name"
 import { selectConfiguredDevices } from "./select-configured-devices"
 import { selectActiveApiDeviceId } from "./select-active-api-device-id"
+import { getBaseDeviceInfo } from "generic-view/utils"
+import { BaseDevice } from "generic-view/models"
+import { DataMigrationStatus } from "../data-migration/reducer"
+import { selectDataMigrationStatus } from "./data-migration-status"
 
 // FIXME: The device name should be moved to the API config response of API device
 const messages = {
@@ -20,14 +21,29 @@ const messages = {
 
 export const selectDataMigrationSourceDevices = createSelector(
   getCoreDevicesSelector,
-  (devices) =>
-    devices
+  selectDataMigrationStatus,
+  (state: ReduxRootState) => state.dataMigration.sourceDevice,
+  (devices, dataMigrationStatus, sourceDevice) => {
+    const availableDevices = devices
       .filter(({ deviceType }) => deviceType === "MuditaPure")
-      .map((device) => ({
-        name: getDeviceTypeName(device.deviceType!),
-        image: device.caseColour === "black" ? pureBlackImage : pureGreyImage,
-        serialNumber: device.serialNumber!,
-      }))
+      .map(getBaseDeviceInfo)
+
+    const sourceDeviceDisconnected =
+      [
+        DataMigrationStatus.PureDatabaseIndexing,
+        DataMigrationStatus.PureDatabaseCreating,
+      ].includes(dataMigrationStatus) &&
+      sourceDevice &&
+      !availableDevices.find(
+        (device) => device.serialNumber === sourceDevice.serialNumber
+      )
+    return [
+      ...(sourceDeviceDisconnected
+        ? [{ ...sourceDevice, disconnected: true }]
+        : []),
+      ...availableDevices,
+    ] as BaseDevice[]
+  }
 )
 
 export const selectDataMigrationTargetDevices = createSelector(
@@ -44,7 +60,7 @@ export const selectDataMigrationTargetDevices = createSelector(
           name,
           image: kompaktImg, // TODO: Add variant support
           serialNumber: device.apiConfig.serialNumber!,
-        }
+        } as BaseDevice
       })
       .filter(Boolean)
   }
@@ -53,8 +69,11 @@ export const selectDataMigrationTargetDevices = createSelector(
 export const selectDataMigrationSourceDevice = createSelector(
   selectDataMigrationSourceDevices,
   (state: ReduxRootState) => state.dataMigration.sourceDevice,
-  (devices, sourceDeviceId) =>
-    devices.find((device) => device?.serialNumber === sourceDeviceId)
+  (devices, sourceDevice) => {
+    return devices.find(
+      (device) => device?.serialNumber === sourceDevice?.serialNumber
+    )
+  }
 )
 
 export const selectDataMigrationTargetDevice = createSelector(
diff --git a/libs/generic-view/store/src/lib/selectors/data-migration-progress.ts b/libs/generic-view/store/src/lib/selectors/data-migration-progress.ts
index 72d61cf7e1..2f35be5410 100644
--- a/libs/generic-view/store/src/lib/selectors/data-migration-progress.ts
+++ b/libs/generic-view/store/src/lib/selectors/data-migration-progress.ts
@@ -3,28 +3,49 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { createSelector } from "@reduxjs/toolkit"
 import { selectDataTransferProgress } from "./data-transfer-progress"
-import { DataMigrationPercentageProgress } from "../data-migration/data-migration-percentage-progress.interface"
+import { selectDataMigrationStatus } from "./data-migration-status"
+import { DataMigrationStatus } from "../data-migration/reducer"
 
 export const selectDataMigrationProgress = createSelector(
   selectDataTransferProgress,
-  (state: ReduxRootState) => state.dataMigration.transferProgress,
+  selectDataMigrationStatus,
   (
     { currentDomain: label, progress: dataTransferProgress = 0 },
-    dataMigrationProgress = 0
+    dataMigrationStatus
   ) => {
-    // Calculate overall progress as a weighted sum of data migration and data transfer progress
-    const dataTransferProgressFactor =
-      (100 - DataMigrationPercentageProgress.TransferringData - 1) / 100
-    const value = Math.floor(
-      dataMigrationProgress + dataTransferProgressFactor * dataTransferProgress
-    )
+    if (dataMigrationStatus === DataMigrationStatus.Idle) {
+      return {
+        value: 0,
+      }
+    }
+    if (dataMigrationStatus === DataMigrationStatus.PureDatabaseCreating) {
+      return {
+        value: 5,
+      }
+    }
+    if (dataMigrationStatus === DataMigrationStatus.PureDatabaseIndexing) {
+      return {
+        value: 30,
+      }
+    }
+
+    if (dataMigrationStatus === DataMigrationStatus.DataTransferring) {
+      // Calculate overall progress as a weighted sum of data migration and data transfer progress
+      const dataTransferProgressFactor = (70 - 1) / 100
+      const value = Math.floor(
+        30 + dataTransferProgressFactor * dataTransferProgress
+      )
+
+      return {
+        value,
+        label,
+      }
+    }
 
     return {
-      value,
-      label,
+      value: 100,
     }
   }
 )
diff --git a/libs/generic-view/store/src/lib/selectors/data-migration-pure-db-indexing.ts b/libs/generic-view/store/src/lib/selectors/data-migration-pure-busy.ts
similarity index 63%
rename from libs/generic-view/store/src/lib/selectors/data-migration-pure-db-indexing.ts
rename to libs/generic-view/store/src/lib/selectors/data-migration-pure-busy.ts
index 83dd6691a6..4eefbcb7c7 100644
--- a/libs/generic-view/store/src/lib/selectors/data-migration-pure-db-indexing.ts
+++ b/libs/generic-view/store/src/lib/selectors/data-migration-pure-busy.ts
@@ -6,7 +6,7 @@
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { createSelector } from "@reduxjs/toolkit"
 
-export const selectDataMigrationPureDbIndexing = createSelector(
-  (state: ReduxRootState) => state.dataMigration.pureDbIndexing,
-  (indexing) => indexing
+export const selectDataMigrationPureBusy = createSelector(
+  (state: ReduxRootState) => state.dataMigration.pureBusy,
+  (busy) => busy
 )
diff --git a/libs/generic-view/store/src/lib/selectors/data-migration-pure-restarting.ts b/libs/generic-view/store/src/lib/selectors/data-migration-pure-restarting.ts
new file mode 100644
index 0000000000..bc439f82a3
--- /dev/null
+++ b/libs/generic-view/store/src/lib/selectors/data-migration-pure-restarting.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { createSelector } from "@reduxjs/toolkit"
+
+export const selectDataMigrationPureRestarting = createSelector(
+  (state: ReduxRootState) => state.dataMigration.pureRestarting,
+  (restarting) => restarting
+)
diff --git a/libs/generic-view/store/src/lib/selectors/index.ts b/libs/generic-view/store/src/lib/selectors/index.ts
index 44bb81c2a2..14cb7839cc 100644
--- a/libs/generic-view/store/src/lib/selectors/index.ts
+++ b/libs/generic-view/store/src/lib/selectors/index.ts
@@ -28,8 +28,9 @@ export * from "./select-configured-devices"
 export * from "./select-devices"
 export * from "./select-failed-devices"
 export * from "./select-generic-view-state"
-export * from "./data-migration-pure-db-indexing"
+export * from "./data-migration-pure-restarting"
 export * from "./device-error-modal-opened"
 export * from "./data-transfer-error-type"
+export * from "./data-migration-pure-busy"
 export * from "./entities"
 export * from "./active-device-configuration"
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
index d4c694f890..b56a612d3d 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-card.tsx
@@ -10,6 +10,7 @@ import { P3 } from "../../../texts/paragraphs"
 import { ButtonPrimary } from "../../../buttons/button-primary"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { BaseDevice } from "generic-view/models"
 
 const messages = defineMessages({
   label: {
@@ -23,14 +24,8 @@ const messages = defineMessages({
   },
 })
 
-export interface Device {
-  name: string
-  image: string
-  serialNumber: string
-}
-
 export const DeviceCard: FunctionComponent<
-  Device & { onSelect: VoidFunction }
+  BaseDevice & { onSelect: VoidFunction }
 > = ({ image, name, serialNumber, onSelect }) => {
   return (
     <Wrapper>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-selector.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-selector.tsx
index feaed09b50..2d7f3dd5b9 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-selector.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/device-selector.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { FunctionComponent, useRef, useState } from "react"
-import { Device, deviceCardStyles, Image, Info, Tag } from "./device-card"
+import { deviceCardStyles, Image, Info, Tag } from "./device-card"
 import styled, { css } from "styled-components"
 import { H4, H5 } from "../../../texts/headers"
 import { P3 } from "../../../texts/paragraphs"
@@ -17,9 +17,9 @@ import {
   selectDataMigrationTargetDevice,
   setDataMigrationSourceDevice,
 } from "generic-view/store"
-import { DeviceId } from "Core/device/constants/device-id"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { BaseDevice } from "generic-view/models"
 
 const messages = defineMessages({
   sourceLabel: {
@@ -37,7 +37,7 @@ type DeviceType = "source" | "target"
 
 interface Props {
   type: DeviceType
-  devices: Device[]
+  devices: BaseDevice[]
 }
 
 export const DeviceSelector: FunctionComponent<Props> = ({ type, devices }) => {
@@ -56,10 +56,10 @@ export const DeviceSelector: FunctionComponent<Props> = ({ type, devices }) => {
     setOpened((prev) => !prev)
   }
 
-  const selectDevice = (serialNumber: DeviceId) => {
+  const selectDevice = (device: BaseDevice) => {
     setOpened(false)
     if (type === "source") {
-      dispatch(setDataMigrationSourceDevice(serialNumber))
+      dispatch(setDataMigrationSourceDevice(device))
     }
   }
 
@@ -85,12 +85,12 @@ export const DeviceSelector: FunctionComponent<Props> = ({ type, devices }) => {
       {dropdownVisible && (
         <DropdownWrapper $opened={opened}>
           {devices.map((device) => {
-            const onSelect = () => selectDevice(device.serialNumber)
+            const onSelect = () => selectDevice(device)
             return (
               <ListItem
                 key={device.serialNumber}
-                image={device.image}
-                name={device.name}
+                image={device.image!}
+                name={device.name!}
                 serialNumber={device.serialNumber}
                 onSelect={onSelect}
                 active={selectedDevice?.serialNumber === device.serialNumber}
@@ -104,7 +104,7 @@ export const DeviceSelector: FunctionComponent<Props> = ({ type, devices }) => {
 }
 
 const ListItem: FunctionComponent<
-  Device & { active?: boolean; onSelect: VoidFunction }
+  BaseDevice & { active?: boolean; onSelect: VoidFunction }
 > = ({ image, name, serialNumber, onSelect, active }) => {
   return (
     <ListItemCard onClick={onSelect}>
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-error-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-error-modal.tsx
index 60c3ca2c63..3e4cbecb57 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-error-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-error-modal.tsx
@@ -35,7 +35,9 @@ const messages = defineMessages({
   },
 })
 
-export const PureErrorModal: FunctionComponent = () => {
+export const PureErrorModal: FunctionComponent<{
+  onButtonClick: VoidFunction
+}> = ({ onButtonClick }) => {
   const dataMigrationStatus = useSelector(selectDataMigrationStatus)
 
   const title = intl.formatMessage(messages.title)
@@ -58,6 +60,7 @@ export const PureErrorModal: FunctionComponent = () => {
       title={title}
       description={getDescription()}
       buttonLabel={intl.formatMessage(messages.closeButtonLabel)}
+      onButtonClick={onButtonClick}
     />
   )
 }
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-passcode-modal.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-passcode-modal.tsx
index afc265c8a0..c06f886848 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-passcode-modal.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/pure-passcode-modal.tsx
@@ -8,6 +8,7 @@ import { useDispatch, useSelector } from "react-redux"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { DeviceId } from "Core/device/constants/device-id"
 import {
+  DataMigrationStatus,
   selectDataMigrationStatus,
   setDataMigrationStatus,
 } from "generic-view/store"
@@ -28,10 +29,13 @@ export const PurePasscodeModal: FunctionComponent<Props> = ({
   const dataMigrationStatus = useSelector(selectDataMigrationStatus)
 
   const closePasscodeModal = () => {
-    dispatch(setDataMigrationStatus("IDLE"))
+    dispatch(setDataMigrationStatus(DataMigrationStatus.Idle))
   }
 
-  if (deviceId && dataMigrationStatus === "PURE-PASSWORD-REQUIRED") {
+  if (
+    deviceId &&
+    dataMigrationStatus === DataMigrationStatus.PurePasswordRequired
+  ) {
     return (
       <ThemeProvider theme={theme as unknown as DefaultTheme}>
         <PurePasscode
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/data-migration.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/data-migration.tsx
index 4d90f67cc1..4271d443c8 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/data-migration.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/data-migration.tsx
@@ -14,22 +14,25 @@ import React, {
 import { defineMessages } from "react-intl"
 import { useDispatch, useSelector } from "react-redux"
 import { APIFC } from "generic-view/utils"
-import { McDataMigrationConfig } from "generic-view/models"
+import { BaseDevice, McDataMigrationConfig } from "generic-view/models"
 import { getActiveDevice } from "device-manager/feature"
 import {
   abortDataMigration,
+  clearDataMigrationAbortControllers,
   clearDataTransfer,
-  DataMigrationPercentageProgress,
-  performDataMigration,
+  DataMigrationStatus,
+  prepareDevicesForDataMigration,
+  processPureDatabase,
+  selectDataMigrationPureRestarting,
   selectDataMigrationSourceDevice,
   selectDataMigrationSourceDevices,
   selectDataMigrationStatus,
   selectDataMigrationTargetDevices,
   setDataMigrationFeatures,
-  setDataMigrationProgress,
+  setDataMigrationPureRestarting,
   setDataMigrationSourceDevice,
   setDataMigrationStatus,
-  startDataMigration,
+  transferMigrationData,
 } from "generic-view/store"
 import { Instruction, InstructionWrapper } from "./instruction"
 import styled from "styled-components"
@@ -42,7 +45,6 @@ import {
   GenericThemeProvider,
   modalTransitionDuration,
 } from "generic-view/theme"
-import { Device } from "./components/device-card"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { PureErrorModal } from "./components/pure-error-modal"
@@ -66,67 +68,127 @@ const DataMigrationUI: FunctionComponent<McDataMigrationConfig> = ({
   const activeDevice = useSelector(getActiveDevice)
   const sourceDevices = useSelector(
     selectDataMigrationSourceDevices
-  ) as Device[]
+  ) as BaseDevice[]
   const targetDevices = useSelector(
     selectDataMigrationTargetDevices
-  ) as Device[]
+  ) as BaseDevice[]
   const sourceDevice = useSelector(selectDataMigrationSourceDevice)
   const dataMigrationStatus = useSelector(selectDataMigrationStatus)
+  const pureRestarting = useSelector(selectDataMigrationPureRestarting)
+
   const [modalOpened, setModalOpened] = useState(false)
 
-  const noSourceDeviceSelected = dataMigrationStatus === "IDLE" && !sourceDevice
+  const noSourceDeviceSelected =
+    dataMigrationStatus === DataMigrationStatus.Idle && !sourceDevice
   const displayInstruction =
     Boolean(sourceDevices.length) !== Boolean(targetDevices.length)
   const displayTargetSelector =
     activeDevice?.deviceType === "MuditaPure" && targetDevices.length > 0
   const displayTransferSetup = !displayInstruction && !displayTargetSelector
 
-  const startMigration = () => {
-    dispatch(startDataMigration())
-  }
+  const startMigration = useCallback(() => {
+    dispatch(
+      prepareDevicesForDataMigration({
+        onSuccess: () => {
+          dispatch(
+            setDataMigrationStatus(DataMigrationStatus.PureDatabaseCreating)
+          )
+        },
+      })
+    )
+  }, [dispatch])
+
+  const onPureUnlock = useCallback(() => {
+    if (pureRestarting) {
+      dispatch(setDataMigrationStatus(DataMigrationStatus.PureDatabaseIndexing))
+    } else {
+      dispatch(setDataMigrationStatus(DataMigrationStatus.PureDatabaseCreating))
+    }
+  }, [dispatch, pureRestarting])
+
+  const startPureDatabaseProcessing = useCallback(() => {
+    dispatch(processPureDatabase())
+  }, [dispatch])
 
   const startTransfer = useCallback(() => {
-    dispatch(performDataMigration())
+    dispatch(transferMigrationData())
   }, [dispatch])
 
   const cancelMigration = useCallback(() => {
-    dispatch(abortDataMigration({ reason: "CANCELLED" }))
+    dispatch(abortDataMigration({ reason: DataMigrationStatus.Cancelled }))
   }, [dispatch])
 
   const onFinish = () => {
     setModalOpened(false)
     setTimeout(() => {
-      dispatch(setDataMigrationStatus("IDLE"))
-      dispatch(setDataMigrationProgress(DataMigrationPercentageProgress.None))
+      dispatch(setDataMigrationStatus(DataMigrationStatus.Idle))
       dispatch(setDataMigrationFeatures([]))
       dispatch(clearDataTransfer())
+      dispatch(clearDataMigrationAbortControllers())
     }, modalTransitionDuration)
   }
 
   useEffect(() => {
-    if (activeDevice?.deviceType === "APIDevice" && noSourceDeviceSelected) {
+    if (
+      activeDevice?.deviceType === "APIDevice" &&
+      noSourceDeviceSelected &&
+      dataMigrationStatus === DataMigrationStatus.Idle
+    ) {
       if (sourceDevices.length > 0) {
-        dispatch(setDataMigrationSourceDevice(sourceDevices[0].serialNumber))
+        dispatch(setDataMigrationSourceDevice(sourceDevices[0]))
       } else {
         dispatch(setDataMigrationSourceDevice(undefined))
       }
     }
   }, [
     activeDevice?.deviceType,
+    dataMigrationStatus,
     dispatch,
     noSourceDeviceSelected,
     sourceDevices,
   ])
 
   useEffect(() => {
-    if (dataMigrationStatus === "IN-PROGRESS") {
-      startTransfer()
+    switch (dataMigrationStatus) {
+      case DataMigrationStatus.PureDatabaseCreating:
+        startPureDatabaseProcessing()
+        break
+      case DataMigrationStatus.PureDatabaseIndexing:
+        dispatch(setDataMigrationPureRestarting(false))
+        break
+      case DataMigrationStatus.DataTransferring:
+        startTransfer()
+        break
     }
     setModalOpened(
-      dataMigrationStatus !== "IDLE" &&
-        dataMigrationStatus !== "PURE-PASSWORD-REQUIRED"
+      dataMigrationStatus !== DataMigrationStatus.Idle &&
+        dataMigrationStatus !== DataMigrationStatus.PurePasswordRequired
     )
-  }, [dataMigrationStatus, startTransfer])
+  }, [
+    dataMigrationStatus,
+    dispatch,
+    startPureDatabaseProcessing,
+    startTransfer,
+  ])
+
+  useEffect(() => {
+    if (dataMigrationStatus === DataMigrationStatus.PureDatabaseCreating) {
+      if (sourceDevice?.disconnected && !pureRestarting) {
+        dispatch(setDataMigrationPureRestarting(true))
+      } else if (!sourceDevice?.disconnected && pureRestarting) {
+        dispatch(
+          prepareDevicesForDataMigration({
+            onSuccess: () => {
+              dispatch(setDataMigrationPureRestarting(false))
+              dispatch(
+                setDataMigrationStatus(DataMigrationStatus.PureDatabaseIndexing)
+              )
+            },
+          })
+        )
+      }
+    }
+  }, [dataMigrationStatus, dispatch, pureRestarting, sourceDevice])
 
   return (
     <Wrapper>
@@ -146,24 +208,26 @@ const DataMigrationUI: FunctionComponent<McDataMigrationConfig> = ({
       </Content>
       <PurePasscodeModal
         deviceId={sourceDevice?.serialNumber}
-        onUnlock={startMigration}
+        onUnlock={onPureUnlock}
       />
       <Modal
         config={{
           defaultOpened:
             modalOpened &&
-            (dataMigrationStatus === "PURE-CRITICAL-BATTERY" ||
-              dataMigrationStatus === "PURE-ONBOARDING-REQUIRED" ||
-              dataMigrationStatus === "PURE-UPDATE-REQUIRED"),
+            (dataMigrationStatus === DataMigrationStatus.PureCriticalBattery ||
+              dataMigrationStatus ===
+                DataMigrationStatus.PureOnboardingRequired ||
+              dataMigrationStatus === DataMigrationStatus.PureUpdateRequired),
           size: "small",
         }}
         componentKey={"data-migration-modal-pure-error"}
       >
-        <PureErrorModal />
+        <PureErrorModal onButtonClick={onFinish} />
       </Modal>
       <Modal
         config={{
-          defaultOpened: modalOpened && dataMigrationStatus === "FAILED",
+          defaultOpened:
+            modalOpened && dataMigrationStatus === DataMigrationStatus.Failed,
           size: "small",
         }}
         componentKey={"data-migration-modal-transfer-failed"}
@@ -172,7 +236,14 @@ const DataMigrationUI: FunctionComponent<McDataMigrationConfig> = ({
       </Modal>
       <Modal
         config={{
-          defaultOpened: modalOpened && dataMigrationStatus === "IN-PROGRESS",
+          defaultOpened:
+            modalOpened &&
+            [
+              DataMigrationStatus.DataTransferring,
+              DataMigrationStatus.PureDatabaseCreating,
+              DataMigrationStatus.PureDatabaseIndexing,
+              DataMigrationStatus.DataTransferred,
+            ].includes(dataMigrationStatus),
           size: "small",
         }}
         componentKey={"data-migration-modal-progress"}
@@ -181,7 +252,9 @@ const DataMigrationUI: FunctionComponent<McDataMigrationConfig> = ({
       </Modal>
       <Modal
         config={{
-          defaultOpened: modalOpened && dataMigrationStatus === "CANCELLED",
+          defaultOpened:
+            modalOpened &&
+            dataMigrationStatus === DataMigrationStatus.Cancelled,
           size: "small",
         }}
         componentKey={"data-migration-modal-cancelled"}
@@ -190,7 +263,9 @@ const DataMigrationUI: FunctionComponent<McDataMigrationConfig> = ({
       </Modal>
       <Modal
         config={{
-          defaultOpened: modalOpened && dataMigrationStatus === "COMPLETED",
+          defaultOpened:
+            modalOpened &&
+            dataMigrationStatus === DataMigrationStatus.Completed,
           size: "small",
         }}
         componentKey={"data-migration-modal-success"}
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/target-selector.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/target-selector.tsx
index a9dafabbc3..d9bcf997a7 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/target-selector.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/target-selector.tsx
@@ -6,10 +6,11 @@
 import React, { FunctionComponent } from "react"
 import styled from "styled-components"
 import { P3 } from "../../texts/paragraphs"
-import { Device, DeviceCard } from "./components/device-card"
+import { DeviceCard } from "./components/device-card"
 import { useDataMigrationDeviceSelector } from "shared/feature"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { BaseDevice } from "generic-view/models"
 
 const messages = defineMessages({
   title: {
@@ -21,7 +22,7 @@ const messages = defineMessages({
 })
 
 interface Props {
-  devices: Device[]
+  devices: BaseDevice[]
 }
 
 export const TargetSelector: FunctionComponent<Props> = ({ devices }) => {
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
index 218011ea31..c3cba64809 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/transfer-setup.tsx
@@ -12,12 +12,13 @@ import styled from "styled-components"
 import { useSelector } from "react-redux"
 import {
   selectDataMigrationFeatures,
-  selectDataMigrationPureDbIndexing,
+  selectDataMigrationPureBusy,
+  selectDataMigrationSourceDevice,
   selectDataMigrationStatus,
 } from "generic-view/store"
 import { defineMessages } from "react-intl"
 import { intl } from "Core/__deprecated__/renderer/utils/intl"
-import { SpinnerLoader } from "../../shared/shared"
+import { SpinnerLoader } from "../../shared/spinner-loader"
 
 const messages = defineMessages({
   unlockInfo: {
@@ -40,10 +41,13 @@ export const TransferSetup: FunctionComponent<Props> = ({
   features,
   onStartMigration,
 }) => {
+  const sourceDevice = useSelector(selectDataMigrationSourceDevice)
   const selectedFeatures = useSelector(selectDataMigrationFeatures)
-  const pureDbIndexing = useSelector(selectDataMigrationPureDbIndexing)
+  const pureBusyId = useSelector(selectDataMigrationPureBusy)
   const dataMigrationStatus = useSelector(selectDataMigrationStatus)
 
+  const pureBusy = pureBusyId === sourceDevice?.serialNumber
+
   return (
     <>
       <Wrapper>
@@ -51,7 +55,7 @@ export const TransferSetup: FunctionComponent<Props> = ({
         <FeaturesSelector features={features} />
       </Wrapper>
       <Footer>
-        {dataMigrationStatus === "IDLE" && pureDbIndexing ? (
+        {dataMigrationStatus === "IDLE" && pureBusy ? (
           <FooterMessage>
             <FooterSpinner dark />
             <p>{intl.formatMessage(messages.pureNotReady)}</p>
@@ -70,7 +74,7 @@ export const TransferSetup: FunctionComponent<Props> = ({
                 callback: onStartMigration,
               },
             ],
-            disabled: pureDbIndexing || selectedFeatures.length === 0,
+            disabled: pureBusy || selectedFeatures.length === 0,
           }}
         />
       </Footer>
diff --git a/libs/generic-view/utils/src/index.ts b/libs/generic-view/utils/src/index.ts
index 70050a1567..fc8ef582eb 100644
--- a/libs/generic-view/utils/src/index.ts
+++ b/libs/generic-view/utils/src/index.ts
@@ -10,6 +10,7 @@ export * from "./lib/models/icons.types"
 export * from "./lib/view-generators/generate-view-config"
 export * from "./lib/map-layout-sizes/map-layout-sizes"
 export * from "./lib/models/modal.types"
+export * from "./lib/get-base-device-info"
 export * from "./lib/data-provider-helpers"
 export * from "./lib/forms-provider/forms-provider"
 export * from "./lib/data-provider-helpers/string-to-regex"
diff --git a/libs/generic-view/utils/src/lib/get-base-device-info.ts b/libs/generic-view/utils/src/lib/get-base-device-info.ts
new file mode 100644
index 0000000000..708b8ef74e
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/get-base-device-info.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DeviceProperties } from "device-manager/models"
+import { getDeviceTypeName } from "Core/discovery-device/utils/get-device-type-name"
+import pureBlackImage from "Core/__deprecated__/renderer/images/pure-black-render.png"
+import pureGreyImage from "Core/__deprecated__/renderer/images/pure-gray-render.png"
+import { BaseDevice } from "generic-view/models"
+
+export const getBaseDeviceInfo = (device: DeviceProperties): BaseDevice => {
+  return {
+    name: getDeviceTypeName(device.deviceType!),
+    image: device.caseColour === "black" ? pureBlackImage : pureGreyImage,
+    serialNumber: device.serialNumber!,
+  }
+}
diff --git a/libs/shared/feature/src/lib/use-data-migration-device-selector.ts b/libs/shared/feature/src/lib/use-data-migration-device-selector.ts
index 13429d95a5..59a264c8da 100644
--- a/libs/shared/feature/src/lib/use-data-migration-device-selector.ts
+++ b/libs/shared/feature/src/lib/use-data-migration-device-selector.ts
@@ -15,6 +15,7 @@ import { URL_DEVICE_INITIALIZATION } from "Core/__deprecated__/renderer/constant
 import { useDispatch, useSelector } from "react-redux"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { useHistory } from "react-router-dom"
+import { getBaseDeviceInfo } from "generic-view/utils"
 
 export const useDataMigrationDeviceSelector = () => {
   const activeDevice = useSelector(getActiveDevice)
@@ -27,7 +28,9 @@ export const useDataMigrationDeviceSelector = () => {
       pathToRedirect = URL_DEVICE_INITIALIZATION.root
     ) => {
       if (!activeDevice || !activeDevice.serialNumber) return
-      await dispatch(setDataMigrationSourceDevice(activeDevice.serialNumber))
+      await dispatch(
+        setDataMigrationSourceDevice(getBaseDeviceInfo(activeDevice))
+      )
       await dispatch(deactivateDevice())
       await dispatch(handleDeviceActivated(serialNumber))
       history.push(pathToRedirect)
diff --git a/libs/system-utils/feature/src/index.ts b/libs/system-utils/feature/src/index.ts
index f7d1a5656d..d7c3a20271 100644
--- a/libs/system-utils/feature/src/index.ts
+++ b/libs/system-utils/feature/src/index.ts
@@ -4,4 +4,5 @@
  */
 
 export * from "./lib/system-utils.module"
+export * from "./lib/directory/directory.requests"
 export * from "./lib/file-dialog/open-file.request"
diff --git a/libs/system-utils/feature/src/lib/directory/directory.requests.ts b/libs/system-utils/feature/src/lib/directory/directory.requests.ts
new file mode 100644
index 0000000000..f635be3490
--- /dev/null
+++ b/libs/system-utils/feature/src/lib/directory/directory.requests.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { ipcRenderer } from "electron-better-ipc"
+import { ResultObject, SuccessResult } from "Core/core/builder"
+import { DirectoryServiceEvents } from "system-utils/models"
+import type { AppPathType, CheckPathResult } from "./directory.service"
+
+export const getAppPath = (
+  type: AppPathType
+): Promise<SuccessResult<string>> => {
+  return ipcRenderer.callMain(DirectoryServiceEvents.GetAppPath, type)
+}
+
+export const checkPath = async <E extends boolean>(
+  path: string,
+  ensureExists?: E
+): Promise<SuccessResult<CheckPathResult<E>>> => {
+  return ipcRenderer.callMain(DirectoryServiceEvents.CheckPath, {
+    path,
+    ensureExists,
+  })
+}
+
+export const removeDirectory = async (
+  path: string
+): Promise<ResultObject<void>> => {
+  return ipcRenderer.callMain(DirectoryServiceEvents.RemoveDirectory, path)
+}
diff --git a/libs/system-utils/feature/src/lib/directory/directory.service.ts b/libs/system-utils/feature/src/lib/directory/directory.service.ts
index 36d227a6de..dfc03fd41c 100644
--- a/libs/system-utils/feature/src/lib/directory/directory.service.ts
+++ b/libs/system-utils/feature/src/lib/directory/directory.service.ts
@@ -3,12 +3,30 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { shell } from "electron"
+import { app, shell } from "electron"
 import { IpcEvent } from "Core/core/decorators"
 import { DirectoryServiceEvents } from "system-utils/models"
 import { Result } from "Core/core/builder"
 import { AppError } from "Core/core/errors"
 import { GeneralError } from "device/models"
+import path from "path"
+import { ensureDir, pathExists, remove } from "fs-extra"
+
+type SystemPathType = Parameters<typeof app.getPath>[0]
+
+const appPathType = {
+  root: [],
+  logs: ["logs"],
+  settings: ["settings.json"],
+  pure: ["pure"],
+  pureBackups: ["pure", "phone", "backups"],
+  pureBackupTemp: ["pure", "phone", "backup-temp"],
+  helpV2: ["help-v2.json"],
+} as const
+
+export type AppPathType = keyof typeof appPathType
+
+export type CheckPathResult<E extends boolean> = E extends true ? true : boolean
 
 export class Directory {
   constructor() {}
@@ -23,4 +41,50 @@ export class Directory {
     }
     return Result.success(undefined)
   }
+
+  private getSystemPath(type: SystemPathType) {
+    return Result.success(app.getPath(type))
+  }
+
+  @IpcEvent(DirectoryServiceEvents.GetAppPath)
+  public getAppPath(type: AppPathType) {
+    const baseAppPath = path.join(
+      this.getSystemPath("appData").data,
+      "@mudita",
+      "mudita-center-app",
+      ...appPathType[type]
+    )
+
+    return Result.success(baseAppPath)
+  }
+
+  @IpcEvent(DirectoryServiceEvents.CheckPath)
+  public async checkPath<E extends boolean>({
+    path,
+    ensureExists,
+  }: {
+    path: string
+    ensureExists?: E
+  }) {
+    if (ensureExists) {
+      await ensureDir(path)
+    }
+    const exists = (await pathExists(path)) as E extends true ? true : boolean
+    return Result.success(exists)
+  }
+
+  @IpcEvent(DirectoryServiceEvents.RemoveDirectory)
+  public async removeDirectory(path: string) {
+    await remove(path)
+    const exists = await pathExists(path)
+    if (!exists) {
+      return Result.success(undefined)
+    }
+    return Result.failed(
+      new AppError(
+        GeneralError.InternalError,
+        `Directory at path "${path}" was not removed`
+      )
+    )
+  }
 }
diff --git a/libs/system-utils/models/src/lib/directory-service-events.ts b/libs/system-utils/models/src/lib/directory-service-events.ts
index bbbe99e1fc..0ed35d0ddf 100644
--- a/libs/system-utils/models/src/lib/directory-service-events.ts
+++ b/libs/system-utils/models/src/lib/directory-service-events.ts
@@ -5,4 +5,7 @@
 
 export enum DirectoryServiceEvents {
   OpenDirectory = "directoryservice-open-directory",
+  GetAppPath = "directoryservice-get-app-path",
+  CheckPath = "directoryservice-check-path",
+  RemoveDirectory = "directoryservice-remove-directory",
 }
diff --git a/package-lock.json b/package-lock.json
index 31e7496767..a99b6c8ddb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "react-is": "18.2.0",
         "react-markdown": "^9.0.1",
         "serialport": "10.1.0",
+        "tar": "^7.4.3",
         "tslib": "^2.3.0",
         "zod": "^3.22.4"
       },
@@ -3735,7 +3736,6 @@
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
       "dependencies": {
         "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
@@ -3752,7 +3752,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
       "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -3764,7 +3763,6 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -3776,7 +3774,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -3793,7 +3790,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -3808,7 +3804,6 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -3821,6 +3816,17 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -5666,7 +5672,6 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
       "optional": true,
       "engines": {
         "node": ">=14"
@@ -15220,6 +15225,39 @@
         "balanced-match": "^1.0.0"
       }
     },
+    "node_modules/app-builder-lib/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/app-builder-lib/node_modules/minimatch": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -15232,6 +15270,50 @@
         "node": ">=10"
       }
     },
+    "node_modules/app-builder-lib/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/app-root-dir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
@@ -18660,6 +18742,15 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/cacache/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cacache/node_modules/lru-cache": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
@@ -18669,6 +18760,74 @@
         "node": "14 || >=16.14"
       }
     },
+    "node_modules/cacache/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cacache/node_modules/tar/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cacache/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacache/node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacache/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -19005,12 +19164,11 @@
       }
     },
     "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/chrome-launcher": {
@@ -20350,7 +20508,6 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -21776,8 +21933,7 @@
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
     "node_modules/easy-stack": {
       "version": "1.0.1",
@@ -22301,8 +22457,7 @@
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -25476,7 +25631,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
       "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -25492,7 +25646,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
       "engines": {
         "node": ">=14"
       },
@@ -26220,6 +26373,39 @@
         "node": ">= 14"
       }
     },
+    "node_modules/giget/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/giget/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/giget/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/giget/node_modules/https-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
@@ -26233,6 +26419,50 @@
         "node": ">= 14"
       }
     },
+    "node_modules/giget/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/giget/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/giget/node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/giget/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/github-slugger": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz",
@@ -26243,7 +26473,6 @@
       "version": "10.3.10",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
       "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-      "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^2.3.5",
@@ -26283,7 +26512,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -26292,7 +26520,6 @@
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
       "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -28759,8 +28986,7 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/isobject": {
       "version": "3.0.1",
@@ -28886,7 +29112,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
       "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
-      "dev": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -35327,7 +35552,6 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
       "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-      "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -36016,6 +36240,39 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/node-gyp/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/node-gyp/node_modules/isexe": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
@@ -36025,6 +36282,44 @@
         "node": ">=16"
       }
     },
+    "node_modules/node-gyp/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/node-gyp/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/node-gyp/node_modules/which": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
@@ -36040,6 +36335,12 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/node-gyp/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -37477,7 +37778,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -37492,7 +37792,6 @@
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
       "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^9.1.1 || ^10.0.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -37508,7 +37807,6 @@
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
       "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==",
-      "dev": true,
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -41776,7 +42074,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -41788,7 +42085,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -42608,7 +42904,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -42621,8 +42916,7 @@
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -42732,7 +43026,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -43525,20 +43818,19 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
-      "dev": true,
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/tar-fs": {
@@ -43575,56 +43867,61 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar/node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "engines": {
-        "node": ">= 8"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
+    "node_modules/tar/node_modules/minizlib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">= 18"
       }
     },
     "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tar/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/tcp-port-used": {
       "version": "1.0.2",
@@ -46675,7 +46972,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -46859,7 +47155,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -46876,7 +47171,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
diff --git a/package.json b/package.json
index 15af3d5607..02dc398df7 100644
--- a/package.json
+++ b/package.json
@@ -287,6 +287,7 @@
     "react-is": "18.2.0",
     "react-markdown": "^9.0.1",
     "serialport": "10.1.0",
+    "tar": "^7.4.3",
     "tslib": "^2.3.0",
     "zod": "^3.22.4"
   },

From 037b6ccce67d079a051a4ede92b23eb7bb2fa0bb Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 22 Oct 2024 13:36:12 +0200
Subject: [PATCH 39/64] [CP-3217] Enable useDevConsole for development,
 mock-development environments, and feature branches (#2142)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Kurczewski <michalkurczewski94@gmail.com>
---
 .env.example                                  |   3 +-
 .../feature/src/lib/use-dev-console.ts        | 165 +++++++++---------
 2 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/.env.example b/.env.example
index 959c12302c..b935f1f01e 100644
--- a/.env.example
+++ b/.env.example
@@ -59,7 +59,8 @@ MUDITA_CENTER_PRERELEASE_ENABLED=
 # [Optional] Set 1 run application with mock server
 MOCK_SERVICE_ENABLED=
 
-# [Optional] Enable shortcut for opening DevTools. Disabled by default, set "1" to enable
+# [Optional] Enable shortcut for opening DevTools and access to useDevConsole functionalities.
+# Disabled by default, set "1" to enable.
 DEV_TOOLS_SHORTCUT_ENABLED=
 
 # [Optional] Automatically open DevTools on startup. Disabled by default, set "1" to enable
diff --git a/libs/generic-view/feature/src/lib/use-dev-console.ts b/libs/generic-view/feature/src/lib/use-dev-console.ts
index 30f9824346..25fc0eb8dc 100644
--- a/libs/generic-view/feature/src/lib/use-dev-console.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-console.ts
@@ -24,89 +24,92 @@ export const useDevConsole = () => {
 
   // Functions for internal testing
   useEffect(() => {
-    if (process.env.NODE_ENV === "development" && activeDeviceId) {
-      if (typeof global !== "undefined") {
-        Object.assign(global, {
-          _seedDataMap: {
-            contacts: contactsSeedData,
-          },
-          _getEntitiesData: (
-            entitiesType: string,
-            responseType: "json" | "file" = "json",
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
-              getEntitiesDataAction({
-                entitiesType,
-                deviceId,
-                responseType,
-              })
-            )
-          },
-          _getEntityData: (
-            entitiesType: string,
-            entityId: string,
-            responseType: "json" | "file" = "json",
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
-              getEntityDataAction({
-                entitiesType,
-                entityId,
-                deviceId,
-                responseType,
-              })
-            )
-          },
-          _getEntitiesMetadata: (
-            entitiesType: string,
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
-              getEntitiesMetadataAction({ entitiesType, deviceId })
-            )
-          },
-          _deleteEntitiesDataAction: (
-            entitiesType: string,
-            ids: EntityId[],
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
-              deleteEntitiesDataAction({ entitiesType, ids, deviceId })
-            )
-          },
-          _createEntityDataAction: (
-            entitiesType: string,
-            data: EntityData,
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
+    if (
+      process.env.DEV_TOOLS_SHORTCUT_ENABLED !== "1" ||
+      activeDeviceId === undefined
+    ) {
+      return
+    }
+
+    if (typeof global !== "undefined") {
+      Object.assign(global, {
+        _seedDataMap: {
+          contacts: contactsSeedData,
+        },
+        _getEntitiesData: (
+          entitiesType: string,
+          responseType: "json" | "file" = "json",
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(
+            getEntitiesDataAction({
+              entitiesType,
+              deviceId,
+              responseType,
+            })
+          )
+        },
+        _getEntityData: (
+          entitiesType: string,
+          entityId: string,
+          responseType: "json" | "file" = "json",
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(
+            getEntityDataAction({
+              entitiesType,
+              entityId,
+              deviceId,
+              responseType,
+            })
+          )
+        },
+        _getEntitiesMetadata: (
+          entitiesType: string,
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(getEntitiesMetadataAction({ entitiesType, deviceId }))
+        },
+        _deleteEntitiesDataAction: (
+          entitiesType: string,
+          ids: EntityId[],
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(
+            deleteEntitiesDataAction({ entitiesType, ids, deviceId })
+          )
+        },
+        _createEntityDataAction: (
+          entitiesType: string,
+          data: EntityData,
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(
+            createEntityDataAction({ entitiesType, data, deviceId })
+          )
+        },
+        _updateEntityDataAction: (
+          entitiesType: string,
+          entityId: EntityId,
+          data: EntityData,
+          deviceId = activeDeviceId
+        ) => {
+          return dispatch(
+            updateEntityDataAction({ entitiesType, entityId, data, deviceId })
+          )
+        },
+        _createMultipleEntities: async (
+          entitiesType: string,
+          entities: EntityData[],
+          deviceId = activeDeviceId
+        ) => {
+          for (const data of entities) {
+            await dispatch(
               createEntityDataAction({ entitiesType, data, deviceId })
             )
-          },
-          _updateEntityDataAction: (
-            entitiesType: string,
-            entityId: EntityId,
-            data: EntityData,
-            deviceId = activeDeviceId
-          ) => {
-            return dispatch(
-              updateEntityDataAction({ entitiesType, entityId, data, deviceId })
-            )
-          },
-          _createMultipleEntities: async (
-            entitiesType: string,
-            entities: EntityData[],
-            deviceId = activeDeviceId
-          ) => {
-            for (const data of entities) {
-              await dispatch(
-                createEntityDataAction({ entitiesType, data, deviceId })
-              )
-            }
-          },
-        })
-      }
+          }
+        },
+      })
     }
   }, [activeDeviceId, dispatch])
 }

From c7b14df31f64c93339c886b0556fe0cc61e1a7f1 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 22 Oct 2024 14:02:57 +0200
Subject: [PATCH 40/64] [CP-XXX] Update quickstart.md to mark JSON files as
 unchanged (#2140)

---
 quickstart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstart.md b/quickstart.md
index 7b8ed1b9da..6066519680 100644
--- a/quickstart.md
+++ b/quickstart.md
@@ -38,7 +38,7 @@ To ensure that files will be excluded from commits you can use the following git
 
 ```bash
  git update-index --assume-unchanged libs/core/news/default-news.json
- git update-index --assume-unchanged libs/core/help/default-help.json
+ git update-index --assume-unchanged libs/help/feature/src/lib/default-help.json
  git update-index --assume-unchanged libs/core/settings/static/app-configuration.json
 ```
 

From 75369fa853a372962ce3641b64683d8bb2b734e1 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 22 Oct 2024 14:18:58 +0200
Subject: [PATCH 41/64] [CP-XXX] Add Troubleshooting for Node.js architecture
 issues after Apple Silicon migration (#2139)

---
 quickstart.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/quickstart.md b/quickstart.md
index 6066519680..25a2ff7e22 100644
--- a/quickstart.md
+++ b/quickstart.md
@@ -158,6 +158,37 @@ Example on how to install it on macOS using Homebrew:
    source ~/.zshrc
    ```
 
+### Checking Node.js Architecture Compatibility After Migration to Apple Silicon
+
+Incompatibility between the Node.js architecture and your Mac's processor (Intel vs. Apple Silicon) often occurs after migrating between devices with different processors. This test will help you determine if this is the source of the issue.
+
+#### Example Error:
+
+```
+App threw an error during load
+Error: dlopen(/path/to/node_modules/@serialport/bindings-cpp/prebuilds/darwin-x64+arm64/node.napi.node, 0x0001): 
+tried: '.../node.napi.node' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64e' or 'arm64')),
+...
+```
+
+#### Steps:
+
+##### Check your computer's architecture:
+
+```
+arch
+```
+
+##### Check Node.js architecture:
+
+```
+node -p "process.arch"
+```
+
+##### Compare the results:
+
+- If the computer's architecture and Node.js architecture are different, reinstall Node.js to match your computer's architecture.
+
 ### The module was compiled against a different Node.js version
 
 ```bash

From beb7a168a40ecabea5b0d202badd5f3d66ec63dd Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Wed, 23 Oct 2024 08:18:29 +0200
Subject: [PATCH 42/64] [CP-3210][Re-flashing Mac] Simplify logic by applying
 filters in device retrieval (#2134)

---
 .../usb-devices/usb-devices-mac.helper.ts     |  10 +-
 .../macos/macos-device-flash-service.ts       |  11 +-
 .../macos-usb-port-device-parser.interface.ts |   2 +
 .../macos-usb-port-device-parser.test.ts      | 211 ++++++++++++++++++
 .../macos-usb-port-device-parser.ts           |  25 ++-
 5 files changed, 241 insertions(+), 18 deletions(-)

diff --git a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts b/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
index 035183a934..b46b5f86a7 100644
--- a/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
+++ b/libs/core/device-manager/services/usb-devices/usb-devices-mac.helper.ts
@@ -9,13 +9,11 @@ import { ProductID, VendorID } from "Core/device/constants"
 
 export const getUsbDevicesMacOS = async (): Promise<PortInfo | void> => {
   try {
-    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
-    const device = devices.find((device) => {
-      return (
-        device.vendorId?.includes(VendorID.MuditaHarmony) &&
-        device.productId?.includes(ProductID.MuditaHarmonyMsc)
-      )
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({
+      vendorId: VendorID.MuditaHarmony,
+      productId: ProductID.MuditaHarmonyMsc,
     })
+    const device = devices[0]
 
     if (device !== undefined) {
       return device
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
index c8d6bae770..80baf3fdfb 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/device-flash/macos/macos-device-flash-service.ts
@@ -32,14 +32,11 @@ class MacDeviceFlashService implements IDeviceFlash {
 
   async findDeviceByDeviceName(): Promise<string> {
     console.log(`Searching for device...`)
-    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
-
-    const device = devices.find((device) => {
-      return (
-        device.vendorId?.includes("3310") &&
-        device.name?.includes("Mudita Harmony (MSC mode)")
-      )
+    const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({
+      vendorId: "3310",
+      name: "Mudita Harmony (MSC mode)",
     })
+    const device = devices[0]
 
     if (!device) {
       console.error(
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
index d72951e307..f5c5ad1e83 100644
--- a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.interface.ts
@@ -21,3 +21,5 @@ export interface USBPortDevice extends USBDevice, PortInfo {
   path: string
   pnpId?: string | undefined
 }
+
+export type USBPortDeviceFilters = Partial<USBPortDevice>;
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
index 1d71c7453a..847c259a73 100644
--- a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
@@ -421,3 +421,214 @@ USB:
     expect(devices.length).toBe(0)
   })
 })
+
+it("should correctly filter devices by vendorId", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ vendorId: '3310' })
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    productId: '0103',
+    vendorId: '3310',
+    version: '1.01',
+    serialNumber: '0123456789ABCDEF',
+    manufacturer: 'Mudita',
+    name: 'Mudita Harmony (MSC mode)',
+    path: '3310/0103/0123456789ABCDEF',
+  })
+})
+
+it("should correctly filter devices by productId", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3310
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ productId: '0104' })
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    productId: '0104',
+    vendorId: '3310',
+    version: '1.02',
+    serialNumber: 'ABCDEF1234567890',
+    manufacturer: 'Mudita',
+    name: 'Mudita Bell',
+    path: '3310/0104/ABCDEF1234567890',
+  })
+})
+
+it("should correctly filter devices by name", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3310
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ name: 'Mudita Bell' })
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    productId: '0104',
+    vendorId: '3310',
+    version: '1.02',
+    serialNumber: 'ABCDEF1234567890',
+    manufacturer: 'Mudita',
+    name: 'Mudita Bell',
+    path: '3310/0104/ABCDEF1234567890',
+  })
+})
+
+it("should correctly filter devices by vendorId and productId when both match", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ vendorId: '3310', productId: '0103' })
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    productId: '0103',
+    vendorId: '3310',
+    version: '1.01',
+    serialNumber: '0123456789ABCDEF',
+    manufacturer: 'Mudita',
+    name: 'Mudita Harmony (MSC mode)',
+    path: '3310/0103/0123456789ABCDEF',
+  })
+})
+
+it("should return an empty array when vendorId matches but productId does not", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ vendorId: '3310', productId: '0104' })
+
+  expect(devices.length).toBe(0)
+})
+
+it("should return an empty array when productId matches but vendorId does not", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ vendorId: '3311', productId: '0103' })
+
+  expect(devices.length).toBe(0)
+})
+
+it("should return an empty array when neither vendorId nor productId match", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Product ID: 0x0103
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Manufacturer: Mudita
+        Mudita Bell:
+          Product ID: 0x0104
+          Vendor ID: 0x3311
+          Version: 1.02
+          Serial Number: ABCDEF1234567890
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices({ vendorId: '9999', productId: '9999' })
+
+  expect(devices.length).toBe(0)
+})
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
index f3f02932cd..a2384582b7 100644
--- a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
@@ -3,10 +3,12 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import isMatch from "lodash/isMatch"
 import { execPromise } from "../exec-command"
 import {
   USBDevice,
   USBPortDevice,
+  USBPortDeviceFilters,
 } from "./macos-usb-port-device-parser.interface"
 
 const fieldPatterns: Partial<Record<keyof USBDevice, RegExp>> = {
@@ -20,16 +22,22 @@ const fieldPatterns: Partial<Record<keyof USBDevice, RegExp>> = {
 }
 
 export class MacosUSBPortDeviceParser {
-  static async getUSBPortDevices(): Promise<USBPortDevice[]> {
+  static async getUSBPortDevices(
+    filters?: USBPortDeviceFilters
+  ): Promise<USBPortDevice[]> {
     const usbDevices = await MacosUSBPortDeviceParser.getUSBDevice()
-    return usbDevices.map((usbDevice) => {
+    return usbDevices.reduce<USBPortDevice[]>((filteredDevices, usbDevice) => {
       const vendorId = usbDevice.vendorId?.replace("0x", "")
       const productId = usbDevice.productId?.replace("0x", "")
       const serialNumber = usbDevice.serialNumber?.replace("0x", "")
       const locationId = usbDevice.locationId?.split(" ")[0]
-      const path = vendorId && productId && serialNumber && `${vendorId}/${productId}/${serialNumber}`
+      const path =
+        vendorId &&
+        productId &&
+        serialNumber &&
+        `${vendorId}/${productId}/${serialNumber}`
 
-      return {
+      const mappedDevice: USBPortDevice = {
         ...usbDevice,
         productId,
         vendorId,
@@ -37,7 +45,14 @@ export class MacosUSBPortDeviceParser {
         locationId,
         path: path ?? "unknown",
       }
-    })
+
+      if (filters && !isMatch(mappedDevice, filters)) {
+        return filteredDevices
+      }
+
+      filteredDevices.push(mappedDevice)
+      return filteredDevices
+    }, [])
   }
 
   private static async getUSBDevice(): Promise<USBDevice[]> {

From d5ac8862b7ded742c1da3b09e898d2a4a105d201 Mon Sep 17 00:00:00 2001
From: milenaniebrzydowska00 <milena.niebrzydowska@mudita.com>
Date: Wed, 23 Oct 2024 13:22:00 +0200
Subject: [PATCH 43/64] [CP-3204] [E2E] [HELP] Help Page and Home Page refactor
 (#2145)

Co-authored-by: Milena Niebrzydowska <milena.niebrzydowska@mmiquido.com>
---
 .../src/page-objects/help.page.ts             | 51 ++++++++++---------
 .../src/page-objects/home.page.ts             | 38 ++++++++------
 .../src/page-objects/tabs.page.ts             |  6 ++-
 .../help/help-section-search-noresults.e2e.ts | 21 +++-----
 4 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/apps/mudita-center-e2e/src/page-objects/help.page.ts b/apps/mudita-center-e2e/src/page-objects/help.page.ts
index 6ded29f834..419eca5fbf 100644
--- a/apps/mudita-center-e2e/src/page-objects/help.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help.page.ts
@@ -6,66 +6,71 @@
 import Page from "./page"
 
 class HelpPage extends Page {
+
+  //Getters
   public get helpTabTitle() {
-    return $('[data-testid="location"]')
+    return $('//h4[@data-testid="location"]')
   }
   public get helpMainHeader() {
-    return $('[data-testid="help-main-header"]')
+    return $('//h3[@data-testid="help-main-header"]')
   }
   public get helpMainSubHeader() {
-    return $('[data-testid="help-main-subheader"]')
+    return $('//p[@data-testid="help-main-subheader"]')
   }
   public get iconSearch() {
-    return $('[data-testid="icon-search"]')
+    return $('//div[@data-testid="icon-search"]')
   }
   public get helpSearchInput() {
-    return $('[data-testid="help-search-input"]')
+    return $('//input[@data-testid="help-search-input"]')
   }
   public get helpSearchResults() {
-    return $('[data-testid="help-search-results"]')
+    return $('//div[@data-testid="help-search-results"]')
   }
   public get iconSearchHelpSearchResults() {
-    return $('[data-testid="help-search-results"] [data-testid="icon-search"]')
+    return $('//div[@data-testid="help-search-results"]//div[@data-testid="icon-search"]')
   }
   public get helpSearchResultsParagraph() {
-    return $('[data-testid="help-search-results"] p')
+    return $('//div[@data-testid="help-search-results"]//p')
   }
   public get helpSearchResultsList() {
-    return $('[data-testid="help-search-results"] ul')
+    return $('//div[@data-testid="help-search-results"]//ul')
   }
   public get helpSearchResultsItems() {
-    return $$('[data-testid="help-search-result-item"]')
+    return $$('//a[@data-testid="help-search-result-item"]')
   }
   public get helpCategoriesTitle() {
-    return $('[data-testid="help-categories-title"]')
+    return $('//h2[@data-testid="help-categories-title"]')
   }
   public get helpCategoriesList() {
-    return $('[data-testid="help-categories-list"]')
+    return $('//nav[@data-testid="help-categories-list"]')
   }
   public get helpCategoriesListItems() {
-    return $$('[data-testid="help-categories-list-item"]')
+    return $$('//a[@data-testid="help-categories-list-item"]')
   }
   public get helpSubCategoriesList() {
-    return $('[data-testid="help-subcategories-list"]')
+    return $('//div[@data-testid="help-subcategories-list"]')
   }
   public get helpSubCategoriesListItems() {
-    return $$('[data-testid="help-subcategories-list-item"]')
+    return $$('//div[@data-testid="help-subcategories-list-item"]')
+  }
+  public getHelpSubCategoriesListItemsFromColumn(columnIndex: number){
+    return $$(`(//div[@data-testid="help-subcategories-list"]/div)[${columnIndex + 1}]//div[@data-testid="help-subcategories-list-item"]`)   
   }
   public get helpSubCategoriesListItemsLeftColumn() {
-    return $$('[data-testid="help-subcategories-list"]>div')[0].$$(
-      '[data-testid="help-subcategories-list-item"]'
-    )
+    return this.getHelpSubCategoriesListItemsFromColumn(0)
   }
   public get helpSubCategoriesListItemsRightColumn() {
-    return $$('[data-testid="help-subcategories-list"]>div')[1].$$(
-      '[data-testid="help-subcategories-list-item"]'
-    )
+    return this.getHelpSubCategoriesListItemsFromColumn(1)
   }
   public get helpMainFooterDescription() {
-    return $('[data-testid="help-main-footer-description"]')
+    return $('//p[@data-testid="help-main-footer-description"]')
   }
   public get helpMainFooterContactSupportButton() {
-    return $('[data-testid="help-main-footer-contact-support-button"]')
+    return $('//button[@data-testid="help-main-footer-contact-support-button"]')
+  }
+  public async searchForArticle(text:string) {
+    const searchInput = await this.helpSearchInput
+    await searchInput.setValue(text)
   }
 }
 
diff --git a/apps/mudita-center-e2e/src/page-objects/home.page.ts b/apps/mudita-center-e2e/src/page-objects/home.page.ts
index 305bbb59f6..4246eb35db 100644
--- a/apps/mudita-center-e2e/src/page-objects/home.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/home.page.ts
@@ -7,73 +7,79 @@ import Page from "./page"
 
 class HomePage extends Page {
   get homeHeader() {
-    return $("h1[data-testid='onboarding-title-header']")
+    return $("//h1[@data-testid='onboarding-title-header']")
   }
 
   get notNowButton() {
-    return $("button[data-testid='onboarding-not-now-button']")
+    return $("//button[@data-testid='onboarding-not-now-button']")
   }
 
   get myDevicesDoesntShowButton() {
     return $(
-      "button[data-testid='onboarding-my-device-does-not-show-up-button']"
+      "//button[@data-testid='onboarding-my-device-does-not-show-up-button']"
     )
   }
 
   get weAreSorryPageHeader() {
-    return $("h2[data-testid=onboarding-troubleshooting-title-header]")
+    return $("//h2[@data-testid='onboarding-troubleshooting-title-header']")
   }
 
   get weAreSorryPageFollowTheInstructionsParagraph() {
-    return $("p[data-testid='onboarding-troubleshooting-subtitle-paragraph']")
+    return $("//p[@data-testid='onboarding-troubleshooting-subtitle-paragraph']")
   }
 
   get weAreSorryPageInstructionsList() {
     return $$(
-      "ol li[data-testid='onboarding-troubleshooting-instruction-step-list-item']"
+      "//ol/li[@data-testid='onboarding-troubleshooting-instruction-step-list-item']"
     )
   }
 
   get thisDidntSolveParagraph() {
     return $(
-      "button[data-testid='onboarding-troubleshooting-ui-more-instructions'] p"
+      "//button[@data-testid='onboarding-troubleshooting-ui-more-instructions']/p"
     )
   }
 
   get tryAgainParagraph() {
-    return $("button[data-testid='onboarding-troubleshooting-ui-retry'] p")
+    return $("//button[@data-testid='onboarding-troubleshooting-ui-retry']/p")
   }
 
   get contactSupportButton() {
-    return $("[data-testid='onboarding-troubleshooting-ui-contact-support']")
+    return $("//button[@data-testid='onboarding-troubleshooting-ui-contact-support']")
   }
 
   get muditaCenterSupportModalHeader() {
-    return $("h2[data-testid='modal-title']")
+    return $("//h2[@data-testid='modal-title']")
   }
 
   get emailField() {
-    return $("input[data-testid='email-input']")
+    return $("//input[@data-testid='email-input']")
   }
 
   get messageField() {
-    return $("textarea[data-testid='description-input']")
+    return $("//textarea[@data-testid='description-input']")
   }
 
   get attachedFile() {
-    return $("ul[data-testid='file-list']")
+    return $("//ul[@data-testid='file-list']")
   }
 
   get sendButton() {
-    return $("button[data-testid='submit-button']")
+    return $("//button[@data-testid='submit-button']")
   }
 
   get closeCenterSupportModalButton() {
-    return $("button[data-testid='close-modal-button']")
+    return $("//button[@data-testid='close-modal-button']")
   }
 
   get centerSupportModal() {
-    return $("div[data-testid='contact-support-modal']")
+    return $("//div[@data-testid='contact-support-modal']")
+  }
+
+  public async clickNotNowButton() {
+    const button = await this.notNowButton;
+    await button.waitForDisplayed();
+    await button.click();
   }
 }
 export default new HomePage()
diff --git a/apps/mudita-center-e2e/src/page-objects/tabs.page.ts b/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
index 1bdd187478..3d712b22ca 100644
--- a/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/tabs.page.ts
@@ -52,8 +52,10 @@ class NavigationTabs extends Page {
     return $('[data-testid="help-menu-button"]')
   }
 
-  async helpTabClick() {
-    await this.helpTab.click()
+  public async openHelpPage() {
+    const helpTab = await this.helpTab;
+    await helpTab.waitForDisplayed({ timeout: 15000 });
+    await helpTab.click();
   }
 }
 
diff --git a/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts b/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts
index cc38130cc5..50ee4379c1 100644
--- a/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts
+++ b/apps/mudita-center-e2e/src/specs/help/help-section-search-noresults.e2e.ts
@@ -10,25 +10,18 @@ import HomePage from "../../page-objects/home.page"
 describe("Check Help search for no results", () => {
   before(async () => {
     //Click Not Now button
-    const notNowButton = await HomePage.notNowButton
-    await notNowButton.waitForDisplayed()
-    await notNowButton.click()
+    await HomePage.clickNotNowButton()
     //Open Help page
-    const helpTab = await NavigationTabs.helpTab
-    await helpTab.waitForDisplayed({ timeout: 15000 })
-    await helpTab.click()
+    await NavigationTabs.openHelpPage()
   })
 
   it("Search for not existing article and verify no results information", async () => {
     //Search for not existing article by entering not findable string (special characters)
-    const helpSearchInput = await HelpPage.helpSearchInput
-    await helpSearchInput.setValue("!@#$%^&*()")
+    await HelpPage.searchForArticle("!@#$%^&*()")
 
     //Verify quick search: no results information
-    const helpSearchResults = await HelpPage.helpSearchResults
-    await expect(helpSearchResults).toBeDisplayed()
-    const iconSearchHelpSearchResults = await HelpPage.iconSearchHelpSearchResults
-    await expect(iconSearchHelpSearchResults).toBeDisplayed()
-    await expect(helpSearchResults).toHaveText("We couldn't find any topics...")
-  })
+    await expect(HelpPage.helpSearchResults).toBeDisplayed()
+    await expect(HelpPage.helpSearchResultsParagraph).toHaveText("We couldn't find any topics...")
+    }
+  )
 })

From 2bcb429c39c67c7790cfa22792aa694179ed98eb Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Fri, 25 Oct 2024 09:08:27 +0200
Subject: [PATCH 44/64] [CP-3166] Enhance Sorting Logic with Grouping, Null
 Handling, and Case Insensitivity (#2116)

---
 .../lib/feature/data-provider-config.test.ts  |   4 +-
 .../src/lib/feature/data-provider-config.ts   |  39 +-
 .../feature/src/lib/setup-component.tsx       |   8 +-
 libs/generic-view/utils/src/index.ts          |   5 +-
 .../data-filter.test.ts}                      |  38 +-
 .../data-filter.ts}                           |  10 +-
 .../index.ts                                  |   3 +-
 .../data-provider-sort.test.ts                | 156 -----
 .../data-provider-sort.ts                     |  58 --
 .../src/lib/data-sort/data-sort.helpers.ts    |  88 +++
 .../utils/src/lib/data-sort/data-sort.test.ts | 582 ++++++++++++++++++
 .../utils/src/lib/data-sort/data-sort.ts      |  86 +++
 .../utils/src/lib/data-sort/index.ts          |   6 +
 .../string-to-regex.test.ts                   |   0
 .../string-to-regex.ts                        |   0
 15 files changed, 827 insertions(+), 256 deletions(-)
 rename libs/generic-view/utils/src/lib/{data-provider-helpers/data-provider-filter.test.ts => data-filter/data-filter.test.ts} (69%)
 rename libs/generic-view/utils/src/lib/{data-provider-helpers/data-provider-filter.ts => data-filter/data-filter.ts} (67%)
 rename libs/generic-view/utils/src/lib/{data-provider-helpers => data-filter}/index.ts (66%)
 delete mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
 delete mode 100644 libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-sort/data-sort.helpers.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-sort/data-sort.ts
 create mode 100644 libs/generic-view/utils/src/lib/data-sort/index.ts
 rename libs/generic-view/utils/src/lib/{data-provider-helpers => string-to-regex}/string-to-regex.test.ts (100%)
 rename libs/generic-view/utils/src/lib/{data-provider-helpers => string-to-regex}/string-to-regex.ts (100%)

diff --git a/libs/device/models/src/lib/feature/data-provider-config.test.ts b/libs/device/models/src/lib/feature/data-provider-config.test.ts
index 59925e6826..d8e78a9a20 100644
--- a/libs/device/models/src/lib/feature/data-provider-config.test.ts
+++ b/libs/device/models/src/lib/feature/data-provider-config.test.ts
@@ -12,7 +12,7 @@ describe("dataProviderSchema", () => {
       entitiesType: "someType",
       sort: [
         {
-          providerField: "someField",
+          field: "someField",
           direction: "asc",
           priority: 1,
           orderingPatterns: ["/pattern/"],
@@ -20,7 +20,7 @@ describe("dataProviderSchema", () => {
       ],
       filters: [
         {
-          providerField: "someField",
+          field: "someField",
           patterns: ["/pattern/"],
         },
       ],
diff --git a/libs/device/models/src/lib/feature/data-provider-config.ts b/libs/device/models/src/lib/feature/data-provider-config.ts
index afe0d6e82f..41fddc4a44 100644
--- a/libs/device/models/src/lib/feature/data-provider-config.ts
+++ b/libs/device/models/src/lib/feature/data-provider-config.ts
@@ -64,23 +64,46 @@ export type DataProviderField =
   | z.infer<typeof enhancedFieldSchema>
   | z.infer<typeof superEnhancedFieldSchema>
 
+const sortDirectionSchema = z.union([z.literal("asc"), z.literal("desc")])
+
+export type SortDirection = z.infer<typeof sortDirectionSchema>
+
+const sortOrderingPatternsSchema = z.array(regexSchema)
+
+export type SortOrderingPatterns = z.infer<typeof sortOrderingPatternsSchema>
+
+// Types come from Intl.CollatorOptions["sensitivity"], used to control text comparison sensitivity
+const sortSensitivitySchema = z.enum(["base", "accent", "case", "variant"])
+
+export type SortSensitivity = z.infer<typeof sortSensitivitySchema>
+
+const emptyOrderSchema = z.enum(["first", "last"])
+
 const sortSchema = z
   .array(
-    z.object({
-      providerField: z.string(),
-      priority: z.number().nonnegative(),
-      direction: z.union([z.literal("asc"), z.literal("desc")]),
-      orderingPatterns: z.array(regexSchema).optional(),
-    })
+    z
+      .object({
+        field: z.string().optional(),
+        fieldGroup: z.array(z.string()).optional(),
+        priority: z.number().nonnegative(),
+        direction: sortDirectionSchema,
+        orderingPatterns: sortOrderingPatternsSchema.optional(),
+        sensitivity: sortSensitivitySchema.optional(),
+        emptyOrder: emptyOrderSchema.optional(),
+      })
+      .refine((data) => data.field || data.fieldGroup, {
+        message: "Either field or fieldGroup must be provided",
+        path: ["field", "fieldGroup"],
+      })
   )
   .optional()
 
-export type DataProviderSortConfig = z.infer<typeof sortSchema>
+export type DataSortConfig = z.infer<typeof sortSchema>
 
 const filtersSchema = z
   .array(
     z.object({
-      providerField: z.string(),
+      field: z.string(),
       patterns: z.array(regexSchema),
     })
   )
diff --git a/libs/generic-view/feature/src/lib/setup-component.tsx b/libs/generic-view/feature/src/lib/setup-component.tsx
index 5ed9e43377..60f5bf3455 100644
--- a/libs/generic-view/feature/src/lib/setup-component.tsx
+++ b/libs/generic-view/feature/src/lib/setup-component.tsx
@@ -24,8 +24,8 @@ import {
   useFormField,
 } from "generic-view/store"
 import {
-  dataProviderFilter,
-  dataProviderSort,
+  dataFilter,
+  dataSort,
   mapLayoutSizes,
   RecursiveComponent,
   useViewFormContext,
@@ -120,11 +120,11 @@ export const setupComponent = <P extends object>(
     })
 
     if (dataProvider?.source === "entities-array") {
-      const filteredData = dataProviderFilter(
+      const filteredData = dataFilter(
         [...entitiesData],
         dataProvider.filters
       )
-      const sortedData = dataProviderSort([...filteredData], dataProvider.sort)
+      const sortedData = dataSort([...filteredData], dataProvider.sort)
       editableProps.data = sortedData?.map((item) => item[idFieldKey!])
     } else if (dataProvider?.source === "entities-field") {
       if (entityData) {
diff --git a/libs/generic-view/utils/src/index.ts b/libs/generic-view/utils/src/index.ts
index fc8ef582eb..bc4e5face0 100644
--- a/libs/generic-view/utils/src/index.ts
+++ b/libs/generic-view/utils/src/index.ts
@@ -11,7 +11,8 @@ export * from "./lib/view-generators/generate-view-config"
 export * from "./lib/map-layout-sizes/map-layout-sizes"
 export * from "./lib/models/modal.types"
 export * from "./lib/get-base-device-info"
-export * from "./lib/data-provider-helpers"
+export * from "./lib/data-filter"
+export * from "./lib/data-sort"
 export * from "./lib/forms-provider/forms-provider"
-export * from "./lib/data-provider-helpers/string-to-regex"
+export * from "./lib/string-to-regex/string-to-regex"
 export * from "./lib/use-current-view-key"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts b/libs/generic-view/utils/src/lib/data-filter/data-filter.test.ts
similarity index 69%
rename from libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
rename to libs/generic-view/utils/src/lib/data-filter/data-filter.test.ts
index 8bed873e86..5be3b85b00 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.test.ts
+++ b/libs/generic-view/utils/src/lib/data-filter/data-filter.test.ts
@@ -3,40 +3,40 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { dataProviderFilter } from "./data-provider-filter"
+import { dataFilter } from "./data-filter"
 import { DataProviderFiltersConfig } from "device/models"
 
 describe("dataProviderFilter", () => {
   it("returns all data when no filters are provided", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const result = dataProviderFilter(data)
+    const result = dataFilter(data)
     expect(result).toEqual(data)
   })
 
   it("filters data based on single field with single pattern", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/Alice/"] },
+      { field: "name", patterns: ["/Alice/"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([{ name: "Alice" }])
   })
 
   it("filters data based on nested field with single pattern", () => {
     const data = [{ user: { name: "Alice" } }, { user: { name: "Bob" } }]
     const filters: DataProviderFiltersConfig = [
-      { providerField: "user.name", patterns: ["/Alice/"] },
+      { field: "user.name", patterns: ["/Alice/"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([{ user: { name: "Alice" } }])
   })
 
   it("filters data based on single field with multiple patterns", () => {
     const data = [{ name: "Alice" }, { name: "Anastasia" }, { name: "Charlie" }]
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/^A/m", "/.+e$/m"] },
+      { field: "name", patterns: ["/^A/m", "/.+e$/m"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([{ name: "Alice" }])
   })
 
@@ -47,10 +47,10 @@ describe("dataProviderFilter", () => {
       { name: "Agnes", age: "30" },
     ]
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/^A/m"] },
-      { providerField: "age", patterns: ["/2[\\d]/"] },
+      { field: "name", patterns: ["/^A/m"] },
+      { field: "age", patterns: ["/2[\\d]/"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([
       { name: "Alice", age: "25" },
       { name: "Anastasia", age: "29" },
@@ -60,39 +60,39 @@ describe("dataProviderFilter", () => {
   it("returns empty array when no data matches the filters", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/Charlie/"] },
+      { field: "name", patterns: ["/Charlie/"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([])
   })
 
   it("handles empty data array", () => {
     const data: Record<string, unknown>[] = []
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/Alice/"] },
+      { field: "name", patterns: ["/Alice/"] },
     ]
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual([])
   })
 
   it("handles undefined data", () => {
     const filters: DataProviderFiltersConfig = [
-      { providerField: "name", patterns: ["/Alice/"] },
+      { field: "name", patterns: ["/Alice/"] },
     ]
-    const result = dataProviderFilter(undefined, filters)
+    const result = dataFilter(undefined, filters)
     expect(result).toEqual([])
   })
 
   it("handles undefined filters", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
-    const result = dataProviderFilter(data, undefined)
+    const result = dataFilter(data, undefined)
     expect(result).toEqual(data)
   })
 
   it("handles empty filters", () => {
     const data = [{ name: "Alice" }, { name: "Bob" }]
     const filters = [] as DataProviderFiltersConfig
-    const result = dataProviderFilter(data, filters)
+    const result = dataFilter(data, filters)
     expect(result).toEqual(data)
   })
 })
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts b/libs/generic-view/utils/src/lib/data-filter/data-filter.ts
similarity index 67%
rename from libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
rename to libs/generic-view/utils/src/lib/data-filter/data-filter.ts
index 6d47a7e8cc..ef65f2e8c3 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-filter.ts
+++ b/libs/generic-view/utils/src/lib/data-filter/data-filter.ts
@@ -4,21 +4,21 @@
  */
 
 import { DataProviderFiltersConfig } from "device/models"
-import { stringToRegex } from "./string-to-regex"
+import { stringToRegex } from "../string-to-regex/string-to-regex"
 import { cloneDeep, get } from "lodash"
 
-export const dataProviderFilter = (
+export const dataFilter = (
   data: Record<string, unknown>[] = [],
   filters?: DataProviderFiltersConfig
 ) => {
   if (!filters || !data) return data
 
   return data.filter((item) => {
-    return cloneDeep(filters).every(({ providerField, patterns }) => {
-      const field = get(item, providerField) as string
+    return cloneDeep(filters).every(({ field, patterns }) => {
+      const value = get(item, field) as string
       return patterns.every((pattern) => {
         const regex = stringToRegex(pattern)
-        return regex.test(field || "")
+        return regex.test(value || "")
       })
     })
   })
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/index.ts b/libs/generic-view/utils/src/lib/data-filter/index.ts
similarity index 66%
rename from libs/generic-view/utils/src/lib/data-provider-helpers/index.ts
rename to libs/generic-view/utils/src/lib/data-filter/index.ts
index 167c355b9f..41052f0f60 100644
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/index.ts
+++ b/libs/generic-view/utils/src/lib/data-filter/index.ts
@@ -3,5 +3,4 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-export * from "./data-provider-sort"
-export * from "./data-provider-filter"
+export * from "./data-filter"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
deleted file mode 100644
index c3d8e5e2d2..0000000000
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { dataProviderSort } from "./data-provider-sort"
-import { DataProviderSortConfig } from "device/models"
-
-describe("dataProviderSort", () => {
-  it("returns all data when no sort configuration is provided", () => {
-    const data = [{ name: "Alice" }, { name: "Bob" }]
-    const result = dataProviderSort(data)
-    expect(result).toEqual(data)
-  })
-
-  it("sorts data based on single field in ascending order", () => {
-    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
-    const sort = [
-      { providerField: "name", direction: "asc", priority: 1 },
-    ] as DataProviderSortConfig
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      { name: "Alice" },
-      { name: "Bob" },
-      { name: "Charlie" },
-    ])
-  })
-
-  it("sorts data based on nested field in ascending order", () => {
-    const data = [
-      { user: { name: "Charlie" } },
-      { user: { name: "Alice" } },
-      { user: { name: "Bob" } },
-    ]
-    const sort: DataProviderSortConfig = [
-      { providerField: "user.name", direction: "asc", priority: 1 },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      { user: { name: "Alice" } },
-      { user: { name: "Bob" } },
-      { user: { name: "Charlie" } },
-    ])
-  })
-
-  it("sorts data based on single field in descending order", () => {
-    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
-    const sort: DataProviderSortConfig = [
-      { providerField: "name", direction: "desc", priority: 1 },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      { name: "Charlie" },
-      { name: "Bob" },
-      { name: "Alice" },
-    ])
-  })
-
-  it("sorts data based on multiple fields with different priorities", () => {
-    const data = [
-      { name: "Alice", age: "30" },
-      { name: "Alice", age: "25" },
-      { name: "Bob", age: "20" },
-    ]
-    const sort: DataProviderSortConfig = [
-      { providerField: "name", direction: "asc", priority: 1 },
-      { providerField: "age", direction: "asc", priority: 2 },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      { name: "Alice", age: "25" },
-      { name: "Alice", age: "30" },
-      { name: "Bob", age: "20" },
-    ])
-  })
-
-  it("sorts incomplete data based on multiple fields with different priorities", () => {
-    const data = [
-      { name: "Bob", surname: "Smith" },
-      { name: "Alice" },
-      { name: "Alice", surname: "Smith" },
-    ]
-    const sort: DataProviderSortConfig = [
-      { providerField: "name", direction: "asc", priority: 2 },
-      { providerField: "surname", direction: "asc", priority: 1 },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      {
-        name: "Alice",
-      },
-      {
-        name: "Alice",
-        surname: "Smith",
-      },
-      {
-        name: "Bob",
-        surname: "Smith",
-      },
-    ])
-  })
-
-  it("sorts data based on ordering patterns ", () => {
-    const data = [
-      { name: "Charlie" },
-      { name: "Bob" },
-      { name: "Alice" },
-      { name: "Beatrice" },
-    ]
-    const sort: DataProviderSortConfig = [
-      {
-        providerField: "name",
-        direction: "asc",
-        priority: 1,
-        orderingPatterns: ["/^B/m"],
-      },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([
-      { name: "Beatrice" },
-      { name: "Bob" },
-      { name: "Alice" },
-      { name: "Charlie" },
-    ])
-  })
-
-  it("returns empty array when data is empty", () => {
-    const data: Record<string, unknown>[] = []
-    const sort: DataProviderSortConfig = [
-      { providerField: "name", direction: "asc", priority: 1 },
-    ]
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual([])
-  })
-
-  it("handles undefined data", () => {
-    const sort: DataProviderSortConfig = [
-      { providerField: "name", direction: "asc", priority: 1 },
-    ]
-    const result = dataProviderSort(undefined, sort)
-    expect(result).toEqual([])
-  })
-
-  it("handles undefined sort configuration", () => {
-    const data = [{ name: "Alice" }, { name: "Bob" }]
-    const result = dataProviderSort(data, undefined)
-    expect(result).toEqual(data)
-  })
-
-  it("handles empty sort configuration", () => {
-    const data = [{ name: "Alice" }, { name: "Bob" }]
-    const sort = [] as DataProviderSortConfig
-    const result = dataProviderSort(data, sort)
-    expect(result).toEqual(data)
-  })
-})
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts b/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
deleted file mode 100644
index e31c54feb2..0000000000
--- a/libs/generic-view/utils/src/lib/data-provider-helpers/data-provider-sort.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { DataProviderSortConfig } from "device/models"
-import { stringToRegex } from "./string-to-regex"
-import { cloneDeep, get } from "lodash"
-
-export const dataProviderSort = (
-  data: Record<string, unknown>[] = [],
-  sort?: DataProviderSortConfig
-) => {
-  if (!sort || !data) return data
-  const fieldsSortedByPriority = cloneDeep(sort).sort(
-    (a, b) => a.priority - b.priority
-  )
-
-  return data.sort((a, b) => {
-    let score = 0
-    for (const {
-      providerField,
-      direction,
-      orderingPatterns = [],
-    } of fieldsSortedByPriority) {
-      const fieldA = get(a, providerField) as string
-      const fieldB = get(b, providerField) as string
-      if (!fieldA || !fieldB) {
-        continue
-      }
-
-      for (let i = 0; i < orderingPatterns.length; i++) {
-        const regex = stringToRegex(orderingPatterns[i])
-        const matchA = regex.test(fieldA)
-        const matchB = regex.test(fieldB)
-
-        if (matchA && !matchB) {
-          score = -1
-          break
-        }
-        if (!matchA && matchB) {
-          score = 1
-          break
-        }
-      }
-      if (score === 0) {
-        score =
-          direction === "asc"
-            ? fieldA.localeCompare(fieldB)
-            : fieldB.localeCompare(fieldA)
-        if (score !== 0) {
-          break
-        }
-      }
-    }
-    return score
-  })
-}
diff --git a/libs/generic-view/utils/src/lib/data-sort/data-sort.helpers.ts b/libs/generic-view/utils/src/lib/data-sort/data-sort.helpers.ts
new file mode 100644
index 0000000000..109e7db12e
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-sort/data-sort.helpers.ts
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { cloneDeep, get } from "lodash"
+import {
+  DataSortConfig,
+  SortDirection,
+  SortOrderingPatterns,
+  SortSensitivity,
+} from "device/models"
+import { stringToRegex } from "../string-to-regex/string-to-regex"
+
+export const sortByPriority = (sortConfigs: DataSortConfig) => {
+  if (!sortConfigs) return []
+  return cloneDeep(sortConfigs).sort((a, b) => a.priority - b.priority)
+}
+
+export const compareFields = (
+  fieldA: string | number,
+  fieldB: string | number,
+  direction: SortDirection,
+  sensitivity: SortSensitivity
+) => {
+  if (typeof fieldA === "number" && typeof fieldB === "number") {
+    return direction === "asc" ? fieldA - fieldB : fieldB - fieldA
+  }
+
+  if (typeof fieldA === "string" && typeof fieldB === "string") {
+    const comparison = fieldA.localeCompare(fieldB, undefined, { sensitivity })
+    return direction === "asc" ? comparison : -comparison
+  }
+
+  if (typeof fieldA === "string" && typeof fieldB === "number") {
+    return direction === "asc" ? -1 : 1
+  }
+
+  if (typeof fieldA === "number" && typeof fieldB === "string") {
+    return direction === "asc" ? 1 : -1
+  }
+
+  return 0
+}
+
+export const compareWithOrderingPatterns = (
+  fieldA: string | number,
+  fieldB: string | number,
+  patterns: SortOrderingPatterns,
+  direction: SortDirection
+) => {
+  const directionMultiplier = direction === "asc" ? 1 : -1
+
+  for (const pattern of patterns) {
+    const regex = stringToRegex(pattern)
+    const matchA = regex.test(String(fieldA))
+    const matchB = regex.test(String(fieldB))
+
+    if (matchA && !matchB) return -1 * directionMultiplier
+    if (!matchA && matchB) return 1 * directionMultiplier
+  }
+  return 0
+}
+
+export const getFirstNonEmptyField = (
+  obj: unknown,
+  fields: string[]
+): unknown => {
+  const fieldKey = fields.find((field) => {
+    const value = get(obj, field)
+
+    if (value === null || value === undefined) {
+      return false
+    }
+
+    if (typeof value === "string" && value.trim() === "") {
+      return false
+    }
+
+    if (typeof value === "number" && isNaN(value)) {
+      return false
+    }
+
+    return true
+  })
+
+  return fieldKey ? get(obj, fieldKey) : ""
+}
diff --git a/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts b/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
new file mode 100644
index 0000000000..d2d7c2cb66
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
@@ -0,0 +1,582 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { dataSort } from "./data-sort"
+import { DataSortConfig } from "device/models"
+
+describe("dataProviderSort", () => {
+  it("returns all data when no sort configuration is provided", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataSort(data)
+    expect(result).toEqual(data)
+  })
+
+  it("sorts data based on single field in ascending order", () => {
+    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
+    const sort = [
+      { field: "name", direction: "asc", priority: 1 },
+    ] as DataSortConfig
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "Alice" },
+      { name: "Bob" },
+      { name: "Charlie" },
+    ])
+  })
+
+  it("sorts data based on single field in descending order", () => {
+    const data = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }]
+    const sort: DataSortConfig = [
+      { field: "name", direction: "desc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "Charlie" },
+      { name: "Bob" },
+      { name: "Alice" },
+    ])
+  })
+
+  it("sorts data based on nested field in ascending order", () => {
+    const data = [
+      { user: { name: "Charlie" } },
+      { user: { name: "Alice" } },
+      { user: { name: "Bob" } },
+    ]
+    const sort: DataSortConfig = [
+      { field: "user.name", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { user: { name: "Alice" } },
+      { user: { name: "Bob" } },
+      { user: { name: "Charlie" } },
+    ])
+  })
+
+  it("sorts data with numeric values as primitive numbers", () => {
+    const data = [
+      { user: { age: 30 } },
+      { user: { age: 40 } },
+      { user: { age: 25 } },
+    ]
+    const sort: DataSortConfig = [
+      { field: "user.age", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { user: { age: 25 } },
+      { user: { age: 30 } },
+      { user: { age: 40 } },
+    ])
+  })
+
+  it("sorts numeric values correctly without converting them to strings", () => {
+    const data = [
+      { value: 3 },
+      { value: 300 },
+      { value: 25 },
+      { value: 100 },
+      { value: 5 },
+    ]
+    const sort: DataSortConfig = [
+      { field: "value", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { value: 3 },
+      { value: 5 },
+      { value: 25 },
+      { value: 100 },
+      { value: 300 },
+    ])
+  })
+
+  it("sorts strings before numbers with strings in lexicographical order and numbers in ascending order", () => {
+    const data = [
+      { value: "Bob" },
+      { value: 1 },
+      { value: 3 },
+      { value: "Alice" },
+      { value: 2 },
+    ]
+    const sort: DataSortConfig = [
+      { field: "value", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { value: "Alice" },
+      { value: "Bob" },
+      { value: 1 },
+      { value: 2 },
+      { value: 3 },
+    ])
+  })
+
+  it("sorts data based on multiple fields with different priorities", () => {
+    const data = [
+      { name: "Alice", age: "30" },
+      { name: "Alice", age: "25" },
+      { name: "Bob", age: "20" },
+    ]
+    const sort: DataSortConfig = [
+      { field: "name", direction: "asc", priority: 1 },
+      { field: "age", direction: "asc", priority: 2 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "Alice", age: "25" },
+      { name: "Alice", age: "30" },
+      { name: "Bob", age: "20" },
+    ])
+  })
+
+  it("sorts incomplete data based on multiple fields with different priorities", () => {
+    const data = [
+      { name: "Bob", surname: "Smith" },
+      { name: "Alice" },
+      { name: "Alice", surname: "Smith" },
+    ]
+    const sort: DataSortConfig = [
+      { field: "surname", direction: "asc", priority: 1 },
+      { field: "name", direction: "asc", priority: 2 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "Alice", surname: "Smith" },
+      { name: "Bob", surname: "Smith" },
+      { name: "Alice" },
+    ])
+  })
+
+  it("sorts data with sensitivity set to 'base' (ignores case and accents)", () => {
+    const data = [
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "Alice" },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        sensitivity: "base",
+      },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Alice" },
+      { name: "Bob" },
+      { name: "charlie" },
+    ])
+  })
+
+  it("sorts data with sensitivity set to 'accent' (ignores case, but considers accents)", () => {
+    const data = [
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "Alice" },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        sensitivity: "accent",
+      },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { name: "alice" },
+      { name: "Alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+    ])
+  })
+
+  it("sorts data with sensitivity set to 'case' (considers case, but ignores accents)", () => {
+    const data = [
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "Alice" },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        sensitivity: "case",
+      },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Alice" },
+      { name: "Bob" },
+      { name: "charlie" },
+    ])
+  })
+
+  it("sorts data with sensitivity set to 'variant' (considers both case and accents)", () => {
+    const data = [
+      { name: "alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "Alice" },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        sensitivity: "variant",
+      },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "alice" },
+      { name: "Alice" },
+      { name: "álice" },
+      { name: "Bob" },
+      { name: "charlie" },
+    ])
+  })
+
+  it("sorts data with empty values first when `emptyOrder` is set to 'first'", () => {
+    const data = [
+      { name: "alice" },
+      { name: null },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "" },
+      { name: undefined },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        emptyOrder: "first",
+      },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { name: null },
+      { name: "" },
+      { name: undefined },
+      { name: "alice" },
+      { name: "Bob" },
+      { name: "charlie" },
+    ])
+  })
+
+  it("sorts data with empty values last when `emptyOrder` is set to 'last'", () => {
+    const data = [
+      { name: "alice" },
+      { name: null },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: "" },
+      { name: undefined },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        emptyOrder: "last",
+      },
+    ]
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { name: "alice" },
+      { name: "Bob" },
+      { name: "charlie" },
+      { name: null },
+      { name: "" },
+      { name: undefined },
+    ])
+  })
+
+  it("sorts data based on fieldGroup fields when lastName is the same", () => {
+    const data = [
+      { firstName: "Alice", lastName: "Smith" },
+      { firstName: "Charlie", lastName: "Smith" },
+      { firstName: "Bob", lastName: "Smith" },
+    ]
+
+    const sort: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "firstName"],
+        direction: "asc",
+        priority: 1,
+      },
+    ]
+
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { firstName: "Alice", lastName: "Smith" },
+      { firstName: "Bob", lastName: "Smith" },
+      { firstName: "Charlie", lastName: "Smith" },
+    ])
+  })
+
+  it("handles sorting when lastName is empty and firstName is used", () => {
+    const data = [
+      { firstName: "Alice", lastName: "" },
+      { firstName: "Bob", lastName: "" },
+      { firstName: "Charlie", lastName: "Smith" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "firstName"],
+        priority: 1,
+        direction: "asc",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { firstName: "Alice", lastName: "" },
+      { firstName: "Bob", lastName: "" },
+      { firstName: "Charlie", lastName: "Smith" },
+    ])
+  })
+
+  it("sorts data with empty fieldGroup values first when emptyOrder is 'first'", () => {
+    const data = [
+      { firstName: "Bob", lastName: "Smith", displayName: "Bob Smith" },
+      { firstName: "Alice", lastName: null, displayName: "Alice" },
+      { firstName: "Yuki", lastName: null, displayName: "Yuki" },
+      { firstName: undefined, lastName: undefined, displayName: "Dave" },
+      { firstName: "Charlie", lastName: "", displayName: "Charlie" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "firstName"],
+        priority: 1,
+        direction: "asc",
+        emptyOrder: "first",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { firstName: undefined, lastName: undefined, displayName: "Dave" },
+      { firstName: "Alice", lastName: null, displayName: "Alice" },
+      { firstName: "Charlie", lastName: "", displayName: "Charlie" },
+      { firstName: "Bob", lastName: "Smith", displayName: "Bob Smith" },
+      { firstName: "Yuki", lastName: null, displayName: "Yuki" },
+    ])
+  })
+
+  it("sorts data with empty fieldGroup values last when emptyOrder is 'last'", () => {
+    const data = [
+      { firstName: "Bob", lastName: "Smith", displayName: "Bob Smith" },
+      { firstName: "Alice", lastName: null, displayName: "Alice" },
+      { firstName: undefined, lastName: undefined, displayName: "Dave" },
+      { firstName: "Charlie", lastName: "", displayName: "Charlie" },
+      { firstName: "Yuki", lastName: null, displayName: "Yuki" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "firstName"],
+        priority: 1,
+        direction: "asc",
+        emptyOrder: "last",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { firstName: "Alice", lastName: null, displayName: "Alice" },
+      { firstName: "Charlie", lastName: "", displayName: "Charlie" },
+      { firstName: "Bob", lastName: "Smith", displayName: "Bob Smith" },
+      { firstName: "Yuki", lastName: null, displayName: "Yuki" },
+      { firstName: undefined, lastName: undefined, displayName: "Dave" },
+    ])
+  })
+
+  it("sorts data based on ordering patterns", () => {
+    const data = [
+      { name: "Charlie" },
+      { name: "Bob" },
+      { name: "Alice" },
+      { name: "Beatrice" },
+    ]
+    const sort: DataSortConfig = [
+      {
+        field: "name",
+        direction: "asc",
+        priority: 1,
+        orderingPatterns: ["/^B/m"],
+      },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([
+      { name: "Beatrice" },
+      { name: "Bob" },
+      { name: "Alice" },
+      { name: "Charlie" },
+    ])
+  })
+
+  it("sorts data using orderingPatterns for alphabetical, numeric, and special character fields", () => {
+    const data = [
+      { displayName: "Anna", firstName: "Anna", lastName: "" },
+      { displayName: "490123456789", firstName: "", lastName: "" },
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+      { displayName: "Michael", firstName: "Michael", lastName: "Brown" },
+      { displayName: "home@home.com", firstName: "", lastName: "" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["displayName"],
+        priority: 1,
+        direction: "asc",
+        orderingPatterns: [
+          "/^\\p{L}.*/u", // first alphabetical values
+          "/^\\d+$/", // then numeric values
+          "/^[^a-zA-Z\\d\\s@]+$/", // then special characters (non-alphanumeric)
+        ],
+        sensitivity: "variant",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { displayName: "Anna", firstName: "Anna", lastName: "" },
+      { displayName: "home@home.com", firstName: "", lastName: "" },
+      { displayName: "Michael", firstName: "Michael", lastName: "Brown" },
+      { displayName: "490123456789", firstName: "", lastName: "" },
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+    ])
+  })
+
+  it("sorts complex data using `fieldGroup` and `orderingPatterns`, handling empty and numeric values", () => {
+    const data = [
+      { displayName: "Anna", firstName: "Anna", lastName: "" },
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+      { displayName: "Michael", firstName: "Michael", lastName: "Brown" },
+      { displayName: "Numer 12345", firstName: "Numer", lastName: "12345" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "firstName", "displayName"],
+        priority: 1,
+        direction: "asc",
+        orderingPatterns: [
+          "/^\\p{L}.*/u", // alphabetic first
+          "/^\\d+$/", // numeric second
+        ],
+        sensitivity: "variant",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { displayName: "Anna", firstName: "Anna", lastName: "" },
+      { displayName: "Michael", firstName: "Michael", lastName: "Brown" },
+      { displayName: "Numer 12345", firstName: "Numer", lastName: "12345" },
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+    ])
+  })
+
+  it("sorts data with phone numbers and empty lastName", () => {
+    const data = [
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+      { displayName: "Jane Smith", firstName: "Jane", lastName: "Smith" },
+      { displayName: "490123456789", firstName: "", lastName: "" },
+      { displayName: "Emily Davis", firstName: "Emily", lastName: "Davis" },
+    ]
+
+    const sortConfig: DataSortConfig = [
+      {
+        fieldGroup: ["lastName", "displayName"],
+        priority: 1,
+        direction: "asc",
+        orderingPatterns: ["/^\\p{L}.*/u", "/^\\d+$/"],
+        sensitivity: "variant",
+      },
+    ]
+
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual([
+      { displayName: "Emily Davis", firstName: "Emily", lastName: "Davis" },
+      { displayName: "Jane Smith", firstName: "Jane", lastName: "Smith" },
+      { displayName: "490123456789", firstName: "", lastName: "" },
+      { displayName: "+48345678902", firstName: "", lastName: "" },
+    ])
+  })
+
+  it("returns empty array when data is empty", () => {
+    const data: Record<string, unknown>[] = []
+    const sort: DataSortConfig = [
+      { field: "name", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(data, sort)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined data", () => {
+    const sort: DataSortConfig = [
+      { field: "name", direction: "asc", priority: 1 },
+    ]
+    const result = dataSort(undefined, sort)
+    expect(result).toEqual([])
+  })
+
+  it("handles undefined sort configuration", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const result = dataSort(data, undefined)
+    expect(result).toEqual(data)
+  })
+
+  it("handles empty sort configuration", () => {
+    const data = [{ name: "Alice" }, { name: "Bob" }]
+    const sort = [] as DataSortConfig
+    const result = dataSort(data, sort)
+    expect(result).toEqual(data)
+  })
+
+  it("returns unsorted data when neither `providerField` nor `fieldGroup` is provided", () => {
+    const data = [
+      { name: "Alice", age: 30 },
+      { name: "Bob", age: 25 },
+      { name: "Charlie", age: 35 },
+    ]
+    const sortConfig: DataSortConfig = [
+      {
+        priority: 1,
+        direction: "asc",
+      },
+    ]
+    const result = dataSort(data, sortConfig)
+    expect(result).toEqual(data)
+  })
+})
diff --git a/libs/generic-view/utils/src/lib/data-sort/data-sort.ts b/libs/generic-view/utils/src/lib/data-sort/data-sort.ts
new file mode 100644
index 0000000000..b524e7e7ca
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-sort/data-sort.ts
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { DataSortConfig } from "device/models"
+import isEmpty from "lodash/isEmpty"
+import {
+  compareFields,
+  compareWithOrderingPatterns,
+  getFirstNonEmptyField,
+  sortByPriority,
+} from "./data-sort.helpers"
+
+export const dataSort = (
+  data: Record<string, unknown>[] = [],
+  configs?: DataSortConfig
+) => {
+  if (!configs || !data) return data
+
+  const sortedConfigs = sortByPriority(configs)
+
+  return data.sort((a, b) => {
+    for (const {
+      field,
+      fieldGroup,
+      direction,
+      orderingPatterns = [],
+      sensitivity = "variant",
+      emptyOrder = "last",
+    } of sortedConfigs) {
+      const fields = field ? [field] : fieldGroup
+      if (!fields) continue
+      let index = 0
+
+      while (index < fields.length) {
+        const remainingFields = fields.slice(index)
+        const fieldA = getFirstNonEmptyField(a, remainingFields)
+        const fieldB = getFirstNonEmptyField(b, remainingFields)
+
+        if (fieldA === fieldB) {
+          index++
+          continue
+        }
+
+        if (isEmpty(fieldA) && !isEmpty(fieldB)) {
+          return emptyOrder === "first" ? -1 : 1
+        } else if (!isEmpty(fieldA) && isEmpty(fieldB)) {
+          return emptyOrder === "first" ? 1 : -1
+        }
+
+        if (
+          (typeof fieldA !== "string" && typeof fieldA !== "number") ||
+          (typeof fieldB !== "string" && typeof fieldB !== "number")
+        ) {
+          index++
+          continue
+        }
+
+        const regexComparison = compareWithOrderingPatterns(
+          fieldA,
+          fieldB,
+          orderingPatterns,
+          direction
+        )
+        if (regexComparison !== 0) {
+          return regexComparison
+        }
+
+        const fieldComparison = compareFields(
+          fieldA,
+          fieldB,
+          direction,
+          sensitivity
+        )
+        if (fieldComparison !== 0) {
+          return fieldComparison
+        } else {
+          index++
+        }
+      }
+    }
+
+    return 0
+  })
+}
diff --git a/libs/generic-view/utils/src/lib/data-sort/index.ts b/libs/generic-view/utils/src/lib/data-sort/index.ts
new file mode 100644
index 0000000000..58f4bb5fa2
--- /dev/null
+++ b/libs/generic-view/utils/src/lib/data-sort/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./data-sort"
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts b/libs/generic-view/utils/src/lib/string-to-regex/string-to-regex.test.ts
similarity index 100%
rename from libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.test.ts
rename to libs/generic-view/utils/src/lib/string-to-regex/string-to-regex.test.ts
diff --git a/libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts b/libs/generic-view/utils/src/lib/string-to-regex/string-to-regex.ts
similarity index 100%
rename from libs/generic-view/utils/src/lib/data-provider-helpers/string-to-regex.ts
rename to libs/generic-view/utils/src/lib/string-to-regex/string-to-regex.ts

From 2d11c64facd7a6e9315d6fd25299e9ffb937d812 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Fri, 25 Oct 2024 09:26:41 +0200
Subject: [PATCH 45/64] [CP-3231] Incorrect Identification of USB Device as
 Mudita Harmony MSC (#2147)

---
 .../macos-usb-port-device-parser.test.ts      | 172 ++++++++++++++++++
 .../macos-usb-port-device-parser.ts           |  15 +-
 2 files changed, 174 insertions(+), 13 deletions(-)

diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
index 847c259a73..9fef7442f6 100644
--- a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.test.ts
@@ -632,3 +632,175 @@ USB:
 
   expect(devices.length).toBe(0)
 })
+
+it("should correctly parse and return details of a Mudita device in a complex USB structure", async () => {
+  const output = `
+USB 3.1 Bus:
+   Host Controller Driver: AppleT8103USBXHCI
+    USB2.0 HUB:
+     Product ID: 0x7250
+     Vendor ID: 0x214b
+     Version: 1.00
+     Speed: Up to 480 Mb/s
+     Location ID: 0x01100000 / 1
+     Current Available (mA): 500
+     Current Required (mA): 100
+     Extra Operating Current (mA): 0
+      Mudita Pure:
+       Product ID: 0x0102
+       Vendor ID: 0x3310
+       Version: 1.12
+       Serial Number: 29605660243632
+       Speed: Up to 480 Mb/s
+       Manufacturer: Mudita
+       Location ID: 0x01140000 / 4
+       Current Available (mA): 500
+       Current Required (mA): 500
+       Extra Operating Current (mA): 0
+      USB2.0 HUB:
+       Product ID: 0x7250
+       Vendor ID: 0x214b
+       Version: 1.00
+       Speed: Up to 480 Mb/s
+       Location ID: 0x01120000 / 3
+       Current Available (mA): 500
+       Current Required (mA): 100
+       Extra Operating Current (mA): 0
+        USB Storage:
+         Product ID: 0x0751
+         Vendor ID: 0x05e3 (Genesys Logic, Inc.)
+         Version: 14.04
+         Speed: Up to 480 Mb/s
+         Manufacturer: USB Storage
+         Location ID: 0x01124000 / 6
+         Current Available (mA): 500
+         Current Required (mA): 98
+         Extra Operating Current (mA): 0
+        Mudita Harmony:
+         Product ID: 0x0300
+         Vendor ID: 0x3310
+         Version: 1.12
+         Serial Number: 0422420002815
+         Speed: Up to 480 Mb/s
+         Manufacturer: Mudita
+         Location ID: 0x01121000 / 5
+         Current Available (mA): 500
+         Current Required (mA): 500
+         Extra Operating Current (mA): 0
+      USB 10/100 LAN:
+       Product ID: 0x8152
+       Vendor ID: 0x0bda (Realtek Semiconductor Corp.)
+       Version: 20.00
+       Serial Number: 00E04C36183B
+       Speed: Up to 480 Mb/s
+       Manufacturer: Realtek
+       Location ID: 0x01110000 / 2
+       Current Available (mA): 500
+       Current Required (mA): 100
+       Extra Operating Current (mA): 0
+  USB 3.1 Bus:
+   Host Controller Driver: AppleT8103USBXHCI
+    USB 2.0 BILLBOARD       :
+     Product ID: 0x0103
+     Vendor ID: 0x2109 (VIA Labs, Inc.)
+     Version: 10.04
+     Serial Number: 0000000000000001
+     Speed: Up to 12 Mb/s
+     Manufacturer: VIA Technologies Inc.
+     Location ID: 0x00100000 / 1
+     Current Available (mA): 500
+     Extra Operating Current (mA): 0
+  `
+
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+
+  expect(devices.length).toBe(2)
+
+  expect(devices).toEqual([
+    {
+      bsdName: undefined,
+      locationId: "0x01140000",
+      manufacturer: "Mudita",
+      name: "Mudita Pure",
+      path: "3310/0102/29605660243632",
+      productId: "0102",
+      serialNumber: "29605660243632",
+      vendorId: "3310",
+      version: "1.12",
+    },
+    {
+      bsdName: undefined,
+      locationId: "0x01121000",
+      manufacturer: "Mudita",
+      name: "Mudita Harmony",
+      path: "3310/0300/0422420002815",
+      productId: "0300",
+      serialNumber: "0422420002815",
+      vendorId: "3310",
+      version: "1.12",
+    },
+  ])
+})
+
+it("should correctly handle a device without a Product ID", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+          Location ID: 0x00100000 / 1
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    locationId: "0x00100000",
+    manufacturer: "Mudita",
+    name: "Mudita Harmony (MSC mode)",
+    path: "unknown",
+    productId: undefined,
+    serialNumber: "0123456789ABCDEF",
+    vendorId: "3310",
+    version: "1.01",
+    bsdName: undefined,
+  })
+})
+
+it("should correctly handle a device without both Product ID and Location ID", async () => {
+  const output = `
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8122USBXHCI
+        Mudita Harmony (MSC mode):
+          Vendor ID: 0x3310
+          Version: 1.01
+          Serial Number: 0123456789ABCDEF
+          Speed: Up to 480 Mb/s
+          Manufacturer: Mudita
+`
+  ;(execPromise as jest.Mock).mockResolvedValue(output)
+
+  const devices = await MacosUSBPortDeviceParser.getUSBPortDevices()
+
+  expect(devices.length).toBe(1)
+  expect(devices[0]).toEqual({
+    locationId: undefined,
+    manufacturer: "Mudita",
+    name: "Mudita Harmony (MSC mode)",
+    path: "unknown",
+    productId: undefined,
+    serialNumber: "0123456789ABCDEF",
+    vendorId: "3310",
+    version: "1.01",
+    bsdName: undefined,
+  })
+})
diff --git a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
index a2384582b7..54a2b6fcd7 100644
--- a/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
+++ b/libs/shared/utils/src/lib/macos-usb-port-device-parser/macos-usb-port-device-parser.ts
@@ -73,13 +73,6 @@ export class MacosUSBPortDeviceParser {
         currentDevice = { name: productNameMatch[1] }
       }
 
-      if (
-        (currentDevice && line.includes("Media")) ||
-        line.includes("Volumes")
-      ) {
-        return
-      }
-
       if (currentDevice) {
         for (const [key, regex] of Object.entries(fieldPatterns) as [
           keyof USBDevice,
@@ -87,14 +80,12 @@ export class MacosUSBPortDeviceParser {
         ][]) {
           const match = regex.exec(line)
           if (match) {
-            if (key === "bsdName" && !currentDevice.bsdName) {
-              currentDevice.bsdName = match[1]
+            if (currentDevice[key]) {
               devices.push(currentDevice)
               currentDevice = null
               break
-            } else if (key !== "bsdName") {
-              currentDevice[key] = match[1]
             }
+            currentDevice[key] = match[1]
           }
         }
       }
@@ -104,8 +95,6 @@ export class MacosUSBPortDeviceParser {
       devices.push(currentDevice)
     }
 
-    console.log("Devices in function: ", devices)
-
     return devices
   }
 }

From 817c292557e6aa3dcc7e6e0e811f5ac51ee0bd72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kurczewski?= <michalkurczewski94@gmail.com>
Date: Fri, 25 Oct 2024 15:13:46 +0200
Subject: [PATCH 46/64] [CP-3232] Improved entities loading mechanism (#2149)

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 .../lib/api-features/api-features.service.ts  |   4 +
 .../src/lib/feature/data-provider-config.ts   |  14 +-
 .../feature/src/lib/setup-component.tsx       |  54 +++----
 .../feature/src/lib/use-dev-console.ts        |   3 +
 .../lib/use-dev-views/views/contacts-view.ts  | 147 +++++++++++++++++-
 libs/generic-view/models/src/lib/device.ts    |   5 -
 libs/generic-view/models/src/lib/table.ts     |   9 +-
 libs/generic-view/store/src/index.ts          |   3 -
 .../store/src/lib/action-names.ts             |   5 +-
 .../store/src/lib/entities/actions.ts         |  20 +--
 .../entities/delete-entities-data.action.ts   |  13 +-
 .../entities/get-entities-config.action.ts    |  52 +++----
 .../entities/get-entities-metadata.action.ts  |  15 +-
 .../lib/entities/get-entity-data.action.ts    |  24 +--
 .../src/lib/entities/load-entities.action.ts  |  32 ++++
 .../store/src/lib/entities/reducer.ts         |  20 +--
 .../features/get-generic-config.actions.ts    |  14 +-
 .../store/src/lib/get-api-config.ts           |  25 +--
 .../store/src/lib/selectors/entities.ts       |   5 +
 .../store/src/lib/selectors/view.ts           |  10 --
 .../store/src/lib/use-form-field.ts           |  55 -------
 .../store/src/lib/use-form-register.ts        |  43 -----
 .../store/src/lib/views/actions.ts            |  16 --
 .../store/src/lib/views/reducer.ts            |  27 ----
 .../ui/src/lib/data-rows/app-portal.tsx       |  11 +-
 .../ui/src/lib/interactive/form/form.tsx      |  19 +--
 .../ui/src/lib/table/table-cell.tsx           |   6 +
 libs/generic-view/ui/src/lib/table/table.tsx  |  16 +-
 .../src/lib/forms-provider/forms-provider.tsx |  59 +++----
 29 files changed, 354 insertions(+), 372 deletions(-)
 create mode 100644 libs/generic-view/store/src/lib/entities/load-entities.action.ts
 delete mode 100644 libs/generic-view/store/src/lib/use-form-field.ts
 delete mode 100644 libs/generic-view/store/src/lib/use-form-register.ts

diff --git a/libs/device/feature/src/lib/api-features/api-features.service.ts b/libs/device/feature/src/lib/api-features/api-features.service.ts
index c88d37a882..e856367297 100644
--- a/libs/device/feature/src/lib/api-features/api-features.service.ts
+++ b/libs/device/feature/src/lib/api-features/api-features.service.ts
@@ -49,6 +49,10 @@ export class APIFeaturesService {
     })
 
     if (response.ok) {
+      if (process.env.DEV_API_CONFIG === "1") {
+        return Result.success(response.data.body as FeatureConfig)
+      }
+
       const config = featureConfigValidator.safeParse(response.data.body)
       if (process.env.NODE_ENV === "development" && !config.success) {
         console.log(JSON.stringify(config, null, 2))
diff --git a/libs/device/models/src/lib/feature/data-provider-config.ts b/libs/device/models/src/lib/feature/data-provider-config.ts
index 41fddc4a44..1edc6c96de 100644
--- a/libs/device/models/src/lib/feature/data-provider-config.ts
+++ b/libs/device/models/src/lib/feature/data-provider-config.ts
@@ -111,6 +111,12 @@ const filtersSchema = z
 
 export type DataProviderFiltersConfig = z.infer<typeof filtersSchema>
 
+const entitiesMetadataSchema = z.object({
+  source: z.literal("entities-metadata"),
+  entitiesType: entitiesTypeSchema,
+  fields: fieldsSchema,
+})
+
 const entitiesArraySchema = z.object({
   source: z.literal("entities-array"),
   entitiesType: entitiesTypeSchema,
@@ -130,17 +136,11 @@ const formFieldsSchema = z.object({
   fields: fieldsSchema,
 })
 
-const formFieldsSchemaV2 = z.object({
-  source: z.literal("form-fields-v2"),
-  formName: z.string(),
-  fields: fieldsSchema,
-})
-
 export const dataProviderSchema = z.union([
+  entitiesMetadataSchema,
   entitiesArraySchema,
   entitiesFieldSchema,
   formFieldsSchema,
-  formFieldsSchemaV2,
 ])
 
 export type DataProviderConfig = z.infer<typeof dataProviderSchema>
diff --git a/libs/generic-view/feature/src/lib/setup-component.tsx b/libs/generic-view/feature/src/lib/setup-component.tsx
index 60f5bf3455..4378fba239 100644
--- a/libs/generic-view/feature/src/lib/setup-component.tsx
+++ b/libs/generic-view/feature/src/lib/setup-component.tsx
@@ -20,8 +20,8 @@ import {
   selectComponentLayout,
   selectEntitiesData,
   selectEntitiesIdFieldKey,
+  selectEntitiesMetadata,
   selectEntityData,
-  useFormField,
 } from "generic-view/store"
 import {
   dataFilter,
@@ -47,7 +47,7 @@ import {
   map,
   set,
 } from "lodash"
-import { Tooltip, Paragraph5 } from "generic-view/ui"
+import { Paragraph5, Tooltip } from "generic-view/ui"
 
 export const setupComponent = <P extends object>(
   Component: ComponentType<P>
@@ -81,11 +81,12 @@ export const setupComponent = <P extends object>(
       if (dataProvider) return
       return selectComponentData(state, { viewKey, componentKey })
     })
-    const formDataV2 = useFormField({
-      formName:
-        dataProvider?.source === "form-fields-v2"
-          ? dataProvider.formName
-          : undefined,
+    const entitiesMetadata = useSelector((state: ReduxRootState) => {
+      if (dataProvider?.source !== "entities-metadata") return
+      return selectEntitiesMetadata(state, {
+        entitiesType: dataProvider.entitiesType,
+        deviceId,
+      })
     })
     const entitiesData =
       useSelector((state: ReduxRootState) => {
@@ -119,7 +120,15 @@ export const setupComponent = <P extends object>(
       data: componentData,
     })
 
-    if (dataProvider?.source === "entities-array") {
+    if (dataProvider?.source === "entities-metadata") {
+      for (const fieldConfig of dataProvider.fields) {
+        const { componentField, providerField, ...config } = fieldConfig
+        const fieldValue = get(entitiesMetadata, providerField)
+        const value = processField(config, fieldValue)
+
+        set(editableProps || {}, componentField, value)
+      }
+    } else if (dataProvider?.source === "entities-array") {
       const filteredData = dataFilter(
         [...entitiesData],
         dataProvider.filters
@@ -130,10 +139,7 @@ export const setupComponent = <P extends object>(
       if (entityData) {
         for (const fieldConfig of dataProvider.fields) {
           const { componentField, providerField, ...config } = fieldConfig
-          const value = processFormFields(
-            config,
-            get(entityData, providerField)
-          )
+          const value = processField(config, get(entityData, providerField))
           if (isString(value) && componentField === "dataItemId") {
             dataItemId = value
             continue
@@ -155,21 +161,8 @@ export const setupComponent = <P extends object>(
         const fieldValue = isFormElement
           ? formContext.getValues(providerField)
           : formContext.watch(providerField)
-        const value = processFormFields(config, fieldValue)
+        const value = processField(config, fieldValue)
 
-        if (isString(value) && componentField === "dataItemId") {
-          dataItemId = value
-          continue
-        }
-        set(editableProps || {}, componentField, value)
-      }
-    } else if (dataProvider?.source === "form-fields-v2") {
-      for (const fieldConfig of dataProvider.fields) {
-        const { componentField, providerField, ...config } = fieldConfig
-        const value = processFormFields(
-          config,
-          formDataV2.getValue(providerField)
-        )
         if (isString(value) && componentField === "dataItemId") {
           dataItemId = value
           continue
@@ -181,7 +174,7 @@ export const setupComponent = <P extends object>(
     const layoutDependency = JSON.stringify(layout)
     const styleDependency = JSON.stringify(style)
     const dataProviderDependency = JSON.stringify(dataProvider)
-    const formDataV2Dependency = JSON.stringify(formDataV2)
+    const entitiesMetadataDependency = JSON.stringify(entitiesMetadata)
 
     const styles = useMemo(() => {
       return setupStyles(style, layout)
@@ -249,8 +242,8 @@ export const setupComponent = <P extends object>(
       dataItemId,
       editablePropsDependency,
       dataProviderDependency,
+      entitiesMetadataDependency,
       styles,
-      formDataV2Dependency,
     ])
   }
 }
@@ -259,10 +252,7 @@ function flattenListByKey<T>(list: T[], key: string): unknown {
   return flatten(map(list, (item) => get(item, key, [])))
 }
 
-const processFormFields = (
-  field: Partial<DataProviderField>,
-  value: unknown
-) => {
+const processField = (field: Partial<DataProviderField>, value: unknown) => {
   let newValue = value
   if ("slice" in field && field.slice !== undefined && value instanceof Array) {
     newValue =
diff --git a/libs/generic-view/feature/src/lib/use-dev-console.ts b/libs/generic-view/feature/src/lib/use-dev-console.ts
index 25fc0eb8dc..678f16c4ab 100644
--- a/libs/generic-view/feature/src/lib/use-dev-console.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-console.ts
@@ -107,6 +107,9 @@ export const useDevConsole = () => {
             await dispatch(
               createEntityDataAction({ entitiesType, data, deviceId })
             )
+            await dispatch(
+              getEntitiesMetadataAction({ entitiesType, deviceId })
+            )
           }
         },
       })
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
index 0e78e70e6b..682af03530 100644
--- a/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/contacts-view.ts
@@ -6,6 +6,151 @@
 import { View } from "generic-view/utils"
 
 // @ts-ignore
-const view: View = {}
+const view: View = {
+  main: {
+    component: "block-plain",
+    config: {
+      backgroundColor: "white",
+    },
+    layout: {
+      gridLayout: {
+        rows: ["auto", "1fr"],
+        columns: ["1fr"],
+      },
+    },
+    childrenKeys: ["emptyListWrapper", "listWrapper"],
+    // @ts-ignore
+    screenTitle: "Contacts",
+  },
+  emptyListWrapper: {
+    component: "conditional-renderer",
+    dataProvider: {
+      source: "entities-metadata",
+      entitiesType: "contacts",
+      fields: [
+        {
+          modifier: "length",
+          providerField: "totalEntities",
+          componentField: "data.render",
+          condition: "eq",
+          value: 0,
+        },
+      ],
+    },
+    childrenKeys: ["fullScreenWrapper"],
+  },
+  listWrapper: {
+    component: "conditional-renderer",
+    dataProvider: {
+      source: "entities-metadata",
+      entitiesType: "contacts",
+      fields: [
+        {
+          providerField: "totalEntities",
+          componentField: "data.render",
+          condition: "gt",
+          value: 0,
+        },
+      ],
+    },
+    childrenKeys: ["contactsForm"],
+  },
+  contactsForm: {
+    component: "form",
+    config: {
+      formOptions: {
+        defaultValues: {
+          selectedContacts: [],
+          allContacts: [],
+        },
+      },
+      defaultValues: {
+        selectedContacts: [],
+        allContacts: [],
+      },
+    },
+    childrenKeys: ["contactsLoader"],
+  },
+  contactsLoader: {
+    component: "entities-loader",
+    config: {
+      entitiesTypes: ["contacts"],
+      text: "Loading contacts, please wait...",
+    },
+    layout: {
+      flexLayout: {
+        rowGap: "24px",
+        direction: "column",
+        justifyContent: "center",
+        alignItems: "center",
+      },
+      gridPlacement: {
+        row: 1,
+        column: 1,
+        width: 1,
+        height: 2,
+      },
+    },
+    childrenKeys: ["contactsPanel", "contactsTableWrapper", "appHeaderCounter"],
+  },
+  contactsTableWrapper: {
+    component: "block-plain",
+    layout: {
+      flexLayout: {
+        direction: "row",
+      },
+    },
+    childrenKeys: ["contactsListTable", "detailsWrapper"],
+  },
+  appHeaderCounterText: {
+    component: "format-message",
+    config: {
+      messageTemplate: "{contactsCount, plural, =0 {} other { (#)}}",
+    },
+    dataProvider: {
+      source: "entities-metadata",
+      entitiesType: "contacts",
+      fields: [
+        {
+          providerField: "totalEntities",
+          componentField: "data.fields.contactsCount",
+        },
+      ],
+    },
+  },
+  contactsListTable: {
+    component: "table",
+    config: {
+      formOptions: {
+        selectedIdsFieldName: "selectedContacts",
+        allIdsFieldName: "allContacts",
+      },
+    },
+    dataProvider: {
+      source: "entities-array",
+      entitiesType: "contacts",
+    },
+    childrenKeys: [
+      "columnCheckbox",
+      "columnName",
+      "columnEmpty",
+      "columnPhoneNumberOptional",
+      "columnPhoneNumberLengthOptional",
+    ],
+  },
+  columnEmpty: {
+    component: "table.cell",
+    config: {
+      width: "100%",
+    },
+  },
+  columnName: {
+    component: "table.cell",
+    config: {
+      width: "479px",
+    },
+    childrenKeys: ["contactDisplayName"],
+  },
+}
 
 export default view
diff --git a/libs/generic-view/models/src/lib/device.ts b/libs/generic-view/models/src/lib/device.ts
index dcb4d9895e..2187ab70e0 100644
--- a/libs/generic-view/models/src/lib/device.ts
+++ b/libs/generic-view/models/src/lib/device.ts
@@ -9,14 +9,9 @@ import { DeviceProperties } from "device-manager/models"
 import { ApiConfig, MenuConfig, OverviewData } from "device/models"
 import { DeviceId } from "Core/device/constants/device-id"
 
-export interface GenericForm {
-  fields: Record<string, unknown>
-}
-
 interface Feature<Data = Record<string, unknown>> {
   config?: View
   data?: Data
-  forms?: Record<string, GenericForm>
 }
 
 export type Features = {
diff --git a/libs/generic-view/models/src/lib/table.ts b/libs/generic-view/models/src/lib/table.ts
index 947045cfbe..691ed46ccb 100644
--- a/libs/generic-view/models/src/lib/table.ts
+++ b/libs/generic-view/models/src/lib/table.ts
@@ -11,18 +11,11 @@ export type TableData = z.infer<typeof dataValidator>
 
 const configValidator = z.object({
   formOptions: z.object({
+    formKey: z.string().optional(),
     activeIdFieldName: z.string().optional(),
     selectedIdsFieldName: z.string().optional(),
     allIdsFieldName: z.string().optional(),
   }),
-  form: z.object({
-    formName: z.string(),
-    assignFields: z.object({
-      activeIdFieldName: z.string().optional(),
-      selectedIdsFieldName: z.string().optional(),
-      allIdsFieldName: z.string().optional(),
-    }),
-  }),
   columnsNames: z.array(z.string()).optional(),
 })
 
diff --git a/libs/generic-view/store/src/index.ts b/libs/generic-view/store/src/index.ts
index 64f6fabc7f..64747407b0 100644
--- a/libs/generic-view/store/src/index.ts
+++ b/libs/generic-view/store/src/index.ts
@@ -68,6 +68,3 @@ export * from "./lib/toasts/actions"
 export * from "./lib/toasts/open-toast.action"
 
 export * from "./lib/action-names"
-
-export * from "./lib/use-form-field"
-export * from "./lib/use-form-register"
diff --git a/libs/generic-view/store/src/lib/action-names.ts b/libs/generic-view/store/src/lib/action-names.ts
index c4e05f6984..f3e40e197a 100644
--- a/libs/generic-view/store/src/lib/action-names.ts
+++ b/libs/generic-view/store/src/lib/action-names.ts
@@ -98,13 +98,12 @@ export enum ActionName {
   MscFlashingAbort = "msc-flashing/abort",
   MscFlashingSetInitialState = "msc-flashing/set-initial-state",
 
+  LoadEntities = "entities/load-entities",
   GetEntitiesConfig = "entities/get-entities-config",
-  SetEntitiesConfig = "entities/set-entities-config",
-  SetEntitiesData = "entities/set-entities-data",
   SetEntityData = "entities/set-entity-data",
+  GetEntitiesMetadata = "entities/get-entities-metadata",
   GetEntitiesData = "entities/get-entities-data",
   GetEntityData = "entities/get-entity-data",
-  SetEntitiesMetadata = "entities/set-entities-metadata",
   ClearEntitiesData = "entities/clear-entities-data",
   DeleteEntityData = "entities/delete-entity-data",
   CreateEntityData = "entities/create-entity-data",
diff --git a/libs/generic-view/store/src/lib/entities/actions.ts b/libs/generic-view/store/src/lib/entities/actions.ts
index b65095e88e..aeda8e1bf6 100644
--- a/libs/generic-view/store/src/lib/entities/actions.ts
+++ b/libs/generic-view/store/src/lib/entities/actions.ts
@@ -5,27 +5,9 @@
 
 import { createAction } from "@reduxjs/toolkit"
 import { ActionName } from "../action-names"
-import {
-  EntityData,
-  EntitiesMetadata,
-  EntitiesConfig,
-  EntityId,
-} from "device/models"
+import { EntityData, EntityId } from "device/models"
 import { DeviceId } from "Core/device/constants/device-id"
 
-export const setEntitiesConfig = createAction<{
-  entitiesType: string
-  config: EntitiesConfig
-  idFieldKey: string
-  deviceId: DeviceId
-}>(ActionName.SetEntitiesConfig)
-
-export const setEntitiesMetadata = createAction<{
-  entitiesType: string
-  metadata: EntitiesMetadata
-  deviceId: DeviceId
-}>(ActionName.SetEntitiesMetadata)
-
 export const setEntityData = createAction<{
   entitiesType: string
   entityId: EntityId
diff --git a/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
index f6da0077da..cadc40dad3 100644
--- a/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/delete-entities-data.action.ts
@@ -11,6 +11,7 @@ import { ActionName } from "../action-names"
 import { EntityId } from "device/models"
 import { difference } from "lodash"
 import delayResponse from "@appnroll/delay-response"
+import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
 
 interface DeleteEntitiesDataActionPayload {
   entitiesType: string
@@ -28,7 +29,7 @@ export const deleteEntitiesDataAction = createAsyncThunk<
   ActionName.DeleteEntityData,
   async (
     { entitiesType, ids, deviceId, onSuccess, onError },
-    { rejectWithValue }
+    { rejectWithValue, dispatch }
   ) => {
     const response = await delayResponse(
       deleteEntitiesDataRequest({
@@ -42,12 +43,10 @@ export const deleteEntitiesDataAction = createAsyncThunk<
       await onError?.()
       return rejectWithValue(response.error)
     }
-    // TODO: consider handling partial success
-    if (response.data?.failedIds) {
-      await onSuccess?.()
-      return difference(ids, response.data.failedIds)
-    }
     await onSuccess?.()
-    return ids
+    await dispatch(getEntitiesMetadataAction({ entitiesType, deviceId }))
+    return response.data?.failedIds
+      ? difference(ids, response.data.failedIds)
+      : ids
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
index 6201c2a93f..f4b9c67f75 100644
--- a/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
+++ b/libs/generic-view/store/src/lib/entities/get-entities-config.action.ts
@@ -7,42 +7,36 @@ import { createAsyncThunk } from "@reduxjs/toolkit"
 import { ActionName } from "../action-names"
 import { getEntitiesConfigRequest } from "device/feature"
 import { DeviceId } from "Core/device/constants/device-id"
-import { setEntitiesConfig } from "./actions"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
-import { getEntitiesDataAction } from "./get-entities-data.action"
+import { EntitiesConfig } from "device/models"
+
+type GetEntitiesConfigActionPayload = {
+  config: EntitiesConfig
+  idFieldKey: string
+}
 
 export const getEntitiesConfigAction = createAsyncThunk<
-  undefined,
-  { deviceId: DeviceId; entitiesTypes?: string[] },
+  GetEntitiesConfigActionPayload,
+  { deviceId: DeviceId; entitiesType: string },
   { state: ReduxRootState }
 >(
   ActionName.GetEntitiesConfig,
-  async ({ deviceId, entitiesTypes = [] }, { rejectWithValue, dispatch }) => {
-    for (const entitiesType of entitiesTypes) {
-      const response = await getEntitiesConfigRequest({
-        deviceId,
-        entitiesType,
-      })
-      if (!response.ok) {
-        return rejectWithValue(response.error)
-      }
-      const config = response.data
-      const idFieldKey = Object.entries(config.fields).find(
-        ([, field]) => field.type === "id"
-      )![0]
+  async ({ deviceId, entitiesType }, { rejectWithValue, dispatch }) => {
+    const response = await getEntitiesConfigRequest({
+      deviceId,
+      entitiesType,
+    })
+    if (!response.ok) {
+      return rejectWithValue(response.error)
+    }
+    const config = response.data
+    const idFieldKey = Object.entries(config.fields).find(
+      ([, field]) => field.type === "id"
+    )![0]
 
-      dispatch(
-        setEntitiesConfig({
-          entitiesType,
-          config,
-          idFieldKey,
-          deviceId,
-        })
-      )
-      await dispatch(getEntitiesMetadataAction({ entitiesType, deviceId }))
-      dispatch(getEntitiesDataAction({ entitiesType, deviceId }))
+    return {
+      config,
+      idFieldKey,
     }
-    return
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
index 529955d562..a4c8a8c5af 100644
--- a/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
+++ b/libs/generic-view/store/src/lib/entities/get-entities-metadata.action.ts
@@ -6,26 +6,19 @@
 import { createAsyncThunk } from "@reduxjs/toolkit"
 import { ActionName } from "../action-names"
 import { getEntitiesMetadataRequest } from "device/feature"
-import { setEntitiesMetadata } from "./actions"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { EntitiesMetadata } from "device/models"
 
 export const getEntitiesMetadataAction = createAsyncThunk<
-  undefined,
+  EntitiesMetadata,
   Required<Parameters<typeof getEntitiesMetadataRequest>[0]>,
   { state: ReduxRootState }
->(ActionName.GetEntitiesData, async (data, { rejectWithValue, dispatch }) => {
+>(ActionName.GetEntitiesMetadata, async (data, { rejectWithValue }) => {
   const response = await getEntitiesMetadataRequest(data)
 
   if (!response.ok) {
     return rejectWithValue(response.error)
   }
 
-  dispatch(
-    setEntitiesMetadata({
-      entitiesType: data.entitiesType,
-      metadata: response.data,
-      deviceId: data.deviceId,
-    })
-  )
-  return
+  return response.data
 })
diff --git a/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
index f5d07b03b2..54e7896a2d 100644
--- a/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/get-entity-data.action.ts
@@ -10,14 +10,13 @@ import {
   getEntitiesDataRequest,
   readEntityDataFromFileRequest,
 } from "device/feature"
-import { setEntityData } from "./actions"
 import { DeviceId } from "Core/device/constants/device-id"
 import { EntitiesFileData, EntityId, EntityJsonData } from "device/models"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { getFile } from "../file-transfer/get-file.action"
 
 export const getEntityDataAction = createAsyncThunk<
-  undefined,
+  Record<string, unknown>,
   {
     entitiesType: string
     entityId: EntityId
@@ -63,26 +62,9 @@ export const getEntityDataAction = createAsyncThunk<
       if (!readFileResponse.ok) {
         return rejectWithValue(readFileResponse.error)
       }
-      dispatch(
-        setEntityData({
-          entitiesType,
-          entityId,
-          data: readFileResponse.data.data,
-          deviceId,
-        })
-      )
-      return
+      return readFileResponse.data.data
     } else {
-      const { data } = response.data as EntityJsonData
-      dispatch(
-        setEntityData({
-          entitiesType,
-          entityId,
-          data,
-          deviceId,
-        })
-      )
-      return
+      return (response.data as EntityJsonData).data
     }
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/load-entities.action.ts b/libs/generic-view/store/src/lib/entities/load-entities.action.ts
new file mode 100644
index 0000000000..969740af56
--- /dev/null
+++ b/libs/generic-view/store/src/lib/entities/load-entities.action.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { createAsyncThunk } from "@reduxjs/toolkit"
+import { ActionName } from "../action-names"
+import { DeviceId } from "Core/device/constants/device-id"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { getEntitiesConfigAction } from "./get-entities-config.action"
+import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
+import { getEntitiesDataAction } from "./get-entities-data.action"
+
+export const loadEntities = createAsyncThunk<
+  void,
+  { deviceId: DeviceId; entitiesTypes?: string[] },
+  { state: ReduxRootState }
+>(
+  ActionName.LoadEntities,
+  async ({ deviceId, entitiesTypes = [] }, { dispatch }) => {
+    for (const entitiesType of entitiesTypes) {
+      await dispatch(
+        getEntitiesConfigAction({
+          deviceId,
+          entitiesType,
+        })
+      )
+      await dispatch(getEntitiesMetadataAction({ entitiesType, deviceId }))
+      await dispatch(getEntitiesDataAction({ entitiesType, deviceId }))
+    }
+  }
+)
diff --git a/libs/generic-view/store/src/lib/entities/reducer.ts b/libs/generic-view/store/src/lib/entities/reducer.ts
index 1e3f45cc30..85fde81b71 100644
--- a/libs/generic-view/store/src/lib/entities/reducer.ts
+++ b/libs/generic-view/store/src/lib/entities/reducer.ts
@@ -5,17 +5,14 @@
 
 import { createReducer } from "@reduxjs/toolkit"
 import { EntitiesConfig, EntitiesMetadata, EntityData } from "device/models"
-import {
-  clearEntities,
-  setEntitiesConfig,
-  setEntitiesMetadata,
-  setEntityData,
-} from "./actions"
+import { clearEntities, setEntityData } from "./actions"
 import { getEntitiesDataAction } from "./get-entities-data.action"
 import { DeviceId } from "Core/device/constants/device-id"
 import { deleteEntitiesDataAction } from "./delete-entities-data.action"
 import { createEntityDataAction } from "./create-entity-data.action"
 import { updateEntityDataAction } from "./update-entity-data.action"
+import { getEntitiesConfigAction } from "./get-entities-config.action"
+import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
 
 type EntitiesType = string
 
@@ -38,9 +35,8 @@ interface EntitiesState {
 const initialState: EntitiesState = {}
 
 export const genericEntitiesReducer = createReducer(initialState, (builder) => {
-  builder.addCase(setEntitiesConfig, (state, action) => {
-    const { deviceId, entitiesType } = action.payload
-
+  builder.addCase(getEntitiesConfigAction.fulfilled, (state, action) => {
+    const { deviceId, entitiesType } = action.meta.arg
     if (!state[deviceId]) {
       state[deviceId] = {
         [entitiesType]: {
@@ -85,9 +81,9 @@ export const genericEntitiesReducer = createReducer(initialState, (builder) => {
       state[deviceId][entitiesType]!.data![entityIndex!] = data
     }
   })
-  builder.addCase(setEntitiesMetadata, (state, action) => {
-    const { deviceId, entitiesType, metadata } = action.payload
-    state[deviceId][entitiesType]!.metadata = metadata
+  builder.addCase(getEntitiesMetadataAction.fulfilled, (state, action) => {
+    const { deviceId, entitiesType } = action.meta.arg
+    state[deviceId][entitiesType]!.metadata = action.payload
   })
   builder.addCase(clearEntities, (state, action) => {
     state[action.payload.deviceId] = {}
diff --git a/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts b/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
index e6458bd14a..dd5109d53a 100644
--- a/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
+++ b/libs/generic-view/store/src/lib/features/get-generic-config.actions.ts
@@ -10,6 +10,7 @@ import { FeaturesActions } from "./featues-action-keys"
 import { View } from "generic-view/utils"
 import { getFeatureConfigRequest } from "device/feature"
 import { transformGenericComponents } from "./transform-generic-components"
+import devViews from "../../../../feature/src/lib/use-dev-views/views"
 
 export const getGenericConfig = createAsyncThunk<
   {
@@ -25,7 +26,18 @@ export const getGenericConfig = createAsyncThunk<
     const response = await getFeatureConfigRequest(deviceId, feature)
 
     if (response.ok) {
-      const fullView = transformGenericComponents(response.data)
+      let fullView = transformGenericComponents(response.data)
+
+      if (process.env.DEV_API_CONFIG === "1") {
+        const devConfig =
+          feature in devViews
+            ? devViews[feature as keyof typeof devViews]
+            : undefined
+        fullView = {
+          ...fullView,
+          ...devConfig,
+        }
+      }
 
       return { deviceId, feature, view: fullView }
     }
diff --git a/libs/generic-view/store/src/lib/get-api-config.ts b/libs/generic-view/store/src/lib/get-api-config.ts
index 3af59038a1..83154d837e 100644
--- a/libs/generic-view/store/src/lib/get-api-config.ts
+++ b/libs/generic-view/store/src/lib/get-api-config.ts
@@ -12,7 +12,7 @@ import { ActionName } from "./action-names"
 import { getAllFeatures } from "./features/get-all-features"
 import { getMenuConfig } from "./get-menu-config"
 import { ResultObject } from "Core/core/builder"
-import { getEntitiesConfigAction } from "./entities/get-entities-config.action"
+import { loadEntities } from "./entities/load-entities.action"
 
 export const getAPIConfig = createAsyncThunk<
   { deviceId: string; apiConfig: ApiConfig },
@@ -29,16 +29,19 @@ export const getAPIConfig = createAsyncThunk<
     } while (retry && retires++ < retryLimit && !response.ok)
 
     if (response.ok) {
-      await dispatch(getMenuConfig({ deviceId }))
-      await dispatch(
-        getAllFeatures({ deviceId, features: response.data.features })
-      )
-      dispatch(
-        getEntitiesConfigAction({
-          deviceId,
-          entitiesTypes: response.data.entityTypes,
-        })
-      )
+      const menuResponse = await dispatch(getMenuConfig({ deviceId }))
+
+      if (menuResponse.meta.requestStatus === "fulfilled") {
+        await dispatch(
+          getAllFeatures({ deviceId, features: response.data.features })
+        )
+        dispatch(
+          loadEntities({
+            deviceId,
+            entitiesTypes: response.data.entityTypes,
+          })
+        )
+      }
 
       return { deviceId, apiConfig: response.data }
     }
diff --git a/libs/generic-view/store/src/lib/selectors/entities.ts b/libs/generic-view/store/src/lib/selectors/entities.ts
index 7c1f445094..89eaab4351 100644
--- a/libs/generic-view/store/src/lib/selectors/entities.ts
+++ b/libs/generic-view/store/src/lib/selectors/entities.ts
@@ -34,6 +34,11 @@ const selectEntities = createSelector(
   }
 )
 
+export const selectEntitiesMetadata = createSelector(
+  selectEntities,
+  (entities) => entities?.metadata
+)
+
 export const selectEntitiesData = createSelector(
   selectEntities,
   (entities) => entities?.data
diff --git a/libs/generic-view/store/src/lib/selectors/view.ts b/libs/generic-view/store/src/lib/selectors/view.ts
index e740adc5aa..333f3b27b8 100644
--- a/libs/generic-view/store/src/lib/selectors/view.ts
+++ b/libs/generic-view/store/src/lib/selectors/view.ts
@@ -26,13 +26,3 @@ export const selectViewData = createSelector(
   selectView,
   (config) => config?.data
 )
-
-const selectViewForms = createSelector(selectView, (config) => config?.forms)
-
-export const selectViewForm = createSelector(
-  selectViewForms,
-  (state: ReduxRootState, { formName }: { formName: string }) => formName,
-  (forms, formName) => {
-    return forms?.[formName]
-  }
-)
diff --git a/libs/generic-view/store/src/lib/use-form-field.ts b/libs/generic-view/store/src/lib/use-form-field.ts
deleted file mode 100644
index 807819cb12..0000000000
--- a/libs/generic-view/store/src/lib/use-form-field.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { useDispatch, useSelector } from "react-redux"
-import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { selectActiveApiDeviceId } from "./selectors/select-active-api-device-id"
-import { selectViewForm } from "./selectors"
-import { setFormField } from "./views/actions"
-import { get } from "lodash"
-import { useCallback } from "react"
-import { useCurrentViewKey } from "generic-view/utils"
-
-interface UseViewForm {
-  formName?: string
-}
-
-export const useFormField = ({ formName }: UseViewForm) => {
-  const viewKey = useCurrentViewKey()
-  const dispatch = useDispatch<Dispatch>()
-  const activeDeviceId = useSelector(selectActiveApiDeviceId)
-  const form = useSelector((state: ReduxRootState) => {
-    if (!formName) return undefined
-    return selectViewForm(state, { formName, viewKey })
-  })
-
-  const getValue = useCallback(
-    (field: string) => {
-      return field && form?.fields ? get(form.fields, field) : undefined
-    },
-    [form?.fields]
-  )
-
-  const setValue = useCallback(
-    (field: string, value: unknown) => {
-      if (!activeDeviceId || !field || !formName) return
-      dispatch(
-        setFormField({
-          field,
-          value,
-          deviceId: activeDeviceId,
-          feature: viewKey,
-          formName,
-        })
-      )
-    },
-    [activeDeviceId, dispatch, formName, viewKey]
-  )
-
-  return {
-    getValue,
-    setValue,
-  }
-}
diff --git a/libs/generic-view/store/src/lib/use-form-register.ts b/libs/generic-view/store/src/lib/use-form-register.ts
deleted file mode 100644
index ba628968e2..0000000000
--- a/libs/generic-view/store/src/lib/use-form-register.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { useDispatch, useSelector } from "react-redux"
-import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
-import { selectActiveApiDeviceId } from "./selectors/select-active-api-device-id"
-import { registerForm } from "./views/actions"
-import { useEffect } from "react"
-import { selectViewForm } from "./selectors"
-import { useCurrentViewKey } from "generic-view/utils"
-
-interface UseViewForm {
-  formName: string
-  options?: {
-    defaultValues?: Record<string, unknown>
-  }
-}
-
-export const useFormRegister = ({ formName, options }: UseViewForm) => {
-  const viewKey = useCurrentViewKey()
-  const dispatch = useDispatch<Dispatch>()
-  const activeDeviceId = useSelector(selectActiveApiDeviceId)
-  const form = useSelector((state: ReduxRootState) => {
-    return selectViewForm(state, { formName, viewKey })
-  })
-
-  useEffect(() => {
-    if (!activeDeviceId || form) return
-    const { defaultValues = {} } = options || {}
-    dispatch(
-      registerForm({
-        deviceId: activeDeviceId,
-        feature: viewKey,
-        formName,
-        form: {
-          fields: defaultValues,
-        },
-      })
-    )
-  }, [activeDeviceId, dispatch, form, formName, options, viewKey])
-}
diff --git a/libs/generic-view/store/src/lib/views/actions.ts b/libs/generic-view/store/src/lib/views/actions.ts
index 29683f1cf1..34a4665fa5 100644
--- a/libs/generic-view/store/src/lib/views/actions.ts
+++ b/libs/generic-view/store/src/lib/views/actions.ts
@@ -9,7 +9,6 @@ import { DeviceState } from "device-manager/models"
 import { DeviceBaseProperties } from "device-protocol/models"
 import { MenuElement } from "Core/__deprecated__/renderer/constants/menu-elements"
 import { ActionName } from "../action-names"
-import { GenericForm } from "generic-view/models"
 
 export const addDevice = createAction<
   DeviceBaseProperties & Partial<{ state: DeviceState.Failed }>
@@ -27,21 +26,6 @@ export const setDeviceState = createAction<{ id: string; state: DeviceState }>(
   ActionName.SetDeviceState
 )
 
-export const registerForm = createAction<{
-  formName: string
-  form: GenericForm
-  feature: string
-  deviceId: string
-}>(ActionName.RegisterForm)
-
-export const setFormField = createAction<{
-  formName: string
-  field: string
-  value: unknown
-  feature: string
-  deviceId: string
-}>(ActionName.SetFormField)
-
 export const setGenericConfig = createAction<{
   config: View
   feature: string
diff --git a/libs/generic-view/store/src/lib/views/reducer.ts b/libs/generic-view/store/src/lib/views/reducer.ts
index 0c96215d04..6bb5a03773 100644
--- a/libs/generic-view/store/src/lib/views/reducer.ts
+++ b/libs/generic-view/store/src/lib/views/reducer.ts
@@ -18,10 +18,8 @@ import { getOutboxData } from "../outbox/get-outbox-data.action"
 import { getGenericConfig } from "../features/get-generic-config.actions"
 import {
   addDevice,
-  registerForm,
   removeDevice,
   setDeviceState,
-  setFormField,
   setGenericConfig,
   setLastRefresh,
   setMenu,
@@ -176,31 +174,6 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
       }
     }
   })
-  builder.addCase(registerForm, (state, action) => {
-    const { deviceId, feature, form, formName } = action.payload
-    state.devices[deviceId].features = {
-      ...state.devices[deviceId].features,
-      [feature]: {
-        ...state.devices[deviceId].features?.[feature],
-        forms: {
-          ...state.devices[deviceId].features?.[feature]?.forms,
-          [formName]: form,
-        },
-      },
-    }
-  })
-  builder.addCase(setFormField, (state, action) => {
-    const { deviceId, feature, formName, field, value } = action.payload
-    const viewFeature = state.devices[deviceId].features?.[feature]
-    if (
-      !viewFeature ||
-      !viewFeature.forms ||
-      !viewFeature.forms[formName] ||
-      !field
-    )
-      return
-    viewFeature.forms[formName].fields[field] = value
-  })
   // Helper action for setting custom generic config without a need of reloading the app
   builder.addCase(setGenericConfig, (state, action) => {
     const { deviceId, feature, config } = action.payload
diff --git a/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx b/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
index ff8d5aa2b9..b673a4a3e3 100644
--- a/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
+++ b/libs/generic-view/ui/src/lib/data-rows/app-portal.tsx
@@ -7,8 +7,11 @@ import { APIFC } from "generic-view/utils"
 import { AppPortalConfig } from "generic-view/models"
 import { createPortal } from "react-dom"
 
-export const AppPortal: APIFC<undefined, AppPortalConfig> = ({ children, config }) => {
-  const appHeaderElement = document.querySelector(`#${config.portal}`)
-  if (!appHeaderElement || !children) return null
-  return createPortal(children, appHeaderElement)
+export const AppPortal: APIFC<undefined, AppPortalConfig> = ({
+  children,
+  config,
+}) => {
+  const portalElement = document.querySelector(`#${config.portal}`)
+  if (!portalElement || !children) return null
+  return createPortal(children, portalElement)
 }
diff --git a/libs/generic-view/ui/src/lib/interactive/form/form.tsx b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
index 264dcd39cf..39320ba08b 100644
--- a/libs/generic-view/ui/src/lib/interactive/form/form.tsx
+++ b/libs/generic-view/ui/src/lib/interactive/form/form.tsx
@@ -3,7 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React from "react"
+import React, { useEffect } from "react"
 import { APIFC, useViewFormRegister } from "generic-view/utils"
 import { FormProvider, useForm } from "react-hook-form"
 import { TextInput } from "./input/text-input"
@@ -12,7 +12,6 @@ import { CheckboxInput } from "./input/checkbox-input"
 import { SearchInput } from "./input/search-input"
 import { FormConfig } from "generic-view/models"
 import { FormConditionalRenderer } from "./helpers/form-conditional-renderer"
-import { useFormRegister } from "generic-view/store"
 
 export const Form: APIFC<undefined, FormConfig> & {
   TextInput: typeof TextInput
@@ -25,13 +24,15 @@ export const Form: APIFC<undefined, FormConfig> & {
     mode: "onTouched",
     ...config?.formOptions,
   })
-  useViewFormRegister(componentKey!, methods)
-  useFormRegister({
-    formName: componentKey!,
-    options: {
-      defaultValues: config?.defaultValues,
-    },
-  })
+  const clear = useViewFormRegister(componentKey!, methods)
+
+  useEffect(() => {
+    return () => {
+      clear()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
   return <FormProvider {...methods}>{children}</FormProvider>
 }
 Form.TextInput = TextInput
diff --git a/libs/generic-view/ui/src/lib/table/table-cell.tsx b/libs/generic-view/ui/src/lib/table/table-cell.tsx
index 86af1b6ee0..929e1631cc 100644
--- a/libs/generic-view/ui/src/lib/table/table-cell.tsx
+++ b/libs/generic-view/ui/src/lib/table/table-cell.tsx
@@ -49,4 +49,10 @@ export const Cell = styled.td<{
   max-width: var(--cell-width);
   min-width: var(--cell-width);
   overflow: hidden;
+
+  p {
+    white-space: nowrap !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+  }
 `
diff --git a/libs/generic-view/ui/src/lib/table/table.tsx b/libs/generic-view/ui/src/lib/table/table.tsx
index d86a17e8d6..6c1ea9412a 100644
--- a/libs/generic-view/ui/src/lib/table/table.tsx
+++ b/libs/generic-view/ui/src/lib/table/table.tsx
@@ -18,7 +18,6 @@ import { TableConfig, TableData } from "generic-view/models"
 import { TableCell } from "./table-cell"
 import { P1 } from "../texts/paragraphs"
 import { difference, intersection } from "lodash"
-import { useFormField } from "generic-view/store"
 
 const rowHeight = 64
 
@@ -26,15 +25,12 @@ export const Table: APIFC<TableData, TableConfig> & {
   Cell: typeof TableCell
 } = ({ data = [], config, children, ...props }) => {
   const getFormContext = useViewFormContext()
-  const formContext = getFormContext()
+  const formContext = getFormContext(config.formOptions.formKey)
   const scrollWrapperRef = useRef<HTMLDivElement>(null)
   const [visibleRowsBounds, setVisibleRowsBounds] = useState<[number, number]>([
     -1, -1,
   ])
 
-  const { setValue: setAllIds } = useFormField({
-    formName: config.form.formName,
-  })
   const { formOptions, columnsNames } = config
   const { activeIdFieldName } = formOptions
 
@@ -47,7 +43,8 @@ export const Table: APIFC<TableData, TableConfig> & {
       if (!activeIdFieldName) return
       formContext.setValue(activeIdFieldName!, id)
     },
-    [activeIdFieldName, formContext]
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [activeIdFieldName]
   )
 
   const handleScroll = useCallback(() => {
@@ -67,9 +64,9 @@ export const Table: APIFC<TableData, TableConfig> & {
   useEffect(() => {
     if (formOptions.allIdsFieldName) {
       formContext.setValue(formOptions.allIdsFieldName, data)
-      setAllIds(formOptions.allIdsFieldName, data)
     }
-  }, [data, formContext, formOptions.allIdsFieldName, setAllIds])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [data, formOptions.allIdsFieldName])
 
   useEffect(() => {
     if (formOptions.selectedIdsFieldName) {
@@ -84,7 +81,8 @@ export const Table: APIFC<TableData, TableConfig> & {
         )
       }
     }
-  }, [data, formContext, formOptions.selectedIdsFieldName])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [data, formOptions.selectedIdsFieldName])
 
   useEffect(() => {
     const scrollWrapper = scrollWrapperRef.current
diff --git a/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx b/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
index 7d803fa1fe..0a45631f81 100644
--- a/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
+++ b/libs/generic-view/utils/src/lib/forms-provider/forms-provider.tsx
@@ -8,7 +8,7 @@ import React, {
   useCallback,
   useContext,
   useEffect,
-  useMemo,
+  useRef,
 } from "react"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { UseFormReturn } from "react-hook-form/dist/types"
@@ -17,56 +17,56 @@ import { useFormContext } from "react-hook-form"
 interface FormsContextValue {
   registerForm: (formKey: string, form: UseFormReturn) => void
   getFormContext: (formKey?: string) => UseFormReturn | undefined
+  clear: (formKey: string) => void
 }
 
 const FormsContext = createContext<FormsContextValue>({
   registerForm: () => {},
   getFormContext: () => undefined,
+  clear: () => {},
 })
 
 export const FormsProvider: FunctionComponent = ({ children }) => {
-  const formContext = useFormContext()
-  const forms = useMemo(() => {
-    return new Map<string, UseFormReturn>()
+  const forms = useRef<Record<string, UseFormReturn>>({})
+
+  const registerForm = useCallback((formKey: string, form: UseFormReturn) => {
+    if (!(formKey in forms.current)) {
+      forms.current[formKey] = form
+    }
   }, [])
 
-  const registerForm = useCallback(
-    (formKey: string, form: UseFormReturn) => {
-      forms.set(formKey, form)
-    },
-    [forms]
-  )
+  const getFormContext = useCallback((formKey?: string) => {
+    if (!formKey) {
+      throw new Error(`Form key is required`)
+    }
+    const form = forms.current[formKey]
+    if (!form) {
+      throw new Error(`Form with key ${formKey} not found`)
+    }
+    return form
+  }, [])
 
-  const getFormContext = useCallback(
-    (formKey?: string) => {
-      if (formKey) {
-        const form = forms.get(formKey)
-        if (!form) {
-          throw new Error(`Form with key ${formKey} not found`)
-        }
-        return form
-      }
-      return formContext
-    },
-    [formContext, forms]
-  )
+  const clear = useCallback((formKey: string) => {
+    delete forms.current[formKey]
+  }, [])
 
   useEffect(() => {
     return () => {
-      forms.clear()
+      forms.current = {}
     }
-  }, [forms])
+  }, [])
 
   return (
-    <FormsContext.Provider value={{ registerForm, getFormContext }}>
+    <FormsContext.Provider value={{ registerForm, getFormContext, clear }}>
       {children}
     </FormsContext.Provider>
   )
 }
 
 export const useViewFormRegister = (formKey: string, form: UseFormReturn) => {
-  const { registerForm } = useContext(FormsContext)
+  const { registerForm, clear } = useContext(FormsContext)
   registerForm(formKey, form)
+  return () => clear(formKey)
 }
 
 export const useViewFormContext = () => {
@@ -74,7 +74,8 @@ export const useViewFormContext = () => {
   const formsContext = useContext(FormsContext)
 
   return (formKey?: string) => {
-    const formContext = formsContext.getFormContext(formKey)
-    return formContext ?? defaultFormContext
+    return (
+      formKey ? formsContext.getFormContext(formKey) : defaultFormContext
+    ) as UseFormReturn
   }
 }

From a3d31d8cc1f83124a9e9e91c9b6ae0652f592ced Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Mon, 28 Oct 2024 11:50:31 +0100
Subject: [PATCH 47/64] [CP-3225] Dev Improvement: Auto-Detect Latest Flash
 Package for Harmony in Local Env (#2136)

---
 .env.example                                  |  3 ++
 .../src/lib/services/dev-flash-mode.ts        | 41 +++++++++++++++++++
 .../src/lib/services/unpack-flashing-image.ts | 23 +++++++++--
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/services/dev-flash-mode.ts

diff --git a/.env.example b/.env.example
index b935f1f01e..a0ff4369b0 100644
--- a/.env.example
+++ b/.env.example
@@ -71,3 +71,6 @@ DEV_HELP_PREVIEW_TOKEN=
 
 # [Optional] Enable DEV version of API configuration. Disabled by default, set "1" to enable
 DEV_API_CONFIG=
+
+# [Optional, only in development mode] Path to the directory with downloaded flash packages for Mudita Harmony. Uses the latest file if set.
+DEV_FLASH_PACKAGE_PATH=
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/dev-flash-mode.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/dev-flash-mode.ts
new file mode 100644
index 0000000000..b55edc625d
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/dev-flash-mode.ts
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import fs from "fs"
+import path from "path"
+
+const flashPackagePath = process.env.DEV_FLASH_PACKAGE_PATH
+
+const findLatestTarXzFile = (dir: string, extension: string): string | null => {
+  const files = fs
+    .readdirSync(dir)
+    .filter((file) => file.endsWith(extension))
+    .map((file) => ({
+      file,
+      time: fs.statSync(path.join(dir, file)).mtime.getTime(),
+    }))
+    .sort((a, b) => b.time - a.time)
+
+  return files.length > 0 ? files[0].file : null
+}
+
+export const getImageFilePathAndName = (
+  osDownloadLocation: string,
+  fileName: string,
+  extension: string
+): { flashPackagePath: string; resolvedFileName: string } => {
+  if (flashPackagePath) {
+    const fileName = findLatestTarXzFile(flashPackagePath, extension) ?? ""
+    return {
+      resolvedFileName: fileName,
+      flashPackagePath: flashPackagePath,
+    }
+  } else {
+    return {
+      resolvedFileName: fileName,
+      flashPackagePath: osDownloadLocation,
+    }
+  }
+}
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
index 2cba1c2e47..d722c68ecf 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/services/unpack-flashing-image.ts
@@ -6,6 +6,7 @@
 import getAppSettingsMain from "Core/__deprecated__/main/functions/get-app-settings"
 import path from "path"
 import { execPromise } from "shared/utils"
+import { getImageFilePathAndName } from "./dev-flash-mode"
 
 export const unpackFlashingImageService = async (
   fileName: string
@@ -15,13 +16,27 @@ export const unpackFlashingImageService = async (
   const { osDownloadLocation } = await getAppSettingsMain()
 
   if (process.platform === "darwin" || process.platform === "linux") {
-    const imageFilePath = path.join(osDownloadLocation, fileName)
+    const { flashPackagePath, resolvedFileName } = getImageFilePathAndName(
+      osDownloadLocation,
+      fileName,
+      ".tar.xz"
+    )
+    const imageFilePath = path.join(flashPackagePath, resolvedFileName)
     command = `tar -xf "${imageFilePath}" -C "${osDownloadLocation}"`
   }
   if (process.platform === "win32") {
-    const imageFilePathTarGz = path.join(osDownloadLocation, fileName)
-    const baseName = path.basename(fileName, ".tar.gz");
-    const imageFilePathTar = path.join(osDownloadLocation, `${baseName}.tar`, `${baseName}.tar`)
+    const { flashPackagePath, resolvedFileName } = getImageFilePathAndName(
+      osDownloadLocation,
+      fileName,
+      ".tar.gz"
+    )
+    const imageFilePathTarGz = path.join(flashPackagePath, resolvedFileName)
+    const baseName = path.basename(resolvedFileName, ".tar.gz")
+    const imageFilePathTar = path.join(
+      flashPackagePath,
+      `${baseName}.tar`,
+      `${baseName}.tar`
+    )
     command = `tar -xzvf "${imageFilePathTarGz}" -C "${osDownloadLocation}" && tar -xvf "${imageFilePathTar}" -C "${osDownloadLocation}" `
   }
 

From d20f0617f6d9f76a4fe8067435c6062d8fcc196c Mon Sep 17 00:00:00 2001
From: robertmudi <robert.rosloniec@mudita.com>
Date: Mon, 21 Oct 2024 08:55:10 +0200
Subject: [PATCH 48/64] CP-3183 added new test, updated help-article-page with
 2 new locators, updated wio.conf.ts and test-filenames.ts

---
 .../src/page-objects/help-article.page.ts     |  6 ++
 .../specs/help/help-link-inside-container.ts  | 62 +++++++++++++++++++
 .../consts/test-filenames.const.ts            |  1 +
 apps/mudita-center-e2e/wdio.conf.ts           |  3 +
 4 files changed, 72 insertions(+)
 create mode 100644 apps/mudita-center-e2e/src/specs/help/help-link-inside-container.ts

diff --git a/apps/mudita-center-e2e/src/page-objects/help-article.page.ts b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
index 3b1023f8d4..a0521c0f66 100644
--- a/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
+++ b/apps/mudita-center-e2e/src/page-objects/help-article.page.ts
@@ -75,6 +75,12 @@ class HelpArticlePage extends Page {
   public get helpArticleFooterVisitSupportButton() {
     return $('[data-testid="help-article-footer-button"]')
   }
+  public get helpCategories() {
+    return $$('[data-testid="help-categories-list-item"]')
+  }
+  public get connectYourDeviceLinks() {
+    return $$('[data-testid="help-article-content-block-internal-link"]')
+  }
 }
 
 export default new HelpArticlePage()
diff --git a/apps/mudita-center-e2e/src/specs/help/help-link-inside-container.ts b/apps/mudita-center-e2e/src/specs/help/help-link-inside-container.ts
new file mode 100644
index 0000000000..034ebfbb27
--- /dev/null
+++ b/apps/mudita-center-e2e/src/specs/help/help-link-inside-container.ts
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import NavigationTabs from "../../page-objects/tabs.page"
+import HelpArticlePage from "../../page-objects/help-article.page"
+import HomePage from "../../page-objects/home.page"
+
+describe("Help - Link inside container", () => {
+  before(async () => {
+    const notNowButton = await HomePage.notNowButton
+    await notNowButton.waitForDisplayed()
+    await notNowButton.click()
+  })
+
+  it("Open Help window", async () => {
+    const helpTab = await NavigationTabs.helpTab
+    await helpTab.waitForDisplayed({ timeout: 15000 })
+    await helpTab.click()
+  })
+
+  it("Open Pure Category in Help", async () => {
+    const pureCategory = HelpArticlePage.helpCategories[1]
+    await expect(pureCategory).toBeDisplayed()
+    await pureCategory.click()
+  })
+
+  it("Open second article, check if there are two containers and click on the link inside first container", async () => {
+    const secondArticle = HelpArticlePage.helpArticleItems[1]
+    await expect(secondArticle).toBeDisplayed()
+    await secondArticle.click()
+
+    //check if there are two containers in the Article
+    const contentBlocks = HelpArticlePage.helpArticleContentBlocks
+    await expect(contentBlocks).toBeElementsArrayOfSize(2)
+
+    //open link from the first container
+    const connectYourDeviceLinkFirst = HelpArticlePage.connectYourDeviceLinks[0]
+    await expect(connectYourDeviceLinkFirst).toBeDisplayed()
+    await expect(connectYourDeviceLinkFirst).toHaveText("connect your device")
+    await connectYourDeviceLinkFirst.click()
+  })
+
+  it("Check if user is redirected to article from the link", async () => {
+    const helpArticleTitle = HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toBeDisplayed()
+    await expect(helpArticleTitle).toHaveText(
+      "How to connect Mudita devices to Mudita Center"
+    )
+  })
+
+  it("Return to the main article", async () => {
+    const helpArticleBackButton = await HelpArticlePage.helpArticleBackButton
+    await expect(helpArticleBackButton).toBeClickable()
+    helpArticleBackButton.click()
+
+    const helpArticleTitle = HelpArticlePage.helpArticleTitle
+    await expect(helpArticleTitle).toBeDisplayed()
+    await expect(helpArticleTitle).toHaveText("How to delete files from Pure")
+  })
+})
diff --git a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
index 647efd2904..c94a52db37 100644
--- a/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
+++ b/apps/mudita-center-e2e/src/test-filenames/consts/test-filenames.const.ts
@@ -32,5 +32,6 @@ export enum TestFilesPaths {
   kompaktBackupModalGettingInitialInfo = "src/specs/overview/kompakt-backup-getting-initial-info.ts",
   helpVerifyFeedback = "src/specs/help/help-verify-feedback.ts",
   helpSectionSearchNoResults = "src/specs/help/help-section-search-noresults.e2e.ts",
+  helpLinkInsideContainer = "src/specs/help/help-link-inside-container.ts",
 }
 export const toRelativePath = (path: string) => `./${path}`
diff --git a/apps/mudita-center-e2e/wdio.conf.ts b/apps/mudita-center-e2e/wdio.conf.ts
index 4ebc32ee65..ad56e458b2 100644
--- a/apps/mudita-center-e2e/wdio.conf.ts
+++ b/apps/mudita-center-e2e/wdio.conf.ts
@@ -81,6 +81,7 @@ export const config: Options.Testrunner = {
     toRelativePath(TestFilesPaths.kompaktBackupModalGettingInitialInfo),
     toRelativePath(TestFilesPaths.helpVerifyFeedback),
     toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
+    toRelativePath(TestFilesPaths.helpLinkInsideContainer),
   ],
   suites: {
     standalone: [
@@ -96,6 +97,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),
       toRelativePath(TestFilesPaths.helpVerifyFeedback),
       toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
+      toRelativePath(TestFilesPaths.helpLinkInsideContainer),
     ],
     mock: [
       toRelativePath(TestFilesPaths.mcCheckForUpdatesTest),
@@ -133,6 +135,7 @@ export const config: Options.Testrunner = {
       toRelativePath(TestFilesPaths.newsMoreNews),
       toRelativePath(TestFilesPaths.helpVerifyFeedback),
       toRelativePath(TestFilesPaths.helpSectionSearchNoResults),
+      toRelativePath(TestFilesPaths.helpLinkInsideContainer),
     ],
     cicdMock: [
       toRelativePath(TestFilesPaths.contactSupportUnhappyPath),

From a604ed44d815a2b9e399a2d0c449816c8c2a2936 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 29 Oct 2024 15:54:26 +0100
Subject: [PATCH 49/64] [CP-2865] I want to perform the Call log migration from
 Pure to Kompakt  (#2150)

---
 .../renderer/locales/default/en-US.json       |   4 +-
 .../actions/read-all-indexes.action.test.ts   |   8 +-
 .../actions/read-all-indexes.action.ts        |   5 +-
 .../data-sync/constants/call-log.constant.ts} |   4 +-
 .../data-sync/constants/index.constant.ts     |   1 +
 libs/core/data-sync/constants/index.ts        |   1 +
 .../data-sync/indexes/base.indexer.test.ts    |   4 +-
 libs/core/data-sync/indexes/base.indexer.ts   |   5 +
 .../data-sync/indexes/call-log.indexer.ts     |  68 ++
 libs/core/data-sync/indexes/index.ts          |   1 +
 .../presenters/base-presenter.test.ts         |  36 +
 .../data-sync/presenters/base-presenter.ts    |  15 +
 .../call-log/call-log.presenter.test.ts       | 764 ++++++++++++++
 .../presenters/call-log/call-log.presenter.ts |  73 ++
 .../contact/contact.presenter.test.ts         |  24 -
 .../presenters/contact/contact.presenter.ts   |  12 +-
 libs/core/data-sync/presenters/index.ts       |   1 +
 .../presenters/message/message.presenter.ts   |  12 +-
 .../presenters/template/template.presenter.ts |  12 +-
 .../presenters/thread/thread.presenter.ts     |  12 +-
 .../data-sync/services/data-sync.service.ts   |  64 +-
 libs/core/data-sync/types/all-indexes.type.ts |   2 +
 .../data-sync/types/call-log-object.type.ts   |  29 +
 libs/core/data-sync/types/get-index.type.ts   |   3 +
 libs/core/data-sync/types/index.ts            |   1 +
 .../types/initialize-options.type.ts          |   3 +
 .../constants/data-index.constant.ts          |   1 +
 .../services/index-storage.service.ts         |   2 +-
 libs/device/models/src/index.ts               |   2 +-
 .../lib/data-transfer/data-transfer.test.ts   |   2 +
 .../src/lib/data-transfer/data-transfer.ts    |   2 +-
 .../models/src/lib/unified-entities/index.ts  |   8 +
 .../lib/unified-entities/unified-call-log.ts  |  30 +
 .../unified-contact.ts                        |   0
 .../lib/unified-entities/unified-message.ts   |  30 +
 .../src/lib/use-dev-views/views/index.ts      |   2 +
 .../views/mc-data-migration-view.ts           |  11 +
 .../pure-to-unified-contact.ts}               |   4 +-
 .../pure-to-unified-message.test.ts           | 956 ++++++++++++++++++
 .../pure-to-unified-message.ts                |  75 ++
 .../data-migration/transfer-migration-data.ts |  30 +-
 .../transfer-data-to-device.action.ts         |  16 +-
 42 files changed, 2240 insertions(+), 95 deletions(-)
 rename libs/{device/models/src/lib/import-contacts/index.ts => core/data-sync/constants/call-log.constant.ts} (75%)
 create mode 100644 libs/core/data-sync/indexes/call-log.indexer.ts
 create mode 100644 libs/core/data-sync/presenters/base-presenter.test.ts
 create mode 100644 libs/core/data-sync/presenters/base-presenter.ts
 create mode 100644 libs/core/data-sync/presenters/call-log/call-log.presenter.test.ts
 create mode 100644 libs/core/data-sync/presenters/call-log/call-log.presenter.ts
 create mode 100644 libs/core/data-sync/types/call-log-object.type.ts
 create mode 100644 libs/device/models/src/lib/unified-entities/index.ts
 create mode 100644 libs/device/models/src/lib/unified-entities/unified-call-log.ts
 rename libs/device/models/src/lib/{import-contacts => unified-entities}/unified-contact.ts (100%)
 create mode 100644 libs/device/models/src/lib/unified-entities/unified-message.ts
 create mode 100644 libs/generic-view/feature/src/lib/use-dev-views/views/mc-data-migration-view.ts
 rename libs/generic-view/store/src/lib/{imports/contacts-mappers/pure/map-pure-api.ts => data-migration/data-migration-mappers/pure-to-unified-contact.ts} (92%)
 create mode 100644 libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.test.ts
 create mode 100644 libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.ts

diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index 9230269ebf..df37d27476 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -966,9 +966,9 @@
   "module.genericViews.dataMigration.features.title": "Select the data you want to transfer",
   "module.genericViews.dataMigration.features.notes": "Notes (coming soon!)",
   "module.genericViews.dataMigration.features.alarms": "Alarms (coming soon!)",
-  "module.genericViews.dataMigration.features.callLog": "Call log (coming soon!)",
+  "module.genericViews.dataMigration.features.callLog": "Call log",
   "module.genericViews.dataMigration.features.contacts": "Contacts",
-  "module.genericViews.dataMigration.features.messages": "Messages (coming soon!)",
+  "module.genericViews.dataMigration.features.messages": "Messages",
   "module.genericViews.dataMigration.features.selectAll": "Select All",
   "module.genericViews.dataMigration.instruction.title": "Connect your devices",
   "module.genericViews.dataMigration.instruction.description": "Data can only be transferred from Pure to Kompakt\nand not vice versa.",
diff --git a/libs/core/data-sync/actions/read-all-indexes.action.test.ts b/libs/core/data-sync/actions/read-all-indexes.action.test.ts
index 3f4c4c930d..2ef7893968 100644
--- a/libs/core/data-sync/actions/read-all-indexes.action.test.ts
+++ b/libs/core/data-sync/actions/read-all-indexes.action.test.ts
@@ -42,7 +42,13 @@ describe("async `readAllIndexes` ", () => {
       expect(mockStore.getActions()).toEqual([
         readAllIndexes.pending(requestId),
         readAllIndexes.fulfilled(
-          { contacts: {}, messages: {}, threads: {}, templates: {} },
+          {
+            contacts: {},
+            messages: {},
+            threads: {},
+            templates: {},
+            callLog: {},
+          },
           requestId,
           undefined
         ),
diff --git a/libs/core/data-sync/actions/read-all-indexes.action.ts b/libs/core/data-sync/actions/read-all-indexes.action.ts
index a2a82cb494..5f9c5a7919 100644
--- a/libs/core/data-sync/actions/read-all-indexes.action.ts
+++ b/libs/core/data-sync/actions/read-all-indexes.action.ts
@@ -20,12 +20,14 @@ export const readAllIndexes = createAsyncThunk<AllIndexes, void>(
     const messages = await getIndexRequest(DataIndex.Message)
     const templates = await getIndexRequest(DataIndex.Template)
     const threads = await getIndexRequest(DataIndex.Thread)
+    const callLog = await getIndexRequest(DataIndex.CallLog)
 
     if (
       contacts === undefined ||
       messages === undefined ||
       templates === undefined ||
-      threads === undefined
+      threads === undefined ||
+      callLog === undefined
     ) {
       return rejectWithValue(
         new AppError(DataSyncError.ReadAllIndexes, "Read All Indexes fails")
@@ -37,6 +39,7 @@ export const readAllIndexes = createAsyncThunk<AllIndexes, void>(
       messages: messages.documentStore.docs,
       templates: templates.documentStore.docs,
       threads: threads.documentStore.docs,
+      callLog: callLog.documentStore.docs,
     }
   }
 )
diff --git a/libs/device/models/src/lib/import-contacts/index.ts b/libs/core/data-sync/constants/call-log.constant.ts
similarity index 75%
rename from libs/device/models/src/lib/import-contacts/index.ts
rename to libs/core/data-sync/constants/call-log.constant.ts
index 18ff2f27b4..1d3cf1c1f0 100644
--- a/libs/device/models/src/lib/import-contacts/index.ts
+++ b/libs/core/data-sync/constants/call-log.constant.ts
@@ -3,4 +3,6 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-export * from "./unified-contact"
+export enum CallLogTable {
+  Calls = "calls",
+}
diff --git a/libs/core/data-sync/constants/index.constant.ts b/libs/core/data-sync/constants/index.constant.ts
index f0b7ba7e36..9c43dd0b04 100644
--- a/libs/core/data-sync/constants/index.constant.ts
+++ b/libs/core/data-sync/constants/index.constant.ts
@@ -8,4 +8,5 @@ export enum DataIndex {
   Message = "message",
   Template = "template",
   Thread = "thread",
+  CallLog = "calllog",
 }
diff --git a/libs/core/data-sync/constants/index.ts b/libs/core/data-sync/constants/index.ts
index e503d3a8c0..e40c5d94c3 100644
--- a/libs/core/data-sync/constants/index.ts
+++ b/libs/core/data-sync/constants/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./call-log.constant"
 export * from "./contact.constant"
 export * from "./controller.constant"
 export * from "./message.constant"
diff --git a/libs/core/data-sync/indexes/base.indexer.test.ts b/libs/core/data-sync/indexes/base.indexer.test.ts
index 74030a978c..31713d7615 100644
--- a/libs/core/data-sync/indexes/base.indexer.test.ts
+++ b/libs/core/data-sync/indexes/base.indexer.test.ts
@@ -10,7 +10,9 @@ import { FileSystemService } from "Core/file-system/services/file-system.service
 
 jest.mock("fs")
 
-class Indexer extends BaseIndexer {}
+class Indexer extends BaseIndexer {
+  index = jest.fn()
+}
 
 const json: DirectoryJSON = {
   "sync/index.db": "",
diff --git a/libs/core/data-sync/indexes/base.indexer.ts b/libs/core/data-sync/indexes/base.indexer.ts
index ebf5edef89..cb21a953dc 100644
--- a/libs/core/data-sync/indexes/base.indexer.ts
+++ b/libs/core/data-sync/indexes/base.indexer.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import { Index } from "elasticlunr"
 import initSqlJs, { SqlJsStatic } from "sql.js"
 import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
 
@@ -30,4 +31,8 @@ export abstract class BaseIndexer {
       return null
     }
   }
+
+  // AUTO DISABLED - fix me if you like :)
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  abstract index(fileDir: string, token?: string): Promise<Index<any>>
 }
diff --git a/libs/core/data-sync/indexes/call-log.indexer.ts b/libs/core/data-sync/indexes/call-log.indexer.ts
new file mode 100644
index 0000000000..8a6d8f755c
--- /dev/null
+++ b/libs/core/data-sync/indexes/call-log.indexer.ts
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+import { Database } from "sql.js"
+import { Index } from "elasticlunr"
+import { ElasticlunrFactory } from "Core/index-storage/factories"
+import { BaseIndexer } from "Core/data-sync/indexes/base.indexer"
+import { CallLogTable } from "Core/data-sync/constants"
+import {
+  IndexerPresenter,
+  CallLogObject,
+  CallLogInput,
+} from "Core/data-sync/types"
+import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
+
+export class CallLogIndexer extends BaseIndexer {
+  constructor(
+    fileSystemService: FileSystemService,
+    private dataPresenter: IndexerPresenter<CallLogInput, CallLogObject[]>
+  ) {
+    super(fileSystemService)
+  }
+
+  // AUTO DISABLED - fix me if you like :)
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async index(fileDir: string, token?: string): Promise<any> {
+    const db = await this.initTmpDatabase(fileDir, token)
+    const object = this.dataPresenter.serializeToObject(this.loadTables(db))
+    return this.createIndex(object)
+  }
+
+  private createIndex(data: CallLogObject[]): Index<CallLogObject> {
+    const index = ElasticlunrFactory.create<CallLogObject>()
+
+    index.setRef("id")
+    index.addField("phone")
+    index.addField("callDate")
+    index.addField("callDuration")
+    index.addField("presentation")
+    index.addField("callType")
+    index.addField("isRead")
+
+    data.forEach((item) => {
+      index.addDoc(item)
+    })
+
+    return index
+  }
+
+  private loadTables(db: Database) {
+    return {
+      [CallLogTable.Calls]: db.exec(
+        `SELECT _id, number, e164number, presentation, date, duration, type, name, contactId, isRead FROM ${CallLogTable.Calls};`
+      )[0] as unknown as CallLogInput["calls"],
+    }
+  }
+
+  private async initTmpDatabase(
+    fileDir: string,
+    token?: string
+  ): Promise<Database> {
+    const data = await this.getData(path.join(fileDir, "calllog.db"), token)
+    return new (await this.sql).Database(data)
+  }
+}
diff --git a/libs/core/data-sync/indexes/index.ts b/libs/core/data-sync/indexes/index.ts
index 6d4f15f0c1..46f5b2332f 100644
--- a/libs/core/data-sync/indexes/index.ts
+++ b/libs/core/data-sync/indexes/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./call-log.indexer"
 export * from "./contact.indexer"
 export * from "./message.indexer"
 export * from "./template.indexer"
diff --git a/libs/core/data-sync/presenters/base-presenter.test.ts b/libs/core/data-sync/presenters/base-presenter.test.ts
new file mode 100644
index 0000000000..c0afc80ee4
--- /dev/null
+++ b/libs/core/data-sync/presenters/base-presenter.test.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
+
+class TestPresenter extends BasePresenter {
+  public serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
+    return super.serializeRecord(values, columns)
+  }
+}
+
+const presenter = new TestPresenter()
+
+test("`serializeRecord` serialize record properly", async () => {
+  const contactNameEntity = {
+    _id: "4",
+    contact_id: "4",
+    name_primary: "Theron",
+    name_alternative: "Paucek",
+  }
+
+  const values: string[][] = [["4", "4", "Theron", "Paucek"]]
+
+  const columns: string[] = [
+    "_id",
+    "contact_id",
+    "name_primary",
+    "name_alternative",
+  ]
+
+  const records = presenter.serializeRecord<typeof contactNameEntity>(values, columns)
+  expect(records).toHaveLength(1)
+  expect(records).toEqual([contactNameEntity])
+})
diff --git a/libs/core/data-sync/presenters/base-presenter.ts b/libs/core/data-sync/presenters/base-presenter.ts
new file mode 100644
index 0000000000..e82becdd94
--- /dev/null
+++ b/libs/core/data-sync/presenters/base-presenter.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export abstract class BasePresenter{
+  protected serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
+    return values.map((item) => {
+      return columns.reduce((acc: Record<string, string>, value, index) => {
+        acc[value.trim()] = String(item[index]).trim()
+        return acc
+      }, {})
+    }) as unknown as Type[]
+  }
+}
diff --git a/libs/core/data-sync/presenters/call-log/call-log.presenter.test.ts b/libs/core/data-sync/presenters/call-log/call-log.presenter.test.ts
new file mode 100644
index 0000000000..797e0d947e
--- /dev/null
+++ b/libs/core/data-sync/presenters/call-log/call-log.presenter.test.ts
@@ -0,0 +1,764 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { CallLogInput, CallLogObject } from "Core/data-sync/types"
+import { CallLogPresenter } from "./call-log.presenter"
+
+const presenter = new CallLogPresenter()
+
+describe("CallLogPresenter - serializeToObject", () => {
+  describe("basic serialization", () => {
+    test("serializes a call log with all fields defined", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "1",
+              "123456789",
+              "+48123456789",
+              "1633036800",
+              "180",
+              "1",
+              "0",
+              "2",
+            ],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "1",
+          phone: "+48123456789",
+          callDate: 1633036800000,
+          callDuration: 180,
+          callType: "TYPE_INCOMING",
+          isRead: false,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles multiple call log entries", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "2",
+              "987654321",
+              "+4987654321",
+              "1633036800",
+              "120",
+              "2",
+              "1",
+              "0",
+            ],
+            ["3", "", "+49321321321", "1633036800", "90", "3", "0", "1"],
+            ["4", "555555555", "", "1633036800", "60", "99", "0", "3"],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "2",
+          phone: "+4987654321",
+          callDate: 1633036800000,
+          callDuration: 120,
+          callType: "TYPE_OUTGOING",
+          isRead: true,
+          presentation: "PRESENTATION_UNKNOWN", // Mapped from "0"
+        },
+        {
+          id: "3",
+          phone: "+49321321321",
+          callDate: 1633036800000,
+          callDuration: 90,
+          callType: "TYPE_MISSED",
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "4",
+          phone: "555555555",
+          callDate: 1633036800000,
+          callDuration: 60,
+          callType: "TYPE_OTHER", // TYPE_OTHER for unknown types
+          isRead: false,
+          presentation: "PRESENTATION_RESTRICTED", // Mapped from "3"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("phone field", () => {
+    test("uses `number` when `e164number` is empty", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [["2", "987654321", "", "1633036800", "120", "2", "1", "1"]],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "2",
+          phone: "987654321",
+          callDate: 1633036800000,
+          callDuration: 120,
+          callType: "TYPE_OUTGOING",
+          isRead: true,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("sets default `phone` as empty string when both `number` and `e164number` are missing", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [["5", "", "", "1633036800", "0", "1", "1", "2"]],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "5",
+          phone: "",
+          callDate: 1633036800000,
+          callDuration: 0,
+          callType: "TYPE_INCOMING",
+          isRead: true,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("isRead mapping", () => {
+    test("correctly maps `isRead`", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "9",
+              "111111111",
+              "+48111111111",
+              "1633036800",
+              "60",
+              "1",
+              "0",
+              "1",
+            ],
+            [
+              "10",
+              "222222222",
+              "+48222222222",
+              "1633036800",
+              "120",
+              "2",
+              "1",
+              "2",
+            ],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "9",
+          phone: "+48111111111",
+          callDate: 1633036800000,
+          callDuration: 60,
+          callType: "TYPE_INCOMING",
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "10",
+          phone: "+48222222222",
+          callDate: 1633036800000,
+          callDuration: 120,
+          callType: "TYPE_OUTGOING",
+          isRead: true,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("ignores invalid `isRead` values, defaults to 0", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "8",
+              "222222222",
+              "+48222222222",
+              "1633036800",
+              "15",
+              "1",
+              "invalid",
+              "3",
+            ],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "8",
+          phone: "+48222222222",
+          callDate: 1633036800000,
+          callDuration: 15,
+          callType: "TYPE_INCOMING",
+          isRead: true,
+          presentation: "PRESENTATION_RESTRICTED", // Mapped from "3"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("call type mapping", () => {
+    test("correctly maps all call types", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "11",
+              "111111111",
+              "+48111111111",
+              "1633036800",
+              "60",
+              "0",
+              "1",
+              "2",
+            ], // CT_NONE
+            [
+              "12",
+              "222222222",
+              "+48222222222",
+              "1633036800",
+              "120",
+              "1",
+              "0",
+              "1",
+            ], // CT_INCOMING
+            [
+              "13",
+              "333333333",
+              "+48333333333",
+              "1633036800",
+              "180",
+              "2",
+              "1",
+              "3",
+            ], // CT_OUTGOING
+            [
+              "14",
+              "444444444",
+              "+48444444444",
+              "1633036800",
+              "90",
+              "3",
+              "0",
+              "1",
+            ], // CT_MISSED
+            [
+              "15",
+              "555555555",
+              "+48555555555",
+              "1633036800",
+              "200",
+              "4",
+              "1",
+              "0",
+            ], // CT_VOICEMAIL
+            [
+              "16",
+              "666666666",
+              "+48666666666",
+              "1633036800",
+              "30",
+              "5",
+              "0",
+              "2",
+            ], // CT_REJECTED
+            [
+              "17",
+              "777777777",
+              "+48777777777",
+              "1633036800",
+              "45",
+              "6",
+              "1",
+              "1",
+            ], // CT_BLOCKED
+            [
+              "18",
+              "888888888",
+              "+48888888888",
+              "1633036800",
+              "75",
+              "7",
+              "0",
+              "0",
+            ], // CT_ANSW_EXT
+            [
+              "19",
+              "999999999",
+              "+48999999999",
+              "1633036800",
+              "150",
+              "99",
+              "1",
+              "2",
+            ], // Unknown type
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "11",
+          phone: "+48111111111",
+          callDate: 1633036800000,
+          callDuration: 60,
+          callType: "TYPE_OTHER", // CT_NONE maps to TYPE_OTHER
+          isRead: true,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+        {
+          id: "12",
+          phone: "+48222222222",
+          callDate: 1633036800000,
+          callDuration: 120,
+          callType: "TYPE_INCOMING", // CT_INCOMING
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "13",
+          phone: "+48333333333",
+          callDate: 1633036800000,
+          callDuration: 180,
+          callType: "TYPE_OUTGOING", // CT_OUTGOING
+          isRead: true,
+          presentation: "PRESENTATION_RESTRICTED", // Mapped from "3"
+        },
+        {
+          id: "14",
+          phone: "+48444444444",
+          callDate: 1633036800000,
+          callDuration: 90,
+          callType: "TYPE_MISSED", // CT_MISSED
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "15",
+          phone: "+48555555555",
+          callDate: 1633036800000,
+          callDuration: 200,
+          callType: "TYPE_VOICEMAIL", // CT_VOICEMAIL
+          isRead: true,
+          presentation: "PRESENTATION_UNKNOWN", // Mapped from "0"
+        },
+        {
+          id: "16",
+          phone: "+48666666666",
+          callDate: 1633036800000,
+          callDuration: 30,
+          callType: "TYPE_REJECTED", // CT_REJECTED
+          isRead: false,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+        {
+          id: "17",
+          phone: "+48777777777",
+          callDate: 1633036800000,
+          callDuration: 45,
+          callType: "TYPE_BLOCKED", // CT_BLOCKED
+          isRead: true,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "18",
+          phone: "+48888888888",
+          callDate: 1633036800000,
+          callDuration: 75,
+          callType: "TYPE_ANSWERED_EXTERNALLY", // CT_ANSW_EXT
+          isRead: false,
+          presentation: "PRESENTATION_UNKNOWN", // Mapped from "0"
+        },
+        {
+          id: "19",
+          phone: "+48999999999",
+          callDate: 1633036800000,
+          callDuration: 150,
+          callType: "TYPE_OTHER", // Unknown type maps to TYPE_OTHER
+          isRead: true,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("sets default `callType` to 8 for unknown types", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "4",
+              "555555555",
+              "+49555555555",
+              "1633036800",
+              "60",
+              "99",
+              "0",
+              "1",
+            ],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "4",
+          phone: "+49555555555",
+          callDate: 1633036800000,
+          callDuration: 60,
+          callType: "TYPE_OTHER", // TYPE_OTHER for unknown typ"TYPE_OUTGOINGs
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("presentation type mapping", () => {
+    test("correctly maps all presentation types", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "2",
+              "987654321",
+              "+4987654321",
+              "1633036800",
+              "120",
+              "2",
+              "1",
+              "0",
+            ],
+            ["3", "", "+49321321321", "1633036800", "90", "3", "0", "1"],
+            ["4", "555555555", "", "1633036800", "60", "99", "0", "3"],
+            ["5", "666666666", "", "1633036800", "90", "1", "1", "4"],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "2",
+          phone: "+4987654321",
+          callDate: 1633036800000,
+          callDuration: 120,
+          callType: "TYPE_OUTGOING",
+          isRead: true,
+          presentation: "PRESENTATION_UNKNOWN", // Mapped from "0"
+        },
+        {
+          id: "3",
+          phone: "+49321321321",
+          callDate: 1633036800000,
+          callDuration: 90,
+          callType: "TYPE_MISSED",
+          isRead: false,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+        {
+          id: "4",
+          phone: "555555555",
+          callDate: 1633036800000,
+          callDuration: 60,
+          callType: "TYPE_OTHER", // TYPE_OTHER for unknown types
+          isRead: false,
+          presentation: "PRESENTATION_RESTRICTED", // Mapped from "3"
+        },
+        {
+          id: "5",
+          phone: "666666666",
+          callDate: 1633036800000,
+          callDuration: 90,
+          callType: "TYPE_INCOMING",
+          isRead: true,
+          presentation: "PRESENTATION_UNKNOWN", // Defaults to "3" for unknown presentation "4"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles missing presentation values, defaults to `3`", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            [
+              "6",
+              "999999999",
+              "+48999999999",
+              "1633036800",
+              "150",
+              "3",
+              "0",
+              "",
+            ], // presentation is empty
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "6",
+          phone: "+48999999999",
+          callDate: 1633036800000,
+          callDuration: 150,
+          callType: "TYPE_MISSED",
+          isRead: false,
+          presentation: "PRESENTATION_UNKNOWN", // Defaults to 3 when presentation is missing or empty
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("handling missing or invalid data", () => {
+    test("sets `callDuration` to default value when duration is missing", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [
+            ["2", "987654321", "+4987654321", "1633036800", "", "2", "1", "1"],
+          ],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "2",
+          phone: "+4987654321",
+          callDate: 1633036800000,
+          callDuration: 0, // Default duration when missing
+          callType: "TYPE_OUTGOING",
+          isRead: true,
+          presentation: "PRESENTATION_ALLOWED", // Mapped from "1"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("sets default `callDate` when `date` is missing", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [["3", "321321321", "+49321321321", "", "90", "3", "0", "2"]],
+        },
+      }
+
+      const expected: CallLogObject[] = [
+        {
+          id: "3",
+          phone: "+49321321321",
+          callDate: 0, // Default when date is missing
+          callDuration: 90,
+          callType: "TYPE_MISSED",
+          isRead: false,
+          presentation: "PRESENTATION_PAYPHONE", // Mapped from "2"
+        },
+      ]
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("returns an empty array when there are no call log values", () => {
+      const callLogInput: CallLogInput = {
+        calls: {
+          columns: [
+            "_id",
+            "number",
+            "e164number",
+            "date",
+            "duration",
+            "type",
+            "isRead",
+            "presentation",
+          ],
+          values: [],
+        },
+      }
+
+      const expected: CallLogObject[] = []
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+
+    test("returns an empty array when `calls` is undefined", () => {
+      const callLogInput: CallLogInput = {
+        calls: undefined,
+      }
+
+      const expected: CallLogObject[] = []
+
+      const result = presenter.serializeToObject(callLogInput)
+      expect(result).toEqual(expected)
+    })
+  })
+})
diff --git a/libs/core/data-sync/presenters/call-log/call-log.presenter.ts b/libs/core/data-sync/presenters/call-log/call-log.presenter.ts
new file mode 100644
index 0000000000..5ab8333797
--- /dev/null
+++ b/libs/core/data-sync/presenters/call-log/call-log.presenter.ts
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  CallLogEntity,
+  CallLogInput,
+  CallLogObject,
+} from "Core/data-sync/types"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
+import {
+  UnifiedCallLogCallType,
+  UnifiedCallLogPresentationType,
+} from "device/models"
+
+export class CallLogPresenter extends BasePresenter {
+  public serializeToObject(input: CallLogInput): CallLogObject[] {
+    if (input.calls === undefined) {
+      return []
+    }
+
+    const calls = this.serializeRecord<CallLogEntity>(
+      input.calls.values,
+      input.calls.columns
+    )
+
+    return calls.map((call) => ({
+      id: String(call._id),
+      phone: call.e164number || call.number || "",
+      callDate: this.parseNumber(call.date) * 1000,
+      callDuration: this.parseNumber(call.duration),
+      presentation: this.mapPresentationType(call.presentation),
+      callType: this.mapCallType(call.type),
+      isRead: this.mapIsNew(call.isRead),
+    }))
+  }
+
+  private parseNumber(value: number | string | undefined | null): number {
+    return Number(value) || 0
+  }
+
+  private mapPresentationType(
+    type: number | string | undefined | null
+  ): UnifiedCallLogPresentationType {
+    const typesMap: Record<number, UnifiedCallLogPresentationType> = {
+      0: "PRESENTATION_UNKNOWN",
+      1: "PRESENTATION_ALLOWED",
+      2: "PRESENTATION_PAYPHONE",
+      3: "PRESENTATION_RESTRICTED",
+    }
+    return typesMap[Number(type)] ?? "PRESENTATION_UNKNOWN"
+  }
+
+  private mapCallType(
+    type: number | string | undefined | null
+  ): UnifiedCallLogCallType {
+    const typesMap: Record<number, UnifiedCallLogCallType> = {
+      0: "TYPE_OTHER",
+      1: "TYPE_INCOMING",
+      2: "TYPE_OUTGOING",
+      3: "TYPE_MISSED",
+      4: "TYPE_VOICEMAIL",
+      5: "TYPE_REJECTED",
+      6: "TYPE_BLOCKED",
+      7: "TYPE_ANSWERED_EXTERNALLY",
+    }
+    return typesMap[Number(type)] ?? "TYPE_OTHER"
+  }
+  private mapIsNew(isRead: number | string | undefined | null): boolean {
+    return Number(isRead) !== 0
+  }
+}
diff --git a/libs/core/data-sync/presenters/contact/contact.presenter.test.ts b/libs/core/data-sync/presenters/contact/contact.presenter.test.ts
index 0a0874e0d0..33d9f88876 100644
--- a/libs/core/data-sync/presenters/contact/contact.presenter.test.ts
+++ b/libs/core/data-sync/presenters/contact/contact.presenter.test.ts
@@ -43,30 +43,6 @@ test("`findRecords` method return records by `contactId`", async () => {
   expect(records).toEqual([contactEntities[0]])
 })
 
-// AUTO DISABLED - fix me if you like :)
-// eslint-disable-next-line @typescript-eslint/require-await
-test("`serializeRecord` serialize record properly", async () => {
-  const contactNameEntity: ContactNameEntity = {
-    _id: "4",
-    contact_id: "4",
-    name_primary: "Theron",
-    name_alternative: "Paucek",
-  }
-
-  const values: string[][] = [["4", "4", "Theron", "Paucek"]]
-
-  const columns: string[] = [
-    "_id",
-    "contact_id",
-    "name_primary",
-    "name_alternative",
-  ]
-
-  const records = presenter.serializeRecord<ContactNameEntity>(values, columns)
-  expect(records).toHaveLength(1)
-  expect(records).toEqual([contactNameEntity])
-})
-
 describe("when contact does not have any defined phone number", () => {
   const contactInput: ContactInput = {
     contacts: {
diff --git a/libs/core/data-sync/presenters/contact/contact.presenter.ts b/libs/core/data-sync/presenters/contact/contact.presenter.ts
index a967c9f47a..54bd7b80c6 100644
--- a/libs/core/data-sync/presenters/contact/contact.presenter.ts
+++ b/libs/core/data-sync/presenters/contact/contact.presenter.ts
@@ -13,10 +13,11 @@ import {
   ContactGroupEntity,
   ContactMatchGroupEntity,
 } from "Core/data-sync/types"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
 
 const forbiddenRestrictedPureId = "0"
 
-export class ContactPresenter {
+export class ContactPresenter extends BasePresenter {
   public findRecords<Type extends { contact_id: string }>(
     data: { contact_id: string }[],
     contactId: string
@@ -28,15 +29,6 @@ export class ContactPresenter {
     )
   }
 
-  public serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
-    return values.map((item) => {
-      return columns.reduce((acc: Record<string, string>, value, index) => {
-        acc[value.trim()] = String(item[index]).trim()
-        return acc
-      }, {})
-    }) as unknown as Type[]
-  }
-
   private contactFavored(
     groups: ContactGroupEntity[],
     contactGroup?: ContactMatchGroupEntity
diff --git a/libs/core/data-sync/presenters/index.ts b/libs/core/data-sync/presenters/index.ts
index c0d39c7f96..5b6c6ac6cd 100644
--- a/libs/core/data-sync/presenters/index.ts
+++ b/libs/core/data-sync/presenters/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./call-log/call-log.presenter"
 export * from "./contact/contact.presenter"
 export * from "./message/message.presenter"
 export * from "./template/template.presenter"
diff --git a/libs/core/data-sync/presenters/message/message.presenter.ts b/libs/core/data-sync/presenters/message/message.presenter.ts
index 880c6692dc..c7f04763fb 100644
--- a/libs/core/data-sync/presenters/message/message.presenter.ts
+++ b/libs/core/data-sync/presenters/message/message.presenter.ts
@@ -12,8 +12,9 @@ import {
   ContactNumberEntity,
   ThreadEntity,
 } from "Core/data-sync/types"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
 
-export class MessagePresenter {
+export class MessagePresenter extends BasePresenter {
   public findRecords<Type extends { _id: string }>(
     data: { _id: string }[],
     recordId: string
@@ -21,15 +22,6 @@ export class MessagePresenter {
     return (data as unknown as Type[]).find((item) => item._id === recordId)
   }
 
-  public serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
-    return values.map((item) => {
-      return columns.reduce((acc: Record<string, string>, value, index) => {
-        acc[value.trim()] = String(item[index]).trim()
-        return acc
-      }, {})
-    }) as unknown as Type[]
-  }
-
   public serializeToObject(data: MessageInput): MessageObject[] {
     if (!data.sms || !data.contact_number || !data.threads) {
       return []
diff --git a/libs/core/data-sync/presenters/template/template.presenter.ts b/libs/core/data-sync/presenters/template/template.presenter.ts
index 32bc67e140..37204f099d 100644
--- a/libs/core/data-sync/presenters/template/template.presenter.ts
+++ b/libs/core/data-sync/presenters/template/template.presenter.ts
@@ -8,8 +8,9 @@ import {
   TemplateInput,
   TemplateEntity,
 } from "Core/data-sync/types"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
 
-export class TemplatePresenter {
+export class TemplatePresenter extends BasePresenter {
   public findRecords<Type extends { _id: string }>(
     data: { _id: string }[],
     recordId: string
@@ -17,15 +18,6 @@ export class TemplatePresenter {
     return (data as unknown as Type[]).find((item) => item._id === recordId)
   }
 
-  public serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
-    return values.map((item) => {
-      return columns.reduce((acc: Record<string, string>, value, index) => {
-        acc[value.trim()] = String(item[index]).trim()
-        return acc
-      }, {})
-    }) as unknown as Type[]
-  }
-
   public serializeToObject(data: TemplateInput): TemplateObject[] {
     if (data.templates === undefined) {
       return []
diff --git a/libs/core/data-sync/presenters/thread/thread.presenter.ts b/libs/core/data-sync/presenters/thread/thread.presenter.ts
index 03d9ecf41d..b2e6559ca7 100644
--- a/libs/core/data-sync/presenters/thread/thread.presenter.ts
+++ b/libs/core/data-sync/presenters/thread/thread.presenter.ts
@@ -13,8 +13,9 @@ import {
 } from "Core/data-sync/types"
 import { MessageType as PureMessageType } from "Core/device/constants"
 import { MessageType } from "Core/messages/constants"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
 
-export class ThreadPresenter {
+export class ThreadPresenter extends BasePresenter {
   private findRecords<Type extends { _id: string }>(
     data: { _id: string }[],
     recordId: string
@@ -36,15 +37,6 @@ export class ThreadPresenter {
     return data.filter((item) => item.contact_id === recordId).reverse()[0]
   }
 
-  private serializeRecord<Type>(values: string[][], columns: string[]): Type[] {
-    return values.map((item) => {
-      return columns.reduce((acc: Record<string, string>, value, index) => {
-        acc[value.trim()] = String(item[index]).trim()
-        return acc
-      }, {})
-    }) as unknown as Type[]
-  }
-
   public serializeToObject(data: ThreadInput): ThreadObject[] {
     if (!data.threads || !data.contact_number) {
       return []
diff --git a/libs/core/data-sync/services/data-sync.service.ts b/libs/core/data-sync/services/data-sync.service.ts
index 2357c2efba..e203678602 100644
--- a/libs/core/data-sync/services/data-sync.service.ts
+++ b/libs/core/data-sync/services/data-sync.service.ts
@@ -11,6 +11,7 @@ import { DataIndex } from "Core/index-storage/constants"
 import { DeviceProtocol } from "device-protocol/feature"
 import { MetadataStore } from "Core/metadata/services"
 import {
+  CallLogIndexer,
   ContactIndexer,
   MessageIndexer,
   TemplateIndexer,
@@ -22,15 +23,26 @@ import {
   MessagePresenter,
   TemplatePresenter,
   ThreadPresenter,
+  CallLogPresenter,
 } from "Core/data-sync/presenters"
 import { SyncBackupCreateService } from "Core/backup/services/sync-backup-create.service"
 import { InitializeOptions } from "Core/data-sync/types"
+import { ElasticlunrFactory } from "Core/index-storage/factories"
+import { BaseIndexer } from "Core/data-sync/indexes/base.indexer"
+
+const defaultRequiredIndexes: DataIndex[] = [
+  DataIndex.Contact,
+  DataIndex.Message,
+  DataIndex.Template,
+  DataIndex.Thread,
+]
 
 export class DataSyncService {
   private contactIndexer: ContactIndexer | null = null
   private messageIndexer: MessageIndexer | null = null
   private threadIndexer: ThreadIndexer | null = null
   private templateIndexer: TemplateIndexer | null = null
+  private callLogIndexer: CallLogIndexer | null = null
   private syncBackupCreateService: SyncBackupCreateService
 
   constructor(
@@ -61,27 +73,32 @@ export class DataSyncService {
       this.fileSystemStorage,
       new TemplatePresenter()
     )
+    this.callLogIndexer = new CallLogIndexer(
+      this.fileSystemStorage,
+      new CallLogPresenter()
+    )
   }
 
   public async indexAll({
     token,
     serialNumber,
     backupDirectory,
+    requiredIndexes = defaultRequiredIndexes,
   }: InitializeOptions): Promise<boolean> {
     if (
       !this.contactIndexer ||
       !this.messageIndexer ||
       !this.threadIndexer ||
-      !this.templateIndexer
+      !this.templateIndexer ||
+      !this.callLogIndexer
     ) {
       return false
     }
 
-    let syncFileDir = backupDirectory
-
-    if (!syncFileDir) {
-      syncFileDir = path.join(getAppPath(), "sync", serialNumber)
+    const syncFileDir =
+      backupDirectory ?? path.join(getAppPath(), "sync", serialNumber)
 
+    if (!backupDirectory) {
       const { ok } = await this.syncBackupCreateService.createSyncBackup(
         {
           token,
@@ -96,17 +113,34 @@ export class DataSyncService {
       }
     }
 
-    const contactIndex = await this.contactIndexer.index(syncFileDir, token)
-    const messageIndex = await this.messageIndexer.index(syncFileDir, token)
-    // AUTO DISABLED - fix me if you like :)
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const templateIndex = await this.templateIndexer.index(syncFileDir, token)
-    const threadIndex = await this.threadIndexer.index(syncFileDir, token)
+    const isRequired = (index: DataIndex) => requiredIndexes.includes(index)
+
+    const indexers = {
+      [DataIndex.Contact]: this.contactIndexer,
+      [DataIndex.Message]: this.messageIndexer,
+      [DataIndex.Template]: this.templateIndexer,
+      [DataIndex.Thread]: this.threadIndexer,
+      [DataIndex.CallLog]: this.callLogIndexer,
+    }
+
+    const indexOrEmptyOnFailure = async (
+      indexName: DataIndex,
+      indexer: BaseIndexer | null
+    ) => {
+      try {
+        return await indexer!.index(syncFileDir, token)
+      } catch (error) {
+        if (!isRequired(indexName)) {
+          return ElasticlunrFactory.create()
+        }
+        throw error
+      }
+    }
 
-    this.index.set(DataIndex.Contact, contactIndex)
-    this.index.set(DataIndex.Message, messageIndex)
-    this.index.set(DataIndex.Template, templateIndex)
-    this.index.set(DataIndex.Thread, threadIndex)
+    for (const [indexName, indexer] of Object.entries(indexers)) {
+      const index = await indexOrEmptyOnFailure(indexName as DataIndex, indexer)
+      this.index.set(indexName as DataIndex, index)
+    }
 
     return true
   }
diff --git a/libs/core/data-sync/types/all-indexes.type.ts b/libs/core/data-sync/types/all-indexes.type.ts
index 21e55b4956..544eb9f3d7 100644
--- a/libs/core/data-sync/types/all-indexes.type.ts
+++ b/libs/core/data-sync/types/all-indexes.type.ts
@@ -7,10 +7,12 @@ import { ContactObject } from "Core/data-sync/types/contact-object.type"
 import { MessageObject } from "Core/data-sync/types/message-object.type"
 import { TemplateObject } from "Core/data-sync/types/template-object.type"
 import { ThreadObject } from "Core/data-sync/types/thread-object.type"
+import { CallLogObject } from "Core/data-sync/types/call-log-object.type"
 
 export interface AllIndexes {
   contacts: Record<string, ContactObject>
   messages: Record<string, MessageObject>
   templates: Record<string, TemplateObject>
   threads: Record<string, ThreadObject>
+  callLog: Record<string, CallLogObject>
 }
diff --git a/libs/core/data-sync/types/call-log-object.type.ts b/libs/core/data-sync/types/call-log-object.type.ts
new file mode 100644
index 0000000000..f60327c3a9
--- /dev/null
+++ b/libs/core/data-sync/types/call-log-object.type.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { UnifiedCallLog } from "device/models"
+import { CallLogTable } from "Core/data-sync/constants"
+import { Entity, DBQueryResult } from "Core/data-sync/types/entity.type"
+
+export type CallLogObject = UnifiedCallLog
+
+export type CallLogEntity = Entity<{
+  _id: string
+  number: string
+  e164number: string
+  presentation: string
+  date: string
+  duration: string
+  type: string
+  name: string
+  contactId: string
+  isRead: string
+}>
+
+export interface CallLogInput {
+  [CallLogTable.Calls]:
+    | DBQueryResult<keyof CallLogEntity, string[]>
+    | undefined
+}
diff --git a/libs/core/data-sync/types/get-index.type.ts b/libs/core/data-sync/types/get-index.type.ts
index 0ca986233a..25e7d758cd 100644
--- a/libs/core/data-sync/types/get-index.type.ts
+++ b/libs/core/data-sync/types/get-index.type.ts
@@ -9,6 +9,7 @@ import { MessageObject } from "./message-object.type"
 import { DataIndex } from "../constants/index.constant"
 import { TemplateObject } from "./template-object.type"
 import { ThreadObject } from "./thread-object.type"
+import { CallLogObject } from "Core/data-sync/types/call-log-object.type"
 
 export type GetIndex<Name extends DataIndex> =
   | SerialisedIndexData<
@@ -20,6 +21,8 @@ export type GetIndex<Name extends DataIndex> =
         ? TemplateObject
         : Name extends DataIndex.Thread
         ? ThreadObject
+        : Name extends DataIndex.CallLog
+        ? CallLogObject
         : never
     >
   | undefined
diff --git a/libs/core/data-sync/types/index.ts b/libs/core/data-sync/types/index.ts
index 25dd0df0e2..f26398b810 100644
--- a/libs/core/data-sync/types/index.ts
+++ b/libs/core/data-sync/types/index.ts
@@ -4,6 +4,7 @@
  */
 
 export * from "./all-indexes.type"
+export * from "./call-log-object.type"
 export * from "./contact-object.type"
 export * from "./message-object.type"
 export * from "./thread-object.type"
diff --git a/libs/core/data-sync/types/initialize-options.type.ts b/libs/core/data-sync/types/initialize-options.type.ts
index d514484ad2..808777f3a9 100644
--- a/libs/core/data-sync/types/initialize-options.type.ts
+++ b/libs/core/data-sync/types/initialize-options.type.ts
@@ -3,8 +3,11 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+import { DataIndex } from "Core/index-storage/constants"
+
 export interface InitializeOptions {
   token?: string
   serialNumber: string
   backupDirectory?: string
+  requiredIndexes?: DataIndex[]
 }
diff --git a/libs/core/index-storage/constants/data-index.constant.ts b/libs/core/index-storage/constants/data-index.constant.ts
index f0b7ba7e36..9c43dd0b04 100644
--- a/libs/core/index-storage/constants/data-index.constant.ts
+++ b/libs/core/index-storage/constants/data-index.constant.ts
@@ -8,4 +8,5 @@ export enum DataIndex {
   Message = "message",
   Template = "template",
   Thread = "thread",
+  CallLog = "calllog",
 }
diff --git a/libs/core/index-storage/services/index-storage.service.ts b/libs/core/index-storage/services/index-storage.service.ts
index a15950c0b9..8abaf84423 100644
--- a/libs/core/index-storage/services/index-storage.service.ts
+++ b/libs/core/index-storage/services/index-storage.service.ts
@@ -12,7 +12,7 @@ import { MetadataStore } from "Core/metadata/services"
 import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
 import { InitializeOptions } from "Core/data-sync/types"
 
-const cacheFileNames: Record<DataIndex, string> = {
+const cacheFileNames: Partial<Record<DataIndex, string>> = {
   [DataIndex.Contact]: "contacts.json",
   [DataIndex.Message]: "messages.json",
   [DataIndex.Thread]: "threads.json",
diff --git a/libs/device/models/src/index.ts b/libs/device/models/src/index.ts
index eb55aff648..3afa2af3e9 100644
--- a/libs/device/models/src/index.ts
+++ b/libs/device/models/src/index.ts
@@ -16,6 +16,6 @@ export * from "./lib/backup"
 export * from "./lib/file-transfer"
 export * from "./lib/restore"
 export * from "./lib/feature"
-export * from "./lib/import-contacts"
+export * from "./lib/unified-entities"
 export * from "./lib/data-transfer"
 export * from "./lib/entities"
diff --git a/libs/device/models/src/lib/data-transfer/data-transfer.test.ts b/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
index 8c2c69b82f..0f873640cd 100644
--- a/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
+++ b/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
@@ -14,6 +14,8 @@ const minimumPreDataTransfer: PreDataTransfer = {
   dataTransferId: 123,
   domains: {
     ["contacts-v1"]: "dummy-text",
+    ["callLog-v1"]: "dummy-text",
+    ["messages-v1"]: "dummy-text",
   },
 }
 
diff --git a/libs/device/models/src/lib/data-transfer/data-transfer.ts b/libs/device/models/src/lib/data-transfer/data-transfer.ts
index ad2eefe254..b4c22f200b 100644
--- a/libs/device/models/src/lib/data-transfer/data-transfer.ts
+++ b/libs/device/models/src/lib/data-transfer/data-transfer.ts
@@ -5,7 +5,7 @@
 
 import { z } from "zod"
 
-export type DataTransferDomain = "contacts-v1"
+export type DataTransferDomain = "contacts-v1" | "callLog-v1" | "messages-v1"
 
 export const PreDataTransferValidator = (domains: DataTransferDomain[]) => {
   const featuresValidator = domains.reduce((acc, key) => {
diff --git a/libs/device/models/src/lib/unified-entities/index.ts b/libs/device/models/src/lib/unified-entities/index.ts
new file mode 100644
index 0000000000..95a660989e
--- /dev/null
+++ b/libs/device/models/src/lib/unified-entities/index.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export * from "./unified-call-log"
+export * from "./unified-contact"
+export * from "./unified-message"
diff --git a/libs/device/models/src/lib/unified-entities/unified-call-log.ts b/libs/device/models/src/lib/unified-entities/unified-call-log.ts
new file mode 100644
index 0000000000..97aee964d9
--- /dev/null
+++ b/libs/device/models/src/lib/unified-entities/unified-call-log.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export type UnifiedCallLogPresentationType =
+  | "PRESENTATION_ALLOWED"
+  | "PRESENTATION_RESTRICTED"
+  | "PRESENTATION_UNKNOWN"
+  | "PRESENTATION_PAYPHONE"
+
+export type UnifiedCallLogCallType =
+  | "TYPE_INCOMING"
+  | "TYPE_OUTGOING"
+  | "TYPE_MISSED"
+  | "TYPE_VOICEMAIL"
+  | "TYPE_REJECTED"
+  | "TYPE_BLOCKED"
+  | "TYPE_ANSWERED_EXTERNALLY"
+  | "TYPE_OTHER"
+
+export type UnifiedCallLog = {
+  id: string
+  phone: string
+  callDate: number
+  callDuration: number
+  presentation: UnifiedCallLogPresentationType
+  callType: UnifiedCallLogCallType
+  isRead: boolean
+}
diff --git a/libs/device/models/src/lib/import-contacts/unified-contact.ts b/libs/device/models/src/lib/unified-entities/unified-contact.ts
similarity index 100%
rename from libs/device/models/src/lib/import-contacts/unified-contact.ts
rename to libs/device/models/src/lib/unified-entities/unified-contact.ts
diff --git a/libs/device/models/src/lib/unified-entities/unified-message.ts b/libs/device/models/src/lib/unified-entities/unified-message.ts
new file mode 100644
index 0000000000..8ae4ef4b8f
--- /dev/null
+++ b/libs/device/models/src/lib/unified-entities/unified-message.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export interface UnifiedMessageAddress {
+  address: string
+}
+
+export type UnifiedMessageType = "SMS" | "MMS"
+
+export type UnifiedMessageStatus = "RECEIVED" | "SENT"
+
+export type UnifiedMessageDeliveryStatus =
+  | "PENDING"
+  | "FAILED"
+  | "DELIVERED"
+  | "NONE"
+
+export interface UnifiedMessage {
+  id: string
+  body: string
+  date: number
+  read: boolean
+  seen: boolean
+  type: UnifiedMessageType
+  address: [UnifiedMessageAddress, UnifiedMessageAddress?]
+  status: UnifiedMessageStatus
+  deliveryStatus: UnifiedMessageDeliveryStatus
+}
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
index 05d4a0ec54..c6ccf8143f 100644
--- a/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/index.ts
@@ -4,7 +4,9 @@
  */
 
 import contactsView from "./contacts-view"
+import mcDataMigrationView from "./mc-data-migration-view"
 
 export default {
   contacts: contactsView,
+  ["mc-data-migration"]: mcDataMigrationView,
 }
diff --git a/libs/generic-view/feature/src/lib/use-dev-views/views/mc-data-migration-view.ts b/libs/generic-view/feature/src/lib/use-dev-views/views/mc-data-migration-view.ts
new file mode 100644
index 0000000000..0e78e70e6b
--- /dev/null
+++ b/libs/generic-view/feature/src/lib/use-dev-views/views/mc-data-migration-view.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { View } from "generic-view/utils"
+
+// @ts-ignore
+const view: View = {}
+
+export default view
diff --git a/libs/generic-view/store/src/lib/imports/contacts-mappers/pure/map-pure-api.ts b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-contact.ts
similarity index 92%
rename from libs/generic-view/store/src/lib/imports/contacts-mappers/pure/map-pure-api.ts
rename to libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-contact.ts
index 1d8d13e999..806443022a 100644
--- a/libs/generic-view/store/src/lib/imports/contacts-mappers/pure/map-pure-api.ts
+++ b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-contact.ts
@@ -5,9 +5,9 @@
 
 import { UnifiedContact } from "device/models"
 import { Contact } from "Core/contacts/reducers"
-import { getDisplayName } from "../helpers"
+import { getDisplayName } from "../../imports/contacts-mappers/helpers"
 
-export const mapPureApi = (contacts: Contact[]): UnifiedContact[] => {
+export const pureToUnifiedContact = (contacts: Contact[]): UnifiedContact[] => {
   return contacts.map((contact) => {
     const unifiedContact: Omit<UnifiedContact, "displayName"> = {
       id: contact.id,
diff --git a/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.test.ts b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.test.ts
new file mode 100644
index 0000000000..1eb1eecc82
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.test.ts
@@ -0,0 +1,956 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  pureToUnifiedMessage,
+  PureToUnifiedMessageOptions,
+} from "./pure-to-unified-message"
+import { MessageType } from "Core/messages/constants"
+
+describe("`pureToUnifiedMessage`", () => {
+  describe("`pureToUnifiedMessage` - Basic Mapping", () => {
+    test("maps a single basic message correctly", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Luke Skywalker",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Hello",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+123456789",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Hello",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+123456789",
+            threadId: "1",
+          },
+        },
+      }
+
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Hello",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+123456789" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+
+    test("maps two messages from different senders correctly", () => {
+      const mockOptionsMultiple: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message from Luke",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+          "2": {
+            contactId: "5",
+            contactName: "Leia Organa",
+            id: "2",
+            lastUpdatedAt: new Date("1970-01-01T00:06:32.000Z"),
+            messageSnippet: "Test Message from Leia",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898405555",
+            unread: false,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Hello from Luke",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Hello from Leia",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898405555",
+            threadId: "2",
+          },
+        },
+      }
+
+      const unifiedMessages = pureToUnifiedMessage(mockOptionsMultiple)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Hello from Luke",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+        {
+          id: "2",
+          body: "Hello from Leia",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898405555" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+  })
+
+  describe("`pureToUnifiedMessage` - Message Type Mapping", () => {
+    test("maps INBOX message type to SENT and DELIVERED", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #1",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+
+    test("maps FAILED message type to SENT and FAILED", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.FAILED,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #2",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.FAILED,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #2",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "FAILED",
+        },
+      ])
+    })
+
+    test("ignores DRAFT message type", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Draft Message",
+            messageType: MessageType.DRAFT,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Draft Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.DRAFT,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([]) // DRAFT messages should be ignored
+    })
+
+    test("maps QUEUED message type to SENT and PENDING", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.QUEUED,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #3",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.QUEUED,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #3",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "PENDING",
+        },
+      ])
+    })
+
+    test("maps INBOX message type to RECEIVED and NONE", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Sent Message",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Sent Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Sent Message #1",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+  })
+
+  describe("`pureToUnifiedMessage` - Read Flag Mapping", () => {
+    test("should mark all messages as read when thread unread is false", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:33.000Z"),
+            messageSnippet: "Latest Message",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: false,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Old Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Old Message #2",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "3": {
+            content: "Latest Message",
+            date: new Date("1970-01-01T00:06:33.000Z"),
+            id: "3",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Old Message #1",
+          date: 391000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "2",
+          body: "Old Message #2",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "3",
+          body: "Latest Message",
+          date: 393000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+
+    test("should mark only the latest message as unread when thread unread is true", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:33.000Z"),
+            messageSnippet: "Latest Message",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Old Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Old Message #2",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "3": {
+            content: "Latest Message",
+            date: new Date("1970-01-01T00:06:33.000Z"),
+            id: "3",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Old Message #1",
+          date: 391000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "2",
+          body: "Old Message #2",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "3",
+          body: "Latest Message",
+          date: 393000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+
+    test("should correctly map read flags across two threads with different unread states", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:32.000Z"),
+            messageSnippet: "Message in first thread",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: false,
+          },
+          "2": {
+            contactId: "5",
+            contactName: "Leia Organa",
+            id: "2",
+            lastUpdatedAt: new Date("1970-01-01T00:06:33.000Z"),
+            messageSnippet: "Latest in second thread",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898405555",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Old Message in Thread 1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Message in Thread 2",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "3": {
+            content: "Latest in Thread 2",
+            date: new Date("1970-01-01T00:06:33.000Z"),
+            id: "3",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898405555",
+            threadId: "2",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Old Message in Thread 1",
+          date: 391000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "2",
+          body: "Message in Thread 2",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "3",
+          body: "Latest in Thread 2",
+          date: 393000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898405555" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+
+    test("should ignore DRAFT messages and set read flag as true for latest message when thread unread is false", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:34.000Z"), // Czas ostatniej wiadomości jako `DRAFT`
+            messageSnippet: "Draft Message",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: false,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Old Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Another INBOX Message",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "3": {
+            content: "Draft Message",
+            date: new Date("1970-01-01T00:06:34.000Z"),
+            id: "3",
+            messageType: MessageType.DRAFT,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Old Message #1",
+          date: 391000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "2",
+          body: "Another INBOX Message",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+
+    // If the last message is `DRAFT` and `thread.unread` is `true`, we ignore the `DRAFT` and mark the previous message as `read: true`.
+    test("should ignore the last DRAFT message and mark the latest message as read to true when thread unread is true", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Skywalker Luke",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:34.000Z"),
+            messageSnippet: "Draft Message",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Old Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Another INBOX Message",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.INBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "3": {
+            content: "Draft Message",
+            date: new Date("1970-01-01T00:06:34.000Z"),
+            id: "3",
+            messageType: MessageType.DRAFT,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Old Message #1",
+          date: 391000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+        {
+          id: "2",
+          body: "Another INBOX Message",
+          date: 392000,
+          read: true,
+          seen: true,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "RECEIVED",
+          deliveryStatus: "NONE",
+        },
+      ])
+    })
+  })
+
+  describe("`pureToUnifiedMessage` - Handling Incomplete or Empty Data", () => {
+    test("should handle undefined contactId and contactName in Thread", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: undefined,
+            contactName: undefined,
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #1",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+
+    test("should handle empty phoneNumber in Thread and Message", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Luke Skywalker",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #1",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "" }], // Pusty adres
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+
+    test("should handle undefined content in Message", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Luke Skywalker",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+
+    test("should handle minimal date for date in Message", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Luke Skywalker",
+            id: "1",
+            lastUpdatedAt: new Date(0),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #1",
+            date: new Date(0),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+        },
+      }
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #1",
+          date: 0,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+  })
+
+  describe("`pureToUnifiedMessage` - Filtering Messages Without Threads", () => {
+    test("excludes messages without a matching thread", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "2": {
+            contactId: "5",
+            contactName: "Leia Organa",
+            id: "2",
+            lastUpdatedAt: new Date("1970-01-01T00:06:32.000Z"),
+            messageSnippet: "Message without thread",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+123456789",
+            unread: false,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Message without a thread",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+123456789",
+            threadId: "3",
+          },
+        },
+      }
+
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([])
+    })
+
+    test("includes only messages with matching threads among multiple messages", () => {
+      const mockOptions: PureToUnifiedMessageOptions = {
+        threads: {
+          "1": {
+            contactId: "4",
+            contactName: "Luke Skywalker",
+            id: "1",
+            lastUpdatedAt: new Date("1970-01-01T00:06:31.000Z"),
+            messageSnippet: "Test Message",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            unread: true,
+          },
+        },
+        messages: {
+          "1": {
+            content: "Test Message #1",
+            date: new Date("1970-01-01T00:06:31.000Z"),
+            id: "1",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898402777",
+            threadId: "1",
+          },
+          "2": {
+            content: "Unmatched Message",
+            date: new Date("1970-01-01T00:06:32.000Z"),
+            id: "2",
+            messageType: MessageType.OUTBOX,
+            phoneNumber: "+91898405555",
+            threadId: "2",
+          },
+        },
+      }
+
+      const unifiedMessages = pureToUnifiedMessage(mockOptions)
+      expect(unifiedMessages).toEqual([
+        {
+          id: "1",
+          body: "Test Message #1",
+          date: 391000,
+          read: false,
+          seen: false,
+          type: "SMS",
+          address: [{ address: "+91898402777" }],
+          status: "SENT",
+          deliveryStatus: "DELIVERED",
+        },
+      ])
+    })
+  })
+})
diff --git a/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.ts b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.ts
new file mode 100644
index 0000000000..f9b81a2823
--- /dev/null
+++ b/libs/generic-view/store/src/lib/data-migration/data-migration-mappers/pure-to-unified-message.ts
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import {
+  UnifiedMessage,
+  UnifiedMessageDeliveryStatus,
+  UnifiedMessageStatus,
+} from "device/models"
+import { MessageObject, ThreadObject } from "Core/data-sync/types"
+import { MessageType } from "Core/messages/constants"
+
+export interface PureToUnifiedMessageOptions {
+  threads: Record<string, ThreadObject>
+  messages: Record<string, MessageObject>
+}
+
+export const pureToUnifiedMessage = ({
+  messages,
+  threads,
+}: PureToUnifiedMessageOptions): UnifiedMessage[] => {
+  return Object.values(messages)
+    .filter((message) =>
+      message.messageType !== MessageType.DRAFT && threads[message.threadId]
+    )
+    .map((message) => {
+      const thread = threads[message.threadId]
+
+      let status: UnifiedMessageStatus
+      let deliveryStatus: UnifiedMessageDeliveryStatus
+
+      switch (message.messageType) {
+        case MessageType.OUTBOX:
+          status = "SENT"
+          deliveryStatus = "DELIVERED"
+          break
+        case MessageType.INBOX:
+          status = "RECEIVED"
+          deliveryStatus = "NONE"
+          break
+        case MessageType.FAILED:
+          status = "SENT"
+          deliveryStatus = "FAILED"
+          break
+        case MessageType.QUEUED:
+          status = "SENT"
+          deliveryStatus = "PENDING"
+          break
+        default:
+          status = "SENT"
+          deliveryStatus = "NONE"
+      }
+
+      const address: UnifiedMessage["address"] = [
+        { address: thread.phoneNumber || "" },
+      ]
+
+      const read =
+        !thread.unread ||
+        message.date.getTime() !== thread.lastUpdatedAt.getTime()
+
+      return {
+        read,
+        address,
+        status,
+        deliveryStatus,
+        type: "SMS",
+        seen: read,
+        id: message.id,
+        body: message.content || "",
+        date: message.date.getTime(),
+      }
+    })
+}
diff --git a/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
index ebda102b1d..2f91621114 100644
--- a/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
+++ b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
@@ -14,7 +14,7 @@ import {
 import { readAllIndexes } from "Core/data-sync/actions"
 import { isEmpty } from "lodash"
 import { AllIndexes } from "Core/data-sync/types"
-import { mapPureApi } from "../imports/contacts-mappers/pure/map-pure-api"
+import { pureToUnifiedContact } from "./data-migration-mappers/pure-to-unified-contact"
 import {
   DomainData,
   transferDataToDevice,
@@ -25,6 +25,7 @@ import { delay } from "shared/utils"
 import { removeDirectory } from "system-utils/feature"
 import { DataMigrationStatus } from "./reducer"
 import { clearMigrationData } from "./clear-migration-data"
+import { pureToUnifiedMessage } from "./data-migration-mappers/pure-to-unified-message"
 
 export const transferMigrationData = createAsyncThunk<
   void,
@@ -89,7 +90,7 @@ export const transferMigrationData = createAsyncThunk<
         switch (feature) {
           case DataMigrationFeature.Contacts: {
             const { contacts } = databaseResponse.payload as AllIndexes
-            const transformedData = mapPureApi(Object.values(contacts))
+            const transformedData = pureToUnifiedContact(Object.values(contacts))
 
             if (!isEmpty(transformedData)) {
               domainsData.push({
@@ -99,6 +100,31 @@ export const transferMigrationData = createAsyncThunk<
             }
             break
           }
+          case DataMigrationFeature.CallLog: {
+            const { callLog } = databaseResponse.payload as AllIndexes
+            const transformedData = Object.values(callLog)
+
+            if (!isEmpty(transformedData)) {
+              domainsData.push({
+                domain: "callLog-v1", // FIXME: The domain should be returned from Data Migration configuration
+                data: transformedData,
+              })
+            }
+            break
+          }
+          case DataMigrationFeature.Messages: {
+            const transformedData = pureToUnifiedMessage(
+              databaseResponse.payload as AllIndexes
+            )
+
+            if (!isEmpty(transformedData)) {
+              domainsData.push({
+                domain: "messages-v1", // FIXME: The domain should be returned from Data Migration configuration
+                data: transformedData,
+              })
+            }
+            break
+          }
         }
       }
 
diff --git a/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts b/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
index 97d19cbef1..7c6d040639 100644
--- a/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
+++ b/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
@@ -9,7 +9,9 @@ import { ActionName } from "../action-names"
 import {
   ApiFileTransferError,
   DataTransferDomain,
+  UnifiedCallLog,
   UnifiedContact,
+  UnifiedMessage,
 } from "device/models"
 import {
   cancelDataTransferRequest,
@@ -30,11 +32,19 @@ import { isEmpty } from "lodash"
 import { DataTransfer } from "./reducer"
 import { selectActiveApiDeviceId } from "../selectors/select-active-api-device-id"
 
-export type DomainData = {
-  domain: Extract<DataTransferDomain, "contacts-v1">
-  data: UnifiedContact[]
+type DomainDataMapping = {
+  "contacts-v1": UnifiedContact[]
+  "callLog-v1": UnifiedCallLog[]
+  "messages-v1": UnifiedMessage[]
 }
 
+export type DomainData = {
+  [K in keyof DomainDataMapping]: {
+    domain: K
+    data: DomainDataMapping[K]
+  }
+}[keyof DomainDataMapping]
+
 export const transferDataToDevice = createAsyncThunk<
   undefined,
   DomainData[],

From cab8b537f9a828a5387a0d82d57fdfcf9ff49453 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Wed, 30 Oct 2024 09:02:22 +0100
Subject: [PATCH 50/64] [CP-XXX] Extend Seed Data with Edge Cases: Long Names &
 Special Characters in Contact Fields (#2156)

---
 .../src/lib/seed-data/contacts-seed-data.ts   | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
index 0db4556b3c..8e11459259 100644
--- a/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
+++ b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
@@ -139,6 +139,48 @@ const contactFullData5 = {
   entityType: "contacts",
 }
 
+const contactWithLongLastName = {
+  firstName: "Long Display Name (last name is long)",
+  lastName:
+    "Anna Maria Katarzyna Nowak-Wielka-Zabłocka-Długosz-Ostrowska-Mickiewicz-Piękna-Sobieska-Kowalewska-Jagiellońska-Słowacka-Krzyżanowska-Kordecka-Kościuszkowska",
+  phoneNumbers: [{ phoneNumber: "+48123456786", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+const contactWithLongFirstName = {
+  firstName: "Aleksandra-Marianna-Katarzyna-Magdalena-Joanna-Weronika-Zofia-Karolina-Małgorzata-Anastazja",
+  lastName: "Long Display Name (first name is long)",
+  phoneNumbers: [{ phoneNumber: "+48234567890", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithSpecialCharactersInLastName = {
+  firstName: "Special Character (last name with special characters)",
+  lastName: "!@#$%^&*()-=+[]{}|;:',.<>?/`~",
+  phoneNumbers: [{ phoneNumber: "+49123454789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithSpecialCharactersInFirstName = {
+  firstName: "###",
+  lastName: "Special Character (first name with special characters)",
+  phoneNumbers: [{ phoneNumber: "+49123426789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithPlusAsSpecialCharacterInLastName = {
+  firstName: "Plus (last name with plus)",
+  lastName: "+",
+  phoneNumbers: [{ phoneNumber: "+49123156789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithPlusAsSpecialCharacterInFirstName = {
+  firstName: "+",
+  lastName: "Plus (first name with plus)",
+  phoneNumbers: [{ phoneNumber: "+49123156789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
 const contactWithNumbersInName = {
   firstName: "Numer (last name is numeric)",
   lastName: "12345",
@@ -158,6 +200,11 @@ const contactWithMiddleNameOnly = {
   entityType: "contacts",
 }
 
+const contactWithWithSpecialCharactersInMiddleName = {
+  middleName: "%%%% (only middle name)",
+  entityType: "contacts",
+}
+
 const contactWithGermanyPhoneNumberOnly = {
   phoneNumbers: [{ phoneNumber: "490123456789", phoneType: "MOBILE" }],
   entityType: "contacts",
@@ -173,7 +220,6 @@ const contactWithChinaPhoneNumberOnly = {
   entityType: "contacts",
 }
 
-
 const contactWithMobilePhoneNumberOnly = {
   phoneNumbers: [{ phoneNumber: "+48345678902", phoneType: "MOBILE" }],
   entityType: "contacts",
@@ -423,9 +469,16 @@ export const contactsSeedData: EntityData[] = [
   contactFullData3,
   contactFullData4,
   contactFullData5,
+  contactWithLongLastName,
+  contactWithLongFirstName,
+  contactWithSpecialCharactersInLastName,
+  contactWithSpecialCharactersInFirstName,
+  contactWithPlusAsSpecialCharacterInLastName,
+  contactWithPlusAsSpecialCharacterInFirstName,
   contactWithNumbersInName,
   contactWithPrefixSuffix,
   contactWithMiddleNameOnly,
+  contactWithWithSpecialCharactersInMiddleName,
   contactWithGermanyPhoneNumberOnly,
   contactWithIndiaPhoneNumberOnly,
   contactWithChinaPhoneNumberOnly,

From b7d1377233efa48daecfe2d3b43c12df72f9b678 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Wed, 30 Oct 2024 09:15:47 +0100
Subject: [PATCH 51/64] [CP-XXX] Add Seed Data with Edge Cases: Emoji-Only
 Fields in Contact Entries (#2157)

---
 .../src/lib/seed-data/contacts-seed-data.ts   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
index 8e11459259..6895994e40 100644
--- a/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
+++ b/libs/generic-view/feature/src/lib/seed-data/contacts-seed-data.ts
@@ -463,6 +463,39 @@ const contactWithNotesOnly = {
   entityType: "contacts",
 }
 
+const contactWithOnlyEmojiFirstName = {
+  firstName: "🌞",
+  lastName: "Clark",
+  phoneNumbers: [{ phoneNumber: "+12123456789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithOnlyEmojiLastName = {
+  firstName: "John",
+  lastName: "🍀",
+  phoneNumbers: [{ phoneNumber: "+441234567890", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithOnlyEmojiNickname = {
+  nickName: "🐶🐱",
+  phoneNumbers: [{ phoneNumber: "+49876543210", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithOnlyEmojiCompany = {
+  company: "🚀💼",
+  phoneNumbers: [{ phoneNumber: "+48123456789", phoneType: "MOBILE" }],
+  entityType: "contacts",
+}
+
+const contactWithOnlyEmojiNotes = {
+  notes: "💡🚨",
+  phoneNumbers: [{ phoneNumber: "+48223456789", phoneType: "WORK" }],
+  entityType: "contacts",
+}
+
+
 export const contactsSeedData: EntityData[] = [
   contactFullData1,
   contactFullData2,
@@ -514,4 +547,9 @@ export const contactsSeedData: EntityData[] = [
   contactWithSipOnly,
   contactWithWebsiteOnly,
   contactWithNotesOnly,
+  contactWithOnlyEmojiFirstName,
+  contactWithOnlyEmojiLastName,
+  contactWithOnlyEmojiNickname,
+  contactWithOnlyEmojiCompany,
+  contactWithOnlyEmojiNotes,
 ]

From 8fbc7b46f7717f4e85b946a7d3205837a51db8d3 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Wed, 30 Oct 2024 16:56:04 +0100
Subject: [PATCH 52/64] [CP-XXX] Add test for alphanumeric sorting of numeric
 strings (#2158)

---
 .../utils/src/lib/data-sort/data-sort.test.ts | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts b/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
index d2d7c2cb66..0518e48a24 100644
--- a/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
+++ b/libs/generic-view/utils/src/lib/data-sort/data-sort.test.ts
@@ -95,6 +95,29 @@ describe("dataProviderSort", () => {
     ])
   })
 
+  it("sorts numeric values represented as strings in ascending alphanumeric order", () => {
+    const data = [
+      { value: "3" },
+      { value: "300" },
+      { value: "25" },
+      { value: "100" },
+      { value: "5" },
+    ]
+    const sort: DataSortConfig = [
+      { field: "value", direction: "asc", priority: 1 },
+    ]
+
+    const result = dataSort(data, sort)
+
+    expect(result).toEqual([
+      { value: "100" },
+      { value: "25" },
+      { value: "3" },
+      { value: "300" },
+      { value: "5" },
+    ])
+  })
+
   it("sorts strings before numbers with strings in lexicographical order and numbers in ascending order", () => {
     const data = [
       { value: "Bob" },

From 29727d4c45e9a7d0845e01b3952de98c94115b82 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Thu, 31 Oct 2024 09:26:39 +0100
Subject: [PATCH 53/64] [CP-3227] Button "Show Connected Devices" Does Not Open
 the Side Drawer (#2161)

---
 .../selectors/is-select-device-drawer-open.selector.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts b/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
index 6148426d07..9b064ee037 100644
--- a/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
+++ b/libs/core/device-select/selectors/is-select-device-drawer-open.selector.ts
@@ -11,6 +11,8 @@ export const isSelectDeviceDrawerOpenSelector = createSelector(
   deviceManagerState,
   selectTimeSynchronizationStatus,
   ({ selectDeviceDrawerOpen }, timeSyncStatus): boolean => {
-    return selectDeviceDrawerOpen && timeSyncStatus === "idle"
+    return (
+      selectDeviceDrawerOpen && ["idle", undefined].includes(timeSyncStatus)
+    )
   }
 )

From 7076e837c770b318b837d28541082215d5bfc416 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Thu, 31 Oct 2024 09:43:48 +0100
Subject: [PATCH 54/64] [CP-3229] Clean up and update .env file in Bitwarden
 and .env.example (#2162)

---
 .env.example                                  | 79 +++++++++++--------
 .github/workflows/e2e-development.yml         |  1 -
 .github/workflows/e2e-feature-branch.yml      |  4 +-
 .github/workflows/e2e-pre-production.yml      |  1 -
 .github/workflows/e2e-production.yml          |  1 -
 .github/workflows/nexus-development.yml       |  3 -
 .github/workflows/nexus-feature-branch.yml    |  3 -
 .github/workflows/nexus-mass-update.yml       |  3 -
 .github/workflows/nexus-mock-development.yml  |  3 -
 .../workflows/nexus-mock-pre-production.yml   |  2 -
 .github/workflows/nexus-mock-production.yml   |  2 -
 .../workflows/nexus-pre-production-latest.yml |  3 -
 .github/workflows/nexus-pre-production.yml    |  2 -
 .../workflows/nexus-production-with-os-rc.yml |  3 -
 .github/workflows/nexus-production.yml        |  2 -
 15 files changed, 46 insertions(+), 66 deletions(-)

diff --git a/.env.example b/.env.example
index a0ff4369b0..dce068f091 100644
--- a/.env.example
+++ b/.env.example
@@ -1,76 +1,87 @@
-# [Optional] Phrase.com
+# All environment variables listed here are not required for the application to start;
+# however, missing values may impact application behavior in various ways.
+
+# Legend:
+# [CI Mode] - Variable used only in Continuous Integration (CI) environments
+# [Dev Mode] - Optional variable primarily used in the development environment
+# [Setup Mode] - Variable required only during the setup and build process of CI Mode
+# [Standard] - Common variable used across all environments
+
+
+# [CI Mode] Mocks behavior of e2e tests run in CI. Default "false"; set "true" to enable.
+E2ECI=
+
+# [CI Mode] Defines the path to external variables file
+STATIC_CONFIGURATION_FILE_PATH=
+
+# [CI Mode] Set LOCALAPPDATA to empty for Windows platform to ensure clean environment in CI.
+LOCALAPPDATA=
+
+# [Setup Mode] URL for mudita-dev-resources repo where gt-pressura font is placed
+FONTS_DIRECTORY_URL=
+
+# [Setup Mode] Access token for dummy-account that has an access to Mudita private repositories
+GITHUB_ACCESS_TOKEN=
+
+# [Standard] Phrase.com
 PHRASE_API_KEY=
 PHRASE_API_URL=
 
-# [Optional, only in development mode] Phrase.com
+# [Dev Mode] Phrase.com API key for development mode
 PHRASE_API_KEY_DEV=
 
-# [Optional] Mudita Center Server URL to access to external services via proxy
+# [Standard] Mudita Center Server URL to access to external services via proxy
 MUDITA_CENTER_SERVER_URL=
 MUDITA_CENTER_SERVER_V2_URL=
 
-# [Optional] Rollbar Token needed to connect user’s app with Rollbar account.
+# [Standard] Rollbar Token needed to connect user’s app with Rollbar account
 ROLLBAR_TOKEN=
 
-# For Mudita developers only
-
-# [Optional] Access token for dummy-account that has an access to Mudita private repositories. This variable is needed only in development and build production app.
-GITHUB_ACCESS_TOKEN=
-
-# [Optional] GitHub repository name for Mudita Center updates. Default: "mudita-center"
+# [Standard] GitHub repository name for Mudita Center updates. Default: "mudita-center"
 RELEASES_REPOSITORY_NAME=
 
-# [Optional] Enable pre release for update process. Disabledd by default, set "1" to enable
+# [Dev Mode] Enable pre-release for update process. Disabled by default; set "1" to enable
 PRERELEASES_ENABLED=
 
-# [Optional] Client id of the Microsoft Outlook application used for calendars and contacts
+# [Standard] Client ID of the Microsoft Outlook application used for calendars and contacts
 LOGIN_MICROSOFT_ONLINE_CLIENT_ID=
 
-# [Optional] URL for mudita-dev-resources repo where gt-pressura font is placed.
-FONTS_DIRECTORY_URL=
-
-# [Optional] mudita.freshdesk.com
+# [Standard] mudita.freshdesk.com
 FRESHDESK_API_URL=
 FRESHDESK_API_TOKEN=
 
-# [Optional] analytics.mudita.com
+# [Standard] analytics.mudita.com
 ANALYTICS_ENABLED=
 ANALYTICS_API_URL=
 ANALYTICS_API_SITE_ID=
 
-# [Optional] Defines current feature toggles environment
+# [Standard] Defines current feature toggles environment
 FEATURE_TOGGLE_ENVIRONMENT=
 
-# [Optional] Defines the path to external variables file (used on CI)
-STATIC_CONFIGURATION_FILE_PATH=
-
-# [Optional] Disable redux logger during development. Enabled by default, set "0" to disable
+# [Dev Mode] Disable redux logger during development. Enabled by default; set "0" to disable
 DEV_REDUX_LOGGER_ENABLED=
 
-# [Optional] Disable device logger during development. Enabled by default, set "0" to disable
+# [Dev Mode] Disable device logger during development. Enabled by default; set "0" to disable
 DEV_DEVICE_LOGGER_ENABLED=
 
-# [Optional] Set desired latest release. Is based on enum OsEnvironment, so can be set to 'production', 'test-production' or 'daily'.
+# [Standard] Set desired latest release. Based on enum OsEnvironment; can be 'production', 'test-production' or 'daily'
 FEATURE_TOGGLE_RELEASE_ENVIRONMENT=
 
-# [Optional] Enable Mudita Center prerelease feature. Disabled by default, set "1" to enable
-MUDITA_CENTER_PRERELEASE_ENABLED=
-
-# [Optional] Set 1 run application with mock server
+# [Dev Mode] Runs the application with a mock server. Disabled by default; set "1" to enable
 MOCK_SERVICE_ENABLED=
 
-# [Optional] Enable shortcut for opening DevTools and access to useDevConsole functionalities.
-# Disabled by default, set "1" to enable.
+# [Dev Mode] Enable shortcut for opening DevTools and access to useDevConsole functionalities.
+# Disabled by default; set "1" to enable
 DEV_TOOLS_SHORTCUT_ENABLED=
 
-# [Optional] Automatically open DevTools on startup. Disabled by default, set "1" to enable
+# [Dev Mode] Automatically open DevTools on startup. Disabled by default; set "1" to enable
 DEV_TOOLS_AUTO_OPEN_ENABLED=
 
-# [Optional] Allows to show unpublished content in Help. Disabled by default, set a secret token to enable
+# [Dev Mode] Allows showing unpublished content in Help. Disabled by default; set a secret token to enable
 DEV_HELP_PREVIEW_TOKEN=
 
-# [Optional] Enable DEV version of API configuration. Disabled by default, set "1" to enable
+# [Dev Mode] Enable DEV version of API configuration. Disabled by default; set "1" to enable
 DEV_API_CONFIG=
 
-# [Optional, only in development mode] Path to the directory with downloaded flash packages for Mudita Harmony. Uses the latest file if set.
+# [Dev Mode] Path to directory with flash packages for Mudita Harmony
 DEV_FLASH_PACKAGE_PATH=
diff --git a/.github/workflows/e2e-development.yml b/.github/workflows/e2e-development.yml
index fcbb2308ec..0d745babfc 100644
--- a/.github/workflows/e2e-development.yml
+++ b/.github/workflows/e2e-development.yml
@@ -41,7 +41,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
         run: |
           printenv > .env
diff --git a/.github/workflows/e2e-feature-branch.yml b/.github/workflows/e2e-feature-branch.yml
index 94462b2f18..2622f5acca 100644
--- a/.github/workflows/e2e-feature-branch.yml
+++ b/.github/workflows/e2e-feature-branch.yml
@@ -46,7 +46,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
         run: |
           printenv > .env
@@ -77,7 +76,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
           NEW_HELP_ENABLED: ${{ secrets.NEW_HELP_ENABLED }}
         shell: cmd
@@ -106,4 +104,4 @@ jobs:
         if: matrix.os == 'Windows'
         run: |
           cd apps/mudita-center-e2e
-          npm run e2e:test:cicd:standalone
\ No newline at end of file
+          npm run e2e:test:cicd:standalone
diff --git a/.github/workflows/e2e-pre-production.yml b/.github/workflows/e2e-pre-production.yml
index 751c6b8648..f34c765d44 100644
--- a/.github/workflows/e2e-pre-production.yml
+++ b/.github/workflows/e2e-pre-production.yml
@@ -43,7 +43,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
         run: |
           printenv > .env
diff --git a/.github/workflows/e2e-production.yml b/.github/workflows/e2e-production.yml
index 317bb4e03c..61860cbb83 100644
--- a/.github/workflows/e2e-production.yml
+++ b/.github/workflows/e2e-production.yml
@@ -43,7 +43,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: ${{ secrets.MOCK_SERVICE_ENABLED }}
         run: |
           printenv > .env
diff --git a/.github/workflows/nexus-development.yml b/.github/workflows/nexus-development.yml
index a2a089d3d3..2b119e4a45 100644
--- a/.github/workflows/nexus-development.yml
+++ b/.github/workflows/nexus-development.yml
@@ -43,7 +43,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           LOCALAPPDATA: ""
         shell: cmd
@@ -74,7 +73,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
         run: |
           printenv > .env
@@ -102,7 +100,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
         run: |
           printenv > .env
diff --git a/.github/workflows/nexus-feature-branch.yml b/.github/workflows/nexus-feature-branch.yml
index 05fe3307ab..c97eb46439 100644
--- a/.github/workflows/nexus-feature-branch.yml
+++ b/.github/workflows/nexus-feature-branch.yml
@@ -43,7 +43,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           LOCALAPPDATA: ""
         shell: cmd
@@ -74,7 +73,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
         run: |
           printenv > .env
@@ -102,7 +100,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
         run: |
           printenv > .env
diff --git a/.github/workflows/nexus-mass-update.yml b/.github/workflows/nexus-mass-update.yml
index 955b5abfdc..cabf05a579 100644
--- a/.github/workflows/nexus-mass-update.yml
+++ b/.github/workflows/nexus-mass-update.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           LOCALAPPDATA: ""
         shell: cmd
         run: |
@@ -75,7 +74,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Setup Env for Linux
@@ -102,7 +100,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Changing app version in packages.json for Linux
diff --git a/.github/workflows/nexus-mock-development.yml b/.github/workflows/nexus-mock-development.yml
index 12a1f29e2a..1ea4afd1b9 100644
--- a/.github/workflows/nexus-mock-development.yml
+++ b/.github/workflows/nexus-mock-development.yml
@@ -43,7 +43,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           LOCALAPPDATA: ""
           MOCK_SERVICE_ENABLED: "1"
@@ -75,7 +74,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           MOCK_SERVICE_ENABLED: "1"
         run: |
@@ -104,7 +102,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           MOCK_SERVICE_ENABLED: "1"
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
         run: |
diff --git a/.github/workflows/nexus-mock-pre-production.yml b/.github/workflows/nexus-mock-pre-production.yml
index 6c357357fc..ad46d3d2e6 100644
--- a/.github/workflows/nexus-mock-pre-production.yml
+++ b/.github/workflows/nexus-mock-pre-production.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           LOCALAPPDATA: ""
           MOCK_SERVICE_ENABLED: "1"
@@ -77,7 +76,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           MOCK_SERVICE_ENABLED: "1"
         run: |
diff --git a/.github/workflows/nexus-mock-production.yml b/.github/workflows/nexus-mock-production.yml
index a779823660..3e2c243833 100644
--- a/.github/workflows/nexus-mock-production.yml
+++ b/.github/workflows/nexus-mock-production.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           LOCALAPPDATA: ""
           MOCK_SERVICE_ENABLED: "1"
@@ -77,7 +76,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           DEV_TOOLS_SHORTCUT_ENABLED: "1"
           MOCK_SERVICE_ENABLED: "1"
         run: |
diff --git a/.github/workflows/nexus-pre-production-latest.yml b/.github/workflows/nexus-pre-production-latest.yml
index a1dbfe02aa..88cd85d837 100644
--- a/.github/workflows/nexus-pre-production-latest.yml
+++ b/.github/workflows/nexus-pre-production-latest.yml
@@ -46,7 +46,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           LOCALAPPDATA: ""
         shell: cmd
         run: |
@@ -76,7 +75,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Setup Env for Linux
@@ -103,7 +101,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Changing app version in packages.json for Linux & Standard Update
diff --git a/.github/workflows/nexus-pre-production.yml b/.github/workflows/nexus-pre-production.yml
index 1373c40d7f..b8ab37b59c 100644
--- a/.github/workflows/nexus-pre-production.yml
+++ b/.github/workflows/nexus-pre-production.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           LOCALAPPDATA: ""
         shell: cmd
         run: |
@@ -75,7 +74,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Setup depedencies
diff --git a/.github/workflows/nexus-production-with-os-rc.yml b/.github/workflows/nexus-production-with-os-rc.yml
index 8742ecad96..16881e260b 100644
--- a/.github/workflows/nexus-production-with-os-rc.yml
+++ b/.github/workflows/nexus-production-with-os-rc.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           LOCALAPPDATA: ""
         shell: cmd
         run: |
@@ -75,7 +74,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Setup Env for Linux
@@ -102,7 +100,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Changing app version in packages.json for Linux
diff --git a/.github/workflows/nexus-production.yml b/.github/workflows/nexus-production.yml
index ed3e0b0423..ddf5858b22 100644
--- a/.github/workflows/nexus-production.yml
+++ b/.github/workflows/nexus-production.yml
@@ -45,7 +45,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
           LOCALAPPDATA: ""
         shell: cmd
         run: |
@@ -75,7 +74,6 @@ jobs:
           DEV_REDUX_LOGGER_ENABLED: ${{ secrets.DEV_REDUX_LOGGER_ENABLED }}
           DEV_DEVICE_LOGGER_ENABLED: ${{ secrets.DEV_DEVICE_LOGGER_ENABLED }}
           FEATURE_TOGGLE_RELEASE_ENVIRONMENT: ${{ secrets.FEATURE_TOGGLE_RELEASE_ENVIRONMENT }}
-          MUDITA_CENTER_PRERELEASE_ENABLED: ${{ secrets.MUDITA_CENTER_PRERELEASE_ENABLED }}
         run: |
           printenv > .env
       - name: Setup depedencies

From 4c446c9540ff145c106d915013a0d061940deaf7 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Mon, 4 Nov 2024 15:09:48 +0100
Subject: [PATCH 55/64] [CP-3240] Fix for Entity loader - Loading NaN% and
 Uncaught runtime error Cannot set properties of undefined (setting 'loading')
 (#2159)

---
 .../feature/src/lib/setup-component.tsx       |  9 +--
 .../lib/entities/create-entity-data.action.ts |  4 +-
 .../lib/entities/get-entities-data.action.ts  |  2 +-
 .../store/src/lib/entities/reducer.ts         | 80 ++++++++++++-------
 .../lib/entities/update-entity-data.action.ts |  4 +-
 .../store/src/lib/selectors/entities.ts       | 29 ++++---
 6 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/libs/generic-view/feature/src/lib/setup-component.tsx b/libs/generic-view/feature/src/lib/setup-component.tsx
index 4378fba239..58b1fbbc4d 100644
--- a/libs/generic-view/feature/src/lib/setup-component.tsx
+++ b/libs/generic-view/feature/src/lib/setup-component.tsx
@@ -129,10 +129,7 @@ export const setupComponent = <P extends object>(
         set(editableProps || {}, componentField, value)
       }
     } else if (dataProvider?.source === "entities-array") {
-      const filteredData = dataFilter(
-        [...entitiesData],
-        dataProvider.filters
-      )
+      const filteredData = dataFilter([...entitiesData], dataProvider.filters)
       const sortedData = dataSort([...filteredData], dataProvider.sort)
       editableProps.data = sortedData?.map((item) => item[idFieldKey!])
     } else if (dataProvider?.source === "entities-field") {
@@ -267,7 +264,9 @@ const processField = (field: Partial<DataProviderField>, value: unknown) => {
   if ("modifier" in field) {
     switch (field.modifier) {
       case "length":
-        if (isString(newValue) || isArray(newValue)) {
+        if (!newValue || !value) {
+          newValue = 0
+        } else if (isString(newValue) || isArray(newValue)) {
           newValue = newValue.length
         } else if (isObject(value)) {
           newValue = Object.keys(value).length
diff --git a/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
index d3f743f62c..fe760934e9 100644
--- a/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/create-entity-data.action.ts
@@ -33,7 +33,7 @@ export const createEntityDataAction = createAsyncThunk<
     }
 
     const { genericEntities } = getState()
-    const entities = genericEntities[deviceId][entitiesType]
+    const entities = genericEntities[deviceId]?.[entitiesType]
     const idFieldKey = entities?.idFieldKey
     if (!entities || !idFieldKey) {
       logger.error(
@@ -55,7 +55,7 @@ export const createEntityDataAction = createAsyncThunk<
     }
 
     const computedFields =
-      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+      genericEntities[deviceId]?.[entitiesType]?.config.computedFields || {}
     return enhanceEntity(response.data.data, { computedFields })
   }
 )
diff --git a/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
index e0509c323e..9b6c4331ad 100644
--- a/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/get-entities-data.action.ts
@@ -70,7 +70,7 @@ export const getEntitiesDataAction = createAsyncThunk<
     }
 
     const computedFields =
-      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+      genericEntities[deviceId]?.[entitiesType]?.config.computedFields || {}
     return data.map((entity) => {
       return enhanceEntity(entity, { computedFields })
     })
diff --git a/libs/generic-view/store/src/lib/entities/reducer.ts b/libs/generic-view/store/src/lib/entities/reducer.ts
index 85fde81b71..89328146f9 100644
--- a/libs/generic-view/store/src/lib/entities/reducer.ts
+++ b/libs/generic-view/store/src/lib/entities/reducer.ts
@@ -26,10 +26,10 @@ interface Entities {
   error?: boolean
 }
 
-interface EntitiesState {
-  [key: DeviceId]: {
-    [key: EntitiesType]: Entities | undefined
-  }
+export type DeviceEntitiesMap = Record<EntitiesType, Entities | undefined>
+
+export interface EntitiesState {
+  [key: DeviceId]: DeviceEntitiesMap | undefined
 }
 
 const initialState: EntitiesState = {}
@@ -37,61 +37,76 @@ const initialState: EntitiesState = {}
 export const genericEntitiesReducer = createReducer(initialState, (builder) => {
   builder.addCase(getEntitiesConfigAction.fulfilled, (state, action) => {
     const { deviceId, entitiesType } = action.meta.arg
-    if (!state[deviceId]) {
-      state[deviceId] = {
-        [entitiesType]: {
-          config: action.payload.config,
-          idFieldKey: action.payload.idFieldKey,
-        },
-      }
-    } else if (!state[deviceId][entitiesType]) {
-      state[deviceId][entitiesType] = {
+
+    state[deviceId] = {
+      ...state[deviceId],
+      [entitiesType]: {
         config: action.payload.config,
         idFieldKey: action.payload.idFieldKey,
-      }
+      },
     }
   })
   builder.addCase(getEntitiesDataAction.pending, (state, action) => {
     const { deviceId, entitiesType } = action.meta.arg
-    state[deviceId][entitiesType]!.loading = true
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
+
+    state[deviceId]![entitiesType]!.loading = true
   })
   builder.addCase(getEntitiesDataAction.fulfilled, (state, action) => {
     const { deviceId, entitiesType } = action.meta.arg
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
 
-    state[deviceId][entitiesType]!.data = action.payload
-    state[deviceId][entitiesType]!.loading = false
+    state[deviceId]![entitiesType]!.data = action.payload
+    state[deviceId]![entitiesType]!.loading = false
   })
   builder.addCase(getEntitiesDataAction.rejected, (state, action) => {
     const { deviceId, entitiesType } = action.meta.arg
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
 
-    state[deviceId][entitiesType]!.loading = false
-    state[deviceId][entitiesType]!.error = true
+    state[deviceId]![entitiesType]!.loading = false
+    state[deviceId]![entitiesType]!.error = true
   })
 
   builder.addCase(setEntityData, (state, action) => {
     const { deviceId, entitiesType, entityId, data } = action.payload
-    const idFieldKey = state[deviceId][entitiesType]?.idFieldKey
+    const idFieldKey = state[deviceId]?.[entitiesType]?.idFieldKey
+
     if (!idFieldKey) {
       return
     }
-    const entityIndex = state[deviceId][entitiesType]!.data?.findIndex(
+
+    const entityIndex = state[deviceId]![entitiesType]!.data?.findIndex(
       (entity) => entity[idFieldKey] === entityId
     )
-    if (entityIndex !== -1 && state[deviceId][entitiesType]?.data) {
-      state[deviceId][entitiesType]!.data![entityIndex!] = data
+    if (entityIndex !== -1 && state[deviceId]![entitiesType]?.data) {
+      state[deviceId]![entitiesType]!.data![entityIndex!] = data
     }
   })
   builder.addCase(getEntitiesMetadataAction.fulfilled, (state, action) => {
     const { deviceId, entitiesType } = action.meta.arg
-    state[deviceId][entitiesType]!.metadata = action.payload
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
+
+    state[deviceId]![entitiesType]!.metadata = action.payload
   })
   builder.addCase(clearEntities, (state, action) => {
     state[action.payload.deviceId] = {}
   })
   builder.addCase(deleteEntitiesDataAction.fulfilled, (state, action) => {
-    const entitiesIds = action.payload
     const { entitiesType, deviceId } = action.meta.arg
-    const entities = state[deviceId][entitiesType]
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
+
+    const entitiesIds = action.payload
+    const entities = state[deviceId]![entitiesType]
 
     if (entities && entities.data && entities.idFieldKey) {
       entities.data = entities.data.filter(
@@ -102,8 +117,13 @@ export const genericEntitiesReducer = createReducer(initialState, (builder) => {
   })
   builder.addCase(createEntityDataAction.fulfilled, (state, action) => {
     const { entitiesType, deviceId } = action.meta.arg
+
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
+
     const newEntity = action.payload
-    const entities = state[deviceId][entitiesType]
+    const entities = state[deviceId]![entitiesType]
 
     if (!entities) return
     if (!entities.data) {
@@ -114,8 +134,12 @@ export const genericEntitiesReducer = createReducer(initialState, (builder) => {
   })
   builder.addCase(updateEntityDataAction.fulfilled, (state, action) => {
     const { entitiesType, deviceId } = action.meta.arg
+    if (!state[deviceId]?.[entitiesType]) {
+      return
+    }
+
     const updatedEntity = action.payload
-    const entities = state[deviceId][entitiesType]
+    const entities = state[deviceId]![entitiesType]
     const idFieldKey = entities?.idFieldKey
 
     if (!entities || !entities.data || !idFieldKey) return
diff --git a/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
index 7dcfce37fa..339cdd6fba 100644
--- a/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
+++ b/libs/generic-view/store/src/lib/entities/update-entity-data.action.ts
@@ -39,7 +39,7 @@ export const updateEntityDataAction = createAsyncThunk<
     }
 
     const { genericEntities } = getState()
-    const entities = genericEntities[deviceId][entitiesType]
+    const entities = genericEntities[deviceId]?.[entitiesType]
     const idFieldKey = entities?.idFieldKey
     if (!entities || !idFieldKey) {
       logger.error(
@@ -61,7 +61,7 @@ export const updateEntityDataAction = createAsyncThunk<
     }
 
     const computedFields =
-      genericEntities[deviceId][entitiesType]?.config.computedFields || {}
+      genericEntities[deviceId]?.[entitiesType]?.config.computedFields || {}
     return enhanceEntity(response.data.data, { computedFields })
   }
 )
diff --git a/libs/generic-view/store/src/lib/selectors/entities.ts b/libs/generic-view/store/src/lib/selectors/entities.ts
index 89eaab4351..3392b7b250 100644
--- a/libs/generic-view/store/src/lib/selectors/entities.ts
+++ b/libs/generic-view/store/src/lib/selectors/entities.ts
@@ -3,33 +3,38 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { createSelector } from "reselect"
+import { createSelector } from "@reduxjs/toolkit"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 
-const selectEntitiesOfDevice = createSelector(
+const selectDeviceEntities = createSelector(
   (state: ReduxRootState) => state.genericEntities,
-  (state: ReduxRootState, { deviceId }: { deviceId: string }) => deviceId,
-  (entities, deviceId) => {
-    return entities[deviceId]
+  (_: ReduxRootState, { deviceId }: { deviceId: string }) => deviceId,
+  (deviceEntitiesMap, deviceId) => {
+    return deviceEntitiesMap[deviceId]
   }
 )
 
 export const selectEntitiesIdFieldKey = createSelector(
-  selectEntitiesOfDevice,
-  (state: ReduxRootState, { entitiesType }: { entitiesType?: string }) => {
+  selectDeviceEntities,
+  (_: ReduxRootState, { entitiesType }: { entitiesType?: string }) => {
     return entitiesType
   },
   (entities, entitiesType) => {
-    if (!entitiesType) return undefined
+    if (!entitiesType || !entities) {
+      return undefined
+    }
     return entities[entitiesType]?.idFieldKey
   }
 )
 
 const selectEntities = createSelector(
-  selectEntitiesOfDevice,
-  (state: ReduxRootState, { entitiesType }: { entitiesType: string }) =>
+  selectDeviceEntities,
+  (_: ReduxRootState, { entitiesType }: { entitiesType: string }) =>
     entitiesType,
   (entities, entityType) => {
+    if (!entities) {
+      return undefined
+    }
     return entities[entityType]
   }
 )
@@ -58,8 +63,8 @@ export const selectEntityData = createSelector(
 )
 
 export const selectEntitiesLoadingState = createSelector(
-  selectEntitiesOfDevice,
-  (entities) => {
+  selectDeviceEntities,
+  (entities = {}) => {
     return Object.entries(entities).reduce(
       (
         acc: Record<

From 8eb4fd1b8f0729a42e145e351e607f95a821e2c7 Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 5 Nov 2024 10:08:28 +0100
Subject: [PATCH 56/64] [CP-3245] Handle content display based on data
 migration feature availability (#2155)

---
 .../renderer/locales/default/en-US.json             |  6 +++---
 .../data-migration/components/features-selector.tsx | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index df37d27476..78d2df2793 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -966,9 +966,9 @@
   "module.genericViews.dataMigration.features.title": "Select the data you want to transfer",
   "module.genericViews.dataMigration.features.notes": "Notes (coming soon!)",
   "module.genericViews.dataMigration.features.alarms": "Alarms (coming soon!)",
-  "module.genericViews.dataMigration.features.callLog": "Call log",
-  "module.genericViews.dataMigration.features.contacts": "Contacts",
-  "module.genericViews.dataMigration.features.messages": "Messages",
+  "module.genericViews.dataMigration.features.callLog": "Call log (coming soon!)",
+  "module.genericViews.dataMigration.features.contacts": "Contacts (coming soon!)",
+  "module.genericViews.dataMigration.features.messages": "Messages (coming soon!)",
   "module.genericViews.dataMigration.features.selectAll": "Select All",
   "module.genericViews.dataMigration.instruction.title": "Connect your devices",
   "module.genericViews.dataMigration.instruction.description": "Data can only be transferred from Pure to Kompakt\nand not vice versa.",
diff --git a/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx b/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
index 30035f0131..24f2169a3c 100644
--- a/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/data-migration/components/features-selector.tsx
@@ -41,6 +41,14 @@ const messages = defineMessages({
   },
 })
 
+const getLabelMessage = (
+  feature: DataMigrationFeature,
+  featureEnabled: boolean
+) => {
+  const message = intl.formatMessage(messages[feature])
+  return featureEnabled ? message.replace(" (coming soon!)", "") : message
+}
+
 interface Props {
   features: DataMigrationFeature[]
 }
@@ -80,6 +88,7 @@ export const FeaturesSelector: FunctionComponent<Props> = ({ features }) => {
       <Divider />
       <List>
         {Object.values(DataMigrationFeature).map((feature, index) => {
+          const featureEnabled = features.includes(feature)
           const onToggle = () => toggleFeature(feature)
           return (
             <Form.CheckboxInput
@@ -87,8 +96,8 @@ export const FeaturesSelector: FunctionComponent<Props> = ({ features }) => {
               config={{
                 name: "features",
                 value: feature,
-                label: intl.formatMessage(messages[feature]),
-                disabled: !features.includes(feature),
+                label: getLabelMessage(feature, featureEnabled),
+                disabled: !featureEnabled,
                 checked: selectedFeatures.includes(feature),
                 onToggle,
               }}

From da03c467e4cb0a5eb34d7f220f414e309059dd1c Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Tue, 5 Nov 2024 19:39:18 +0100
Subject: [PATCH 57/64] [CP-3248] Logic Reduction and Error Logging for Kompakt
 Backup (#2160)

---
 .../lib/file-manager/file-manager.service.ts  | 14 +++++++++---
 .../read-backup-directory.request.ts          | 11 +++++++---
 .../lib/backup/refresh-backup-list.action.ts  | 12 +++++++---
 .../src/lib/hooks/use-app-events-listeners.ts | 12 +++++++---
 .../store/src/lib/hooks/use-backup-list.ts    | 16 +++++++++-----
 .../store/src/lib/hooks/use-outbox.ts         | 22 +++++++++----------
 6 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/libs/device/feature/src/lib/file-manager/file-manager.service.ts b/libs/device/feature/src/lib/file-manager/file-manager.service.ts
index 65e2dd0361..81c3a1cc70 100644
--- a/libs/device/feature/src/lib/file-manager/file-manager.service.ts
+++ b/libs/device/feature/src/lib/file-manager/file-manager.service.ts
@@ -164,13 +164,19 @@ export class FileManager {
   }
 
   @IpcEvent(FileManagerServiceEvents.ReadDirectory)
-  public readDirectory({ path }: { path: string }): ResultObject<string[]> {
+  public readDirectory({
+    path,
+    disableErrorLog,
+  }: {
+    path: string
+    disableErrorLog?: boolean
+  }): ResultObject<string[]> {
     try {
       const result = readdirSync(path)
 
       return Result.success(result)
     } catch (e) {
-      console.log(e)
+      !disableErrorLog && console.log(e)
       return Result.failed(new AppError(GeneralError.InternalError))
     }
   }
@@ -178,8 +184,10 @@ export class FileManager {
   @IpcEvent(FileManagerServiceEvents.ReadBackupDirectory)
   public readBackupDirectory({
     deviceId,
+    disableErrorLog,
   }: {
     deviceId?: DeviceId
+    disableErrorLog?: boolean
   }): ResultObject<string[]> {
     const pathResult = this.getBackupPath({ deviceId })
 
@@ -187,7 +195,7 @@ export class FileManager {
       return Result.failed(new AppError(GeneralError.InternalError))
     }
 
-    return this.readDirectory({ path: pathResult.data })
+    return this.readDirectory({ disableErrorLog, path: pathResult.data })
   }
 
   public getFile(id: string) {
diff --git a/libs/device/feature/src/lib/file-manager/read-backup-directory.request.ts b/libs/device/feature/src/lib/file-manager/read-backup-directory.request.ts
index 85637dd091..cdd42a6318 100644
--- a/libs/device/feature/src/lib/file-manager/read-backup-directory.request.ts
+++ b/libs/device/feature/src/lib/file-manager/read-backup-directory.request.ts
@@ -8,10 +8,15 @@ import { DeviceId } from "Core/device/constants/device-id"
 import { FileManagerServiceEvents } from "device/models"
 import { ipcRenderer } from "electron-better-ipc"
 
-export const readBackupDirectoryRequest = (
-  deviceId: DeviceId
-): Promise<ResultObject<string[]>> => {
+export const readBackupDirectoryRequest = ({
+  deviceId,
+  disableErrorLog,
+}: {
+  deviceId?: DeviceId
+  disableErrorLog?: boolean
+}): Promise<ResultObject<string[]>> => {
   return ipcRenderer.callMain(FileManagerServiceEvents.ReadBackupDirectory, {
     deviceId,
+    disableErrorLog,
   })
 }
diff --git a/libs/generic-view/store/src/lib/backup/refresh-backup-list.action.ts b/libs/generic-view/store/src/lib/backup/refresh-backup-list.action.ts
index 8fa3abed20..393ba6f1b3 100644
--- a/libs/generic-view/store/src/lib/backup/refresh-backup-list.action.ts
+++ b/libs/generic-view/store/src/lib/backup/refresh-backup-list.action.ts
@@ -13,11 +13,14 @@ import { Backup } from "./reducer"
 
 export const refreshBackupList = createAsyncThunk<
   { refreshTimestamp: number; backups: Backup[]; deviceId: DeviceId },
-  undefined,
+  { disableErrorLog: boolean } | undefined,
   { state: ReduxRootState }
 >(
   ActionName.RefreshBackupList,
-  async (_, { getState, dispatch, rejectWithValue }) => {
+  async (
+    { disableErrorLog } = { disableErrorLog: false },
+    { getState, rejectWithValue }
+  ) => {
     const refreshTimestamp = new Date().getTime()
 
     const deviceId = selectActiveApiDeviceId(getState())
@@ -25,7 +28,10 @@ export const refreshBackupList = createAsyncThunk<
       return rejectWithValue(undefined)
     }
 
-    const backupsList = await readBackupDirectoryRequest(deviceId)
+    const backupsList = await readBackupDirectoryRequest({
+      deviceId,
+      disableErrorLog,
+    })
 
     if (!backupsList.ok) {
       return rejectWithValue(undefined)
diff --git a/libs/generic-view/store/src/lib/hooks/use-app-events-listeners.ts b/libs/generic-view/store/src/lib/hooks/use-app-events-listeners.ts
index 251e1942d1..3c276d4098 100644
--- a/libs/generic-view/store/src/lib/hooks/use-app-events-listeners.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-app-events-listeners.ts
@@ -4,24 +4,30 @@
  */
 
 import { useEffect } from "react"
-import { useDispatch } from "react-redux"
+import { useDispatch, useSelector } from "react-redux"
 import { answerMain, AppEvents } from "shared/utils"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { refreshBackupList } from "../backup/refresh-backup-list.action"
+import { selectActiveApiDeviceId } from "../selectors/select-active-api-device-id"
 
 export const useAppEventsListeners = () => {
   const dispatch = useDispatch<Dispatch>()
+  const activeApiDeviceId = useSelector(selectActiveApiDeviceId)
 
   useEffect(() => {
+    if (!activeApiDeviceId) {
+      return
+    }
+
     const unregisterWindowFocusedListener = answerMain(
       AppEvents.WindowFocused,
       () => {
-        dispatch(refreshBackupList())
+        dispatch(refreshBackupList({ disableErrorLog: true }))
       }
     )
 
     return () => {
       unregisterWindowFocusedListener()
     }
-  }, [dispatch])
+  }, [dispatch, activeApiDeviceId])
 }
diff --git a/libs/generic-view/store/src/lib/hooks/use-backup-list.ts b/libs/generic-view/store/src/lib/hooks/use-backup-list.ts
index e1292c44cd..2e9a4442dc 100644
--- a/libs/generic-view/store/src/lib/hooks/use-backup-list.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-backup-list.ts
@@ -3,22 +3,26 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { useEffect } from "react"
-import { useDispatch } from "react-redux"
+import { useDispatch, useSelector } from "react-redux"
+import { Dispatch } from "Core/__deprecated__/renderer/store"
 import { refreshBackupList } from "../backup/refresh-backup-list.action"
+import { selectActiveApiDeviceId } from "../selectors/select-active-api-device-id"
 
 export const useBackupList = () => {
   const dispatch = useDispatch<Dispatch>()
+  const activeApiDeviceId = useSelector(selectActiveApiDeviceId)
 
   useEffect(() => {
+    if (!activeApiDeviceId) {
+      return
+    }
+
     const interval = setInterval(() => {
-      dispatch(refreshBackupList())
+      dispatch(refreshBackupList({ disableErrorLog: true }))
     }, 5000)
     return () => {
       clearInterval(interval)
     }
-  }, [dispatch])
-
-  return undefined
+  }, [dispatch, activeApiDeviceId])
 }
diff --git a/libs/generic-view/store/src/lib/hooks/use-outbox.ts b/libs/generic-view/store/src/lib/hooks/use-outbox.ts
index f7be926140..395432e277 100644
--- a/libs/generic-view/store/src/lib/hooks/use-outbox.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-outbox.ts
@@ -13,23 +13,23 @@ import { useLockedDeviceHandler } from "./use-locked-device-handler"
 
 export const useOutbox = () => {
   const dispatch = useDispatch<Dispatch>()
-  const activeDeviceId = useSelector(selectActiveApiDeviceId)
+  const activeApiDeviceId = useSelector(selectActiveApiDeviceId)
   const lastRefreshTimestamp = useSelector(selectLastRefreshTimestamp)
   useLockedDeviceHandler()
 
   useEffect(() => {
-    if (activeDeviceId) {
-      const outboxTimeout = setTimeout(() => {
-        dispatch(getOutboxData({ deviceId: activeDeviceId }))
-      }, 2000)
+    if (!activeApiDeviceId) {
+      return
+    }
+
+    const outboxTimeout = setTimeout(() => {
+      dispatch(getOutboxData({ deviceId: activeApiDeviceId }))
+    }, 2000)
 
-      return () => {
-        clearTimeout(outboxTimeout)
-      }
+    return () => {
+      clearTimeout(outboxTimeout)
     }
-    return
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [activeDeviceId, lastRefreshTimestamp])
+  }, [activeApiDeviceId, lastRefreshTimestamp, dispatch])
 }
 
 export const OutboxWrapper = () => {

From 40e323bff0047df6121a953a36aa500c87aa4513 Mon Sep 17 00:00:00 2001
From: MateuszMudita <165778944+MateuszMudita@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:17:10 +0100
Subject: [PATCH 58/64] [CP-3205] Recovery Completed modal (#2154)

---
 .../components/core/icon/icon-type.ts         |  3 +-
 .../components/core/icon/icon.config.ts       |  2 +
 .../renderer/locales/default/en-US.json       | 14 +--
 .../renderer/svg/light-button-icon.svg        | 13 +++
 .../analytic-data-tracker.factory.test.ts     | 11 +++
 .../services/backup-create.service.test.ts    | 11 +++
 .../services/backup-restore.service.test.ts   | 11 +++
 .../hooks/use-msc-device-detached-effect.ts   | 22 +++--
 .../selectors/device-state.selector.test.ts   | 11 +++
 .../selectors/get-left-time.selector.test.ts  | 11 +++
 .../components/modals-manager.component.tsx   |  3 +-
 .../reducers/settings.reducer.test.ts         | 11 +++
 ...get-device-lowest-version.selector.test.ts | 11 +++
 .../services/configuration.service.test.ts    | 11 +++
 ...lready-processed-releases.selector.test.ts | 11 +++
 .../are-all-releases-downloaded.test.ts       | 11 +++
 .../selectors/update-state.selector.test.ts   | 11 +++
 .../actions/handle-device-activated.action.ts |  2 +
 .../src/lib/selectors/index.ts                |  1 -
 .../selectors/select-is-flashing-in-state.ts  | 14 ---
 .../msc-flash-harmony/src/lib/ui/index.ts     |  1 +
 .../mac-terminal-info-modal.component.tsx     | 12 +--
 .../recovery-complete-modal.component.tsx     | 87 +++++++++++++++++++
 23 files changed, 261 insertions(+), 34 deletions(-)
 create mode 100644 libs/core/__deprecated__/renderer/svg/light-button-icon.svg
 delete mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
 create mode 100644 libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-complete-modal/recovery-complete-modal.component.tsx

diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
index f5231feacb..4def9c3805 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon-type.ts
@@ -132,5 +132,6 @@ export enum IconType {
   DataMigration,
   RecoveryModeWhite,
   RecoveryModeBlack,
-  ButtonSuccess
+  ButtonSuccess,
+  LightButton,
 }
diff --git a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
index 2558ed4f46..0ab1afadad 100644
--- a/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
+++ b/libs/core/__deprecated__/renderer/components/core/icon/icon.config.ts
@@ -131,6 +131,7 @@ import ButtonSuccess from "Core/__deprecated__/renderer/svg/button-success.svg"
 import DataMigration from "../../../../../../generic-view/ui/src/lib/icon/svg/data-migration.svg"
 import RecoveryModeWhite from "../../../../../../generic-view/ui/src/lib/icon/svg/recovery-mode-white.svg"
 import RecoveryModeBlack from "../../../../../../generic-view/ui/src/lib/icon/svg/recovery-mode-black.svg"
+import LightButton from "Core/__deprecated__/renderer/svg/light-button-icon.svg"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
 
@@ -508,6 +509,7 @@ const typeToIcon: Partial<Record<IconType, typeof Arrow>> = {
   [IconType.RecoveryModeWhite]: RecoveryModeWhite,
   [IconType.RecoveryModeBlack]: RecoveryModeBlack,
   [IconType.ButtonSuccess]: ButtonSuccess,
+  [IconType.LightButton]: LightButton,
 }
 
 export const getIconType = (
diff --git a/libs/core/__deprecated__/renderer/locales/default/en-US.json b/libs/core/__deprecated__/renderer/locales/default/en-US.json
index 78d2df2793..0754fd1456 100644
--- a/libs/core/__deprecated__/renderer/locales/default/en-US.json
+++ b/libs/core/__deprecated__/renderer/locales/default/en-US.json
@@ -1028,12 +1028,14 @@
   "module.recoveryMode.modal.error.message": "The process was interrupted. Please try again.",
   "module.recoveryMode.modal.waitingForBackButton.subtitle": "Almost finished...",
   "module.recoveryMode.modal.waitingForBackButton.description": "Press the back button on your device to complete the recovery process.",
-  "module.recoveryMode.mocal.terminalInfo.subtitle": "Just a few more steps...",
-  "module.recoveryMode.mocal.terminalInfo.description": "The Terminal was opened in the background",
-  "module.recoveryMode.mocal.terminalInfo.step1": "1. Switch to the open terminal",
-  "module.recoveryMode.mocal.terminalInfo.step2": "2. Press enter to start the process",
-  "module.recoveryMode.mocal.terminalInfo.step3": "3. Enter your computer password when prompted",
-  "module.recoveryMode.mocal.terminalInfo.step4": "4. Repeat your computer password when prompted",
+  "module.recoveryMode.modal.terminalInfo.subtitle": "Just a few more steps...",
+  "module.recoveryMode.modal.terminalInfo.description": "The Terminal was opened in the background",
+  "module.recoveryMode.modal.terminalInfo.step1": "1. Switch to the open terminal",
+  "module.recoveryMode.modal.terminalInfo.step2": "2. Press enter to start the process",
+  "module.recoveryMode.modal.terminalInfo.step3": "3. Enter your computer password when prompted",
+  "module.recoveryMode.modal.terminalInfo.step4": "4. Repeat your computer password when prompted",
+  "module.recoveryMode.modal.completed.subtitle": "Recovery process complete",
+  "module.recoveryMode.modal.completed.description": "Harmony is in transport mode. Press the light button when \"ON\" and \"OFF\" appear on harmony's screen.",
   "module.genericViews.dataMigration.cancelConfirm.title": "Cancel data transfer?",
   "module.genericViews.dataMigration.cancelConfirm.description": "We’ll stop the transfer but some data may already be on your Kompakt.",
   "module.genericViews.dataMigration.cancelConfirm.cancelButtonLabel": "Cancel transfer",
diff --git a/libs/core/__deprecated__/renderer/svg/light-button-icon.svg b/libs/core/__deprecated__/renderer/svg/light-button-icon.svg
new file mode 100644
index 0000000000..b427a42bc2
--- /dev/null
+++ b/libs/core/__deprecated__/renderer/svg/light-button-icon.svg
@@ -0,0 +1,13 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="47" height="47" rx="23.5" fill="white"/>
+<rect x="0.5" y="0.5" width="47" height="47" rx="23.5" stroke="#3B3F42"/>
+<path d="M33.6455 19.3221L30.1078 20.7875C29.6971 20.9576 29.501 21.4257 29.6697 21.833C29.8385 22.2403 30.3081 22.4326 30.7188 22.2625L34.2565 20.7972C34.6671 20.6271 34.8632 20.159 34.6945 19.7517C34.5258 19.3443 34.0561 19.152 33.6455 19.3221Z" fill="black"/>
+<path d="M17.539 25.9912L14.0013 27.4566C13.5907 27.6266 13.3946 28.0947 13.5633 28.502C13.732 28.9094 14.2017 29.1017 14.6123 28.9316L18.15 27.4662C18.5607 27.2961 18.7568 26.8281 18.588 26.4207C18.4193 26.0134 17.9497 25.8211 17.539 25.9912Z" fill="black"/>
+<path d="M14.6211 19.3262C14.2105 19.1561 13.7408 19.3484 13.5721 19.7558C13.4034 20.1631 13.5995 20.6312 14.0101 20.8013L17.5478 22.2666C17.9585 22.4367 18.4281 22.2444 18.5968 21.8371C18.7656 21.4298 18.5694 20.9617 18.1588 20.7916L14.6211 19.3262Z" fill="black"/>
+<path d="M30.71 26.0072C30.2993 25.8372 29.8297 26.0295 29.661 26.4368C29.4922 26.8441 29.6884 27.3122 30.099 27.4823L33.6367 28.9477C34.0473 29.1177 34.517 28.9254 34.6857 28.5181C34.8544 28.1108 34.6583 27.6427 34.2477 27.4726L30.71 26.0072Z" fill="black"/>
+<path d="M27.4546 14.0032L25.9893 17.5409C25.8192 17.9515 26.0115 18.4212 26.4188 18.5899C26.8261 18.7586 27.2942 18.5625 27.4643 18.1519L28.9297 14.6142C29.0998 14.2035 28.9074 13.7339 28.5001 13.5652C28.0928 13.3965 27.6247 13.5926 27.4546 14.0032Z" fill="black"/>
+<path d="M20.7736 30.0919L19.3082 33.6297C19.1381 34.0403 19.3304 34.5099 19.7378 34.6787C20.1451 34.8474 20.6132 34.6513 20.7833 34.2406L22.2486 30.7029C22.4187 30.2923 22.2264 29.8226 21.8191 29.6539C21.4118 29.4852 20.9437 29.6813 20.7736 30.0919Z" fill="black"/>
+<path d="M28.207 22.451C28.541 23.2548 28.6292 24.1395 28.4603 24.9934C28.2915 25.8472 27.8732 26.6318 27.2584 27.2479C26.6436 27.8641 25.8599 28.284 25.0064 28.4547C24.153 28.6253 23.268 28.5391 22.4636 28.2067C21.6591 27.8744 20.9713 27.311 20.4871 26.5878C20.0029 25.8645 19.744 25.0139 19.7433 24.1435C19.7426 23.2731 20 22.422 20.4829 21.698C20.9659 20.9739 21.6528 20.4093 22.4567 20.0756C23.5346 19.6319 24.7443 19.6327 25.8216 20.0777C26.8989 20.5228 27.7565 21.376 28.207 22.451ZM23.0149 21.5554C22.5118 21.7778 22.0858 22.1438 21.7901 22.6076C21.4944 23.0713 21.3424 23.6121 21.3531 24.162C21.3637 24.7118 21.5366 25.2463 21.8501 25.6982C22.1635 26.1502 22.6034 26.4994 23.1147 26.7021C23.626 26.9048 24.1857 26.952 24.7237 26.8376C25.2616 26.7232 25.7538 26.4524 26.1384 26.0593C26.5229 25.6661 26.7828 25.1681 26.8852 24.6277C26.9877 24.0874 26.9282 23.5288 26.7142 23.0222C26.5716 22.6798 26.3618 22.3694 26.0972 22.1094C25.8327 21.8495 25.5188 21.6451 25.174 21.5084C24.8292 21.3717 24.4605 21.3054 24.0897 21.3135C23.7188 21.3215 23.3534 21.4038 23.0149 21.5554Z" fill="black"/>
+<path d="M20.7892 14.0013C20.6192 13.5907 20.1511 13.3946 19.7437 13.5633C19.3364 13.732 19.1441 14.2017 19.3142 14.6123L20.7796 18.15C20.9497 18.5606 21.4177 18.7567 21.8251 18.588C22.2324 18.4193 22.4247 17.9497 22.2546 17.539L20.7892 14.0013Z" fill="black"/>
+<path d="M27.4583 30.1078C27.2882 29.6971 26.8201 29.501 26.4128 29.6697C26.0055 29.8384 25.8132 30.3081 25.9833 30.7187L27.4486 34.2564C27.6187 34.6671 28.0868 34.8632 28.4941 34.6945C28.9015 34.5258 29.0938 34.0561 28.9237 33.6455L27.4583 30.1078Z" fill="black"/>
+</svg>
diff --git a/libs/core/analytic-data-tracker/services/analytic-data-tracker.factory.test.ts b/libs/core/analytic-data-tracker/services/analytic-data-tracker.factory.test.ts
index 2d21de225f..40a56c9f44 100644
--- a/libs/core/analytic-data-tracker/services/analytic-data-tracker.factory.test.ts
+++ b/libs/core/analytic-data-tracker/services/analytic-data-tracker.factory.test.ts
@@ -13,6 +13,17 @@ import { getSettingsService } from "Core/settings/containers"
 import { SettingsService } from "Core/settings/services"
 import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 jest.mock("Core/settings/containers/settings.container")
 jest.mock("Core/__deprecated__/main/utils/logger")
 jest.mock("axios")
diff --git a/libs/core/backup/services/backup-create.service.test.ts b/libs/core/backup/services/backup-create.service.test.ts
index 25ec034d2e..788574f2b4 100644
--- a/libs/core/backup/services/backup-create.service.test.ts
+++ b/libs/core/backup/services/backup-create.service.test.ts
@@ -16,6 +16,17 @@ import { DeviceFileSystemService } from "Core/device-file-system/services"
 import { FileManagerService } from "Core/files-manager/services"
 import { DeviceInfoService } from "Core/device-info/services"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const updaterStatusSuccessMock: UpdaterStatus = {
   branch: "",
   message: "",
diff --git a/libs/core/backup/services/backup-restore.service.test.ts b/libs/core/backup/services/backup-restore.service.test.ts
index d5ef5208b1..3698d5fc20 100644
--- a/libs/core/backup/services/backup-restore.service.test.ts
+++ b/libs/core/backup/services/backup-restore.service.test.ts
@@ -17,6 +17,17 @@ import { FileSystemService } from "Core/file-system/services/file-system.service
 import { DeviceFileSystemService } from "Core/device-file-system/services"
 import { DeviceInfoService } from "Core/device-info/services"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const arrayBufferToBuffer = (unitArray: Uint8Array): Buffer => {
   const buffer = Buffer.alloc(unitArray.byteLength)
   const view = new Uint8Array(unitArray)
diff --git a/libs/core/core/hooks/use-msc-device-detached-effect.ts b/libs/core/core/hooks/use-msc-device-detached-effect.ts
index bbc452f0db..734e204497 100644
--- a/libs/core/core/hooks/use-msc-device-detached-effect.ts
+++ b/libs/core/core/hooks/use-msc-device-detached-effect.ts
@@ -14,8 +14,9 @@ import {
 import {
   abortMscFlashing,
   FlashingProcessState,
+  selectFlashingProcessState,
   selectIsFlashingInActivePhases,
-  selectIsFlashingInState,
+  setFlashingProcessState,
   setMscFlashingInitialState,
 } from "msc-flash-harmony"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
@@ -36,10 +37,12 @@ export const useMscDeviceDetachedEffect = () => {
 
 const useHandleDevicesDetached = () => {
   const dispatch = useDispatch<Dispatch>()
+  const flashingProcessState = useSelector(selectFlashingProcessState)
   const flashingInActivePhases = useSelector(selectIsFlashingInActivePhases)
-  const flashingInWaitingForBackButtonState = useSelector(
-    selectIsFlashingInState(FlashingProcessState.WaitingForBackButton)
-  )
+  const flashingInWaitingForBackButtonState =
+    flashingProcessState === FlashingProcessState.WaitingForBackButton
+  const flashingInRestartingPhase =
+    flashingProcessState === FlashingProcessState.Restarting
 
   return useCallback(
     (deviceDetachedEvents: DeviceBaseProperties[]) => {
@@ -56,11 +59,20 @@ const useHandleDevicesDetached = () => {
         return
       }
 
+      if (flashingInRestartingPhase) {
+        dispatch(setFlashingProcessState(FlashingProcessState.Completed))
+      }
+
       const reason = flashingInActivePhases
         ? FlashingProcessState.Failed
         : undefined
       dispatch(abortMscFlashing({ reason }))
     },
-    [dispatch, flashingInActivePhases, flashingInWaitingForBackButtonState]
+    [
+      dispatch,
+      flashingInActivePhases,
+      flashingInWaitingForBackButtonState,
+      flashingInRestartingPhase,
+    ]
   )
 }
diff --git a/libs/core/device/selectors/device-state.selector.test.ts b/libs/core/device/selectors/device-state.selector.test.ts
index 46fcbf3e03..ba6c750be3 100644
--- a/libs/core/device/selectors/device-state.selector.test.ts
+++ b/libs/core/device/selectors/device-state.selector.test.ts
@@ -7,6 +7,17 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { initialState, deviceReducer } from "Core/device/reducers"
 import { deviceStateSelector } from "Core/device/selectors/device-state.selector"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 describe("`deviceStateSelector` selector", () => {
   test("when initial state is set selector returns initial state", () => {
     const state = {
diff --git a/libs/core/device/selectors/get-left-time.selector.test.ts b/libs/core/device/selectors/get-left-time.selector.test.ts
index d512c74fb2..063b45782c 100644
--- a/libs/core/device/selectors/get-left-time.selector.test.ts
+++ b/libs/core/device/selectors/get-left-time.selector.test.ts
@@ -8,6 +8,17 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { deviceReducer, initialState } from "Core/device"
 import { getLeftTimeSelector } from "Core/device/selectors/get-left-time.selector"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 MockDate.set("2000-2-1")
 
 describe("`getLeftTimeSelector` selector", () => {
diff --git a/libs/core/modals-manager/components/modals-manager.component.tsx b/libs/core/modals-manager/components/modals-manager.component.tsx
index 80323d4262..08e9365075 100644
--- a/libs/core/modals-manager/components/modals-manager.component.tsx
+++ b/libs/core/modals-manager/components/modals-manager.component.tsx
@@ -5,7 +5,7 @@
 
 import React from "react"
 import { useSelector } from "react-redux"
-import { FlashingErrorModal } from "msc-flash-harmony"
+import { FlashingErrorModal, RecoveryCompleteModal } from "msc-flash-harmony"
 import { FunctionComponent } from "Core/core/types/function-component.interface"
 import ContactSupportFlow from "Core/contact-support/containers/contact-support-flow.container"
 import { UpdateOsInterruptedFlowContainer } from "Core/update/components/update-os-interrupted-flow"
@@ -27,6 +27,7 @@ const ModalsManager: FunctionComponent = () => {
       <ConnectingLoaderModal />
       <DetachedDuringUploadErrorModal />
       <FlashingErrorModal />
+      <RecoveryCompleteModal />
       {appUpdateVisible && <AppUpdateFlow />}
     </>
   )
diff --git a/libs/core/settings/reducers/settings.reducer.test.ts b/libs/core/settings/reducers/settings.reducer.test.ts
index 88b0d630a5..63eecb2579 100644
--- a/libs/core/settings/reducers/settings.reducer.test.ts
+++ b/libs/core/settings/reducers/settings.reducer.test.ts
@@ -14,6 +14,17 @@ import {
 } from "Core/__deprecated__/renderer/store/helpers"
 import { SettingsState } from "Core/settings/reducers"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const settings: SettingsState = {
   applicationId: "app-Nr8uiSV7KmWxX3WOFqZPF7uB",
   osBackupLocation: `fake/path/pure/phone/backups/`,
diff --git a/libs/core/settings/selectors/get-device-lowest-version.selector.test.ts b/libs/core/settings/selectors/get-device-lowest-version.selector.test.ts
index 19c1eb265f..cb52636964 100644
--- a/libs/core/settings/selectors/get-device-lowest-version.selector.test.ts
+++ b/libs/core/settings/selectors/get-device-lowest-version.selector.test.ts
@@ -8,6 +8,17 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { initialState } from "Core/settings/reducers"
 import { getDeviceLatestVersion } from "Core/settings/selectors/get-device-lowest-version.selector"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const defaultState = {
   device: {
     deviceType: null,
diff --git a/libs/core/settings/services/configuration.service.test.ts b/libs/core/settings/services/configuration.service.test.ts
index 7f8ae4b702..03d3fe3c1d 100644
--- a/libs/core/settings/services/configuration.service.test.ts
+++ b/libs/core/settings/services/configuration.service.test.ts
@@ -8,6 +8,17 @@ import axios from "axios"
 import { Configuration } from "Core/settings/dto"
 import { ConfigurationService } from "Core/settings/services/configuration.service"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const createMockAdapter = (): MockAdapter => {
   return new MockAdapter(axios)
 }
diff --git a/libs/core/update/selectors/already-processed-releases/already-processed-releases.selector.test.ts b/libs/core/update/selectors/already-processed-releases/already-processed-releases.selector.test.ts
index 6a11d95822..b6c6e5e4e7 100644
--- a/libs/core/update/selectors/already-processed-releases/already-processed-releases.selector.test.ts
+++ b/libs/core/update/selectors/already-processed-releases/already-processed-releases.selector.test.ts
@@ -16,6 +16,17 @@ import {
   ReleaseProcessState,
 } from "Core/update/constants"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const mockedRelease: OsRelease = {
   date: "2021-02-02",
   file: {
diff --git a/libs/core/update/selectors/are-all-releases-downloaded/are-all-releases-downloaded.test.ts b/libs/core/update/selectors/are-all-releases-downloaded/are-all-releases-downloaded.test.ts
index 45895f919c..505f65b19c 100644
--- a/libs/core/update/selectors/are-all-releases-downloaded/are-all-releases-downloaded.test.ts
+++ b/libs/core/update/selectors/are-all-releases-downloaded/are-all-releases-downloaded.test.ts
@@ -13,6 +13,17 @@ import { initialState, updateOsReducer } from "Core/update/reducers"
 import { areAllReleasesDownloaded } from "Core/update/selectors/are-all-releases-downloaded/are-all-releases-downloaded.selector"
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 const mockedRelease: OsRelease = {
   date: "2021-02-02",
   file: {
diff --git a/libs/core/update/selectors/update-state.selector.test.ts b/libs/core/update/selectors/update-state.selector.test.ts
index 6464eecb9a..3498938b16 100644
--- a/libs/core/update/selectors/update-state.selector.test.ts
+++ b/libs/core/update/selectors/update-state.selector.test.ts
@@ -7,6 +7,17 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { initialState, updateOsReducer } from "Core/update/reducers"
 import { updateStateSelector } from "Core/update/selectors/update-state-selector"
 
+jest.mock("history", () => ({
+  createHashHistory: jest.fn(() => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    block: jest.fn(),
+    listen: jest.fn(),
+    location: { pathname: "", search: "", hash: "", state: null },
+  })),
+}))
+
 describe("`updateStateSelector` selector", () => {
   test("when initial state is set selector returns initial state", () => {
     const state = {
diff --git a/libs/device-manager/feature/src/actions/handle-device-activated.action.ts b/libs/device-manager/feature/src/actions/handle-device-activated.action.ts
index 4a47e60e71..a04182e9aa 100644
--- a/libs/device-manager/feature/src/actions/handle-device-activated.action.ts
+++ b/libs/device-manager/feature/src/actions/handle-device-activated.action.ts
@@ -11,6 +11,7 @@ import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { DeviceId } from "Core/device/constants/device-id"
 import { setDiscoveryStatus } from "Core/discovery-device/actions/base.action"
 import { DiscoveryStatus } from "Core/discovery-device/reducers/discovery-device.interface"
+import { setMscFlashingInitialState } from "../../../../msc-flash/msc-flash-harmony/src/lib/actions/actions"
 
 export const handleDeviceActivated = createAsyncThunk<
   void,
@@ -20,5 +21,6 @@ export const handleDeviceActivated = createAsyncThunk<
   await dispatch(setActiveDevice(deviceId))
   dispatch(cleanBackupProcess())
   dispatch(cleanRestoreProcess())
+  dispatch(setMscFlashingInitialState())
   setDiscoveryStatus(DiscoveryStatus.Discovered)
 })
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
index e523005240..313272bf24 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/index.ts
@@ -7,4 +7,3 @@ export * from "./select-flashing-state"
 export * from "./select-flashing-abort-controller"
 export * from "./select-flashing-process-state"
 export * from "./select-is-flashing-in-active-phases"
-export * from "./select-is-flashing-in-state"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts b/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
deleted file mode 100644
index fb799f00c0..0000000000
--- a/libs/msc-flash/msc-flash-harmony/src/lib/selectors/select-is-flashing-in-state.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) Mudita sp. z o.o. All rights reserved.
- * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
- */
-
-import { createSelector } from "@reduxjs/toolkit"
-import { FlashingProcessState } from "../constants"
-import { selectFlashingProcessState } from "./select-flashing-process-state"
-
-export const selectIsFlashingInState = (targetState: FlashingProcessState) =>
-  createSelector(
-    selectFlashingProcessState,
-    (flashingProcessState) => flashingProcessState === targetState
-  )
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
index 780f62c731..3505b8299c 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/index.ts
@@ -5,3 +5,4 @@
 
 export * from "./recovery-mode"
 export * from "./flashing-error-modal/flashing-error-modal.component"
+export * from "./recovery-complete-modal/recovery-complete-modal.component"
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
index 5582e12570..cd5977a7e9 100644
--- a/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/mac-terminal-info-modal/mac-terminal-info-modal.component.tsx
@@ -26,22 +26,22 @@ const messages = defineMessages({
     id: "module.recoveryMode.harmony.title",
   },
   macTerminalInfoModalSubtitle: {
-    id: "module.recoveryMode.mocal.terminalInfo.subtitle",
+    id: "module.recoveryMode.modal.terminalInfo.subtitle",
   },
   macTerminalInfoModalDescription: {
-    id: "module.recoveryMode.mocal.terminalInfo.description",
+    id: "module.recoveryMode.modal.terminalInfo.description",
   },
   macTerminalInfoModalStep1: {
-    id: "module.recoveryMode.mocal.terminalInfo.step1",
+    id: "module.recoveryMode.modal.terminalInfo.step1",
   },
   macTerminalInfoModalStep2: {
-    id: "module.recoveryMode.mocal.terminalInfo.step2",
+    id: "module.recoveryMode.modal.terminalInfo.step2",
   },
   macTerminalInfoModalStep3: {
-    id: "module.recoveryMode.mocal.terminalInfo.step3",
+    id: "module.recoveryMode.modal.terminalInfo.step3",
   },
   macTerminalInfoModalStep4: {
-    id: "module.recoveryMode.mocal.terminalInfo.step4",
+    id: "module.recoveryMode.modal.terminalInfo.step4",
   },
 })
 
diff --git a/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-complete-modal/recovery-complete-modal.component.tsx b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-complete-modal/recovery-complete-modal.component.tsx
new file mode 100644
index 0000000000..00bee1d54f
--- /dev/null
+++ b/libs/msc-flash/msc-flash-harmony/src/lib/ui/recovery-complete-modal/recovery-complete-modal.component.tsx
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import React from "react"
+import styled from "styled-components"
+import { useDispatch, useSelector } from "react-redux"
+import { defineMessages } from "react-intl"
+import { ModalContent, ModalDialog, RoundIconWrapper } from "Core/ui"
+import Icon from "Core/__deprecated__/renderer/components/core/icon/icon.component"
+import { FunctionComponent } from "Core/core/types/function-component.interface"
+import { intl } from "Core/__deprecated__/renderer/utils/intl"
+import { ModalSize } from "Core/__deprecated__/renderer/components/core/modal/modal.interface"
+import { IconType } from "Core/__deprecated__/renderer/components/core/icon/icon-type"
+import Text, {
+  TextDisplayStyle,
+} from "Core/__deprecated__/renderer/components/core/text/text.component"
+import { selectFlashingProcessState } from "../../selectors"
+import { FlashingProcessState } from "../../constants"
+import { setFlashingProcessState } from "../../actions"
+
+const messages = defineMessages({
+  recoveryCompleteModalTitle: {
+    id: "module.recoveryMode.harmony.title",
+  },
+  recoveryCompleteModalSubtitle: {
+    id: "module.recoveryMode.modal.completed.subtitle",
+  },
+  recoveryCompleteModalDescription: {
+    id: "module.recoveryMode.modal.completed.description",
+  },
+})
+
+export const RecoveryCompleteModal: FunctionComponent = () => {
+  const dispatch = useDispatch()
+  const flashingProcessState = useSelector(selectFlashingProcessState)
+  const opened = flashingProcessState === FlashingProcessState.Completed
+
+  const onClose = () => {
+    dispatch(setFlashingProcessState(FlashingProcessState.Idle))
+  }
+
+  return (
+    <>
+      <ModalDialog
+        open={opened}
+        title={intl.formatMessage(messages.recoveryCompleteModalTitle)}
+        size={ModalSize.Small}
+        closeable={true}
+        closeButton={false}
+        closeModal={onClose}
+        onClose={onClose}
+      >
+        <ModalContent>
+          <RoundIconWrapper>
+            <Icon type={IconType.CheckCircleBlack} width={4.8} />
+          </RoundIconWrapper>
+          <Text
+            displayStyle={TextDisplayStyle.Headline4}
+            message={messages.recoveryCompleteModalSubtitle}
+          />
+          <Descrption>
+            <Text
+              displayStyle={TextDisplayStyle.Paragraph4}
+              message={messages.recoveryCompleteModalDescription}
+            />
+          </Descrption>
+          <LightButtonIconWrapper>
+            <Icon type={IconType.LightButton} width={4.8} />
+          </LightButtonIconWrapper>
+        </ModalContent>
+      </ModalDialog>
+    </>
+  )
+}
+
+const Descrption = styled.div`
+  margin-top: 0.8rem;
+`
+
+export const LightButtonIconWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.4rem;
+`

From cfc567dc670cb431bb3037013136580ad8fed12b Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Fri, 8 Nov 2024 12:22:53 +0100
Subject: [PATCH 59/64] [CP-3261] The drawer does not appear when the second
 device is connected (#2169)

---
 .../components/use-loader-skip-on-connect.hook.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts b/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
index 49df42ebfc..f16f226fa5 100644
--- a/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
+++ b/libs/core/modals-manager/components/use-loader-skip-on-connect.hook.ts
@@ -38,7 +38,7 @@ export const useLoaderSkipOnConnect = () => {
       checkIsAnyOtherModalPresent(CONNECTING_LOADER_MODAL_ID) ||
       !noNewDevicesDetectedState ||
       dialogOpen ||
-      timeSyncStatus !== "idle"
+      !["idle", undefined].includes(timeSyncStatus)
     )
   }, [
     history.location.pathname,

From e8dced270161839d8abe35350753ae180bc6480d Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Thu, 14 Nov 2024 09:13:11 +0100
Subject: [PATCH 60/64] [CP-2866] I want to perform the Alarms migration from
 Pure to Kompakt  (#2167)

---
 .../actions/read-all-indexes.action.test.ts   |   1 +
 .../actions/read-all-indexes.action.ts        |   5 +-
 .../data-sync/constants/event.constant.ts     |   8 +
 .../data-sync/constants/index.constant.ts     |   1 +
 libs/core/data-sync/constants/index.ts        |   1 +
 libs/core/data-sync/indexes/alarm-indexer.ts  |  63 +++
 libs/core/data-sync/indexes/index.ts          |   1 +
 .../presenters/alarm/alarm-presenter.ts       |  66 +++
 .../presenters/alarm/alarm.presenter.test.ts  | 389 ++++++++++++++++++
 libs/core/data-sync/presenters/index.ts       |   1 +
 .../data-sync/services/data-sync.service.ts   |  11 +-
 .../core/data-sync/types/alarm-object.type.ts |  24 ++
 libs/core/data-sync/types/all-indexes.type.ts |   2 +
 libs/core/data-sync/types/index.ts            |   1 +
 .../constants/data-index.constant.ts          |   1 +
 .../lib/data-transfer/data-transfer.test.ts   |   1 +
 .../src/lib/data-transfer/data-transfer.ts    |   6 +-
 .../models/src/lib/unified-entities/index.ts  |   1 +
 .../src/lib/unified-entities/unified-alarm.ts |  15 +
 .../data-migration/transfer-migration-data.ts |  22 +-
 .../transfer-data-to-device.action.ts         |   2 +
 21 files changed, 615 insertions(+), 7 deletions(-)
 create mode 100644 libs/core/data-sync/constants/event.constant.ts
 create mode 100644 libs/core/data-sync/indexes/alarm-indexer.ts
 create mode 100644 libs/core/data-sync/presenters/alarm/alarm-presenter.ts
 create mode 100644 libs/core/data-sync/presenters/alarm/alarm.presenter.test.ts
 create mode 100644 libs/core/data-sync/types/alarm-object.type.ts
 create mode 100644 libs/device/models/src/lib/unified-entities/unified-alarm.ts

diff --git a/libs/core/data-sync/actions/read-all-indexes.action.test.ts b/libs/core/data-sync/actions/read-all-indexes.action.test.ts
index 2ef7893968..e598061622 100644
--- a/libs/core/data-sync/actions/read-all-indexes.action.test.ts
+++ b/libs/core/data-sync/actions/read-all-indexes.action.test.ts
@@ -48,6 +48,7 @@ describe("async `readAllIndexes` ", () => {
             threads: {},
             templates: {},
             callLog: {},
+            alarms: {},
           },
           requestId,
           undefined
diff --git a/libs/core/data-sync/actions/read-all-indexes.action.ts b/libs/core/data-sync/actions/read-all-indexes.action.ts
index 5f9c5a7919..35f04e6487 100644
--- a/libs/core/data-sync/actions/read-all-indexes.action.ts
+++ b/libs/core/data-sync/actions/read-all-indexes.action.ts
@@ -21,13 +21,15 @@ export const readAllIndexes = createAsyncThunk<AllIndexes, void>(
     const templates = await getIndexRequest(DataIndex.Template)
     const threads = await getIndexRequest(DataIndex.Thread)
     const callLog = await getIndexRequest(DataIndex.CallLog)
+    const alarms = await getIndexRequest(DataIndex.Alarm)
 
     if (
       contacts === undefined ||
       messages === undefined ||
       templates === undefined ||
       threads === undefined ||
-      callLog === undefined
+      callLog === undefined ||
+      alarms === undefined
     ) {
       return rejectWithValue(
         new AppError(DataSyncError.ReadAllIndexes, "Read All Indexes fails")
@@ -40,6 +42,7 @@ export const readAllIndexes = createAsyncThunk<AllIndexes, void>(
       templates: templates.documentStore.docs,
       threads: threads.documentStore.docs,
       callLog: callLog.documentStore.docs,
+      alarms: alarms.documentStore.docs,
     }
   }
 )
diff --git a/libs/core/data-sync/constants/event.constant.ts b/libs/core/data-sync/constants/event.constant.ts
new file mode 100644
index 0000000000..ff71880152
--- /dev/null
+++ b/libs/core/data-sync/constants/event.constant.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum EventTable {
+  Alarms = "alarms",
+}
diff --git a/libs/core/data-sync/constants/index.constant.ts b/libs/core/data-sync/constants/index.constant.ts
index 9c43dd0b04..2a1fe1b4fa 100644
--- a/libs/core/data-sync/constants/index.constant.ts
+++ b/libs/core/data-sync/constants/index.constant.ts
@@ -9,4 +9,5 @@ export enum DataIndex {
   Template = "template",
   Thread = "thread",
   CallLog = "calllog",
+  Alarm = "alarm",
 }
diff --git a/libs/core/data-sync/constants/index.ts b/libs/core/data-sync/constants/index.ts
index e40c5d94c3..e801535808 100644
--- a/libs/core/data-sync/constants/index.ts
+++ b/libs/core/data-sync/constants/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./event.constant"
 export * from "./call-log.constant"
 export * from "./contact.constant"
 export * from "./controller.constant"
diff --git a/libs/core/data-sync/indexes/alarm-indexer.ts b/libs/core/data-sync/indexes/alarm-indexer.ts
new file mode 100644
index 0000000000..58cc5c821a
--- /dev/null
+++ b/libs/core/data-sync/indexes/alarm-indexer.ts
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import path from "path"
+import { Database } from "sql.js"
+import { Index } from "elasticlunr"
+import { ElasticlunrFactory } from "Core/index-storage/factories"
+import { BaseIndexer } from "Core/data-sync/indexes/base.indexer"
+import { EventTable } from "Core/data-sync/constants"
+import { IndexerPresenter, AlarmObject, EventInput } from "Core/data-sync/types"
+import { FileSystemService } from "Core/file-system/services/file-system.service.refactored"
+
+export class AlarmIndexer extends BaseIndexer {
+  constructor(
+    fileSystemService: FileSystemService,
+    private dataPresenter: IndexerPresenter<EventInput, AlarmObject[]>
+  ) {
+    super(fileSystemService)
+  }
+
+  // AUTO DISABLED - fix me if you like :)
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async index(fileDir: string, token?: string): Promise<any> {
+    const db = await this.initTmpDatabase(fileDir, token)
+    const object = this.dataPresenter.serializeToObject(this.loadTables(db))
+    return this.createIndex(object)
+  }
+
+  private createIndex(data: AlarmObject[]): Index<AlarmObject> {
+    const index = ElasticlunrFactory.create<AlarmObject>()
+
+    index.setRef("id")
+    index.addField("repeatDays")
+    index.addField("isEnabled")
+    index.addField("hour")
+    index.addField("minute")
+    index.addField("snoozeTime")
+
+    data.forEach((item) => {
+      index.addDoc(item)
+    })
+
+    return index
+  }
+
+  private loadTables(db: Database) {
+    return {
+      [EventTable.Alarms]: db.exec(
+        `SELECT _id, hour, minute, music_tone, enabled, snooze_duration, rrule FROM ${EventTable.Alarms};`
+      )[0] as unknown as EventInput["alarms"],
+    }
+  }
+
+  private async initTmpDatabase(
+    fileDir: string,
+    token?: string
+  ): Promise<Database> {
+    const data = await this.getData(path.join(fileDir, "events.db"), token)
+    return new (await this.sql).Database(data)
+  }
+}
diff --git a/libs/core/data-sync/indexes/index.ts b/libs/core/data-sync/indexes/index.ts
index 46f5b2332f..27d75297bc 100644
--- a/libs/core/data-sync/indexes/index.ts
+++ b/libs/core/data-sync/indexes/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./alarm-indexer"
 export * from "./call-log.indexer"
 export * from "./contact.indexer"
 export * from "./message.indexer"
diff --git a/libs/core/data-sync/presenters/alarm/alarm-presenter.ts b/libs/core/data-sync/presenters/alarm/alarm-presenter.ts
new file mode 100644
index 0000000000..c72cc5e99b
--- /dev/null
+++ b/libs/core/data-sync/presenters/alarm/alarm-presenter.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { AlarmEntity, EventInput, AlarmObject } from "Core/data-sync/types"
+import { BasePresenter } from "Core/data-sync/presenters/base-presenter"
+import { UnifiedAlarmRepeatDaysType } from "device/models"
+
+export class AlarmPresenter extends BasePresenter {
+  public serializeToObject(input: EventInput): AlarmObject[] {
+    if (input.alarms === undefined) {
+      return []
+    }
+
+    const alarms = this.serializeRecord<AlarmEntity>(
+      input.alarms.values,
+      input.alarms.columns
+    )
+
+    return alarms.map((alarm) => {
+      return {
+        id: String(alarm._id),
+        repeatDays: this.parseRRule(alarm.rrule),
+        isEnabled: alarm.enabled === "1",
+        hour: this.parseNumber(alarm.hour),
+        minute: this.parseNumber(alarm.minute),
+        snoozeTime: this.parseNumber(alarm.snooze_duration),
+      }
+    })
+  }
+
+  private parseNumber(value: string | undefined | null): number {
+    return Number(value) || 0
+  }
+
+  private parseRRule(rrule: string): UnifiedAlarmRepeatDaysType {
+    const daysMap: Record<string, 1 | 2 | 3 | 4 | 5 | 6 | 7> = {
+      MO: 1,
+      TU: 2,
+      WE: 3,
+      TH: 4,
+      FR: 5,
+      SA: 6,
+      SU: 7,
+    }
+    const repeatDays: UnifiedAlarmRepeatDaysType = []
+
+    if (rrule?.includes("BYDAY")) {
+      const byDayPart = rrule
+        .split(";")
+        .find((part) => part.startsWith("BYDAY"))
+      if (byDayPart) {
+        const days = byDayPart.replace("BYDAY=", "").split(",")
+        days.forEach((day) => {
+          const mappedDay = daysMap[day]
+          if (mappedDay) {
+            repeatDays.push(mappedDay)
+          }
+        })
+      }
+    }
+
+    return repeatDays
+  }
+}
diff --git a/libs/core/data-sync/presenters/alarm/alarm.presenter.test.ts b/libs/core/data-sync/presenters/alarm/alarm.presenter.test.ts
new file mode 100644
index 0000000000..9f860cf5fd
--- /dev/null
+++ b/libs/core/data-sync/presenters/alarm/alarm.presenter.test.ts
@@ -0,0 +1,389 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { AlarmPresenter } from "./alarm-presenter"
+import { AlarmObject, EventInput } from "Core/data-sync/types"
+
+const presenter = new AlarmPresenter()
+
+describe("AlarmPresenter - serializeToObject", () => {
+  describe("basic serialization", () => {
+    test("serializes an alarm with all fields defined", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [
+            [
+              "3",
+              "1",
+              "0",
+              "/system/assets/audio/alarm/alarm_cymbals.mp3",
+              "1",
+              "0",
+              "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU",
+            ],
+          ],
+        },
+      }
+
+      const expected = [
+        {
+          id: "3",
+          repeatDays: [1, 2, 3, 4, 5, 6, 7],
+          isEnabled: true,
+          hour: 1,
+          minute: 0,
+          snoozeTime: 0,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles multiple alarm entries", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [
+            [
+              "4",
+              "2",
+              "0",
+              "/system/assets/audio/alarm/alarm_cymbals.mp3",
+              "1",
+              "0",
+              "",
+            ],
+            [
+              "5",
+              "3",
+              "0",
+              "/system/assets/audio/alarm/alarm_cymbals.mp3",
+              "1",
+              "0",
+              "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR",
+            ],
+          ],
+        },
+      }
+
+      const expected = [
+        {
+          id: "4",
+          repeatDays: [],
+          isEnabled: true,
+          hour: 2,
+          minute: 0,
+          snoozeTime: 0,
+        },
+        {
+          id: "5",
+          repeatDays: [1, 2, 3, 4, 5],
+          isEnabled: true,
+          hour: 3,
+          minute: 0,
+          snoozeTime: 0,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("isEnabled field", () => {
+    test("handles isEnabled true", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [["7", "5", "30", "", "1", "10", ""]],
+        },
+      }
+
+      const expected = [
+        {
+          id: "7",
+          repeatDays: [],
+          isEnabled: true,
+          hour: 5,
+          minute: 30,
+          snoozeTime: 10,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles isEnabled false", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [["8", "6", "45", "", "0", "15", ""]],
+        },
+      }
+
+      const expected = [
+        {
+          id: "8",
+          repeatDays: [],
+          isEnabled: false,
+          hour: 6,
+          minute: 45,
+          snoozeTime: 15,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles missing isEnabled value, defaults to false", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [["9", "7", "15", "", "", "5", ""]],
+        },
+      }
+
+      const expected = [
+        {
+          id: "9",
+          repeatDays: [],
+          isEnabled: false,
+          hour: 7,
+          minute: 15,
+          snoozeTime: 5,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+  })
+
+  describe("repeatDays field", () => {
+    test("handles empty repeatDays array", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [["10", "8", "0", "", "1", "0", ""]],
+        },
+      }
+
+      const expected = [
+        {
+          id: "10",
+          repeatDays: [],
+          isEnabled: true,
+          hour: 8,
+          minute: 0,
+          snoozeTime: 0,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles repeatDays with one value", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [["11", "9", "15", "", "1", "5", "FREQ=WEEKLY;BYDAY=MO"]],
+        },
+      }
+
+      const expected = [
+        {
+          id: "11",
+          repeatDays: [1],
+          isEnabled: true,
+          hour: 9,
+          minute: 15,
+          snoozeTime: 5,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles repeatDays with multiple values", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [
+            ["12", "10", "30", "", "1", "10", "FREQ=WEEKLY;BYDAY=MO,WE,FR"],
+          ],
+        },
+      }
+
+      const expected = [
+        {
+          id: "12",
+          repeatDays: [1, 3, 5],
+          isEnabled: true,
+          hour: 10,
+          minute: 30,
+          snoozeTime: 10,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    test("handles repeatDays with all values", () => {
+      const input: EventInput = {
+        alarms: {
+          columns: [
+            "_id",
+            "hour",
+            "minute",
+            "music_tone",
+            "enabled",
+            "snooze_duration",
+            "rrule",
+          ],
+          values: [
+            [
+              "13",
+              "11",
+              "0",
+              "",
+              "1",
+              "20",
+              "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU",
+            ],
+          ],
+        },
+      }
+
+      const expected = [
+        {
+          id: "13",
+          repeatDays: [1, 2, 3, 4, 5, 6, 7],
+          isEnabled: true,
+          hour: 11,
+          minute: 0,
+          snoozeTime: 20,
+        },
+      ]
+
+      const result = presenter.serializeToObject(input)
+      expect(result).toEqual(expected)
+    })
+
+    describe("handling missing or invalid data", () => {
+      test("returns an empty array when alarms are undefined", () => {
+        const input: EventInput = {
+          alarms: undefined,
+        }
+
+        const expected: AlarmObject[] = []
+
+        const result = presenter.serializeToObject(input)
+        expect(result).toEqual(expected)
+      })
+
+      test("handles missing snooze_duration, defaults to 0", () => {
+        const input: EventInput = {
+          alarms: {
+            columns: [
+              "_id",
+              "hour",
+              "minute",
+              "music_tone",
+              "enabled",
+              "snooze_duration",
+              "rrule",
+            ],
+            values: [["6", "4", "0", "", "1", "", ""]],
+          },
+        }
+
+        const expected = [
+          {
+            id: "6",
+            repeatDays: [],
+            isEnabled: true,
+            hour: 4,
+            minute: 0,
+            snoozeTime: 0,
+          },
+        ]
+
+        const result = presenter.serializeToObject(input)
+        expect(result).toEqual(expected)
+      })
+    })
+  })
+})
diff --git a/libs/core/data-sync/presenters/index.ts b/libs/core/data-sync/presenters/index.ts
index 5b6c6ac6cd..ec19e69df6 100644
--- a/libs/core/data-sync/presenters/index.ts
+++ b/libs/core/data-sync/presenters/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./alarm/alarm-presenter"
 export * from "./call-log/call-log.presenter"
 export * from "./contact/contact.presenter"
 export * from "./message/message.presenter"
diff --git a/libs/core/data-sync/services/data-sync.service.ts b/libs/core/data-sync/services/data-sync.service.ts
index e203678602..fad42da544 100644
--- a/libs/core/data-sync/services/data-sync.service.ts
+++ b/libs/core/data-sync/services/data-sync.service.ts
@@ -11,6 +11,7 @@ import { DataIndex } from "Core/index-storage/constants"
 import { DeviceProtocol } from "device-protocol/feature"
 import { MetadataStore } from "Core/metadata/services"
 import {
+  AlarmIndexer,
   CallLogIndexer,
   ContactIndexer,
   MessageIndexer,
@@ -24,6 +25,7 @@ import {
   TemplatePresenter,
   ThreadPresenter,
   CallLogPresenter,
+  AlarmPresenter,
 } from "Core/data-sync/presenters"
 import { SyncBackupCreateService } from "Core/backup/services/sync-backup-create.service"
 import { InitializeOptions } from "Core/data-sync/types"
@@ -43,6 +45,7 @@ export class DataSyncService {
   private threadIndexer: ThreadIndexer | null = null
   private templateIndexer: TemplateIndexer | null = null
   private callLogIndexer: CallLogIndexer | null = null
+  private alarmIndexer: AlarmIndexer | null = null
   private syncBackupCreateService: SyncBackupCreateService
 
   constructor(
@@ -77,6 +80,10 @@ export class DataSyncService {
       this.fileSystemStorage,
       new CallLogPresenter()
     )
+    this.alarmIndexer = new AlarmIndexer(
+      this.fileSystemStorage,
+      new AlarmPresenter()
+    )
   }
 
   public async indexAll({
@@ -90,7 +97,8 @@ export class DataSyncService {
       !this.messageIndexer ||
       !this.threadIndexer ||
       !this.templateIndexer ||
-      !this.callLogIndexer
+      !this.callLogIndexer ||
+      !this.alarmIndexer
     ) {
       return false
     }
@@ -121,6 +129,7 @@ export class DataSyncService {
       [DataIndex.Template]: this.templateIndexer,
       [DataIndex.Thread]: this.threadIndexer,
       [DataIndex.CallLog]: this.callLogIndexer,
+      [DataIndex.Alarm]: this.alarmIndexer,
     }
 
     const indexOrEmptyOnFailure = async (
diff --git a/libs/core/data-sync/types/alarm-object.type.ts b/libs/core/data-sync/types/alarm-object.type.ts
new file mode 100644
index 0000000000..f15f5afebb
--- /dev/null
+++ b/libs/core/data-sync/types/alarm-object.type.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+import { UnifiedAlarm } from "device/models"
+import { EventTable } from "Core/data-sync/constants"
+import { Entity, DBQueryResult } from "Core/data-sync/types/entity.type"
+
+export type AlarmObject = UnifiedAlarm
+
+export type AlarmEntity = Entity<{
+  _id: string
+  hour: string
+  minute: string
+  music_tone: string
+  enabled: string
+  snooze_duration: string
+  rrule: string
+}>
+
+export interface EventInput {
+  [EventTable.Alarms]: DBQueryResult<keyof AlarmEntity, string[]> | undefined
+}
diff --git a/libs/core/data-sync/types/all-indexes.type.ts b/libs/core/data-sync/types/all-indexes.type.ts
index 544eb9f3d7..4e5b7f3358 100644
--- a/libs/core/data-sync/types/all-indexes.type.ts
+++ b/libs/core/data-sync/types/all-indexes.type.ts
@@ -8,6 +8,7 @@ import { MessageObject } from "Core/data-sync/types/message-object.type"
 import { TemplateObject } from "Core/data-sync/types/template-object.type"
 import { ThreadObject } from "Core/data-sync/types/thread-object.type"
 import { CallLogObject } from "Core/data-sync/types/call-log-object.type"
+import { AlarmObject } from "Core/data-sync/types/alarm-object.type"
 
 export interface AllIndexes {
   contacts: Record<string, ContactObject>
@@ -15,4 +16,5 @@ export interface AllIndexes {
   templates: Record<string, TemplateObject>
   threads: Record<string, ThreadObject>
   callLog: Record<string, CallLogObject>
+  alarms: Record<string, AlarmObject>
 }
diff --git a/libs/core/data-sync/types/index.ts b/libs/core/data-sync/types/index.ts
index f26398b810..fd46ab650c 100644
--- a/libs/core/data-sync/types/index.ts
+++ b/libs/core/data-sync/types/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./alarm-object.type"
 export * from "./all-indexes.type"
 export * from "./call-log-object.type"
 export * from "./contact-object.type"
diff --git a/libs/core/index-storage/constants/data-index.constant.ts b/libs/core/index-storage/constants/data-index.constant.ts
index 9c43dd0b04..a465403ea4 100644
--- a/libs/core/index-storage/constants/data-index.constant.ts
+++ b/libs/core/index-storage/constants/data-index.constant.ts
@@ -4,6 +4,7 @@
  */
 
 export enum DataIndex {
+  Alarm = "alarm",
   Contact = "contact",
   Message = "message",
   Template = "template",
diff --git a/libs/device/models/src/lib/data-transfer/data-transfer.test.ts b/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
index 0f873640cd..b48cb724f7 100644
--- a/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
+++ b/libs/device/models/src/lib/data-transfer/data-transfer.test.ts
@@ -16,6 +16,7 @@ const minimumPreDataTransfer: PreDataTransfer = {
     ["contacts-v1"]: "dummy-text",
     ["callLog-v1"]: "dummy-text",
     ["messages-v1"]: "dummy-text",
+    ["alarms-v1"]: "dummy-text",
   },
 }
 
diff --git a/libs/device/models/src/lib/data-transfer/data-transfer.ts b/libs/device/models/src/lib/data-transfer/data-transfer.ts
index b4c22f200b..b74a29b8ee 100644
--- a/libs/device/models/src/lib/data-transfer/data-transfer.ts
+++ b/libs/device/models/src/lib/data-transfer/data-transfer.ts
@@ -5,7 +5,11 @@
 
 import { z } from "zod"
 
-export type DataTransferDomain = "contacts-v1" | "callLog-v1" | "messages-v1"
+export type DataTransferDomain =
+  | "contacts-v1"
+  | "callLog-v1"
+  | "messages-v1"
+  | "alarms-v1"
 
 export const PreDataTransferValidator = (domains: DataTransferDomain[]) => {
   const featuresValidator = domains.reduce((acc, key) => {
diff --git a/libs/device/models/src/lib/unified-entities/index.ts b/libs/device/models/src/lib/unified-entities/index.ts
index 95a660989e..8bf9d98daa 100644
--- a/libs/device/models/src/lib/unified-entities/index.ts
+++ b/libs/device/models/src/lib/unified-entities/index.ts
@@ -3,6 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
+export * from "./unified-alarm"
 export * from "./unified-call-log"
 export * from "./unified-contact"
 export * from "./unified-message"
diff --git a/libs/device/models/src/lib/unified-entities/unified-alarm.ts b/libs/device/models/src/lib/unified-entities/unified-alarm.ts
new file mode 100644
index 0000000000..8590190777
--- /dev/null
+++ b/libs/device/models/src/lib/unified-entities/unified-alarm.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export type UnifiedAlarmRepeatDaysType = (1 | 2 | 3 | 4 | 5 | 6 | 7)[]
+
+export interface UnifiedAlarm {
+  id: string
+  repeatDays: UnifiedAlarmRepeatDaysType
+  isEnabled: boolean
+  hour: number
+  minute: number
+  snoozeTime: number
+}
diff --git a/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
index 2f91621114..02d4bae2dc 100644
--- a/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
+++ b/libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts
@@ -90,11 +90,13 @@ export const transferMigrationData = createAsyncThunk<
         switch (feature) {
           case DataMigrationFeature.Contacts: {
             const { contacts } = databaseResponse.payload as AllIndexes
-            const transformedData = pureToUnifiedContact(Object.values(contacts))
+            const transformedData = pureToUnifiedContact(
+              Object.values(contacts)
+            )
 
             if (!isEmpty(transformedData)) {
               domainsData.push({
-                domain: "contacts-v1", // FIXME: The domain should be returned from Data Migration configuration
+                domain: "contacts-v1", // TODO: As part of CP-3255: retrieve domain from Data Migration configuration.
                 data: transformedData,
               })
             }
@@ -106,7 +108,7 @@ export const transferMigrationData = createAsyncThunk<
 
             if (!isEmpty(transformedData)) {
               domainsData.push({
-                domain: "callLog-v1", // FIXME: The domain should be returned from Data Migration configuration
+                domain: "callLog-v1", // TODO: As part of CP-3255: retrieve domain from Data Migration configuration.
                 data: transformedData,
               })
             }
@@ -119,7 +121,19 @@ export const transferMigrationData = createAsyncThunk<
 
             if (!isEmpty(transformedData)) {
               domainsData.push({
-                domain: "messages-v1", // FIXME: The domain should be returned from Data Migration configuration
+                domain: "messages-v1", // TODO: As part of CP-3255: retrieve domain from Data Migration configuration.
+                data: transformedData,
+              })
+            }
+            break
+          }
+          case DataMigrationFeature.Alarms: {
+            const { alarms } = databaseResponse.payload as AllIndexes
+            const transformedData = Object.values(alarms)
+
+            if (!isEmpty(transformedData)) {
+              domainsData.push({
+                domain: "alarms-v1", // TODO: As part of CP-3255: retrieve domain from Data Migration configuration.
                 data: transformedData,
               })
             }
diff --git a/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts b/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
index 7c6d040639..565d236b23 100644
--- a/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
+++ b/libs/generic-view/store/src/lib/data-transfer/transfer-data-to-device.action.ts
@@ -9,6 +9,7 @@ import { ActionName } from "../action-names"
 import {
   ApiFileTransferError,
   DataTransferDomain,
+  UnifiedAlarm,
   UnifiedCallLog,
   UnifiedContact,
   UnifiedMessage,
@@ -36,6 +37,7 @@ type DomainDataMapping = {
   "contacts-v1": UnifiedContact[]
   "callLog-v1": UnifiedCallLog[]
   "messages-v1": UnifiedMessage[]
+  "alarms-v1": UnifiedAlarm[]
 }
 
 export type DomainData = {

From dce820b1f6f845d71f6f5f2528f85c50cf31f87a Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Fri, 15 Nov 2024 09:33:38 +0100
Subject: [PATCH 61/64] [CP-3114] Implement handling for 'coming soon' feature
 copy using configuration provided by Kompakt for Backup (#2178)

---
 .../lib/predefined/backup/backup-features.tsx | 51 +++++++++++++++----
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
index 46652dd037..53e8677cd1 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-features.tsx
@@ -3,7 +3,7 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import React, { FunctionComponent } from "react"
+import React, { FunctionComponent, useMemo } from "react"
 import styled from "styled-components"
 import { IconType } from "generic-view/utils"
 import { ButtonSecondary } from "../../buttons/button-secondary"
@@ -50,11 +50,38 @@ interface Props {
   nextAction: ButtonAction
 }
 
+const getRawBackupFeatureKey = (key: string) => {
+  const [rawKey] = key.split("_")
+  return rawKey.toLowerCase()
+}
+
+const filterComingSoonMessages = (features: BackupFeature[]) => {
+  return Object.entries(comingSoonMessages).reduce(
+    (prev, [comingSoonMessagesKey, message]) => {
+      if (
+        !features.some(
+          ({ key }) => getRawBackupFeatureKey(key) === comingSoonMessagesKey
+        )
+      ) {
+        prev[comingSoonMessagesKey] = message
+      }
+
+      return prev
+    },
+    {} as Record<string, { id: string }>
+  )
+}
+
 export const BackupFeatures: FunctionComponent<Props> = ({
   features,
   closeAction,
   nextAction,
 }) => {
+  const filteredComingSoonMessages = useMemo(
+    () => filterComingSoonMessages(features),
+    [features]
+  )
+
   return (
     <>
       <Modal.TitleIcon config={{ type: IconType.Backup }} />
@@ -75,16 +102,18 @@ export const BackupFeatures: FunctionComponent<Props> = ({
                 {feature.label}
               </li>
             ))}
-            {Object.entries(comingSoonMessages).map(([key, message], index) => {
-              return (
-                <ComingSoonListItem
-                  key={key + index}
-                  data-testid={BackupModalTestIds.FeatureElementInactive}
-                >
-                  {intl.formatMessage(message)}
-                </ComingSoonListItem>
-              )
-            })}
+            {Object.entries(filteredComingSoonMessages).map(
+              ([key, message], index) => {
+                return (
+                  <ComingSoonListItem
+                    key={key + index}
+                    data-testid={BackupModalTestIds.FeatureElementInactive}
+                  >
+                    {intl.formatMessage(message)}
+                  </ComingSoonListItem>
+                )
+              }
+            )}
           </ul>
         </Modal.ScrollableContent>
       </Article>

From 34ab4e677f7e10b0ddf8e5abb9db3037577fcb0a Mon Sep 17 00:00:00 2001
From: Katarzyna Stegienko <katarzyna.stegienko@mudita.com>
Date: Fri, 15 Nov 2024 10:11:04 +0100
Subject: [PATCH 62/64] [CP-3259] Wrong command to run project (#2168)

Co-authored-by: Katazyna Stegienko <katazynastegienko@MBP-Mudita.stegienko.local>
Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
---
 quickstart.md | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/quickstart.md b/quickstart.md
index 25a2ff7e22..92ebff4749 100644
--- a/quickstart.md
+++ b/quickstart.md
@@ -47,21 +47,10 @@ To ensure that files will be excluded from commits you can use the following git
 Please run the following command to start the Mudita Center dev environment:
 
 ```bash
-npm run develop
+npm run app:develop
 ```
 
-This will start the application with hot-reload so you can instantly start developing it. You can also enable logs by executing:
-
-```bash
-npm run develop -- --stream
-```
-
-This command runs the User Interface and the backend simultaneously, however, if you wish to have logs from both processes in two separate consoles then please run the following commands in parallel in separate console tabs:
-
-```bash
-lerna run --stream --scope @mudita/mudita-center-app dev:start:renderer
-lerna run --stream --scope @mudita/mudita-center-app dev:start:main
-```
+This will start the application with hot-reload so you can instantly start developing it.
 
 ## Enable Developer mode inside the application
 
@@ -83,7 +72,7 @@ Using Developer mode you can:
 We use [Electron builder](https://www.electron.build/) to build and package the application. By default, you can run the following to package it for your current platform:
 
 ```bash
-npm run dist
+npm run app:dist
 ```
 
 This will create an installer for your platform in the `releases` folder.
@@ -93,7 +82,7 @@ You can also make builds for a specific platform (or multiple platforms) by usin
 For example, building for Windows and Linux:
 
 ```bash
-npm run dist -- -wl
+npm run app:dist -- -wl
 ```
 
 ### Feature toggle environment separation
@@ -103,13 +92,13 @@ Also you are able to distribute an application with in specific predefined envir
 To run distribution with feature toggle environment use the next formula:
 
 ```bash
-FEATURE_TOGGLE_ENVIRONMENT=__environment__ npm run dist
+FEATURE_TOGGLE_ENVIRONMENT=__environment__ npm run app:dist
 ```
 
 For example:
 
 ```bash
-FEATURE_TOGGLE_ENVIRONMENT=development npm run dist
+FEATURE_TOGGLE_ENVIRONMENT=development npm run app:dist
 ```
 
 Will distribute an application with development set of feature toggles

From ef9f250f592475a6501fc9859ef9faf22ec0164d Mon Sep 17 00:00:00 2001
From: Daniel Karski <daniel.karski5q@gmail.com>
Date: Mon, 18 Nov 2024 10:46:36 +0100
Subject: [PATCH 63/64]  [CP-3277] Disable Code Signing for Applications on
 Non-Production Environments in Windows (#2182)

---
 .github/workflows/nexus-development.yml        | 18 ------------------
 .github/workflows/nexus-feature-branch.yml     | 18 ------------------
 .github/workflows/nexus-mock-development.yml   | 18 ------------------
 .../workflows/nexus-mock-pre-production.yml    | 18 ------------------
 .github/workflows/nexus-mock-production.yml    | 18 ------------------
 .../workflows/nexus-pre-production-latest.yml  | 18 ------------------
 .github/workflows/nexus-pre-production.yml     | 18 ------------------
 7 files changed, 126 deletions(-)

diff --git a/.github/workflows/nexus-development.yml b/.github/workflows/nexus-development.yml
index 2b119e4a45..c8b65e20ee 100644
--- a/.github/workflows/nexus-development.yml
+++ b/.github/workflows/nexus-development.yml
@@ -154,24 +154,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-feature-branch.yml b/.github/workflows/nexus-feature-branch.yml
index c97eb46439..594c746cf5 100644
--- a/.github/workflows/nexus-feature-branch.yml
+++ b/.github/workflows/nexus-feature-branch.yml
@@ -154,24 +154,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-mock-development.yml b/.github/workflows/nexus-mock-development.yml
index 1ea4afd1b9..fc891dc468 100644
--- a/.github/workflows/nexus-mock-development.yml
+++ b/.github/workflows/nexus-mock-development.yml
@@ -157,24 +157,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-mock-pre-production.yml b/.github/workflows/nexus-mock-pre-production.yml
index ad46d3d2e6..2804470045 100644
--- a/.github/workflows/nexus-mock-pre-production.yml
+++ b/.github/workflows/nexus-mock-pre-production.yml
@@ -125,24 +125,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-mock-production.yml b/.github/workflows/nexus-mock-production.yml
index 3e2c243833..8a5817b55f 100644
--- a/.github/workflows/nexus-mock-production.yml
+++ b/.github/workflows/nexus-mock-production.yml
@@ -125,24 +125,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-pre-production-latest.yml b/.github/workflows/nexus-pre-production-latest.yml
index 88cd85d837..2e3566dfdc 100644
--- a/.github/workflows/nexus-pre-production-latest.yml
+++ b/.github/workflows/nexus-pre-production-latest.yml
@@ -176,24 +176,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-pre-production.yml b/.github/workflows/nexus-pre-production.yml
index b8ab37b59c..bf3766555d 100644
--- a/.github/workflows/nexus-pre-production.yml
+++ b/.github/workflows/nexus-pre-production.yml
@@ -101,24 +101,6 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
-      - name: Signing via Digicert
-        if: matrix.os == 'Windows'
-        env:
-          SM_HOST: ${{ secrets.SM_HOST }}
-          SM_API_KEY: ${{ secrets.SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
-          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        run: |
-          SET SM_HOST=%SM_HOST%
-          SET SM_API_KEY=%SM_API_KEY%
-          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
-          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
-          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
-          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
-        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:

From a009946d9c50cd729672f77027f5fbf8d13cd829 Mon Sep 17 00:00:00 2001
From: MateuszMudita <165778944+MateuszMudita@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:18:16 +0100
Subject: [PATCH 64/64] Release v2.5.0 - to stage (#2199)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Daniel Karski <daniel.karski5q@gmail.com>
Co-authored-by: Michał Kurczewski <michalkurczewski94@gmail.com>
---
 .../workflows/nexus-mock-pre-production.yml   | 18 ++++++++
 .../workflows/nexus-pre-production-latest.yml | 18 ++++++++
 .github/workflows/nexus-pre-production.yml    | 18 ++++++++
 CHANGELOG.md                                  |  8 ++++
 apps/mudita-center/package-lock.json          |  4 +-
 apps/mudita-center/package.json               |  2 +-
 .../actions/upload-file.action.ts             |  2 +-
 .../src/lib/modals/backup-error-modal.tsx     |  3 +-
 .../src/lib/modals/restore-error-modal.tsx    |  3 +-
 libs/generic-view/store/src/index.ts          |  1 +
 .../store/src/lib/backup/actions.ts           |  6 +--
 .../store/src/lib/backup/backup.types.ts      | 28 +++++++++++++
 .../src/lib/backup/create-backup.action.ts    | 21 +++++++---
 .../store/src/lib/backup/reducer.ts           | 41 +++++++------------
 .../src/lib/backup/restore-backup.action.ts   | 17 +++++---
 .../hooks/use-api-serial-port-listeners.ts    | 12 +++++-
 .../src/lib/selectors/backup-progress.ts      | 10 +++--
 .../store/src/lib/selectors/backup-restore.ts | 16 +++++---
 .../backup-restore/backup-restore.tsx         | 15 +++----
 .../lib/predefined/backup/backup-create.tsx   | 11 ++---
 package-lock.json                             |  2 +-
 21 files changed, 185 insertions(+), 71 deletions(-)
 create mode 100644 libs/generic-view/store/src/lib/backup/backup.types.ts

diff --git a/.github/workflows/nexus-mock-pre-production.yml b/.github/workflows/nexus-mock-pre-production.yml
index 2804470045..ad46d3d2e6 100644
--- a/.github/workflows/nexus-mock-pre-production.yml
+++ b/.github/workflows/nexus-mock-pre-production.yml
@@ -125,6 +125,24 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
+      - name: Signing via Digicert
+        if: matrix.os == 'Windows'
+        env:
+          SM_HOST: ${{ secrets.SM_HOST }}
+          SM_API_KEY: ${{ secrets.SM_API_KEY }}
+          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
+          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
+          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+        run: |
+          SET SM_HOST=%SM_HOST%
+          SET SM_API_KEY=%SM_API_KEY%
+          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
+          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
+          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
+          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
+          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
+          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
+        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-pre-production-latest.yml b/.github/workflows/nexus-pre-production-latest.yml
index 2e3566dfdc..88cd85d837 100644
--- a/.github/workflows/nexus-pre-production-latest.yml
+++ b/.github/workflows/nexus-pre-production-latest.yml
@@ -176,6 +176,24 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
+      - name: Signing via Digicert
+        if: matrix.os == 'Windows'
+        env:
+          SM_HOST: ${{ secrets.SM_HOST }}
+          SM_API_KEY: ${{ secrets.SM_API_KEY }}
+          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
+          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
+          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+        run: |
+          SET SM_HOST=%SM_HOST%
+          SET SM_API_KEY=%SM_API_KEY%
+          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
+          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
+          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
+          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
+          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
+          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
+        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/.github/workflows/nexus-pre-production.yml b/.github/workflows/nexus-pre-production.yml
index bf3766555d..b8ab37b59c 100644
--- a/.github/workflows/nexus-pre-production.yml
+++ b/.github/workflows/nexus-pre-production.yml
@@ -101,6 +101,24 @@ jobs:
         if: matrix.os == 'macOS'
         run: |
           codesign -v -v apps/mudita-center/release/mac/Mudita\ Center.app
+      - name: Signing via Digicert
+        if: matrix.os == 'Windows'
+        env:
+          SM_HOST: ${{ secrets.SM_HOST }}
+          SM_API_KEY: ${{ secrets.SM_API_KEY }}
+          SM_CLIENT_CERT_FILE: "C:\\actions-runner\\certs\\Certificate_pkcs12.p12"
+          SM_CLIENT_CERT_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
+          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+        run: |
+          SET SM_HOST=%SM_HOST%
+          SET SM_API_KEY=%SM_API_KEY%
+          SET SM_CLIENT_CERT_FILE=%SM_CLIENT_CERT_FILE%
+          SET SM_CLIENT_CERT_PASSWORD=%SM_CLIENT_CERT_PASSWORD%
+          SET SM_CODE_SIGNING_CERT_SHA1_HASH=%SM_CODE_SIGNING_CERT_SHA1_HASH%
+          SET PATH=%PATH%;"C:\Program Files\DigiCert\DigiCert One Signing Manager Tools"
+          SET PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
+          signtool.exe sign /sha1 %SM_CODE_SIGNING_CERT_SHA1_HASH% /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 ./apps/mudita-center/release/Mudita-Center.exe
+        shell: cmd
       - name: Push artifacts to nexus registry from Windows
         if: matrix.os == 'Windows'
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f7b93eec..5eac8e5572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Here we write upgrading notes for brands. It's a team effort to make them as
 straightforward as possible.
 
+## [2.5.0] - 2024-12-02
+
+Starting with version 2.5.0, users will be able to synchronize the time and date on the Harmony and will be informed about an error in case of fail in the synchronization.
+
+### Added
+
+- Added time synchronization for Mudita Harmony.
+
 ## [2.4.0] - 2024-09-16
 
 In this release, we have updated the Help section in the Mudita Center application. As of version 2.4.0, users can benefit from a refreshed help section with intuitive navigation. The article search functionality is also available. In addition, we have fixed two bugs occurring in our software.
diff --git a/apps/mudita-center/package-lock.json b/apps/mudita-center/package-lock.json
index c6474fb501..b12f9e0fbe 100644
--- a/apps/mudita-center/package-lock.json
+++ b/apps/mudita-center/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@mudita/mudita-center-app",
-	"version": "2.4.0",
+	"version": "2.5.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@mudita/mudita-center-app",
-			"version": "2.4.0",
+			"version": "2.5.0",
 			"license": "GPL-3.0",
 			"dependencies": {
 				"serialport": "10.1.0"
diff --git a/apps/mudita-center/package.json b/apps/mudita-center/package.json
index c7a5e560e6..7c393dc3d1 100644
--- a/apps/mudita-center/package.json
+++ b/apps/mudita-center/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mudita-center",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Mudita Center",
   "main": "./dist/main.js",
   "productName": "Mudita Center",
diff --git a/libs/core/files-manager/actions/upload-file.action.ts b/libs/core/files-manager/actions/upload-file.action.ts
index 5aa1bbd40a..42a9624bcf 100644
--- a/libs/core/files-manager/actions/upload-file.action.ts
+++ b/libs/core/files-manager/actions/upload-file.action.ts
@@ -58,7 +58,7 @@ export const uploadFile = createAsyncThunk<
 
     if (!openFileResult.ok || !openFileResult.data) {
       dispatch(setUploadBlocked(false))
-      return rejectWithValue("no files to upload")
+      return
     }
 
     const filePaths = openFileResult.data
diff --git a/libs/generic-view/feature/src/lib/modals/backup-error-modal.tsx b/libs/generic-view/feature/src/lib/modals/backup-error-modal.tsx
index 923ed7c235..a5fb28726b 100644
--- a/libs/generic-view/feature/src/lib/modals/backup-error-modal.tsx
+++ b/libs/generic-view/feature/src/lib/modals/backup-error-modal.tsx
@@ -7,6 +7,7 @@ import React, { FunctionComponent, useEffect } from "react"
 import { BackupError, Modal } from "generic-view/ui"
 import { useDispatch, useSelector } from "react-redux"
 import {
+  BackupProcessStatus,
   cleanBackupProcess,
   selectActiveApiDeviceId,
   selectBackupProcessStatus,
@@ -18,7 +19,7 @@ const BackupErrorModal: FunctionComponent = () => {
   const dispatch = useDispatch()
   const activeDeviceId = useSelector(selectActiveApiDeviceId)
   const backupStatus = useSelector(selectBackupProcessStatus)
-  const opened = backupStatus === "FAILED" && !activeDeviceId
+  const opened = backupStatus === BackupProcessStatus.Failed && !activeDeviceId
 
   const onClose = () => {
     dispatch(cleanBackupProcess())
diff --git a/libs/generic-view/feature/src/lib/modals/restore-error-modal.tsx b/libs/generic-view/feature/src/lib/modals/restore-error-modal.tsx
index d4660d08b8..633d74bfcf 100644
--- a/libs/generic-view/feature/src/lib/modals/restore-error-modal.tsx
+++ b/libs/generic-view/feature/src/lib/modals/restore-error-modal.tsx
@@ -8,6 +8,7 @@ import { BackupRestoreError, Modal } from "generic-view/ui"
 import { useDispatch, useSelector } from "react-redux"
 import {
   cleanRestoreProcess,
+  RestoreProcessStatus,
   selectActiveApiDeviceId,
   selectBackupRestoreStatus,
   setDeviceErrorModalOpened,
@@ -18,7 +19,7 @@ const RestoreErrorModal: FunctionComponent = () => {
   const dispatch = useDispatch()
   const activeDevice = useSelector(selectActiveApiDeviceId)
   const restoreStatus = useSelector(selectBackupRestoreStatus)
-  const opened = restoreStatus === "FAILED" && !activeDevice
+  const opened = restoreStatus === RestoreProcessStatus.Failed && !activeDevice
 
   const onClose = () => {
     dispatch(cleanRestoreProcess())
diff --git a/libs/generic-view/store/src/index.ts b/libs/generic-view/store/src/index.ts
index 64747407b0..f9a8c48530 100644
--- a/libs/generic-view/store/src/index.ts
+++ b/libs/generic-view/store/src/index.ts
@@ -21,6 +21,7 @@ export * from "./lib/file-transfer/send-file.action"
 export * from "./lib/file-transfer/get-file.action"
 export * from "./lib/backup/load-backup-metadata.action"
 export * from "./lib/backup/restore-backup.action"
+export * from "./lib/backup/backup.types"
 export * from "./lib/imports/start-import-authorization.action"
 export * from "./lib/imports/reducer"
 export * from "./lib/imports/actions"
diff --git a/libs/generic-view/store/src/lib/backup/actions.ts b/libs/generic-view/store/src/lib/backup/actions.ts
index f1c4b9c4ea..42e71c3dad 100644
--- a/libs/generic-view/store/src/lib/backup/actions.ts
+++ b/libs/generic-view/store/src/lib/backup/actions.ts
@@ -4,13 +4,13 @@
  */
 
 import { createAction } from "@reduxjs/toolkit"
+import { BackupProcess } from "./reducer"
+import { ActionName } from "../action-names"
 import {
-  BackupProcess,
   BackupProcessFileStatus,
   BackupProcessStatus,
   RestoreProcessStatus,
-} from "./reducer"
-import { ActionName } from "../action-names"
+} from "./backup.types"
 
 export const setBackupProcess = createAction<BackupProcess>(
   ActionName.SetBackupProcess
diff --git a/libs/generic-view/store/src/lib/backup/backup.types.ts b/libs/generic-view/store/src/lib/backup/backup.types.ts
new file mode 100644
index 0000000000..c52570f023
--- /dev/null
+++ b/libs/generic-view/store/src/lib/backup/backup.types.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Mudita sp. z o.o. All rights reserved.
+ * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
+ */
+
+export enum BackupProcessStatus {
+  PreBackup,
+  FilesTransfer,
+  SaveFile,
+  Done,
+  Failed,
+}
+
+export enum BackupProcessFileStatus {
+  Pending,
+  InProgress,
+  Done,
+}
+
+export enum RestoreProcessStatus {
+  PasswordNotRequired,
+  PasswordRequired,
+  PreRestore,
+  FilesTransfer,
+  Restoring,
+  Done,
+  Failed,
+}
diff --git a/libs/generic-view/store/src/lib/backup/create-backup.action.ts b/libs/generic-view/store/src/lib/backup/create-backup.action.ts
index 06ffd020fc..409ddb0f3e 100644
--- a/libs/generic-view/store/src/lib/backup/create-backup.action.ts
+++ b/libs/generic-view/store/src/lib/backup/create-backup.action.ts
@@ -21,6 +21,7 @@ import {
   setBackupProcessStatus,
 } from "./actions"
 import { refreshBackupList } from "./refresh-backup-list.action"
+import { BackupProcessFileStatus, BackupProcessStatus } from "./backup.types"
 
 export const createBackup = createAsyncThunk<
   undefined,
@@ -54,7 +55,7 @@ export const createBackup = createAsyncThunk<
 
     dispatch(
       setBackupProcess({
-        status: "PRE_BACKUP",
+        status: BackupProcessStatus.PreBackup,
         featureFilesTransfer: features.reduce((acc, item) => {
           return { ...acc, [item]: { done: false } }
         }, {}),
@@ -107,7 +108,7 @@ export const createBackup = createAsyncThunk<
 
       backupFeaturesFiles = checkPreBackupResponse.data.features
     }
-    dispatch(setBackupProcessStatus("FILES_TRANSFER"))
+    dispatch(setBackupProcessStatus(BackupProcessStatus.FilesTransfer))
 
     for (let i = 0; i < features.length; ++i) {
       if (aborted) {
@@ -115,7 +116,12 @@ export const createBackup = createAsyncThunk<
       }
       const feature = features[i]
 
-      dispatch(setBackupProcessFileStatus({ feature, status: "IN_PROGRESS" }))
+      dispatch(
+        setBackupProcessFileStatus({
+          feature,
+          status: BackupProcessFileStatus.InProgress,
+        })
+      )
       const filePromise = dispatch(
         getFile({
           deviceId,
@@ -131,7 +137,12 @@ export const createBackup = createAsyncThunk<
         "transferId" in file.payload
       ) {
         featureToTransferId[feature] = file.payload.transferId
-        dispatch(setBackupProcessFileStatus({ feature, status: "DONE" }))
+        dispatch(
+          setBackupProcessFileStatus({
+            feature,
+            status: BackupProcessFileStatus.Done,
+          })
+        )
       } else if (!aborted) {
         console.log("Error while downloading file")
         await clearTransfers()
@@ -142,7 +153,7 @@ export const createBackup = createAsyncThunk<
     if (aborted) {
       return rejectWithValue(undefined)
     }
-    dispatch(setBackupProcessStatus("SAVE_FILE"))
+    dispatch(setBackupProcessStatus(BackupProcessStatus.SaveFile))
     const saveBackupFileResponse = await saveBackupFileRequest(
       featureToTransferId,
       deviceId,
diff --git a/libs/generic-view/store/src/lib/backup/reducer.ts b/libs/generic-view/store/src/lib/backup/reducer.ts
index 0d6719ebd2..8d25cefd0c 100644
--- a/libs/generic-view/store/src/lib/backup/reducer.ts
+++ b/libs/generic-view/store/src/lib/backup/reducer.ts
@@ -18,6 +18,11 @@ import { refreshBackupList } from "./refresh-backup-list.action"
 import { RestoreMetadata } from "device/models"
 import { loadBackupMetadata } from "./load-backup-metadata.action"
 import { restoreBackup } from "./restore-backup.action"
+import {
+  BackupProcessFileStatus,
+  BackupProcessStatus,
+  RestoreProcessStatus,
+} from "./backup.types"
 
 export interface Backup {
   fileName: string
@@ -25,15 +30,6 @@ export interface Backup {
   serialNumber: string
 }
 
-export type BackupProcessStatus =
-  | "PRE_BACKUP"
-  | "FILES_TRANSFER"
-  | "SAVE_FILE"
-  | "DONE"
-  | "FAILED"
-
-export type BackupProcessFileStatus = "PENDING" | "IN_PROGRESS" | "DONE"
-
 export interface BackupProcess {
   status: BackupProcessStatus
   featureFilesTransfer: Record<
@@ -42,15 +38,6 @@ export interface BackupProcess {
   >
 }
 
-export type RestoreProcessStatus =
-  | "PASSWORD_NOT_REQUIRED"
-  | "PASSWORD_REQUIRED"
-  | "PRE_RESTORE"
-  | "FILES_TRANSFER"
-  | "RESTORING"
-  | "DONE"
-  | "FAILED"
-
 export interface RestoreProcess {
   status: RestoreProcessStatus
   metadata?: RestoreMetadata
@@ -93,20 +80,20 @@ export const genericBackupsReducer = createReducer(initialState, (builder) => {
   })
   builder.addCase(createBackup.rejected, (state, action) => {
     if (state.backupProcess) {
-      state.backupProcess.status = "FAILED"
+      state.backupProcess.status = BackupProcessStatus.Failed
     } else {
       state.backupProcess = {
-        status: "FAILED",
+        status: BackupProcessStatus.Failed,
         featureFilesTransfer: {},
       }
     }
   })
   builder.addCase(createBackup.fulfilled, (state, action) => {
     if (state.backupProcess) {
-      state.backupProcess.status = "DONE"
+      state.backupProcess.status = BackupProcessStatus.Done
     } else {
       state.backupProcess = {
-        status: "DONE",
+        status: BackupProcessStatus.Done,
         featureFilesTransfer: {},
       }
     }
@@ -120,8 +107,8 @@ export const genericBackupsReducer = createReducer(initialState, (builder) => {
   builder.addCase(loadBackupMetadata.fulfilled, (state, action) => {
     state.restoreProcess = {
       status: action.payload.restoreMetadata.header.password
-        ? "PASSWORD_REQUIRED"
-        : "PASSWORD_NOT_REQUIRED",
+        ? RestoreProcessStatus.PasswordRequired
+        : RestoreProcessStatus.PasswordNotRequired,
       metadata: action.payload.restoreMetadata,
       restoreFileId: action.payload.restoreFileId,
     }
@@ -131,18 +118,18 @@ export const genericBackupsReducer = createReducer(initialState, (builder) => {
   })
   builder.addCase(loadBackupMetadata.rejected, (state, action) => {
     state.restoreProcess = {
-      status: "FAILED",
+      status: RestoreProcessStatus.Failed,
     }
   })
   builder.addCase(restoreBackup.pending, (state, action) => {
     state.restoreProcess = {
       ...state.restoreProcess,
-      status: "PRE_RESTORE",
+      status: RestoreProcessStatus.PreRestore,
     }
   })
   builder.addCase(restoreBackup.rejected, (state, action) => {
     state.restoreProcess = {
-      status: "FAILED",
+      status: RestoreProcessStatus.Failed,
     }
   })
   builder.addCase(setRestoreProcessStatus, (state, action) => {
diff --git a/libs/generic-view/store/src/lib/backup/restore-backup.action.ts b/libs/generic-view/store/src/lib/backup/restore-backup.action.ts
index 777c6c29b2..8d88e2edc9 100644
--- a/libs/generic-view/store/src/lib/backup/restore-backup.action.ts
+++ b/libs/generic-view/store/src/lib/backup/restore-backup.action.ts
@@ -19,6 +19,7 @@ import { ActionName } from "../action-names"
 import { sendFile } from "../file-transfer/send-file.action"
 import { selectActiveApiDeviceId } from "../selectors/select-active-api-device-id"
 import { setRestoreProcessFileStatus, setRestoreProcessStatus } from "./actions"
+import { BackupProcessFileStatus, RestoreProcessStatus } from "./backup.types"
 
 export const restoreBackup = createAsyncThunk<
   undefined,
@@ -133,12 +134,14 @@ export const restoreBackup = createAsyncThunk<
       dispatch(
         setRestoreProcessFileStatus({
           feature: featurePath.feature,
-          status: "PENDING",
+          status: BackupProcessFileStatus.Pending,
         })
       )
     }
 
-    dispatch(setRestoreProcessStatus({ status: "FILES_TRANSFER" }))
+    dispatch(
+      setRestoreProcessStatus({ status: RestoreProcessStatus.FilesTransfer })
+    )
 
     for (let i = 0; i < features.length; ++i) {
       if (aborted) {
@@ -148,7 +151,7 @@ export const restoreBackup = createAsyncThunk<
       dispatch(
         setRestoreProcessFileStatus({
           feature: featurePath.feature,
-          status: "IN_PROGRESS",
+          status: BackupProcessFileStatus.InProgress,
         })
       )
       const sendFilePromise = dispatch(
@@ -170,7 +173,7 @@ export const restoreBackup = createAsyncThunk<
         dispatch(
           setRestoreProcessFileStatus({
             feature: featurePath.feature,
-            status: "DONE",
+            status: BackupProcessFileStatus.Done,
           })
         )
       }
@@ -178,7 +181,9 @@ export const restoreBackup = createAsyncThunk<
 
     clearTransfers()
 
-    dispatch(setRestoreProcessStatus({ status: "RESTORING" }))
+    dispatch(
+      setRestoreProcessStatus({ status: RestoreProcessStatus.Restoring })
+    )
 
     if (aborted) {
       return rejectWithValue(undefined)
@@ -213,7 +218,7 @@ export const restoreBackup = createAsyncThunk<
     if (aborted) {
       return rejectWithValue(undefined)
     }
-    dispatch(setRestoreProcessStatus({ status: "DONE" }))
+    dispatch(setRestoreProcessStatus({ status: RestoreProcessStatus.Done }))
     return undefined
   }
 )
diff --git a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
index b92925fdde..82d8a3a24f 100644
--- a/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
+++ b/libs/generic-view/store/src/lib/hooks/use-api-serial-port-listeners.ts
@@ -26,6 +26,7 @@ import {
 } from "../selectors/data-migration-devices"
 import { clearEntities } from "../entities/actions"
 import { DataMigrationStatus } from "../data-migration/reducer"
+import { BackupProcessStatus } from "../backup/backup.types"
 
 export const useAPISerialPortListeners = () => {
   const dispatch = useDispatch<Dispatch>()
@@ -112,8 +113,15 @@ const useHandleDevicesDetached = () => {
       }
       dispatch(closeAllModals())
 
-      if (backupProcess) {
-        dispatch(setBackupProcessStatus("FAILED"))
+      if (
+        backupProcess &&
+        [
+          BackupProcessStatus.PreBackup,
+          BackupProcessStatus.SaveFile,
+          BackupProcessStatus.FilesTransfer,
+        ].includes(backupProcess)
+      ) {
+        dispatch(setBackupProcessStatus(BackupProcessStatus.Failed))
       }
     },
     [
diff --git a/libs/generic-view/store/src/lib/selectors/backup-progress.ts b/libs/generic-view/store/src/lib/selectors/backup-progress.ts
index e0e65d9e68..222d0ed786 100644
--- a/libs/generic-view/store/src/lib/selectors/backup-progress.ts
+++ b/libs/generic-view/store/src/lib/selectors/backup-progress.ts
@@ -6,6 +6,10 @@
 import { createSelector } from "@reduxjs/toolkit"
 
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import {
+  BackupProcessFileStatus,
+  BackupProcessStatus,
+} from "../backup/backup.types"
 
 export const backupProgress = createSelector(
   [(state: ReduxRootState) => state.genericBackups.backupProcess],
@@ -14,13 +18,13 @@ export const backupProgress = createSelector(
       return { progress: 0 }
     }
 
-    if (backupProcess.status === "DONE") {
+    if (backupProcess.status === BackupProcessStatus.Done) {
       return { progress: 100 }
     }
 
     const features = Object.values(backupProcess.featureFilesTransfer)
     const downloadedFilesCount = features.filter(
-      (item) => item.status === "DONE"
+      (item) => item.status === BackupProcessFileStatus.Done
     ).length
 
     if (features.length <= downloadedFilesCount) {
@@ -29,7 +33,7 @@ export const backupProgress = createSelector(
 
     const [featureInProgress] =
       Object.entries(backupProcess.featureFilesTransfer).find(
-        ([, item]) => item.status === "IN_PROGRESS"
+        ([, item]) => item.status === BackupProcessFileStatus.InProgress
       ) ?? []
 
     return {
diff --git a/libs/generic-view/store/src/lib/selectors/backup-restore.ts b/libs/generic-view/store/src/lib/selectors/backup-restore.ts
index 9755269625..5d49b3e81b 100644
--- a/libs/generic-view/store/src/lib/selectors/backup-restore.ts
+++ b/libs/generic-view/store/src/lib/selectors/backup-restore.ts
@@ -6,6 +6,10 @@
 import { createSelector } from "@reduxjs/toolkit"
 
 import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import {
+  BackupProcessFileStatus,
+  RestoreProcessStatus,
+} from "../backup/backup.types"
 
 export const selectBackupRestore = createSelector(
   [(state: ReduxRootState) => state.genericBackups.restoreProcess],
@@ -29,20 +33,20 @@ export const selectBackupRestoreProgress = createSelector(
     }
 
     if (
-      restoreProcess.status === "PASSWORD_NOT_REQUIRED" ||
-      restoreProcess.status === "PASSWORD_REQUIRED" ||
-      restoreProcess.status === "PRE_RESTORE"
+      restoreProcess.status === RestoreProcessStatus.PasswordNotRequired ||
+      restoreProcess.status === RestoreProcessStatus.PasswordRequired ||
+      restoreProcess.status === RestoreProcessStatus.PreRestore
     ) {
       return { progress: 0 }
     }
 
-    if (restoreProcess.status === "DONE") {
+    if (restoreProcess.status === RestoreProcessStatus.Done) {
       return { progress: 100 }
     }
 
     const features = Object.values(restoreProcess.featureFilesTransfer ?? [])
     const downloadedFilesCount = features.filter(
-      (item) => item.status === "DONE"
+      (item) => item.status === BackupProcessFileStatus.Done
     ).length
 
     if (features.length <= downloadedFilesCount) {
@@ -51,7 +55,7 @@ export const selectBackupRestoreProgress = createSelector(
 
     const [featureInProgress] =
       Object.entries(restoreProcess.featureFilesTransfer ?? []).find(
-        ([, item]) => item.status === "IN_PROGRESS"
+        ([, item]) => item.status === BackupProcessFileStatus.InProgress
       ) ?? []
 
     return {
diff --git a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
index c302da9f0f..6fa78ea8c9 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup-restore/backup-restore.tsx
@@ -12,6 +12,7 @@ import {
   closeModal as closeModalAction,
   loadBackupMetadata,
   restoreBackup,
+  RestoreProcessStatus,
   selectBackupRestoreStatus,
 } from "generic-view/store"
 import { useDispatch, useSelector } from "react-redux"
@@ -116,21 +117,21 @@ export const BackupRestoreForm: FunctionComponent<BackupRestoreConfig> = ({
 
   useEffect(() => {
     switch (restoreStatus) {
-      case "PASSWORD_NOT_REQUIRED":
+      case RestoreProcessStatus.PasswordNotRequired:
         startRestore()
         break
-      case "PASSWORD_REQUIRED":
+      case RestoreProcessStatus.PasswordRequired:
         setStep(Step.Password)
         break
-      case "FAILED":
+      case RestoreProcessStatus.Failed:
         setStep(Step.Error)
         break
-      case "DONE":
+      case RestoreProcessStatus.Done:
         setStep(Step.Success)
         break
-      case "PRE_RESTORE":
-      case "FILES_TRANSFER":
-      case "RESTORING":
+      case RestoreProcessStatus.PreRestore:
+      case RestoreProcessStatus.FilesTransfer:
+      case RestoreProcessStatus.Restoring:
         setStep(Step.Progress)
         break
     }
diff --git a/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx b/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
index 7b5464976e..75162284ce 100644
--- a/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
+++ b/libs/generic-view/ui/src/lib/predefined/backup/backup-create.tsx
@@ -16,6 +16,7 @@ import { Form } from "../../interactive/form/form"
 import { useDispatch, useSelector } from "react-redux"
 import { Dispatch } from "Core/__deprecated__/renderer/store"
 import {
+  BackupProcessStatus,
   cleanBackupProcess,
   closeModal as closeModalAction,
   createBackup,
@@ -124,15 +125,15 @@ const BackupCreateForm: FunctionComponent<BackupCreateConfig> = ({
 
   useEffect(() => {
     switch (backupProcessStatus) {
-      case "DONE":
+      case BackupProcessStatus.Done:
         setStep(Step.Success)
         break
-      case "FAILED":
+      case BackupProcessStatus.Failed:
         setStep(Step.Error)
         break
-      case "PRE_BACKUP":
-      case "FILES_TRANSFER":
-      case "SAVE_FILE":
+      case BackupProcessStatus.PreBackup:
+      case BackupProcessStatus.FilesTransfer:
+      case BackupProcessStatus.SaveFile:
         setStep(Step.Progress)
         break
     }
diff --git a/package-lock.json b/package-lock.json
index a99b6c8ddb..6c266f0b42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -258,7 +258,7 @@
       }
     },
     "apps/mudita-center": {
-      "version": "2.4.0",
+      "version": "2.5.0",
       "license": "GPL-3.0",
       "dependencies": {
         "serialport": "10.1.0"