Merge branch 'develop' into CP-3171

.github/workflows/e2e-feature-branch.yml

@@ -22,6 +22,46 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18.16.1
+      - name: Find open port for ChromeBrowser on Linux/Mac
+        if: matrix.os != 'Windows'
+        id: find-port-unix
+        run: |
+            START_PORT=30000
+            END_PORT=40000
+            PORT=$START_PORT
+            RUNNER_OS="${{ matrix.os }}"
+            while [ $PORT -le $END_PORT ]; do
+              if [[ "$RUNNER_OS" == "Linux" ]]; then
+                nc -z 127.0.0.1 $PORT 2>/dev/null || break
+              elif [[ "$RUNNER_OS" == "macOS" ]]; then
+                nc -z -w1 127.0.0.1 $PORT 2>/dev/null || break
+              fi
+              PORT=$((PORT+1))
+            done
+            if [ $PORT -gt $END_PORT ]; then
+              echo "No available port found in the range $START_PORT-$END_PORT" >&2
+              exit 1
+            fi
+            echo "CHROME_OPEN_PORT=$PORT" >> $GITHUB_ENV
+      - name: Find open port for ChromeBrowser on Windows
+        if: matrix.os == 'Windows'
+        id: find-port-windows
+        run: |
+            $startPort = 30000
+            $endPort = 40000
+            $port = $startPort
+            while ($port -le $endPort) {
+              $isUsed = (Test-NetConnection -ComputerName 127.0.0.1 -Port $port).TcpTestSucceeded
+              if (-not $isUsed) {
+                break
+              }
+              $port++
+            }
+            if ($port -gt $endPort) {
+              Write-Error "No available port found in the range $startPort-$endPort"
+              exit 1
+            }
+            echo "CHROME_OPEN_PORT=$port" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
       - name: Setup environment variables for Linux
         if: matrix.os == 'Linux'
         env:

libs/core/__deprecated__/renderer/locales/default/en-US.json

@@ -1045,5 +1045,5 @@
   "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.recoveryMode.modal.completed.description": "Hold down the light button on Harmony to turn it on when prompted."
 }

libs/device/models/src/lib/entities/entities-metadata.validator.ts

@@ -7,6 +7,7 @@ import { z } from "zod"
 
 export const entitiesMetadataValidator = z.object({
   totalEntities: z.number().nonnegative(),
+  uniqueKey: z.string().optional(),
 })
 
 export type EntitiesMetadata = z.infer<typeof entitiesMetadataValidator>

libs/generic-view/store/src/index.ts

@@ -52,6 +52,7 @@ 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/entities/refresh-entities-if-metadata-changed.action"
 
 export * from "./lib/data-migration/reducer"
 export * from "./lib/data-migration/actions"

libs/generic-view/store/src/lib/action-names.ts

@@ -109,4 +109,5 @@ export enum ActionName {
   DeleteEntityData = "entities/delete-entity-data",
   CreateEntityData = "entities/create-entity-data",
   UpdateEntityData = "entities/update-entity-data",
+  RefreshEntitiesIfMetadataChanged = "entities/refresh-entities-if-metadata-changed",
 }

libs/generic-view/store/src/lib/backup/restore-backup.action.ts

@@ -21,6 +21,7 @@ import { selectActiveApiDeviceId } from "../selectors/select-active-api-device-i
 import { setRestoreProcessFileStatus, setRestoreProcessStatus } from "./actions"
 import { BackupProcessFileStatus, RestoreProcessStatus } from "./backup.types"
 import { delay } from "shared/utils"
+import { refreshEntitiesIfMetadataChanged } from "../entities/refresh-entities-if-metadata-changed.action"
 
 export const restoreBackup = createAsyncThunk<
   undefined,
@@ -221,6 +222,14 @@ export const restoreBackup = createAsyncThunk<
       return rejectWithValue(undefined)
     }
     dispatch(setRestoreProcessStatus({ status: RestoreProcessStatus.Done }))
+
+    await dispatch(
+      refreshEntitiesIfMetadataChanged({
+        deviceId: deviceId,
+        entitiesType: "contacts",
+      })
+    )
+
     return undefined
   }
 )

libs/generic-view/store/src/lib/data-migration/transfer-migration-data.ts

@@ -26,6 +26,8 @@ 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"
+import { refreshEntitiesIfMetadataChanged } from "../entities/refresh-entities-if-metadata-changed.action"
+import { selectActiveApiDeviceId } from "../selectors"
 
 export const transferMigrationData = createAsyncThunk<
   void,
@@ -56,6 +58,12 @@ export const transferMigrationData = createAsyncThunk<
         return rejectWithValue(undefined)
       }
 
+      const deviceId = selectActiveApiDeviceId(getState())
+
+      if (!deviceId) {
+        return handleError("Device not found")
+      }
+
       const sourceDeviceId = dataMigration.sourceDevice
       if (!sourceDeviceId) {
         return handleError("Source device not selected")
@@ -173,6 +181,15 @@ export const transferMigrationData = createAsyncThunk<
 
       await delay()
 
+      if (domainsData.some((obj) => obj.domain === "contacts-v1")) {
+        await dispatch(
+          refreshEntitiesIfMetadataChanged({
+            deviceId: deviceId,
+            entitiesType: "contacts",
+          })
+        )
+      }
+
       dispatch(setDataMigrationStatus(DataMigrationStatus.Completed))
 
       return

libs/generic-view/store/src/lib/entities/refresh-entities-if-metadata-changed.action.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 { createAsyncThunk } from "@reduxjs/toolkit"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
+import { ActionName } from "../action-names"
+import { getEntitiesMetadataAction } from "./get-entities-metadata.action"
+import { selectEntitiesMetadata } from "../selectors"
+import { getEntitiesDataAction } from "./get-entities-data.action"
+import { EntitiesMetadata } from "Libs/device/models/src"
+
+export const refreshEntitiesIfMetadataChanged = createAsyncThunk<
+  void,
+  { deviceId: string; entitiesType: string },
+  { state: ReduxRootState }
+>(
+  ActionName.RefreshEntitiesIfMetadataChanged,
+  async (
+    { deviceId, entitiesType },
+    { dispatch, getState, rejectWithValue }
+  ) => {
+    if (!deviceId) {
+      return rejectWithValue(undefined)
+    }
+
+    const currentMetadata = selectEntitiesMetadata(getState(), {
+      deviceId,
+      entitiesType,
+    })
+
+    const metadata = await dispatch(
+      getEntitiesMetadataAction({ deviceId, entitiesType })
+    )
+
+    if (
+      currentMetadata?.uniqueKey !==
+      (metadata.payload as EntitiesMetadata)?.uniqueKey
+    ) {
+      dispatch(getEntitiesDataAction({ deviceId, entitiesType }))
+    }
+
+    return
+  }
+)

libs/generic-view/store/src/lib/imports/start-contacts-import-to-device.ts

@@ -23,6 +23,7 @@ import { sendFile } from "../file-transfer/send-file.action"
 import { selectActiveApiDeviceId } from "../selectors"
 import { setImportProcessFileStatus, setImportProcessStatus } from "./actions"
 import { delay } from "shared/utils"
+import { refreshEntitiesIfMetadataChanged } from "../entities/refresh-entities-if-metadata-changed.action"
 
 export const startImportToDevice = createAsyncThunk<
   undefined,
@@ -254,6 +255,13 @@ export const startImportToDevice = createAsyncThunk<
       return rejectWithValue(undefined)
     }
 
+    await dispatch(
+      refreshEntitiesIfMetadataChanged({
+        deviceId: deviceId,
+        entitiesType: "contacts",
+      })
+    )
+
     return undefined
   }
 )