Merge branch 'develop' into feature/ddw-582-implement-wallet-utxo-sta…

…tistics-screen
input-output-hk · Mar 22, 2019 · b6a79c5 · b6a79c5
2 parents 2485ecf + b11f010
commit b6a79c5
Show file tree

Hide file tree

Showing 17 changed files with 189 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,13 @@ Changelog
 - Introduced automated code formatting with prettier ([PR 1335](https://github.com/input-output-hk/daedalus/pull/1335))
 - Improved error messages for connecting screen ([PR 1344](https://github.com/input-output-hk/daedalus/pull/1344))
 
+## 0.13.1
+
+### Fixes
+
+- Improve text on the Support screen ([PR 1361](https://github.com/input-output-hk/daedalus/pull/1361))
+- Fixed Daedalus log file rotation ([PR 1358](https://github.com/input-output-hk/daedalus/pull/1358))
+
 ## 0.13.0
 
 ### Features

diff --git a/cardano-sl-src.json b/cardano-sl-src.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/input-output-hk/cardano-sl",
-  "rev": "35e8f14b88733a39e4abc7e06d55562ef10986ee",
-  "sha256": "0iirlrrm84h6s3h30x5021n0p2ljvqwpmf03s3wik8lgb0hfy1y3",
+  "rev": "57a0d236eed59c48214ee70128549d6cfdbc73db",
+  "sha256": "04mj27kgwfs6wqqqcypxc17d2r17d193pqi9gv5s7dkrkcz0fqpb",
   "fetchSubmodules": false
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

diff --git a/source/main/config.js b/source/main/config.js
@@ -60,7 +60,7 @@ export const appLogsFolderPath = launcherConfig.logsPrefix;
 export const pubLogsFolderPath = path.join(appLogsFolderPath, 'pub');
 export const appFolderPath = launcherConfig.workingDir;
 export const nodeDbPath = launcherConfig.nodeDbPath;
-export const ALLOWED_LOGS = ['Daedalus.json', 'System-info.json'];
+export const ALLOWED_LOGS = ['Daedalus.json.log', 'System-info.json'];
 export const ALLOWED_NODE_LOGS = new RegExp(/(node.json-)(\d{14}$)/);
 export const ALLOWED_LAUNCHER_LOGS = new RegExp(/(launcher-)(\d{14}$)/);
 export const MAX_NODE_LOGS_ALLOWED = 3;

diff --git a/source/main/utils/setupLogging.js b/source/main/utils/setupLogging.js
@@ -20,7 +20,7 @@ const isTest = process.env.NODE_ENV === 'test';
 const isDev = process.env.NODE_ENV === 'development';
 
 export const setupLogging = () => {
-  const logFilePath = path.join(pubLogsFolderPath, APP_NAME + '.json');
+  const logFilePath = path.join(pubLogsFolderPath, APP_NAME + '.json.log');
   ensureDirectoryExists(pubLogsFolderPath);
   log.transports.console.level = isTest ? 'error' : 'info';
   log.transports.rendererConsole.level = isDev ? 'info' : 'error';

diff --git a/source/renderer/app/components/settings/categories/SupportSettings.js b/source/renderer/app/components/settings/categories/SupportSettings.js
@@ -14,7 +14,7 @@ const messages = defineMessages({
   faqContent: {
     id: 'settings.support.faq.content',
     defaultMessage:
-      '!!!If you are experiencing issues, for guidance please see the {faqLink} article in the Support Portal.',
+      '!!!If you are experiencing a problem, please look for guidance using the list of {faqLink} on the support pages. If you can’t find a solution, please submit a support ticket.',
     description:
       'Content for the "Help and support" section on the support settings page.',
   },
@@ -24,37 +24,44 @@ const messages = defineMessages({
     description:
       '"Known Issues" link in the "Help and support" section on the support settings page',
   },
-  reportProblemTitle: {
-    id: 'settings.support.reportProblem.title',
-    defaultMessage: '!!!Reporting a problem',
-    description: 'Title "Reporting a problem" on the support settings page.',
+  stepsTitle: {
+    id: 'settings.support.steps.title',
+    defaultMessage: '!!!Steps for creating a support request:',
+    description:
+      'Title "Steps for creating a support request" on the support settings page.',
+  },
+  stepsDownloadLogsTitle: {
+    id: 'settings.support.steps.downloadLogs.title',
+    defaultMessage: '!!!Download the logs',
+    description: 'Title "Download the logs" on the support settings page.',
   },
-  reportProblemContent: {
-    id: 'settings.support.reportProblem.content',
+  stepsDownloadLogsDescription: {
+    id: 'settings.support.steps.downloadLogs.description',
     defaultMessage:
-      '!!!If you are still experiencing an issue, please submit a support request.',
+      '!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.',
     description:
-      'Content for the "Reporting a problem" section on the support settings page.',
+      'Description of "Download the logs" on the support settings page.',
   },
-  supportRequestLink: {
-    id: 'settings.support.reportProblem.link',
-    defaultMessage: '!!!submit a support request',
+  stepsDownloadLogsLink: {
+    id: 'settings.support.steps.downloadLogs.link',
+    defaultMessage: '!!!download your logs here',
     description:
-      '"submit a support request" link in the "Report a problem" section on the support settings page.',
+      '"download your logs here" link in the Logs section on the support settings page',
   },
-  logsTitle: {
-    id: 'settings.support.logs.title',
-    defaultMessage: '!!!Logs',
-    description: 'Title "Logs" on the support settings page.',
+  stepsReportProblemTitle: {
+    id: 'settings.support.steps.reportProblem.title',
+    defaultMessage: '!!!Report a problem',
+    description: 'Title "Report a problem" on the support settings page.',
   },
-  logsContent: {
-    id: 'settings.support.logs.content',
+  stepsReportProblemDescription: {
+    id: 'settings.support.steps.reportProblem.description',
     defaultMessage:
-      '!!!Please download your logs here and attach the downloaded file when submitting a support ticket to help the support team investigate the issue. Logs do not contain sensitive information.',
-    description: 'Content for the "Logs" section on the support settings page.',
+      '!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.',
+    description:
+      'Description of "Download the logs" on the support settings page.',
   },
-  downloadLogsLink: {
-    id: 'settings.support.logs.downloadLogsLink',
+  stepsReportProblemLink: {
+    id: 'settings.support.steps.reportProblem.link',
     defaultMessage: '!!!download your logs here',
     description:
       '"download your logs here" link in the Logs section on the support settings page',
@@ -91,43 +98,52 @@ export default class SupportSettings extends Component<Props> {
       </a>
     );
 
-    const supportRequestLink = (
-      <button onClick={onSupportRequestClick}>
-        {intl.formatMessage(messages.supportRequestLink)}
+    const stepsDownloadLogsLink = (
+      <button onClick={onDownloadLogs}>
+        {intl.formatMessage(messages.stepsDownloadLogsLink)}
       </button>
     );
 
-    const downloadLogsLink = (
-      <button onClick={onDownloadLogs}>
-        {intl.formatMessage(messages.downloadLogsLink)}
+    const reportProblemLink = (
+      <button onClick={onSupportRequestClick}>
+        {intl.formatMessage(messages.stepsReportProblemLink)}
       </button>
     );
 
     return (
       <div className={styles.component}>
+        {/* Help and Support */}
+
         <h1>{intl.formatMessage(messages.faqTitle)}</h1>
 
         <p>
           <FormattedMessage {...messages.faqContent} values={{ faqLink }} />
         </p>
 
-        <h1>{intl.formatMessage(messages.reportProblemTitle)}</h1>
+        {/* Steps for creating a support request: */}
 
-        <p>
-          <FormattedMessage
-            {...messages.reportProblemContent}
-            values={{ supportRequestLink }}
-          />
-        </p>
+        <h1>{intl.formatMessage(messages.stepsTitle)}</h1>
 
-        <h1>{intl.formatMessage(messages.logsTitle)}</h1>
-
-        <p>
-          <FormattedMessage
-            {...messages.logsContent}
-            values={{ downloadLogsLink }}
-          />
-        </p>
+        <ol>
+          <li>
+            <h2>{intl.formatMessage(messages.stepsDownloadLogsTitle)}</h2>
+            <p>
+              <FormattedMessage
+                {...messages.stepsDownloadLogsDescription}
+                values={{ stepsDownloadLogsLink }}
+              />
+            </p>
+          </li>
+          <li>
+            <h2>{intl.formatMessage(messages.stepsReportProblemTitle)}</h2>
+            <p>
+              <FormattedMessage
+                {...messages.stepsReportProblemDescription}
+                values={{ reportProblemLink }}
+              />
+            </p>
+          </li>
+        </ol>
       </div>
     );
   }

diff --git a/source/renderer/app/components/settings/categories/SupportSettings.scss b/source/renderer/app/components/settings/categories/SupportSettings.scss
@@ -4,24 +4,39 @@
   padding-bottom: 10px;
 
   h1 {
+    color: var(--theme-support-settings-text-color);
+    font-family: var(--font-semibold);
+    font-size: 18px;
+    line-height: 1.38;
+    margin-bottom: 11px;
+  }
+
+  h2 {
     color: var(--theme-support-settings-text-color);
     font-family: var(--font-semibold);
     font-size: 16px;
     line-height: 1.38;
-    margin-bottom: 4px;
+    margin-bottom: 6px;
   }
 
-  h1:not(:first-child) {
-    padding-top: 6px;
+  ol {
+    font-family: var(--font-semibold);
+    color: var(--theme-support-settings-item-color);
+    list-style: decimal;
+    padding-left: 17px;
+  }
+
+  li {
+    padding-left: 6.5px;
   }
 
   a,
   button,
   p {
     color: var(--theme-support-settings-text-color);
     font-family: var(--font-regular);
-    font-size: 14px;
-    line-height: 19px;
+    font-size: 16px;
+    line-height: 1.38;
   }
 
   a,
@@ -35,6 +50,10 @@
   }
 
   p {
-    margin-bottom: 10px;
+    margin-bottom: 11px;
+
+    & + h1 {
+      margin-top: 24px;
+    }
   }
 }
diff --git a/source/renderer/app/i18n/locales/de-DE.json b/source/renderer/app/i18n/locales/de-DE.json
@@ -162,14 +162,15 @@
   "settings.support.faq.faqLink": "!!!Known Issues",
   "settings.support.faq.faqLinkURL": "!!!https://daedaluswallet.io/known-issues/",
   "settings.support.faq.title": "!!!Help and support",
-  "settings.support.logs.content": "!!!Please download your logs here and attach the downloaded file when submitting a support ticket to help the support team investigate the issue. Logs do not contain sensitive information.",
-  "settings.support.logs.downloadLogsLink": "!!!download your logs here",
-  "settings.support.logs.title": "!!!Logs",
-  "settings.support.reportProblem.content": "!!!If you are still experiencing an issue, please submit a support request.",
   "settings.support.reportProblem.downloadLogsSuccessMessage": "!!!Logs successfully downloaded",
-  "settings.support.reportProblem.link": "!!!submit a support request",
   "settings.support.reportProblem.linkUrl": "!!!https://iohk.zendesk.com/hc/en-us/requests/new/",
-  "settings.support.reportProblem.title": "!!!Reporting a problem",
+  "settings.support.steps.downloadLogs.description": "!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.",
+  "settings.support.steps.downloadLogs.link": "!!!download your logs here",
+  "settings.support.steps.downloadLogs.title": "!!!Download the logs",
+  "settings.support.steps.reportProblem.description": "!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.",
+  "settings.support.steps.reportProblem.link": "!!!download your logs here",
+  "settings.support.steps.reportProblem.title": "!!!Report a problem",
+  "settings.support.steps.title": "!!!Steps for creating a support request:",
   "sidebar.wallets.addWallet": "!!!Add wallet",
   "static.about.buildInfo": "!!!MacOS build 3769, with Cardano 1.0.4",
   "static.about.content.cardano.headline": "!!!Cardano Team:",