From fcdebfa4d4a689e308f88322f29993d42e817d86 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <ik@adguard.com>
Date: Tue, 2 Jul 2024 13:30:55 +0300
Subject: [PATCH] Pull request: ADG-8737 fixed missing version in the footer,
 unnecessary validation call on the encryption page

Squashed commit of the following:

commit 1c4a15f2f32cd8bfbe0878f79feee4f581f0f5a8
Merge: 399d28e67 9d1c45fd9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jul 2 13:08:21 2024 +0300

    Merge branch 'master' into ADG-8737

commit 399d28e67ff8f8886d5552fea96017e83a122306
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Jul 1 19:37:05 2024 +0300

    fix install

commit 91d5dd23cea0dd5cde1bf5979bad181229d36f1a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jul 1 17:40:22 2024 +0300

    home: imp logs

commit 06917df08b2154c726ca2de7ed7fda1de4269655
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Jul 1 16:38:38 2024 +0300

    ADG-8737 add missing version, remove validation call
---
 CHANGELOG.md                                        | 2 ++
 client/src/components/Settings/Encryption/index.tsx | 2 +-
 client/src/components/ui/Version.tsx                | 9 ++++-----
 internal/home/web.go                                | 9 ++++++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50aa2cb5..89065487 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Unnecessary validation call on the encryption page.
+- Missing version in the footer.
 - Panic caused by missing user-specific blocked services object in configuration
   file ([#7069]).
 - Tracking `/etc/hosts` file changes causing panics within particular
diff --git a/client/src/components/Settings/Encryption/index.tsx b/client/src/components/Settings/Encryption/index.tsx
index 4c15567b..b50a2257 100644
--- a/client/src/components/Settings/Encryption/index.tsx
+++ b/client/src/components/Settings/Encryption/index.tsx
@@ -38,7 +38,7 @@ class Encryption extends Component<EncryptionProps> {
     handleFormChange = debounce((values) => {
         const submitValues = this.getSubmitValues(values);
 
-        if (submitValues.enabled || submitValues.serve_plain_dns) {
+        if (submitValues.enabled) {
             this.props.validateTlsConfig(submitValues);
         }
     }, DEBOUNCE_TIMEOUT);
diff --git a/client/src/components/ui/Version.tsx b/client/src/components/ui/Version.tsx
index b37e156e..b1a70ba2 100644
--- a/client/src/components/ui/Version.tsx
+++ b/client/src/components/ui/Version.tsx
@@ -12,12 +12,11 @@ const Version = () => {
     const dashboard = useSelector((state: RootState) => state.dashboard, shallowEqual);
     const install = useSelector((state: RootState) => state.install, shallowEqual);
 
-    if (!dashboard || !install) {
+    if (!dashboard && !install) {
         return null;
     }
 
-    const { dnsVersion, processingVersion, checkUpdateFlag } = dashboard;
-    const version = dnsVersion || install?.dnsVersion;
+    const version = dashboard?.dnsVersion || install?.dnsVersion;
 
     const onClick = () => {
         dispatch(getVersion(true));
@@ -35,12 +34,12 @@ const Version = () => {
                     </>
                 )}
 
-                {checkUpdateFlag && (
+                {dashboard?.checkUpdateFlag && (
                     <button
                         type="button"
                         className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
                         onClick={onClick}
-                        disabled={processingVersion}
+                        disabled={dashboard?.processingVersion}
                         title={t('check_updates_now')}>
                         <svg className="icons icon12">
                             <use xlinkHref="#refresh" />
diff --git a/internal/home/web.go b/internal/home/web.go
index f1997b05..3c403e4b 100644
--- a/internal/home/web.go
+++ b/internal/home/web.go
@@ -133,7 +133,14 @@ func webCheckPortAvailable(port uint16) (ok bool) {
 
 	addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), port)
 
-	return aghnet.CheckPort("tcp", addrPort) == nil
+	err := aghnet.CheckPort("tcp", addrPort)
+	if err != nil {
+		log.Info("web: warning: checking https port: %s", err)
+
+		return false
+	}
+
+	return true
 }
 
 // tlsConfigChanged updates the TLS configuration and restarts the HTTPS server