From 89920bc518b6d8bcc7bf754b0b768ad3bf49de9b Mon Sep 17 00:00:00 2001
From: Artem Baskal <a.baskal@adguard.com>
Date: Thu, 30 Apr 2020 18:59:14 +0300
Subject: [PATCH] Merge: + client: Hide dns autofix warning text

Squashed commit of the following:

commit e99192ac85400bcce09ca8d73ceef0224f003e0c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Apr 30 16:03:20 2020 +0300

    Show autofix warning conditionally

commit e5658fc3aaee449a49bee76063033dc62e61c722
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 19:18:02 2020 +0300

    + client: Add wiki link on instllation screen
---
 client/src/install/Setup/Settings.js | 79 ++++++++++++++--------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/client/src/install/Setup/Settings.js b/client/src/install/Setup/Settings.js
index 876aa05b..1c31143f 100644
--- a/client/src/install/Setup/Settings.js
+++ b/client/src/install/Setup/Settings.js
@@ -217,19 +217,19 @@ class Settings extends Component {
                         </div>
                         <div className="col-12">
                             {webStatus &&
-                                <div className="setup__error text-danger">
-                                    {webStatus}
-                                    {isWebFixAvailable &&
-                                        <button
-                                            type="button"
-                                            className="btn btn-secondary btn-sm ml-2"
-                                            onClick={() => this.handleAutofix('web')}
-                                        >
-                                            <Trans>fix</Trans>
-                                        </button>
-                                    }
-                                    <hr className="divider--small" />
-                                </div>
+                            <div className="setup__error text-danger">
+                                {webStatus}
+                                {isWebFixAvailable &&
+                                <button
+                                    type="button"
+                                    className="btn btn-secondary btn-sm ml-2"
+                                    onClick={() => this.handleAutofix('web')}
+                                >
+                                    <Trans>fix</Trans>
+                                </button>
+                                }
+                                <hr className="divider--small" />
+                            </div>
                             }
                         </div>
                     </div>
@@ -287,32 +287,33 @@ class Settings extends Component {
                         </div>
                         <div className="col-12">
                             {dnsStatus &&
-                                <Fragment>
-                                    <div className="setup__error text-danger">
-                                        {dnsStatus}
-                                        {isDnsFixAvailable &&
-                                            <button
-                                                type="button"
-                                                className="btn btn-secondary btn-sm ml-2"
-                                                onClick={() => this.handleAutofix('dns')}
-                                            >
-                                                <Trans>fix</Trans>
-                                            </button>
-                                        }
-                                    </div>
-                                    <div className="text-muted mb-2">
-                                        <p className="mb-1">
-                                            <Trans>autofix_warning_text</Trans>
-                                        </p>
-                                        <Trans components={[<li key="0">text</li>]}>
-                                            autofix_warning_list
-                                        </Trans>
-                                        <p className="mb-1">
-                                            <Trans>autofix_warning_result</Trans>
-                                        </p>
-                                    </div>
-                                    <hr className="divider--small" />
-                                </Fragment>
+                            <Fragment>
+                                <div className="setup__error text-danger">
+                                    {dnsStatus}
+                                    {isDnsFixAvailable &&
+                                    <button
+                                        type="button"
+                                        className="btn btn-secondary btn-sm ml-2"
+                                        onClick={() => this.handleAutofix('dns')}
+                                    >
+                                        <Trans>fix</Trans>
+                                    </button>
+                                    }
+                                </div>
+                                {isDnsFixAvailable &&
+                                <div className="text-muted mb-2">
+                                    <p className="mb-1">
+                                        <Trans>autofix_warning_text</Trans>
+                                    </p>
+                                    <Trans components={[<li key="0">text</li>]}>
+                                        autofix_warning_list
+                                    </Trans>
+                                    <p className="mb-1">
+                                        <Trans>autofix_warning_result</Trans>
+                                    </p>
+                                </div>}
+                                <hr className="divider--small" />
+                            </Fragment>
                             }
                         </div>
                     </div>