fix(pr): show merged pull requests (#852)

gitpoint · Nov 23, 2018 · 85ea4e2 · 85ea4e2
1 parent 54b5ff3
commit 85ea4e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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) => (
   <TouchableHighlight
     style={issue.state === 'closed' && styles.closedIssue}
@@ -92,7 +102,7 @@ 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
@@ -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'
         );
   };