Release v2.2.4 - develop to stage (#1520)

.env.example

@@ -30,6 +30,7 @@ FRESHDESK_API_URL=
 FRESHDESK_API_TOKEN=
 
 # [Optional] analytics.mudita.com
+ANALYTICS_ENABLED=
 ANALYTICS_API_URL=
 ANALYTICS_API_SITE_ID=
 

.github/pull_request_template.md

@@ -2,7 +2,7 @@ JIRA Reference: [CP-XXX]
 
 ### :memo: Description ️
 
-- 
+-
 
 ### :muscle: Checklist before requesting a review - nice to have
 

.github/workflows/nexus-development.yml

@@ -32,6 +32,7 @@ jobs:
           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 }}

.github/workflows/nexus-pre-production.yml

@@ -33,6 +33,7 @@ jobs:
           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 }}

.github/workflows/nexus-production.yml

@@ -33,6 +33,7 @@ jobs:
           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 }}

CHANGELOG.md

@@ -10,6 +10,20 @@ 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.2.4] - 2023-10-26
+
+Here we write upgrading notes for brands. It's a team effort to make them as
+straightforward as possible.
+
+### Fixed
+
+- Secondary phone number disappears after deleting it
+
+### Changed
+
+- Enhance of update badge status for Mudita Center
+- Enhance of update badge status for OS
+
 ## [2.2.3] - 2023-05-10
 
 ### Fixed

packages/app/src/__deprecated__/main/autoupdate.ts

@@ -53,7 +53,6 @@ export default (win: BrowserWindow): void => {
   })
   autoUpdater.on("error", (error) => {
     void ipcMain.callRenderer(win, AppUpdateEvent.Error, error)
-    void ipcMain.callRenderer(win, AppUpdateEvent.NotAvailable)
     win.setProgressBar(-1)
   })
   autoUpdater.on("download-progress", ({ percent }) => {

packages/app/src/__deprecated__/main/main.ts

@@ -24,11 +24,7 @@ import registerCopyFileListener from "App/__deprecated__/main/functions/register
 import registerWriteGzipListener from "App/__deprecated__/main/functions/register-write-gzip-listener"
 import registerRmdirListener from "App/__deprecated__/main/functions/register-rmdir-listener"
 import registerArchiveFilesListener from "App/__deprecated__/main/functions/register-archive-files-listener"
-import registerReadFileListener from "App/file-system/listeners/read-file.listener"
 import createDownloadListenerRegistrar from "App/__deprecated__/main/functions/create-download-listener-registrar"
-import registerEncryptFileListener from "App/file-system/listeners/encrypt-file.listener"
-import registerDecryptFileListener from "App/file-system/listeners/decrypt-file.listener"
-import registerUnlinkFileListener from "App/file-system/listeners/unlink-file.listener"
 import {
   registerDownloadHelpHandler,
   removeDownloadHelpHandler,
@@ -196,10 +192,6 @@ const createWindow = async () => {
   registerRmdirListener()
   registerWriteGzipListener()
   registerArchiveFilesListener()
-  registerEncryptFileListener()
-  registerReadFileListener()
-  registerUnlinkFileListener()
-  registerDecryptFileListener()
   registerMetadataAllGetValueListener()
   registerMetadataGetValueListener()
   registerMetadataSetValueListener()

packages/app/src/__deprecated__/renderer/components/rest/news/update-button/update-button.component.tsx

@@ -57,7 +57,7 @@ const UpdateButtonComponent: FunctionComponent<
     <UpdateButton
       displayStyle={DisplayStyle.LinkWithParagraph}
       label={label}
-      Icon={IconType.Refresh}
+      Icon={updating ? IconType.Refresh : undefined}
       onClick={onClick}
       updating={updating}
       disabled={updating}

packages/app/src/__deprecated__/renderer/locales/default/en-US.json

@@ -714,10 +714,10 @@
   "module.overview.systemDownloadAction": "Download now",
   "module.overview.systemLastUpdate": "Updated: {date}",
   "module.overview.systemUpdateAction": "Update now",
-  "module.overview.systemUpdateAvailable": "Update is available",
-  "module.overview.systemUpdateCheckFailed": "Checking for update failed",
-  "module.overview.systemUpdateDownloaded": "Update is available",
-  "module.overview.systemUpdateUpToDate": "You’re up to date.",
+  "module.overview.systemUpdateAvailable": "Version {version} is available",
+  "module.overview.systemUpdateCheckFailed": "Checking for updates failed",
+  "module.overview.systemUpdateDownloaded": "Install now",
+  "module.overview.systemUpdateUpToDate": "You’re up to date",
   "module.overview.systemVersion": "MuditaOS version",
   "module.overview.systemVersionTitle": "Current version:",
   "module.overview.updateAvailableAboutOsVersionSubDescription": "the device will be upgraded to this version",

packages/app/src/__deprecated__/renderer/wrappers/root-wrapper.tsx

@@ -69,6 +69,8 @@ import {
 import { setConnectionStatus } from "App/device/actions"
 import { resetUploadingState } from "App/files-manager/actions"
 import { setInitializationFailed } from "App/data-sync/actions"
+import registerErrorAppUpdateListener from "App/__deprecated__/main/functions/register-error-app-update-listener"
+import { setCheckingForUpdateFailed } from "App/settings/actions/set-checking-for-update-failed.action"
 
 interface Props {
   history: History
@@ -144,14 +146,6 @@ const RootWrapper: FunctionComponent<Props> = ({
     [mode, history]
   )
 
-  const handleAppUpdateAvailableCheck = (): void => {
-    if (!window.navigator.onLine) {
-      toggleApplicationUpdateAvailable(false)
-    } else {
-      checkUpdateAvailable()
-    }
-  }
-
   const onDeviceDetachHandler = () => {
     void resetUploadingState()
     void setConnectionStatus(false)
@@ -220,8 +214,17 @@ const RootWrapper: FunctionComponent<Props> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [connectedAndUnlocked])
 
+  useEffect(() => {
+    const unregister = registerErrorAppUpdateListener(() => {
+      dispatch(setCheckingForUpdateFailed(true))
+      setCheckingForUpdate(false)
+    })
+    return () => unregister()
+  })
+
   useEffect(() => {
     const unregister = registerAvailableAppUpdateListener((version) => {
+      dispatch(setCheckingForUpdateFailed(false))
       setCheckingForUpdate(false)
       toggleApplicationUpdateAvailable(true)
       setLatestVersion(version as string)
@@ -242,7 +245,7 @@ const RootWrapper: FunctionComponent<Props> = ({
   useEffect(() => {
     loadSettings()
     if (!mode) {
-      handleAppUpdateAvailableCheck()
+      checkUpdateAvailable()
     }
 
     const devModeEnabled = flags.get(Feature.DeveloperModeEnabled)

packages/app/src/analytic-data-tracker/constants/controller.constant.ts

@@ -3,24 +3,12 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-export const ControllerPrefix = "analytic-data-tracker"
-
 export enum IpcAnalyticDataTrackerEvent {
-  Track = "track",
-  TrackUnique = "track-unique",
-  TrackWithoutDeviceCheck = "track-without-device-check",
-  TrackUniqueWithoutDeviceCheck = "track-unique-without-device-check",
-  ToggleTracking = "toggle-tracking",
-  SetExternalUsageDevice = "set-external-usage-device",
-  SetVisitorMetadata = "set-visitor-metadata",
-}
-
-export enum IpcAnalyticDataTrackerRequest {
-  Track = "analytic-data-tracker-track",
-  TrackUnique = "analytic-data-tracker-track-unique",
-  TrackWithoutDeviceCheck = "analytic-data-tracker-track-without-device-check",
-  TrackUniqueWithoutDeviceCheck = "analytic-data-tracker-track-unique-without-device-check",
-  ToggleTracking = "analytic-data-tracker-toggle-tracking",
-  SetExternalUsageDevice = "analytic-data-tracker-set-external-usage-device",
-  SetVisitorMetadata = "analytic-data-tracker-set-visitor-metadata",
+  Track = "analytic_track",
+  TrackUnique = "analytic_track-unique",
+  TrackWithoutDeviceCheck = "analytic_track-without-device-check",
+  TrackUniqueWithoutDeviceCheck = "analytic_track-unique-without-device-check",
+  ToggleTracking = "analytic_toggle-tracking",
+  SetExternalUsageDevice = "analytic_set-external-usage-device",
+  SetVisitorMetadata = "analytic_set-visitor-metadata",
 }

packages/app/src/analytic-data-tracker/controllers/analytic-data-tracker.controller.ts

@@ -3,18 +3,14 @@
  * For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
  */
 
-import { Controller, IpcEvent } from "App/core/decorators"
-import {
-  ControllerPrefix,
-  IpcAnalyticDataTrackerEvent,
-} from "App/analytic-data-tracker/constants"
+import { IpcEvent } from "App/core/decorators"
+import { IpcAnalyticDataTrackerEvent } from "App/analytic-data-tracker/constants"
 import {
   AnalyticDataTrackerClass,
   VisitorMetadata,
 } from "App/analytic-data-tracker/services"
 import { TrackEvent } from "App/analytic-data-tracker/types"
 
-@Controller(ControllerPrefix)
 export class AnalyticDataTrackerController {
   constructor(private tracker: AnalyticDataTrackerClass) {}
 

packages/app/src/analytic-data-tracker/requests/set-external-usage-device.request.ts

@@ -4,13 +4,13 @@
  */
 
 import { ipcRenderer } from "electron-better-ipc"
-import { IpcAnalyticDataTrackerRequest } from "App/analytic-data-tracker/constants"
+import { IpcAnalyticDataTrackerEvent } from "App/analytic-data-tracker/constants"
 
 export const setExternalUsageDeviceRequest = async (
   flag: boolean
 ): Promise<void> => {
   return ipcRenderer.callMain(
-    IpcAnalyticDataTrackerRequest.SetExternalUsageDevice,
+    IpcAnalyticDataTrackerEvent.SetExternalUsageDevice,
     flag
   )
 }