From 147e3911f1afce068dde24276f02740f886dec4d Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 19 Apr 2021 21:31:55 +0200 Subject: [PATCH] fixed no extensions message --- app/scripts/views/settings/settings-browser-view.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/scripts/views/settings/settings-browser-view.js b/app/scripts/views/settings/settings-browser-view.js index 71348f87..b23b2bb5 100644 --- a/app/scripts/views/settings/settings-browser-view.js +++ b/app/scripts/views/settings/settings-browser-view.js @@ -22,7 +22,9 @@ class SettingsBrowserView extends View { if (Features.isDesktop) { data.extensionNames = ['KeeWeb Connect', 'KeePassXC-Browser']; data.settingsPerBrowser = this.getSettingsPerBrowser(); - data.anyBrowserIsEnabled = data.settingsPerBrowser.some((s) => s.kwc || s.kpxc); + data.anyBrowserIsEnabled = data.settingsPerBrowser.some((perBrowser) => + perBrowser.extensions.some((ext) => ext.enabled) + ); } else { const extensionBrowserFamily = Features.extensionBrowserFamily; data.extensionBrowserFamily = Features.extensionBrowserFamily; @@ -36,7 +38,7 @@ class SettingsBrowserView extends View { if (Features.isMac) { browsers.unshift('Safari'); } - const settingsPerBrowser = browsers.map((browser) => { + return browsers.map((browser) => { const extensions = [ { alias: 'kwc', loc: 'KeeWebConnect' }, { alias: 'kpxc', loc: 'KeePassXcBrowser' } @@ -55,8 +57,6 @@ class SettingsBrowserView extends View { } return { browser, extensions }; }); - - return settingsPerBrowser; } changeEnableForBrowser(e) {