Skip to content

Commit

Permalink
fix(issue-events): Fix inverted label for deleted/restored this branch (
Browse files Browse the repository at this point in the history
  • Loading branch information
machour authored and alejandronanez committed Oct 21, 2017
1 parent 93cb6c7 commit 9bf2b3f
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions src/components/issue-event-list-item.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ export class IssueEventListItem extends Component {
<View style={styles.eventTextContainer}>
<ActorLink actor={event.actor} onPress={this.onPressUser} />
<Text>
{' '}{event.event === 'unlabeled' ? 'removed' : 'added'}{' '}
{' '}
{event.event === 'unlabeled' ? 'removed' : 'added'}{' '}
</Text>
<InlineLabel label={event.label} />
</View>
Expand Down Expand Up @@ -257,7 +258,7 @@ export class IssueEventListItem extends Component {
case 'head_ref_deleted':
case 'head_ref_restored': {
const isRestored = event.event === 'head_ref_restored';
const headRefAction = isRestored ? 'deleted' : 'restored';
const headRefAction = isRestored ? 'restored' : 'deleted';

return (
<Event
Expand Down Expand Up @@ -359,13 +360,9 @@ class Event extends Component {
size={16}
/>
<View style={styles.contentContainer}>
<View style={styles.eventTextContainer}>
{text}
</View>
<View style={styles.eventTextContainer}>{text}</View>
<View style={styles.dateContainer}>
<Text style={styles.date}>
{moment(createdAt).fromNow()}
</Text>
<Text style={styles.date}>{moment(createdAt).fromNow()}</Text>
</View>
</View>
</View>
Expand All @@ -387,8 +384,9 @@ class LabelGroup extends Component {
created_at: createdAt,
} = this.props.group;

const toInlineLabel = (type, { label }, index) =>
<InlineLabel key={type + index} label={label} />;
const toInlineLabel = (type, { label }, index) => (
<InlineLabel key={type + index} label={label} />
);

/* eslint-disable react/jsx-no-bind */
const labels = labeled.map(toInlineLabel.bind(null, 'added'));
Expand Down Expand Up @@ -450,10 +448,6 @@ class Bold extends Component {
};

render() {
return (
<Text style={styles.boldText}>
{this.props.children}
</Text>
);
return <Text style={styles.boldText}>{this.props.children}</Text>;
}
}

0 comments on commit 9bf2b3f

Please sign in to comment.