merges master into branch

2018-09-28 17:07:27 +02:00
parent b09cd01cd5 fb5a51621f
commit d87727b449
41 changed files with 1322 additions and 165 deletions
@@ -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