From 9ae9f6cf75a95846a39882d7921fbd6f7d6cb2b3 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Wed, 10 Nov 2021 07:31:11 -0600
Subject: [PATCH] Minor changes after rebase to latest master

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 .../src/components/PullRequestTable/PullRequestTable.tsx   | 6 ++++--
 plugins/azure-devops/src/hooks/usePullRequests.ts          | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx b/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
index f91fc34c58..81cf3fd56a 100644
--- a/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
+++ b/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
@@ -21,12 +21,14 @@ import {
   Table,
   TableColumn,
 } from '@backstage/core-components';
+import {
+  PullRequest,
+  PullRequestStatus,
+} from '@backstage/plugin-azure-devops-common';
 import React, { useState } from 'react';
 
 import { AzureReposIcon } from '../AzureReposIcon';
 import { DateTime } from 'luxon';
-import { PullRequest } from '../../api/types';
-import { PullRequestStatus } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { PullRequestStatusButtonGroup } from '../PullRequestStatusButtonGroup';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { usePullRequests } from '../../hooks/usePullRequests';
diff --git a/plugins/azure-devops/src/hooks/usePullRequests.ts b/plugins/azure-devops/src/hooks/usePullRequests.ts
index eea0c37d58..687478453e 100644
--- a/plugins/azure-devops/src/hooks/usePullRequests.ts
+++ b/plugins/azure-devops/src/hooks/usePullRequests.ts
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-import { PullRequest, PullRequestOptions } from '../api/types';
+import {
+  PullRequest,
+  PullRequestOptions,
+  PullRequestStatus,
+} from '@backstage/plugin-azure-devops-common';
 
 import { AZURE_DEVOPS_DEFAULT_TOP } from '../constants';
 import { Entity } from '@backstage/catalog-model';
-import { PullRequestStatus } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { azureDevOpsApiRef } from '../api';
 import { useApi } from '@backstage/core-plugin-api';
 import { useAsync } from 'react-use';