merges master into branch

components/cycle-day/symptoms/action-button-footer.js

@@ -53,7 +53,8 @@ export default class ActionButtonFooter extends Component {
     return (
       <View style={styles.menu}>
         {buttons.map(({ title, action, disabledCondition, icon }, i) => {
-          const textStyle = disabledCondition ? styles.menuTextInActive : styles.menuText
+          const textStyle = [styles.menuText]
+          if (disabledCondition) textStyle.push(styles.menuTextInActive)
           const iconStyle = disabledCondition ?
             Object.assign({}, iconStyles.menuIcon, iconStyles.menuIconInactive) :
             iconStyles.menuIcon

components/cycle-day/symptoms/sex.js

@@ -37,6 +37,12 @@ const contraceptiveBoxes = [{
 }, {
   label: labels.implant,
   stateKey: 'implant'
+}, {
+  label: labels.diaphragm,
+  stateKey: 'diaphragm'
+}, {
+  label: labels.none,
+  stateKey: 'none'
 }, {
   label: labels.other,
   stateKey: 'other'