Merge: - client: request tls status on app load

Closes #851

* commit '640620288892afad7b84cc3b25d96bab10cdb5d6':
  - client: fix version alignment
  - client: request tls status on app load

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());

client/src/components/Header/Header.css

@@ -91,6 +91,7 @@
 
 .nav-version__text {
     display: flex;
+    align-items: center;
     justify-content: flex-end;
 }
 

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);