From 05ea4a4ff8581dbeb1273842dee60b9be4f6f851 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Mon, 29 Mar 2021 15:18:58 -0700 Subject: [PATCH] Don't pass `false` query value for `enableCI` `?enableCI=false` in the main window URL is treated as truthy value so don't pass it at all. --- main.js | 2 +- preload.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.js b/main.js index f147e5293f..9449fc3987 100644 --- a/main.js +++ b/main.js @@ -224,7 +224,7 @@ function prepareURL(pathSegments, moreKeys) { cdnUrl2: config.get('cdn').get('2'), certificateAuthority: config.get('certificateAuthority'), environment: enableCI ? 'production' : config.environment, - enableCI, + enableCI: enableCI ? true : undefined, node_version: process.versions.node, hostname: os.hostname(), appInstance: process.env.NODE_APP_INSTANCE, diff --git a/preload.js b/preload.js index 830cbff02f..8fb31da557 100644 --- a/preload.js +++ b/preload.js @@ -518,10 +518,12 @@ try { getRegionCode: () => window.storage.get('regionCode'), logger: window.log, }); - window.CI = config.enableCI && { - setProvisioningURL: url => ipc.send('set-provisioning-url', url), - deviceName: title, - }; + window.CI = config.enableCI + ? { + setProvisioningURL: url => ipc.send('set-provisioning-url', url), + deviceName: title, + } + : undefined; // these need access to window.Signal: require('./ts/models/messages');