Merge pull request #2179 from myxmaster/improve-close-channel-button

Improve delete/close button colors
ZeusLN · May 8, 2024 · c71db86 · c71db86
2 parents b6caff2 + 4295fc3
commit c71db86
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git 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
@@ -592,12 +592,6 @@ export default class ChannelView extends React.Component<
                                         })
                                     }
                                     warning={!confirmCloseChannel}
-                                    titleStyle={{
-                                        color: 'white'
-                                    }}
-                                    buttonStyle={{
-                                        backgroundColor: themeColor('delete')
-                                    }}
                                 />
                             </View>
                         )}
@@ -694,7 +688,6 @@ export default class ChannelView extends React.Component<
                                             deliveryAddress
                                         )
                                     }
-                                    quaternary
                                     warning
                                 />
                             </View>

diff --git 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
                             />
                         </View>
                     )}

diff --git 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
                             />
                         </View>
                     )}