From 2ecd38544a1a5c93dce4a5d361813e62c8af5c8e Mon Sep 17 00:00:00 2001 From: Artem Baskal <a.baskal@adguard.com> Date: Tue, 2 Jun 2020 13:46:35 +0300 Subject: [PATCH] - 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 --- client/src/components/ui/Version.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/components/ui/Version.js b/client/src/components/ui/Version.js index 185ba78d..1ef24bec 100644 --- a/client/src/components/ui/Version.js +++ b/client/src/components/ui/Version.js @@ -6,14 +6,17 @@ import './Version.css'; const Version = (props) => { const { - dnsVersion = 'undefined', processingVersion, t, checkUpdateFlag, + dnsVersion, processingVersion, t, checkUpdateFlag, } = props; return ( <div className="version"> <div className="version__text"> - <Trans>version</Trans>: - <span className="version__value" title={dnsVersion}>{dnsVersion}</span> + {dnsVersion + && <> + <Trans>version</Trans>: + <span className="version__value" title={dnsVersion}>{dnsVersion}</span> + </>} {checkUpdateFlag && <button type="button" className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2" @@ -31,10 +34,10 @@ const Version = (props) => { }; Version.propTypes = { - dnsVersion: PropTypes.string.isRequired, - getVersion: PropTypes.func.isRequired, - processingVersion: PropTypes.bool.isRequired, - checkUpdateFlag: PropTypes.bool.isRequired, + dnsVersion: PropTypes.string, + getVersion: PropTypes.func, + processingVersion: PropTypes.bool, + checkUpdateFlag: PropTypes.bool, t: PropTypes.func.isRequired, };