From 31d1695e35e9f1e05ad6013b0df4554d0c785ce6 Mon Sep 17 00:00:00 2001 From: Alexey Padalko Date: Thu, 24 Oct 2019 21:53:33 +0300 Subject: [PATCH] fix(ui): disable app password on windows platform --- config/default.js | 1 + renderer/components/Settings/SettingsPage.js | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/default.js b/config/default.js index f3dc164c695..3436266df0e 100644 --- a/config/default.js +++ b/config/default.js @@ -117,6 +117,7 @@ module.exports = { secureStorage: { namespace: IS_STABLE_VERSION ? 'ln-zap' : 'ln-zap-next', + isWinPlatformSupported: false, }, // feature flags to enable/disable experimental functionality diff --git a/renderer/components/Settings/SettingsPage.js b/renderer/components/Settings/SettingsPage.js index 5e6544e768f..159bccc6799 100644 --- a/renderer/components/Settings/SettingsPage.js +++ b/renderer/components/Settings/SettingsPage.js @@ -5,6 +5,7 @@ import { useFormState, useFormApi } from 'informed' import styled from 'styled-components' import { Box, Flex } from 'rebass/styled-components' import merge from 'lodash/merge' +import config from 'config' import difference from '@zap/utils/difference' import { ActionBar, Button, Heading, MainContent, Menu, Panel, Sidebar } from 'components/UI' import ZapLogo from 'components/Icon/ZapLogo' @@ -17,6 +18,8 @@ import PasswordPromptDialog from 'containers/Settings/PasswordPromptDialog' import PasswordSetDialog from 'containers/Settings/PasswordSetDialog' import messages from './messages' +const isSecurityPaneEnabled = window.Zap.getPlatform() !== 'win32' || config.isWinPlatformSupported + const SettingsMenu = ({ group, setGroup, isLoggedIn, ...rest }) => { // Items accessible to unauthenticated users. const anonItems = [ @@ -34,15 +37,17 @@ const SettingsMenu = ({ group, setGroup, isLoggedIn, ...rest }) => { title: , onClick: () => setGroup('wallet'), }, - { - id: 'security', - title: , - onClick: () => setGroup('security'), - }, ] let items = [...anonItems] if (isLoggedIn) { + if (isSecurityPaneEnabled) { + authItems.push({ + id: 'security', + title: , + onClick: () => setGroup('security'), + }) + } items = items.concat(authItems) } @@ -118,7 +123,7 @@ const SettingsPage = ({ const fieldgroups = { general: SettingsFieldsGeneral, wallet: SettingsFieldsWallet, - security: SettingsFieldsSecurity, + security: isSecurityPaneEnabled && SettingsFieldsSecurity, } const FieldGroup = fieldgroups[group]