Release v2.4.0 - to stage (#2062)

Co-authored-by: Daniel Karski <[email protected]>
Co-authored-by: Michał Kurczewski <[email protected]>

apps/mudita-center/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mudita-center",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Mudita Center",
   "main": "./dist/main.js",
   "productName": "Mudita Center",

libs/core/core/hooks/use-device-connected-effect.ts

@@ -23,7 +23,7 @@ import {
   DeviceBaseProperties,
 } from "device-protocol/models"
 import { selectDialogOpenState } from "shared/app-state"
-import { Dispatch } from "Core/__deprecated__/renderer/store"
+import { Dispatch, ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { isActiveDeviceProcessingSelector } from "Core/device/selectors/is-active-device-processing.selector"
 import { setDiscoveryStatus } from "Core/discovery-device/actions/base.action"
 import { DiscoveryStatus } from "Core/discovery-device/reducers/discovery-device.interface"
@@ -44,7 +44,11 @@ export const useDeviceConnectedEffect = () => {
   const dispatch = useDispatch<Dispatch>()
 
   const activeDeviceId = useSelector(activeDeviceIdSelector)
-  const activeApiDeviceLocked = useSelector(isActiveApiDeviceLockedSelector)
+  const activeApiDeviceLocked = useSelector((state: ReduxRootState) =>
+    activeDeviceId
+      ? isActiveApiDeviceLockedSelector(state, activeDeviceId)
+      : false
+  )
 
   const shouldDiscoverySkipOnConnect = useDiscoverySkipOnConnect()
   const continueProcess = useContinueProcess()

libs/core/device-initialization/components/devices-initialization-modal-flows/api-device-initialization-modal-flow.tsx

@@ -21,6 +21,7 @@ import {
   selectDataMigrationTargetDevice,
   setDataMigrationSourceDevice,
 } from "generic-view/store"
+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"
@@ -53,18 +54,24 @@ export const APIDeviceInitializationModalFlow: FunctionComponent = () => {
   const deactivateDeviceAndRedirect = useDeactivateDeviceAndRedirect()
   const selectDevice = useDataMigrationDeviceSelector()
   const firstRenderTime = useRef(Date.now())
-  const deviceLocked = useSelector((state: ReduxRootState) => {
-    return selectApiError(state, ApiError.DeviceLocked)
-  })
   const menuElements = useSelector(selectActiveDeviceMenuElements)
-  const [pathToGoBack] = useFilteredRoutesHistory([
-    URL_MAIN.root,
-    ...Object.values(URL_ONBOARDING),
-    ...Object.values(URL_DISCOVERY_DEVICE),
-    ...Object.values(URL_DEVICE_INITIALIZATION),
-  ], URL_DISCOVERY_DEVICE.availableDeviceListModal)
+  const [pathToGoBack] = useFilteredRoutesHistory(
+    [
+      URL_MAIN.root,
+      ...Object.values(URL_ONBOARDING),
+      ...Object.values(URL_DISCOVERY_DEVICE),
+      ...Object.values(URL_DEVICE_INITIALIZATION),
+    ],
+    URL_DISCOVERY_DEVICE.availableDeviceListModal
+  )
   const dataMigrationSourceDevice = useSelector(selectDataMigrationSourceDevice)
   const dataMigrationTargetDevice = useSelector(selectDataMigrationTargetDevice)
+  const activeDeviceId = useSelector(activeDeviceIdSelector)
+  const deviceLocked = useSelector((state: ReduxRootState) =>
+    activeDeviceId
+      ? selectApiError(state, activeDeviceId, ApiError.DeviceLocked)
+      : false
+  )
 
   const targetPath = useMemo(() => {
     const firstMenuItemUrl = menuElements?.[0]?.items?.[0]?.button.url

libs/device/feature/src/lib/file-manager/file-manager.service.ts

@@ -43,7 +43,7 @@ export class FileManager {
     try {
       const file =
         this.serviceBridge.fileTransfer.getFileByTransferId(transferId)
-      writeFileSync(filePath, file.chunks.join(), "base64")
+      writeFileSync(filePath, file.chunks.join(""), "base64")
 
       return Result.success(undefined)
     } catch (e) {
@@ -130,8 +130,8 @@ export class FileManager {
             this.serviceBridge.fileTransfer.getFileByTransferId(transferId)
 
           const featureData = password
-            ? AES.encrypt(transfer.chunks.join(), password).toString()
-            : transfer.chunks.join()
+            ? AES.encrypt(transfer.chunks.join(""), password).toString()
+            : transfer.chunks.join("")
 
           return { ...acc, [feature]: featureData }
         },

libs/generic-view/store/src/lib/hooks/use-locked-device-handler.ts

@@ -17,9 +17,9 @@ import { getAPIConfig } from "../get-api-config"
 export const useLockedDeviceHandler = () => {
   const dispatch = useDispatch<Dispatch>()
   const deviceId = useSelector(selectActiveApiDeviceId)
-  const deviceLocked = useSelector((state: ReduxRootState) => {
-    return selectApiError(state, ApiError.DeviceLocked)
-  })
+  const deviceLocked = useSelector((state: ReduxRootState) =>
+    deviceId ? selectApiError(state, deviceId, ApiError.DeviceLocked) : false
+  )
   const features = useSelector(selectActiveDeviceFeatures)
 
   useEffect(() => {

libs/generic-view/store/src/lib/selectors/api-error.ts

@@ -14,6 +14,7 @@ export const selectApiErrors = createSelector(
 
 export const selectApiError = createSelector(
   selectApiErrors,
-  (state: ReduxRootState, apiError: ApiError) => apiError,
-  (apiErrors, apiError) => apiErrors[apiError]
+  (state: ReduxRootState, deviceId: string) => deviceId,
+  (state: ReduxRootState, deviceId: string, apiError: ApiError) => apiError,
+  (apiErrors, deviceId, apiError) => apiErrors[deviceId]?.[apiError]
 )

libs/generic-view/store/src/lib/selectors/is-device-locked-error.selector.ts

@@ -5,11 +5,15 @@
 
 import { createSelector } from "@reduxjs/toolkit"
 import { ApiError } from "device/models"
+import { ReduxRootState } from "Core/__deprecated__/renderer/store"
 import { selectGenericViewState } from "./select-generic-view-state"
 
 export const isDeviceLockedErrorSelector = createSelector(
-  selectGenericViewState,
-  (genericState): boolean => {
-    return genericState.apiErrors[ApiError.DeviceLocked]
+  [
+    selectGenericViewState,
+    (state: ReduxRootState, deviceId: string) => deviceId,
+  ],
+  (genericState, deviceId): boolean => {
+    return genericState.apiErrors[deviceId]?.[ApiError.DeviceLocked]
   }
 )

libs/generic-view/store/src/lib/views/reducer.ts

@@ -39,17 +39,15 @@ export interface GenericState {
   lastResponse: unknown
   lastRefresh?: number
   devices: Record<string, Device>
-  apiErrors: Record<ApiError, boolean>
+  apiErrors: Record<string, Record<ApiError, boolean>>
 }
 
 const initialState: GenericState = {
   menu: undefined,
   views: {},
   lastResponse: {},
   devices: {},
-  apiErrors: {
-    [ApiError.DeviceLocked]: false,
-  },
+  apiErrors: {},
 }
 
 export const genericViewsReducer = createReducer(initialState, (builder) => {
@@ -99,15 +97,19 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
     state.devices[action.payload.deviceId].menuConfig =
       action.payload.menuConfig
     state.lastResponse = action.payload
-    state.apiErrors[ApiError.DeviceLocked] = false
+    state.apiErrors[action.payload.deviceId] = {
+      [ApiError.DeviceLocked]: false,
+    }
   })
   builder.addCase(getMenuConfig.rejected, (state, action) => {
     const error = action.payload as AppError
     const apiError = !isNaN(Number(error.type))
       ? (Number(error.type) as ApiError)
       : undefined
     if (apiError && ApiError[apiError]) {
-      state.apiErrors[apiError] = true
+      state.apiErrors[action.meta.arg.deviceId] = {
+        [apiError]: true,
+      }
     }
 
     if (apiError !== ApiError.DeviceLocked) {
@@ -168,7 +170,9 @@ export const genericViewsReducer = createReducer(initialState, (builder) => {
     state.lastRefresh = action.payload
   })
   builder.addCase(getOutboxData.fulfilled, (state, action) => {
-    state.apiErrors[ApiError.DeviceLocked] = false
+    state.apiErrors[action.payload.deviceId] = {
+      [ApiError.DeviceLocked]: false,
+    }
   })
   builder.addCase(getGenericConfig.fulfilled, (state, action) => {
     const { deviceId, feature, view } = action.payload

libs/generic-view/ui/src/lib/predefined/backup/backup-password.tsx

@@ -54,8 +54,8 @@ export const BackupPassword: FunctionComponent<Props> = ({
   nextAction,
 }) => {
   const { watch, formState } = useFormContext()
-  const password = watch("password")
-  const passwordRepeat = watch("passwordRepeat")
+  const password = watch("password") || ""
+  const passwordRepeat = watch("passwordRepeat") || ""
 
   const passwordsMatching = password === passwordRepeat
 
@@ -89,9 +89,10 @@ export const BackupPassword: FunctionComponent<Props> = ({
           label: intl.formatMessage(messages.passwordRepeatPlaceholder),
           type: "password",
           validation: {
-            validate: (value: string, formValues) => {
+            validate: (value = "", formValues) => {
+              const password = formValues.password || ""
               return (
-                value === formValues.password ||
+                value === password ||
                 intl.formatMessage(messages.passwordRepeatNotMatchingError)
               )
             },

package.json

@@ -2,7 +2,6 @@
   "name": "mudita-center",
   "description": "Mudita Center",
   "productName": "Mudita Center",
-  "version": "2.3.0",
   "private": true,
   "workspaces": {
     "packages": [