From 14770c4f3ab8140addb76d7fd7007b8afd65399c Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 15 Jun 2021 12:22:26 +0200
Subject: [PATCH] chore: tidy up the app and fix tsc warnings

Signed-off-by: blam <ben@blam.sh>
---
 packages/app/src/App.tsx                           | 2 +-
 packages/app/src/components/catalog/EntityPage.tsx | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index a7ed41d2a4..cc65cd65b3 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createApp, FlatRoutes, FeatureFlagged } from '@backstage/core-app-api';
+import { createApp, FlatRoutes } from '@backstage/core-app-api';
 import {
   AlertDisplay,
   OAuthRequestDialog,
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index d1c5d44f85..f646992c97 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -108,7 +108,6 @@ import {
   isTravisciAvailable,
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
-import { FeatureFlagged } from '@backstage/core-app-api';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
@@ -283,11 +282,9 @@ const serviceEntityPage = (
       {overviewContent}
     </EntityLayout.Route>
 
-    <FeatureFlagged with="show-graphiql-page">
-      <EntityLayout.Route path="/ci-cd" title="CI/CD">
-        {cicdContent}
-      </EntityLayout.Route>
-    </FeatureFlagged>
+    <EntityLayout.Route path="/ci-cd" title="CI/CD">
+      {cicdContent}
+    </EntityLayout.Route>
 
     <EntityLayout.Route path="/errors" title="Errors">
       {errorsContent}