diff --git a/components/common/app-icon.js b/components/common/app-icon.js index 03bdb5e..b0b3c35 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 } 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 3591eee..39107cd 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 }) => { {!shouldShowMenu && - + } {shouldShowMenu && @@ -34,7 +34,7 @@ const SideMenu = ({ shouldShowMenu, toggleMenu }) => { - + {settingsMenuItems.map(item => { {item.name} {item.text.length > 0 && {item.text}} - + )