Skip to content

Commit

Permalink
Merge pull request #2340 from mozilla/MAC709
Browse files Browse the repository at this point in the history
Refresh the UI even when there are no proxy settings - MAC-709
  • Loading branch information
bakulf authored Apr 26, 2022
2 parents d4e9502 + 5d7b970 commit 847fba2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/js/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -1547,6 +1547,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
this.updateProxyDependentUi(proxy);
} else {
this.switch.checked = false;
this.updateProxyDependentUi({});
return;
}
});
Expand Down Expand Up @@ -1677,7 +1678,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
this.currentCityName.textContent = proxyInfo.cityName;
this.countryCode = proxyInfo.countryCode;
}
return;
}

expandUi() {
Expand Down Expand Up @@ -1892,6 +1892,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
if (proxyPermissionEnabled) {
const proxyData = await proxifiedContainers.retrieve(identity.cookieStoreId);
if (proxyData && proxyData.proxy.mozProxyEnabled && !mozillaVpnConnected) {
mozillaVpnUi.updateProxyDependentUi({});
return;
}
const proxy = proxyData ? proxyData.proxy : {};
Expand Down

0 comments on commit 847fba2

Please sign in to comment.