diff --git a/components/common/app-icon.js b/components/common/app-icon.js index 03bdb5efbccd8dd9e218c6b2982ffbed30792a2f..b0b3c351aa8bb735cbc4f1a8c50fc7e43b12e14c 100644 --- a/components/common/app-icon.js +++ b/components/common/app-icon.js @@ -3,30 +3,25 @@ import PropTypes from 'prop-types' import { StyleSheet } from 'react-native' import Icon from 'react-native-vector-icons/Entypo' -import { Colors, Sizes } from '../../styles/redesign' +import { Sizes } from '../../styles/redesign' -const AppIcon = ({ isCTA, name }) => { - const style = isCTA ? styles.iconCTA : styles.icon +const AppIcon = ({ color, name }) => { + const style = [styles.icon, { color }] return <Icon name={name} style={style}/> } AppIcon.propTypes = { - isCTA: PropTypes.bool, + color: PropTypes.string, name: PropTypes.string.isRequired } AppIcon.defaultProps = { - isCTA: true + isCTA: 'black' } const styles = StyleSheet.create({ icon: { - color: 'black', - fontSize: Sizes.subtitle - }, - iconCTA: { - color: Colors.orange, fontSize: Sizes.subtitle } }) diff --git a/components/header/side-menu.js b/components/header/side-menu.js index 3591eeebf7a2250bdd28d50ca11ab56d22b31e90..39107cdbd42c386533a23f22e1597d3890bac5ef 100644 --- a/components/header/side-menu.js +++ b/components/header/side-menu.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types' import AppIcon from '../common/app-icon' import MenuItem from './menu-item' -import { Sizes } from '../../styles/redesign' +import { Colors, Sizes } from '../../styles/redesign' import settingsLabels from '../../i18n/en/settings' const { menuItems } = settingsLabels @@ -21,7 +21,7 @@ const SideMenu = ({ shouldShowMenu, toggleMenu }) => { <React.Fragment> {!shouldShowMenu && <TouchableOpacity onPress={toggleMenu}> - <AppIcon name={'dots-three-vertical'} isCTA/> + <AppIcon name={'dots-three-vertical'} color={Colors.orange}/> </TouchableOpacity> } {shouldShowMenu && @@ -34,7 +34,7 @@ const SideMenu = ({ shouldShowMenu, toggleMenu }) => { <View style={styles.blackBackground}></View> <View style={styles.menu}> <TouchableOpacity onPress={toggleMenu} style={styles.iconContainer}> - <AppIcon name={'cross'} isCTA={false}/> + <AppIcon name={'cross'} color={'black'}/> </TouchableOpacity> {settingsMenuItems.map(item => <MenuItem diff --git a/components/settings/menu-item.js b/components/settings/menu-item.js index b9336a196f67cf53b9f8b0414a6b967f548f4ce0..1bef2228851d9b22401136130539c88fcace388f 100644 --- a/components/settings/menu-item.js +++ b/components/settings/menu-item.js @@ -23,7 +23,7 @@ const MenuItem = ({ item, last, navigate }) => { <AppText style={styles.title}>{item.name}</AppText> {item.text.length > 0 && <AppText>{item.text}</AppText>} </View> - <AppIcon name={'chevron-right'} isCTA/> + <AppIcon name={'chevron-right'} color={Colors.orange}/> </TouchableOpacity> </Segment> )