From 2361fc789932310d229a7fe53cae001ce66957b3 Mon Sep 17 00:00:00 2001
From: Lesley Norton <lnorton@mozilla.com>
Date: Wed, 8 Dec 2021 14:59:04 -0800
Subject: [PATCH] Fix Windows UI edge cases (Jira - 683)

---
 src/js/popup.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 5842be2..11de2fc 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1488,9 +1488,11 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
           const bothMozillaVpnPermissionsEnabled = await MozillaVPN.bothPermissionsEnabled();
           this.primaryCta.addEventListener("click", async() => {
             if (!bothMozillaVpnPermissionsEnabled && mozillaVpnInstalled) {
-              return await browser.permissions.request({ permissions: ["proxy", "nativeMessaging"] });
+              await browser.permissions.request({ permissions: ["proxy", "nativeMessaging"] });
+            } else {
+              MozillaVPN.handleMozillaCtaClick("mac-edit-container-panel-btn");
             }
-            MozillaVPN.handleMozillaCtaClick("mac-edit-container-panel-btn");
+           
           });
 
           this.switch.addEventListener("click", async() => {
@@ -1564,8 +1566,10 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
 
         if (mozillaVpnInstalled && !bothMozillaVpnPermissionsEnabled) {
           this.subtitle.style.flex = "1 1 100%";
+          this.classList.remove("show-server-button");
           this.subtitle.textContent = browser.i18n.getMessage("additionalPermissionNeeded");
-          this.hideEls(this.hideShowButton, this.switch, this.switchLabel);
+          this.hideEls(this.hideShowButton, this.switch, this.switchLabel, this.currentServerButton);
+          this.primaryCta.style.display = "block";
           this.primaryCta.textContent = "Enable";
           return;
         }
@@ -1576,6 +1580,8 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
 
           // Update subtitle
           this.subtitle.textContent = mozillaVpnConnected ? browser.i18n.getMessage("useCustomLocation") : browser.i18n.getMessage("mozillaVpnMustBeOn");
+          this.subtitle.style.flex = "1 1 80%";
+          this.currentServerButton.style.display = "flex";
         }
 
         if (mozillaVpnConnected) {
@@ -1716,6 +1722,10 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     customElements.define("moz-vpn-container-ui", MozVpnContainerUi);
     const mozillaVpnUi = document.querySelector("moz-vpn-container-ui");
     mozillaVpnUi.updateMozVpnStatusDependentUi();
+
+    browser.permissions.onAdded.addListener(() => { mozillaVpnUi.updateMozVpnStatusDependentUi(); });
+    browser.permissions.onRemoved.addListener(() => { mozillaVpnUi.updateMozVpnStatusDependentUi(); });
+
     const advancedProxySettingsButton = document.querySelector(".advanced-proxy-settings-btn");
     Utils.addEnterHandler(advancedProxySettingsButton, () => {
       Logic.showPanel(P_ADVANCED_PROXY_SETTINGS, this.getEditInProgressIdentity(), false, false);