From 4295fc32d50a5405585d358f9489858ea82eab66 Mon Sep 17 00:00:00 2001 From: myxmaster Date: Mon, 6 May 2024 22:55:28 +0200 Subject: [PATCH] improved colors of (confirm) close channel buttons --- components/Button.tsx | 8 +++++--- views/Channels/Channel.tsx | 7 ------- views/Settings/AddContact.tsx | 8 +------- views/Settings/NodeConfiguration.tsx | 8 +------- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/components/Button.tsx b/components/Button.tsx index 1a2a5e124..0f6eac378 100644 --- a/components/Button.tsx +++ b/components/Button.tsx @@ -87,6 +87,8 @@ function Button(props: ButtonProps) { ? themeColor('highlight') : secondary ? themeColor('secondary') + : warning + ? themeColor('delete') : themeColor('text'), ...buttonStyle }} @@ -101,9 +103,9 @@ function Button(props: ButtonProps) { color: iconOnly ? textColor : quaternary - ? warning - ? themeColor('warning') - : textColor + ? textColor + : warning + ? themeColor('text') : secondary ? themeColor('highlight') : themeColor('background'), diff --git a/views/Channels/Channel.tsx b/views/Channels/Channel.tsx index f9a47282f..8c11cfe34 100644 --- a/views/Channels/Channel.tsx +++ b/views/Channels/Channel.tsx @@ -592,12 +592,6 @@ export default class ChannelView extends React.Component< }) } warning={!confirmCloseChannel} - titleStyle={{ - color: 'white' - }} - buttonStyle={{ - backgroundColor: themeColor('delete') - }} /> )} @@ -694,7 +688,6 @@ export default class ChannelView extends React.Component< deliveryAddress ) } - quaternary warning /> diff --git a/views/Settings/AddContact.tsx b/views/Settings/AddContact.tsx index aaf228ad3..08b5e7dac 100644 --- a/views/Settings/AddContact.tsx +++ b/views/Settings/AddContact.tsx @@ -1252,13 +1252,7 @@ export default class AddContact extends React.Component< this.deleteContact(); } }} - containerStyle={{ - borderColor: themeColor('delete') - }} - titleStyle={{ - color: themeColor('delete') - }} - secondary + warning /> )} diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx index aabc9da92..512eb1709 100644 --- a/views/Settings/NodeConfiguration.tsx +++ b/views/Settings/NodeConfiguration.tsx @@ -1737,13 +1737,7 @@ export default class NodeConfiguration extends React.Component< this.deleteNodeConfig(); } }} - containerStyle={{ - borderColor: themeColor('delete') - }} - titleStyle={{ - color: themeColor('delete') - }} - secondary + warning /> )}