Merge 8e1a104 into d403789

atom · Nov 20, 2018 · 06627d1 · 06627d1
2 parents d403789 + 8e1a104
commit 06627d1
Show file tree

Hide file tree

Showing 3 changed files with 884 additions and 9 deletions.
diff --git a/lib/controllers/issueish-detail-controller.js b/lib/controllers/issueish-detail-controller.js
@@ -6,6 +6,8 @@ import {BranchSetPropType, RemoteSetPropType} from '../prop-types';
 import {GitError} from '../git-shell-out-strategy';
 import EnableableOperation from '../models/enableable-operation';
 import IssueishDetailView, {checkoutStates} from '../views/issueish-detail-view';
+import PullRequestDetailView from '../views/pr-detail-view';
+import IssueDetailView from '../views/issue-detail-view';
 import {incrementCounter} from '../reporter-proxy';
 
 export class BareIssueishDetailController extends React.Component {
@@ -78,15 +80,26 @@ export class BareIssueishDetailController extends React.Component {
     }
 
     this.checkoutOp = this.nextCheckoutOp();
-
-    return (
-      <IssueishDetailView
-        repository={repository}
-        issueish={repository.issueish}
-        checkoutOp={this.checkoutOp}
-        switchToIssueish={this.props.switchToIssueish}
-      />
-    );
+    const isPr = repository.issueish.__typename === 'PullRequest';
+    if (isPr) {
+      return (
+        <PullRequestDetailView
+          repository={repository}
+          issueish={repository.issueish}
+          checkoutOp={this.checkoutOp}
+          switchToIssueish={this.props.switchToIssueish}
+        />
+      );
+    } else {
+      return (
+        <IssueDetailView
+          repository={repository}
+          issueish={repository.issueish}
+          checkoutOp={this.checkoutOp}
+          switchToIssueish={this.props.switchToIssueish}
+        />
+      );
+    }
   }
 
   nextCheckoutOp() {