diff --git a/components/settings/shared/confirm-with-password.js b/components/settings/shared/confirm-with-password.js index b4344c7..0f34422 100644 --- a/components/settings/shared/confirm-with-password.js +++ b/components/settings/shared/confirm-with-password.js @@ -64,7 +64,6 @@ export default class ConfirmWithPassword extends Component { } render() { - const { password } = this.state const labels = settings.passwordSettings @@ -75,17 +74,27 @@ export default class ConfirmWithPassword extends Component { value={password} onChangeText={this.handlePasswordInput} /> - - {shared.confirmToProceed} - - - {shared.cancel} - + + + {shared.cancel} + + + {shared.confirmToProceed} + + ) diff --git a/components/settings/shared/settings-button.js b/components/settings/shared/settings-button.js index 97272bb..00bc8ed 100644 --- a/components/settings/shared/settings-button.js +++ b/components/settings/shared/settings-button.js @@ -5,16 +5,22 @@ import { TouchableOpacity } from 'react-native' import AppText from '../../app-text' import styles from '../../../styles' -const SettingsButton = ({ children, ...props }) => { +const SettingsButton = ({ children, style, secondary, ...props }) => { return ( - + {children} diff --git a/styles/index.js b/styles/index.js index 08487b2..8c758e2 100644 --- a/styles/index.js +++ b/styles/index.js @@ -280,10 +280,12 @@ export default StyleSheet.create({ fontWeight: 'bold' }, settingsButton: { - backgroundColor: secondaryColor, padding: 10, alignItems: 'center', - margin: 10, + margin: 10 + }, + settingsButtonAccent: { + backgroundColor: secondaryColor }, settingsButtonDisabled: { backgroundColor: colorInActive @@ -291,6 +293,10 @@ export default StyleSheet.create({ settingsButtonText: { color: fontOnPrimaryColor }, + settingsButtonSecondaryText: { + color: secondaryColor + + }, statsRow: { flexDirection: 'row', width: '100%'