wildtail/multi-account-containers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2340 from mozilla/MAC709

Browse Source 
Refresh the UI even when there are no proxy settings - MAC-709
This commit is contained in:
Andrea Marchesini
2022-04-26 07:39:23 +02:00
committed by GitHub
parent d4e9502e94 5d7b970f1c
commit 847fba26a9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/popup.js
+2 -1
View File
@@ -1547,6 +1547,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
this.updateProxyDependentUi(proxy); this.updateProxyDependentUi(proxy);
} else { } else {
this.switch.checked = false; this.switch.checked = false;
this.updateProxyDependentUi({});
return; return;
} }
}); });
@@ -1677,7 +1678,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
this.currentCityName.textContent = proxyInfo.cityName; this.currentCityName.textContent = proxyInfo.cityName;
this.countryCode = proxyInfo.countryCode; this.countryCode = proxyInfo.countryCode;
} }
return;
} }
expandUi() { expandUi() {
@@ -1892,6 +1892,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
if (proxyPermissionEnabled) { if (proxyPermissionEnabled) {
const proxyData = await proxifiedContainers.retrieve(identity.cookieStoreId); const proxyData = await proxifiedContainers.retrieve(identity.cookieStoreId);
if (proxyData && proxyData.proxy.mozProxyEnabled && !mozillaVpnConnected) { if (proxyData && proxyData.proxy.mozProxyEnabled && !mozillaVpnConnected) {
mozillaVpnUi.updateProxyDependentUi({});
return; return;
} }
const proxy = proxyData ? proxyData.proxy : {}; const proxy = proxyData ? proxyData.proxy : {};