diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js
index a761a24bcc0ba01ad8d246b9d6fe734d88a91bd1..63c05368843ea9efe9d9e563093b5e3b879024fa 100644
--- a/components/cycle-day/select-tab-group.js
+++ b/components/cycle-day/select-tab-group.js
@@ -8,12 +8,13 @@ import AppText from '../app-text'
 
 export default class SelectTabGroup extends Component {
   render() {
+    const { buttons, onSelect } = this.props
     return (
       <View style={styles.selectTabGroup}>
         {
-          this.props.buttons.map(({ label, value }, i) => {
+          buttons.map(({ label, value }, i) => {
             let firstOrLastStyle
-            if (i === this.props.buttons.length - 1) {
+            if (i === buttons.length - 1) {
               firstOrLastStyle = styles.selectTabLast
             } else if (i === 0) {
               firstOrLastStyle = styles.selectTabFirst
@@ -23,7 +24,7 @@ export default class SelectTabGroup extends Component {
             if (isActive) activeStyle = styles.selectTabActive
             return (
               <TouchableOpacity
-                onPress={() => isActive ? this.props.onSelect(null) : this.props.onSelect(value)}
+                onPress={() => onSelect(isActive ? null : value)}
                 key={i}
                 activeOpacity={1}
               >