fixing issue with loading/persistence of timeout in network window

Author: robertpatrick

electron/app/main.js

@@ -845,11 +845,10 @@ class Main {
     });
 
     ipcMain.handle('get-network-settings', async () => {
-      const proxyUrl = getHttpsProxyUrl();
-      const bypassHosts = getBypassProxyHosts();
       return {
-        proxyUrl: proxyUrl,
-        bypassHosts: bypassHosts
+        proxyUrl: getHttpsProxyUrl(),
+        bypassHosts: getBypassProxyHosts(),
+        timeout: userSettings.getConnectivityTestTimeout()
       };
     });
 

webui/src/js/viewModels/network-page.js

@@ -15,6 +15,12 @@ function(accUtils, ko, i18n, project) {
         .then(settings => {
           this.proxyUrl(settings.proxyUrl);
           this.bypassProxyHosts(settings.bypassHosts);
+
+          let timeoutSeconds = settings.timeout / 1000;
+          if (timeoutSeconds < 1) {
+            timeoutSeconds = 1;
+          }
+          this.requestTimeoutSeconds(timeoutSeconds);
         });
     };