Skip to content

Commit 85ea4e2

Browse files
authored
fix(pr): show merged pull requests (#852)
1 parent 54b5ff3 commit 85ea4e2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/components/issue-list-item.component.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ const getIconName = (type, issue) => {
6060
return 'git-pull-request';
6161
};
6262

63+
const getIconColor = issue => {
64+
if (issue.state === 'open') {
65+
return colors.green;
66+
} else if (issue.state === 'merged') {
67+
return colors.purple;
68+
}
69+
70+
return colors.red;
71+
};
72+
6373
export const IssueListItem = ({ type, issue, navigation, locale }: Props) => (
6474
<TouchableHighlight
6575
style={issue.state === 'closed' && styles.closedIssue}
@@ -92,7 +102,7 @@ export const IssueListItem = ({ type, issue, navigation, locale }: Props) => (
92102
leftIcon={{
93103
name: getIconName(type, issue),
94104
size: 36,
95-
color: issue.state === 'open' ? colors.green : colors.red,
105+
color: getIconColor(issue),
96106
type: 'octicon',
97107
}}
98108
hideChevron

src/repository/screens/pull-list.screen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class PullList extends Component {
140140
return searchType === 0
141141
? navigation.state.params.issues.filter(issue => issue.state === 'open')
142142
: navigation.state.params.issues.filter(
143-
issue => issue.state === 'closed'
143+
issue => issue.state === 'closed' || issue.state === 'merged'
144144
);
145145
};
146146

0 commit comments

Comments
 (0)