Merge branch 'develop' into fix/ddw-911-remove-warning-when-recommended-decimal-is-zero

Author: shawnbusuttil

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
 - Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
 
 ### Chores
@@ -29,6 +30,7 @@
 
 - Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
 - Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
+- Fixed the gap between Stake Pool View options ([PR 2899](https://github.com/input-output-hk/daedalus/pull/2899))
 
 ### Chores
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.9.0-FC1",
+  "version": "4.9.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

source/renderer/app/components/knownIssues/RTSFlagsRecommendationOverlay/RTSFlagsRecommendationOverlay.scss

@@ -96,6 +96,14 @@
         background-color: rgba(45, 45, 45, 0.5);
       }
     }
+
+    & p {
+      margin-bottom: 11px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .title {

source/renderer/app/components/knownIssues/RTSFlagsRecommendationOverlay/RTSFlagsRecommendationOverlay.tsx

@@ -22,7 +22,7 @@ const messages = defineMessages({
   content: {
     id: 'knownIssues.rtsRecommendationOverlay.content',
     defaultMessage:
-      '!!!Your system specifications do not meet Daedalus’ recommended hardware requirements.<br />You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.',
+      '!!!<p>Your system specifications do not meet Daedalus’ recommended hardware requirements.</p><p>You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.</p><p>You can enable it now by clicking the ‘Enable and quit’ button. Note that you will have to restart Daedalus for this change to take effect. To enable or disable it at any time, go to the Help menu.</p>',
     description: 'Content of the RTS flags recommendation overlay',
   },
   enableAndQuitButtonLabel: {

source/renderer/app/components/staking/stake-pools/StakePoolsSearch.scss

@@ -97,10 +97,15 @@
   line-height: 48px;
   margin-left: 10px;
   padding: 0 20px;
-  width: 118px;
+  width: auto;
 
   & > span {
     display: flex;
+    margin-right: 15px;
+
+    &:last-child {
+      margin-right: 0;
+    }
   }
 
   button {

source/renderer/app/i18n/locales/defaultMessages.json

@@ -1620,7 +1620,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Your system specifications do not meet Daedalus’ recommended hardware requirements.<br />You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.",
+        "defaultMessage": "!!!<p>Your system specifications do not meet Daedalus’ recommended hardware requirements.</p><p>You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.</p><p>You can enable it now by clicking the ‘Enable and quit’ button. Note that you will have to restart Daedalus for this change to take effect. To enable or disable it at any time, go to the Help menu.</p>",
         "description": "Content of the RTS flags recommendation overlay",
         "end": {
           "column": 3,

source/renderer/app/i18n/locales/en-US.json

@@ -219,7 +219,7 @@
   "knownIssues.dialog.enableRtsFlagsMode.explanation": "When enabled, the Cardano node will attempt to reduce its RAM usage. You will need to restart Daedalus for this change to take effect.",
   "knownIssues.dialog.enableRtsFlagsMode.title": "Enable RAM management (RTS Flags)",
   "knownIssues.dialog.toggleRtsFlagsMode.manualRelaunchConfirmationCheckboxLabel": "I understand that I will need to manually launch Daedalus",
-  "knownIssues.rtsRecommendationOverlay.content": "Your system specifications do not meet Daedalus’ recommended hardware requirements. <br /><br />You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.",
+  "knownIssues.rtsRecommendationOverlay.content": "<p>Your system specifications do not meet Daedalus’ recommended hardware requirements.</p><p>You can enable RAM management (RTS Flags), an experimental setting that can reduce memory usage on computers with less than 16GB of RAM.</p><p>You can enable it now by clicking the ‘Enable and quit’ button. Note that you will have to restart Daedalus for this change to take effect. To enable or disable it at any time, go to the Help menu.</p>",
   "knownIssues.rtsRecommendationOverlay.decideLaterButtonLabel": "Decide later",
   "knownIssues.rtsRecommendationOverlay.enableAndQuitButtonLabel": "Enable and quit",
   "knownIssues.rtsRecommendationOverlay.title": "Recommended hardware requirements status",

source/renderer/app/i18n/locales/ja-JP.json

@@ -219,7 +219,7 @@
   "knownIssues.dialog.enableRtsFlagsMode.explanation": "有効にすると、CardanoノードはRAM使用量の削減を試みます。変更を有効にするために、Daedalusを再起動する必要があります。",
   "knownIssues.dialog.enableRtsFlagsMode.title": "RAM管理（RTSフラグ）を有効にする",
   "knownIssues.dialog.toggleRtsFlagsMode.manualRelaunchConfirmationCheckboxLabel": "Daedalusを手動で再起動する必要があることを理解しました。",
-  "knownIssues.rtsRecommendationOverlay.content": "システム仕様がDaedalusの推奨ハードウェア要件を満たしていません。<br /><br />RAMが16GB未満のコンピューターでメモリー使用量を削減できる試験的設定であるRAM管理（RTSフラグ）を有効にすることができます。",
+  "knownIssues.rtsRecommendationOverlay.content": "<p>システム仕様がDaedalusの推奨ハードウェア要件を満たしていません。</p><p>RAMが16GB未満のコンピューターでメモリー使用量を削減できる試験的設定であるRAM管理（RTSフラグ）を有効にすることができます。</p><p>[有効にして終了する] ボタンをクリックすると有効化できます。変更を有効にするためには、Daedalusを再起動する必要があります。有効化または無効化は、いつでもヘルプメニューから実行できます。</p>",
   "knownIssues.rtsRecommendationOverlay.decideLaterButtonLabel": "あとで決める",
   "knownIssues.rtsRecommendationOverlay.enableAndQuitButtonLabel": "有効にして終了する",
   "knownIssues.rtsRecommendationOverlay.title": "推奨ハードウェア要件ステータス",

storybook/stories/news/AlertsOverlay.stories.tsx

@@ -12,6 +12,7 @@ import {
   DATE_JAPANESE_OPTIONS,
 } from '../../../source/renderer/app/config/profileConfig';
 import AlertsOverlay from '../../../source/renderer/app/components/news/AlertsOverlay';
+import RTSFlagsRecommendationOverlay from '../../../source/renderer/app/components/knownIssues/RTSFlagsRecommendationOverlay/RTSFlagsRecommendationOverlay';
 
 const { intl: enIntl } = new IntlProvider({
   locale: 'en-US',
@@ -108,4 +109,10 @@ storiesOf('News|Overlays', module)
         dateOptionsIntl[props.locale][0].value
       )}
     />
+  ))
+  .add('RTS Recommendation', () => (
+    <RTSFlagsRecommendationOverlay
+      onConfirm={action('onConfirm')}
+      onClose={action('onClose')}
+    />
   ));