a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- client: Hide version on inintial setup and login: Merge pull request #642 in DNS/adguard-home from fix/1748 to master 

Close #1748

Squashed commit of the following:

commit 16721edf69eb3f5ad96253e0999b99c3aaeac822
Merge: 15e1867f eac1b809
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jun 2 13:37:57 2020 +0300

    Merge branch 'master' into fix/1748

commit 15e1867fdaee8d5c024d74ee2ef7416fec920341
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 1 13:54:15 2020 +0300

    - client: Hide version on inintial setup and login
This commit is contained in:
Artem Baskal 2020-06-02 13:46:35 +03:00
parent eac1b80930
commit 2ecd38544a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/components/ui/Version.js
View File

@ -6,14 +6,17 @@ import './Version.css';
const Version = (props) => { const Version = (props) => {
const { const {
dnsVersion = 'undefined', processingVersion, t, checkUpdateFlag, dnsVersion, processingVersion, t, checkUpdateFlag,
} = props; } = props;
return ( return (
<div className="version"> <div className="version">
<div className="version__text"> <div className="version__text">
{dnsVersion
&& <>
<Trans>version</Trans>:&nbsp; <Trans>version</Trans>:&nbsp;
<span className="version__value" title={dnsVersion}>{dnsVersion}</span> <span className="version__value" title={dnsVersion}>{dnsVersion}</span>
</>}
{checkUpdateFlag && <button {checkUpdateFlag && <button
type="button" type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2" className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
@ -31,10 +34,10 @@ const Version = (props) => {
}; };
Version.propTypes = { Version.propTypes = {
dnsVersion: PropTypes.string.isRequired, dnsVersion: PropTypes.string,
getVersion: PropTypes.func.isRequired, getVersion: PropTypes.func,
processingVersion: PropTypes.bool.isRequired, processingVersion: PropTypes.bool,
checkUpdateFlag: PropTypes.bool.isRequired, checkUpdateFlag: PropTypes.bool,
t: PropTypes.func.isRequired, t: PropTypes.func.isRequired,
}; };