Merge release/0.14.0 into develop branch (#1524)

* bump cardano-sl to include CHANGELOG fix (#1497)

* disable signing with the test keys (#1501)

* bump cardano-sl to latest 3.0.3 (#1505)

* bump cardano-sl to latest 3.0.3 (#1506)

* [DDW-815] Remove "Realtime statistics monitor" link in Testnet builds (#1516)

* [DDW-815] Removed 'Realtime statistics monitor' link from Testnet builds

* [DDW-815] Trigger rebuild

* [DDW-812] Fix application dialog close button colour (#1517)

* DDW-812 Fix application dialog close button colour

* [DDW-812] CHANGELOG

* [DDW-813] Remove unused code

* [DDW-812] Run translation manager

* [DDW-813] Adds a link to the 'Safety Tips' Support portal article (#1518)

* [DDW-813] Adds a link to the 'Safety Tips' Support portal article

* [DDW-815] Trigger rebuild

* [DDW-813] Adds missing Japanese translation

* [DDW-813] Fix failing acceptance test

* [DDW-812] Fix notification z-index issue on Daedalus Diagnostics screen (#1521)

* [DDW-812] Fix notification z-index issue on Daedalus Diagnostics screen

* [DDW-812] Prevent display of main UI under the Block consolidation screen

* cardano-sl bump for RC3 (#1519)

* [DDW-810] Replace '[GPU Safe Mode]' window titlebar text (#1523)

CHANGELOG.md

@@ -28,7 +28,7 @@ Changelog
 
 - Implemented guided manual updates ([PR 1410](https://github.com/input-output-hk/daedalus/pull/1410), [PR 1423](https://github.com/input-output-hk/daedalus/pull/1423))
 - Application menu improvements:
-  - Implemented "Help" application menu item with "Known Issues", "Blank Screen Fix", "Safety Tips", "Feature Request", "Support Request", "Download Logs", "Block Consolidation Status" and "Daedalus Diagnostics" options ([PR 1382](https://github.com/input-output-hk/daedalus/pull/1382), [PR 1459](https://github.com/input-output-hk/daedalus/pull/1459), [PR 1487](https://github.com/input-output-hk/daedalus/issues/1487), [PR 1488](https://github.com/input-output-hk/daedalus/pull/1488), [PR 1493](https://github.com/input-output-hk/daedalus/pull/1493), [PR 1518](https://github.com/input-output-hk/daedalus/pull/1518))
+  - Implemented "Help" application menu item with "Known Issues", "Blank Screen Fix", "Safety Tips", "Feature Request", "Support Request", "Download Logs", "Block Consolidation Status" and "Daedalus Diagnostics" options ([PR 1382](https://github.com/input-output-hk/daedalus/pull/1382), [PR 1459](https://github.com/input-output-hk/daedalus/pull/1459), [PR 1487](https://github.com/input-output-hk/daedalus/issues/1487), [PR 1488](https://github.com/input-output-hk/daedalus/pull/1488), [PR 1493](https://github.com/input-output-hk/daedalus/pull/1493), [PR 1518](https://github.com/input-output-hk/daedalus/pull/1518), [PR 1523](https://github.com/input-output-hk/daedalus/pull/1523))
   - Improved the "Ada redemption" menu item UX by disabling the option while Daedalus is not fully synced ([PR 1458](https://github.com/input-output-hk/daedalus/pull/1458))
 - Application dialogs improvements:
   - Implemented new "About Us" dialog design ([PR 1369](https://github.com/input-output-hk/daedalus/pull/1369), [PR 1450](https://github.com/input-output-hk/daedalus/pull/1450))

source/common/types/environment.types.js

@@ -27,7 +27,7 @@ export type Environment = {
   isWindows: boolean,
   isMacOS: boolean,
   isLinux: boolean,
-  isInSafeMode: boolean,
+  isBlankScreenFixActive: boolean,
 };
 
 // constants

source/common/types/logging.types.js

@@ -44,7 +44,7 @@ export type LogSystemInfoParams = {
   cardanoVersion: string,
   cpu: Array<Object>,
   daedalusVersion: string,
-  isInSafeMode: boolean,
+  isBlankScreenFixActive: boolean,
   network: string,
   osName: string,
   platformVersion: string,

source/main/environment.js

@@ -35,7 +35,7 @@ const PLATFORM_VERSION = os.release();
 const OS = OS_NAMES[PLATFORM] || PLATFORM;
 const cpu = os.cpus();
 const ram = os.totalmem();
-const isInSafeMode = includes(process.argv.slice(1), '--safe-mode');
+const isBlankScreenFixActive = includes(process.argv.slice(1), '--safe-mode');
 const BUILD = process.env.BUILD_NUMBER || 'dev';
 const BUILD_NUMBER = uniq([API_VERSION, BUILD]).join('.');
 const BUILD_LABEL = (() => {
@@ -81,7 +81,7 @@ export const environment: Environment = Object.assign(
     isWindows,
     isMacOS,
     isLinux,
-    isInSafeMode,
+    isBlankScreenFixActive,
   },
   process.env
 );

source/main/index.js

@@ -46,7 +46,7 @@ let cardanoNode: ?CardanoNode;
 const {
   isDev,
   isWatchMode,
-  isInSafeMode,
+  isBlankScreenFixActive,
   network,
   os: osName,
   version: daedalusVersion,
@@ -93,7 +93,7 @@ const onAppReady = async () => {
     cardanoVersion,
     cpu,
     daedalusVersion,
-    isInSafeMode,
+    isBlankScreenFixActive,
     network,
     osName,
     platformVersion,

source/main/locales/en-US.json

@@ -16,17 +16,17 @@
   "menu.edit.undo": "Undo",
   "menu.helpSupport": "Help",
   "menu.helpSupport.blankScreenFix": "Blank Screen Fix",
+  "menu.helpSupport.blankScreenFixDialogCancel": "Cancel",
+  "menu.helpSupport.blankScreenFixDialogConfirm": "Yes",
+  "menu.helpSupport.blankScreenFixDialogMessage": "Turn off 'Blank screen fix'? \n \nDisabling the blank screen fix setting will improve the performance of user interface rendering by enabling graphics acceleration, however, some users may find that Daedalus runs better with this setting enabled. If you see a blank screen instead of the Daedalus user interface after disabling this setting and restarting Daedalus, please turn this setting back on. \n \nDo you want to disable this setting and restart Daedalus?",
+  "menu.helpSupport.blankScreenFixDialogTitle": "Turn off 'Blank screen fix'?",
   "menu.helpSupport.blockConsolidationStatus": "Block Consolidation Status",
   "menu.helpSupport.daedalusDiagnostics": "Daedalus Diagnostics",
   "menu.helpSupport.downloadLogs": "Download Logs",
-  "menu.helpSupport.gpuSafeModeDialogCancel": "Cancel",
-  "menu.helpSupport.gpuSafeModeDialogConfirm": "Yes",
-  "menu.helpSupport.gpuSafeModeDialogMessage": "Turn off 'Blank screen fix'? \n \nDisabling the blank screen fix setting will improve the performance of user interface rendering by enabling graphics acceleration, however, some users may find that Daedalus runs better with this setting enabled. If you see a blank screen instead of the Daedalus user interface after disabling this setting and restarting Daedalus, please turn this setting back on. \n \nDo you want to disable this setting and restart Daedalus?",
-  "menu.helpSupport.gpuSafeModeDialogTitle": "Turn off 'Blank screen fix'?",
   "menu.helpSupport.knownIssues": "Known Issues",
   "menu.helpSupport.knownIssuesUrl": "https://daedaluswallet.io/known-issues/",
-  "menu.helpSupport.nonGpuSafeModeDialogMessage": "Turn on 'Blank screen fix'? \n \nIf the Daedalus user interface is failing to load then enabling this setting may fix the problem. It will reduce the performance of user interface rendering by disabling graphics acceleration, but some users may find that Daedalus runs better with this setting enabled. \n \nEnable this setting only if the Daedalus user interface is failing to load. If Daedalus is working properly, please click ‘No’. Otherwise, click ‘Yes’ to restart Daedalus with the blank screen fix setting enabled. \n \nDo you want to enable this setting and restart Daedalus?",
-  "menu.helpSupport.nonGpuSafeModeDialogTitle": "Turn on 'Blank screen fix'?",
+  "menu.helpSupport.nonBlankScreenFixDialogMessage": "Turn on 'Blank screen fix'? \n \nIf the Daedalus user interface is failing to load then enabling this setting may fix the problem. It will reduce the performance of user interface rendering by disabling graphics acceleration, but some users may find that Daedalus runs better with this setting enabled. \n \nEnable this setting only if the Daedalus user interface is failing to load. If Daedalus is working properly, please click ‘No’. Otherwise, click ‘Yes’ to restart Daedalus with the blank screen fix setting enabled. \n \nDo you want to enable this setting and restart Daedalus?",
+  "menu.helpSupport.nonBlankScreenFixDialogTitle": "Turn on 'Blank screen fix'?",
   "menu.helpSupport.featureRequest": "Feature Requests",
   "menu.helpSupport.featureRequestUrl": "https://iohk.zendesk.com/hc/en-us/sections/360002144373",
   "menu.helpSupport.safetyTips": "Safety Tips",
@@ -38,5 +38,5 @@
   "menu.view.toggleDeveloperTools": "Toggle Developer Tools",
   "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleMaximumWindowSize": "Toggle Maximum Window Size",
-  "window.title.gpuSafeMode": "[GPU Safe Mode]"
+  "window.title.blankScreenFix": "['Blank screen fix' active]"
 }

source/main/locales/ja-JP.json

@@ -16,17 +16,17 @@
   "menu.edit.undo": "元に戻す",
   "menu.helpSupport": "ヘルプ",
   "menu.helpSupport.blankScreenFix": "ブランク画面修正",
+  "menu.helpSupport.blankScreenFixDialogCancel": "キャンセル",
+  "menu.helpSupport.blankScreenFixDialogConfirm": "はい",
+  "menu.helpSupport.blankScreenFixDialogMessage": "「ブランク画面修正」を無効にしますか? \n \nブランク画面修正設定を無効にすると、グラフィックアクセラレーションが有効化されてユーザーインターフェイスのレンダリングパフォーマンスが向上しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。この設定を無効にしてDaedalusを再起動した際にDaedalusユーザーインターフェイスの代わりにブランク画面が表示される場合は、この設定をもう一度有効にしてください。 \n \nこの設定を無効にしてDaedalusを再起動しますか。",
+  "menu.helpSupport.blankScreenFixDialogTitle": "「ブランク画面修正」を無効にしますか?",
   "menu.helpSupport.blockConsolidationStatus": "ブロック統合状況",
   "menu.helpSupport.daedalusDiagnostics": "Daedalus診断",
   "menu.helpSupport.downloadLogs": "ログのダウンロード",
-  "menu.helpSupport.gpuSafeModeDialogCancel": "キャンセル",
-  "menu.helpSupport.gpuSafeModeDialogConfirm": "はい",
-  "menu.helpSupport.gpuSafeModeDialogMessage": "「ブランク画面修正」を無効にしますか? \n \nブランク画面修正設定を無効にすると、グラフィックアクセラレーションが有効化されてユーザーインターフェイスのレンダリングパフォーマンスが向上しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。この設定を無効にしてDaedalusを再起動した際にDaedalusユーザーインターフェイスの代わりにブランク画面が表示される場合は、この設定をもう一度有効にしてください。 \n \nこの設定を無効にしてDaedalusを再起動しますか。",
-  "menu.helpSupport.gpuSafeModeDialogTitle": "「ブランク画面修正」を無効にしますか?",
   "menu.helpSupport.knownIssues": "既知の問題",
   "menu.helpSupport.knownIssuesUrl": "https://daedaluswallet.io/ja/known-issues/",
-  "menu.helpSupport.nonGpuSafeModeDialogMessage": "「ブランク画面修正」を有効にしますか? \n \nDaedalusユーザーインターフェイスがロードに失敗した際、この設定を有効にすることにより問題が解消される場合があります。この場合、グラフィックアクセラレーションが無効化されることでユーザーインターフェイスのレンダリングパフォーマンスが低下しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。 \n \nこの設定はDaedalusユーザーインターフェイスがロードに失敗した場合にのみ有効にしてください。Daedalusが正常に作動している場合は[いいえ]をクリックします。正常に作動していない場合には[はい]をクリックし、ブランク画面修正設定を有効にしてDaedalusを再起動してください。 \n \nこの設定を有効にしてDaedalusを再起動しますか。",
-  "menu.helpSupport.nonGpuSafeModeDialogTitle": "「ブランク画面修正」を有効にしますか?",
+  "menu.helpSupport.nonBlankScreenFixDialogMessage": "「ブランク画面修正」を有効にしますか? \n \nDaedalusユーザーインターフェイスがロードに失敗した際、この設定を有効にすることにより問題が解消される場合があります。この場合、グラフィックアクセラレーションが無効化されることでユーザーインターフェイスのレンダリングパフォーマンスが低下しますが、この設定を有効にした方がDaedalusがスムーズに作動する場合があります。 \n \nこの設定はDaedalusユーザーインターフェイスがロードに失敗した場合にのみ有効にしてください。Daedalusが正常に作動している場合は[いいえ]をクリックします。正常に作動していない場合には[はい]をクリックし、ブランク画面修正設定を有効にしてDaedalusを再起動してください。 \n \nこの設定を有効にしてDaedalusを再起動しますか。",
+  "menu.helpSupport.nonBlankScreenFixDialogTitle": "「ブランク画面修正」を有効にしますか?",
   "menu.helpSupport.featureRequest": "ご意見、要望",
   "menu.helpSupport.featureRequestUrl": "https://iohk.zendesk.com/hc/ja/sections/360002144373",
   "menu.helpSupport.safetyTips": "安全に利用するために",
@@ -38,5 +38,5 @@
   "menu.view.toggleDeveloperTools": "「開発者ツールの切り替え」",
   "menu.view.toggleFullScreen": "フルスクリーン切り替え",
   "menu.view.toggleMaximumWindowSize": "最大ウインドウサイズ切り切り替え",
-  "window.title.gpuSafeMode": "[GPUセーフモード]"
+  "window.title.blankScreenFix": "[「ブランク画面修正」有効 ]"
 }

source/main/menus/MenuActions.types.js

@@ -1,6 +1,6 @@
 // @flow
 export type MenuActions = {
-  toggleOnSafeMode: Function,
+  toggleBlankScreenFix: Function,
   openAboutDialog: Function,
   openAdaRedemptionScreen: Function,
   openBlockConsolidationStatusDialog: Function,

source/main/menus/osx.js

@@ -10,7 +10,7 @@ import { NOTIFICATIONS } from '../../common/ipc/constants';
 import { generateSupportRequestLink } from '../../common/utils/reporting';
 
 const id = 'menu';
-const { isInSafeMode } = environment;
+const { isBlankScreenFixActive } = environment;
 
 export const osxMenu = (
   app: App,
@@ -129,9 +129,9 @@ export const osxMenu = (
       {
         label: translation('helpSupport.blankScreenFix'),
         type: 'checkbox',
-        checked: isInSafeMode,
+        checked: isBlankScreenFixActive,
         click(item) {
-          actions.toggleOnSafeMode(item);
+          actions.toggleBlankScreenFix(item);
         },
       },
       { type: 'separator' },

source/main/menus/win-linux.js

@@ -10,7 +10,7 @@ import { showUiPartChannel } from '../ipc/control-ui-parts';
 import { generateSupportRequestLink } from '../../common/utils/reporting';
 
 const id = 'menu';
-const { isWindows, isInSafeMode } = environment;
+const { isWindows, isBlankScreenFixActive } = environment;
 
 export const winLinuxMenu = (
   app: App,
@@ -135,9 +135,9 @@ export const winLinuxMenu = (
       {
         label: translation('helpSupport.blankScreenFix'),
         type: 'checkbox',
-        checked: isInSafeMode,
+        checked: isBlankScreenFixActive,
         click(item) {
-          actions.toggleOnSafeMode(item);
+          actions.toggleBlankScreenFix(item);
         },
       },
       { type: 'separator' },

source/main/utils/buildAppMenus.js

@@ -19,7 +19,7 @@ export const buildAppMenus = async (
   const { ADA_REDEMPTION } = SCREENS;
   const { ABOUT, BLOCK_CONSOLIDATION, DAEDALUS_DIAGNOSTICS } = DIALOGS;
 
-  const { isMacOS, isInSafeMode } = environment;
+  const { isMacOS, isBlankScreenFixActive } = environment;
   const translations = require(`../locales/${locale}`);
 
   const openAboutDialog = () => {
@@ -38,55 +38,55 @@ export const buildAppMenus = async (
     if (mainWindow) showUiPartChannel.send(DAEDALUS_DIAGNOSTICS, mainWindow);
   };
 
-  const restartInSafeMode = async () => {
-    Logger.info('Restarting in SafeMode...');
+  const restartWithBlankScreenFix = async () => {
+    Logger.info('Restarting in BlankScreenFix...');
     if (cardanoNode) await cardanoNode.stop();
     Logger.info('Exiting Daedalus with code 21', { code: 21 });
     safeExitWithCode(21);
   };
 
-  const restartWithoutSafeMode = async () => {
-    Logger.info('Restarting without SafeMode...');
+  const restartWithoutBlankScreenFix = async () => {
+    Logger.info('Restarting without BlankScreenFix...');
     if (cardanoNode) await cardanoNode.stop();
     Logger.info('Exiting Daedalus with code 22', { code: 22 });
     safeExitWithCode(22);
   };
 
-  const toggleOnSafeMode = item => {
+  const toggleBlankScreenFix = item => {
     const translation = getTranslation(translations, 'menu');
-    const gpuSafeModeDialogOptions = {
+    const blankScreenFixDialogOptions = {
       buttons: [
-        translation('helpSupport.gpuSafeModeDialogConfirm'),
-        translation('helpSupport.gpuSafeModeDialogCancel'),
+        translation('helpSupport.blankScreenFixDialogConfirm'),
+        translation('helpSupport.blankScreenFixDialogCancel'),
       ],
       type: 'warning',
-      title: isInSafeMode
-        ? translation('helpSupport.gpuSafeModeDialogTitle')
-        : translation('helpSupport.nonGpuSafeModeDialogTitle'),
-      message: isInSafeMode
-        ? translation('helpSupport.gpuSafeModeDialogMessage')
-        : translation('helpSupport.nonGpuSafeModeDialogMessage'),
+      title: isBlankScreenFixActive
+        ? translation('helpSupport.blankScreenFixDialogTitle')
+        : translation('helpSupport.nonBlankScreenFixDialogTitle'),
+      message: isBlankScreenFixActive
+        ? translation('helpSupport.blankScreenFixDialogMessage')
+        : translation('helpSupport.nonBlankScreenFixDialogMessage'),
       defaultId: 1,
       cancelId: 1,
       noLink: true,
     };
-    dialog.showMessageBox(mainWindow, gpuSafeModeDialogOptions, buttonId => {
+    dialog.showMessageBox(mainWindow, blankScreenFixDialogOptions, buttonId => {
       if (buttonId === 0) {
-        if (isInSafeMode) {
-          restartWithoutSafeMode();
+        if (isBlankScreenFixActive) {
+          restartWithoutBlankScreenFix();
         } else {
-          restartInSafeMode();
+          restartWithBlankScreenFix();
         }
       }
-      item.checked = isInSafeMode;
+      item.checked = isBlankScreenFixActive;
     });
   };
 
   const menuActions = {
     openAboutDialog,
     openDaedalusDiagnosticsDialog,
     openAdaRedemptionScreen,
-    toggleOnSafeMode,
+    toggleBlankScreenFix,
     openBlockConsolidationStatusDialog,
   };
 

source/main/utils/setupLogging.js

@@ -114,7 +114,7 @@ export const logStateSnapshot = (
     daedalusVersion,
     daedalusProcessID,
     daedalusMainProcessID,
-    isInSafeMode,
+    isBlankScreenFixActive,
     cardanoVersion,
     cardanoNetwork,
     cardanoProcessID,
@@ -138,7 +138,7 @@ export const logStateSnapshot = (
     daedalusVersion,
     daedalusProcessID,
     daedalusMainProcessID,
-    isInSafeMode,
+    isBlankScreenFixActive,
     cardanoVersion,
     cardanoNetwork,
     cardanoProcessID,

source/main/windows/main.js

@@ -9,15 +9,22 @@ import { launcherConfig } from '../config';
 
 const rendererErrorHandler = new RendererErrorHandler();
 
-const { isDev, isTest, buildLabel, isLinux, isInSafeMode } = environment;
+const {
+  isDev,
+  isTest,
+  buildLabel,
+  isLinux,
+  isBlankScreenFixActive,
+} = environment;
 
 const id = 'window';
 
 const getWindowTitle = (locale: string): string => {
   const translations = require(`../locales/${locale}`);
   const translation = getTranslation(translations, id);
   let title = buildLabel;
-  if (isInSafeMode) title += ` ${translation('title.gpuSafeMode')}`;
+  if (isBlankScreenFixActive)
+    title += ` ${translation('title.blankScreenFix')}`;
   return title;
 };
 
@@ -44,7 +51,7 @@ export const createMainWindow = (locale: string) => {
       webviewTag: false,
       enableRemoteModule: isTest,
       preload: path.join(__dirname, './preload.js'),
-      additionalArguments: isInSafeMode ? ['--safe-mode'] : [],
+      additionalArguments: isBlankScreenFixActive ? ['--safe-mode'] : [],
     },
   };