From b9038e254e34daab0ef9b861a5fc2b0f670c0390 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Fri, 27 Oct 2017 12:38:26 +0100 Subject: [PATCH] Adjust Note in Uitab && Add message notification for policy save --- .../modals/PreferencesModal/ConfigTab.styl | 1 - .../main/modals/PreferencesModal/InfoTab.js | 20 +++++++++++++++++++ .../main/modals/PreferencesModal/InfoTab.styl | 4 ++++ browser/main/modals/PreferencesModal/UiTab.js | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index 23eef574..117bb541 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -115,7 +115,6 @@ line-height 1.2 .note-for-keymap - margin-left: 10px font-size: 12px .code-mirror diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js index 9fbea110..8503cdae 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.js +++ b/browser/main/modals/PreferencesModal/InfoTab.js @@ -4,6 +4,7 @@ import styles from './InfoTab.styl' import ConfigManager from 'browser/main/lib/ConfigManager' import store from 'browser/main/store' import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' +import _ from 'lodash' const electron = require('electron') const { shell, remote } = electron @@ -36,8 +37,21 @@ class InfoTab extends React.Component { if (!newConfig.amaEnabled) { AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA') + this.setState({ + amaMessage: 'We hope we will gain your trust' + }) + } else { + this.setState({ + amaMessage: 'Thank\'s for trust us' + }) } + _.debounce(() => { + this.setState({ + amaMessage: '' + }) + }, 3000)() + ConfigManager.set(newConfig) store.dispatch({ @@ -46,6 +60,11 @@ class InfoTab extends React.Component { }) } + infoMessage () { + const { amaMessage } = this.state + return amaMessage ?

{amaMessage}

: null + } + render () { return (
@@ -107,6 +126,7 @@ class InfoTab extends React.Component { /> Enable to send analytics to our servers
+ {this.infoMessage()}
) } diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl index 176405f4..cefb3abc 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.styl +++ b/browser/main/modals/PreferencesModal/InfoTab.styl @@ -50,6 +50,10 @@ .policy-submit margin-top 10px +.policy-confirm + margin-top 10px + font-size 12px + body[data-theme="dark"] .root color alpha($tab--dark-text-color, 80%) diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index efcfffff..dc20c67a 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -228,7 +228,7 @@ class UiTab extends React.Component { - Please restart boostnote after you change the keymap +

⚠️ Please restart boostnote after you change the keymap