Merge pull request #935 from NordicSemiconductor/enhance/install_app_error

Enhance message when installing downloadable apps fails

Author: datenreisender

Changelog.minor.md

@@ -12,6 +12,9 @@ release the new version.
 ### Changed
 
 -   #914: Show the devices actually supported by the current Quick Start app.
+-   #935: Updated and corrected dialog styles from
+    [shared v146](https://github.com/NordicSemiconductor/pc-nrfconnect-shared/releases/tag/v146).
+-   #935: Better message when installing downloadable apps fails.
 
 ## 4.3.0
 

jest.config.js

@@ -6,7 +6,6 @@
 
 const sharedConfig =
     require('@nordicsemiconductor/pc-nrfconnect-shared/config/jest.config')([
-        'packageJson',
         'serialport',
     ]);
 

package-lock.json

@@ -92,7 +92,7 @@
     },
     "devDependencies": {
         "@electron/notarize": "^2.1.0",
-        "@nordicsemiconductor/pc-nrfconnect-shared": "^132.0.0",
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^147.0.0",
         "@playwright/test": "^1.16.3",
         "@testing-library/user-event": "^14.4.3",
         "@types/chmodr": "1.0.0",

package.json

@@ -21,6 +21,7 @@ import {
     isInstalled,
     LaunchableApp,
 } from '../../../ipc/apps';
+import { cleanIpcErrorMessage } from '../../../ipc/error';
 import type { AppThunk } from '../../store';
 import appCompatibilityWarning from '../../util/appCompatibilityWarning';
 import { handleSourcesWithErrors } from '../sources/sourcesEffects';
@@ -149,7 +150,9 @@ const install =
         } catch (error) {
             dispatch(
                 ErrorDialogActions.showDialog(
-                    `Unable to install: ${(error as Error).message}`
+                    `Unable to install downloadable app.`,
+                    undefined,
+                    cleanIpcErrorMessage(describeError(error))
                 )
             );
         }

src/launcher/features/apps/appsEffects.ts

@@ -43,7 +43,7 @@ exports[`UpdateAvailableDialog shows the new version if one becomes available  1
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             A new version (

src/launcher/features/launcherUpdate/__snapshots__/UpdateAvailableDialog.test.tsx.snap

@@ -44,7 +44,7 @@ exports[`UpdateProgressDialog can be without progress, and not cancellable 1`] =
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             Downloading nRF Connect for Desktop 
@@ -101,7 +101,7 @@ exports[`UpdateProgressDialog can have a version, percent downloaded, and be can
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             Downloading nRF Connect for Desktop 
@@ -179,7 +179,7 @@ exports[`UpdateProgressDialog has cancelling disabled after being cancelled 1`]
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             Downloading nRF Connect for Desktop 
@@ -258,7 +258,7 @@ exports[`UpdateProgressDialog has cancelling disabled when 100 percent complete
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             Downloading nRF Connect for Desktop 

src/launcher/features/launcherUpdate/__snapshots__/UpdateProgressDialog.test.tsx.snap

@@ -40,7 +40,7 @@ exports[`ProxyErrorDialog is displayed after users canceled the login 1`] = `
           />
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             It appears that you are having problems authenticating with a proxy server. This will prevent you from using certain features of nRF Connect for Desktop, such as installing downloadable apps or checking for updates.

src/launcher/features/proxyLogin/__snapshots__/ProxyErrorDialog.test.tsx.snap

@@ -36,7 +36,7 @@ exports[`ProxyLoginDialog is displayed after a login is requested 1`] = `
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             The proxy server 
@@ -166,7 +166,7 @@ exports[`ProxyLoginDialog is updated if users enter a username 1`] = `
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           <p>
             The proxy server 

src/launcher/features/proxyLogin/__snapshots__/ProxyLoginDialog.test.tsx.snap

@@ -209,7 +209,7 @@ exports[`SettingsView should render check for updates completed, with everything
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           All apps are up to date.
         </div>
@@ -438,7 +438,7 @@ exports[`SettingsView should render check for updates completed, with updates av
           </div>
         </div>
         <div
-          class="modal-body"
+          class="tw-select-text modal-body"
         >
           One or more updates are available. Go to the apps screen to update.
         </div>