v2.3.0-rc.3 (#1859)

mudita · Apr 26, 2024 · 32096e4 · 32096e4
1 parent 95c4e90
commit 32096e4
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 20 deletions.
diff --git a/apps/mudita-center/package-lock.json b/apps/mudita-center/package-lock.json
diff --git a/apps/mudita-center/package.json b/apps/mudita-center/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mudita-center",
-  "version": "2.3.0-rc.2",
+  "version": "2.3.0-rc.3",
   "description": "Mudita Center",
   "main": "./dist/main.js",
   "productName": "Mudita Center",

diff --git a/..._deprecated__/renderer/wrappers/app-update-step-modal/app-update-step-modal.component.tsx b/..._deprecated__/renderer/wrappers/app-update-step-modal/app-update-step-modal.component.tsx
@@ -61,7 +61,7 @@ const AppUpdateStepModal: FunctionComponent<Props> = ({
     })
 
     return () => unregister()
-  })
+  }, [appCurrentVersion, appLatestVersion])
 
   useEffect(() => {
     const unregister = registerErrorAppUpdateListener(() => {
@@ -70,10 +70,15 @@ const AppUpdateStepModal: FunctionComponent<Props> = ({
         toCenterVersion: appLatestVersion,
         state: TrackCenterUpdateState.Fail,
       })
-      setAppUpdateStep(AppUpdateStep.Error)
+      setAppUpdateStep((prevAppUpdateStep) => {
+        // allow user to try updating before throw error to handle no network connection
+        return prevAppUpdateStep === AppUpdateStep.Updating
+          ? AppUpdateStep.Error
+          : prevAppUpdateStep
+      })
     })
     return () => unregister()
-  })
+  }, [appCurrentVersion, appLatestVersion])
 
   const handleProcessDownload = () => {
     void trackCenterUpdate({

diff --git a/libs/core/app-initialization/selectors/is-app-update-process-passed.selector.ts b/libs/core/app-initialization/selectors/is-app-update-process-passed.selector.ts
@@ -8,8 +8,17 @@ import { settingsStateSelector } from "Core/settings/selectors"
 
 export const isAppUpdateProcessPassed = createSelector(
   settingsStateSelector,
-  (settingsState): boolean => {
-    const { updateAvailable, updateAvailableSkipped, checkingForUpdateFailed } = settingsState
-    return checkingForUpdateFailed || updateAvailableSkipped || updateAvailable === false
+  ({
+    updateAvailable,
+    updateAvailableSkipped,
+    checkingForUpdateFailed,
+    updateRequired,
+  }): boolean => {
+    return (
+      !updateRequired &&
+      (checkingForUpdateFailed ||
+        updateAvailableSkipped ||
+        updateAvailable === false)
+    )
   }
 )
diff --git a/libs/core/app-initialization/selectors/should-app-update-flow-visible.selector.ts b/libs/core/app-initialization/selectors/should-app-update-flow-visible.selector.ts
@@ -8,8 +8,7 @@ import { settingsStateSelector } from "Core/settings/selectors"
 
 export const shouldAppUpdateFlowVisible = createSelector(
   settingsStateSelector,
-  (settingsState): boolean => {
-    const { updateAvailable, updateAvailableSkipped } = settingsState
-    return updateAvailable === true && !updateAvailableSkipped
+  ({ updateAvailable, updateAvailableSkipped, updateRequired }): boolean => {
+    return (updateAvailable && !updateAvailableSkipped) || updateRequired
   }
 )
diff --git a/libs/core/contacts/components/contacts/contacts.component.tsx b/libs/core/contacts/components/contacts/contacts.component.tsx
@@ -274,6 +274,13 @@ const Contacts: FunctionComponent<ContactsProps> = ({
 
         if (payload || message) {
           const newError: FormError[] = []
+
+          if (message === "Edit Contact request failed") {
+            void modalService.openModal(<ErrorDataModal />, true)
+            reject()
+            return
+          }
+
           if (
             message === "phone-number-duplicated" &&
             payload?.primaryPhoneNumberIsDuplicated

diff --git a/libs/core/settings/actions/base.action.ts b/libs/core/settings/actions/base.action.ts
@@ -15,6 +15,8 @@ export const setSettings = createAction<
     | "updateAvailable"
     | "latestVersion"
     | "updateAvailableSkipped"
+    | "checkingForUpdate"
+    | "checkingForUpdateFailed"
   >
 >(SettingsEvent.SetSettings)
 

diff --git a/libs/core/settings/actions/load-settings.action.test.ts b/libs/core/settings/actions/load-settings.action.test.ts
@@ -63,8 +63,6 @@ test("`loadSettings` action dispatch SettingsEvent.LoadSettings event and calls
     {
       type: SettingsEvent.SetSettings,
       payload: {
-        checkingForUpdate: false,
-        checkingForUpdateFailed: false,
         collectingData: false,
         currentVersion: `${packageInfo.version}`,
         lowestSupportedVersions: {

diff --git a/libs/core/settings/actions/load-settings.action.ts b/libs/core/settings/actions/load-settings.action.ts
@@ -44,8 +44,6 @@ export const loadSettings = createAsyncThunk<
       ...settings,
       updateRequired,
       currentVersion: packageInfo.version,
-      checkingForUpdate: false,
-      checkingForUpdateFailed: false,
       lowestSupportedVersions: {
         lowestSupportedCenterVersion: configuration.centerVersion,
         lowestSupportedProductVersion: configuration.productVersions,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "mudita-center",
   "description": "Mudita Center",
   "productName": "Mudita Center",
-  "version": "2.3.0-rc.2",
+  "version": "2.3.0-rc.3",
   "private": true,
   "workspaces": {
     "packages": [