From 85ea4e2b12dea437b6df59b2dfa67da2776c2178 Mon Sep 17 00:00:00 2001 From: Xianming Zhong Date: Fri, 23 Nov 2018 13:06:44 +0800 Subject: [PATCH] fix(pr): show merged pull requests (#852) --- src/components/issue-list-item.component.js | 12 +++++++++++- src/repository/screens/pull-list.screen.js | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/issue-list-item.component.js b/src/components/issue-list-item.component.js index a88facdf1..67542d3c8 100644 --- a/src/components/issue-list-item.component.js +++ b/src/components/issue-list-item.component.js @@ -60,6 +60,16 @@ const getIconName = (type, issue) => { return 'git-pull-request'; }; +const getIconColor = issue => { + if (issue.state === 'open') { + return colors.green; + } else if (issue.state === 'merged') { + return colors.purple; + } + + return colors.red; +}; + export const IssueListItem = ({ type, issue, navigation, locale }: Props) => ( ( leftIcon={{ name: getIconName(type, issue), size: 36, - color: issue.state === 'open' ? colors.green : colors.red, + color: getIconColor(issue), type: 'octicon', }} hideChevron diff --git a/src/repository/screens/pull-list.screen.js b/src/repository/screens/pull-list.screen.js index 008188a61..5f4287850 100644 --- a/src/repository/screens/pull-list.screen.js +++ b/src/repository/screens/pull-list.screen.js @@ -140,7 +140,7 @@ class PullList extends Component { return searchType === 0 ? navigation.state.params.issues.filter(issue => issue.state === 'open') : navigation.state.params.issues.filter( - issue => issue.state === 'closed' + issue => issue.state === 'closed' || issue.state === 'merged' ); };