From b3c2b3a21bc79025bfdf2d829e371d5283815c71 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 1 Jul 2019 15:04:07 +0300
Subject: [PATCH 1/2] - client: request tls status on app load

---
 client/src/actions/index.js                        | 2 ++
 client/src/components/Settings/Encryption/index.js | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/actions/index.js b/client/src/actions/index.js
index aca824c6..047b1e7d 100644
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -6,6 +6,7 @@ import axios from 'axios';
 
 import { normalizeHistory, normalizeFilteringStatus, normalizeLogs, normalizeTextarea, sortClients } from '../helpers/helpers';
 import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
+import { getTlsStatus } from './encryption';
 import Api from '../api/Api';
 
 const apiClient = new Api();
@@ -269,6 +270,7 @@ export const getDnsStatus = () => async (dispatch) => {
         dispatch(getVersion());
         dispatch(getClients());
         dispatch(getTopStats());
+        dispatch(getTlsStatus());
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(initSettingsFailure());
diff --git a/client/src/components/Settings/Encryption/index.js b/client/src/components/Settings/Encryption/index.js
index cd2c4f5b..a8075dc1 100644
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -11,9 +11,7 @@ import Loading from '../../ui/Loading';
 
 class Encryption extends Component {
     componentDidMount() {
-        const { getTlsStatus, validateTlsConfig, encryption } = this.props;
-
-        getTlsStatus();
+        const { validateTlsConfig, encryption } = this.props;
 
         if (encryption.enabled) {
             validateTlsConfig(encryption);

From 640620288892afad7b84cc3b25d96bab10cdb5d6 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 1 Jul 2019 15:07:29 +0300
Subject: [PATCH 2/2] - client: fix version alignment

---
 client/src/components/Header/Header.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Header/Header.css b/client/src/components/Header/Header.css
index 759594ac..181045bf 100644
--- a/client/src/components/Header/Header.css
+++ b/client/src/components/Header/Header.css
@@ -91,6 +91,7 @@
 
 .nav-version__text {
     display: flex;
+    align-items: center;
     justify-content: flex-end;
 }