From 08c6451da337b7708cfa0bc1b7183e1f340e4e1b Mon Sep 17 00:00:00 2001
From: Lisa Kim <lisa@goteleport.com>
Date: Tue, 5 Nov 2024 23:32:34 -0800
Subject: [PATCH 1/3] Fix teleterm role request info banner

---
 .../NewRequest/NewRequest.tsx                 | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
index 64bf86013b3b7..45af49e03bfb2 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
@@ -172,21 +172,18 @@ function Inner(props: { rootCluster: Cluster }) {
       </StyledMain>
       {isRequestingResourcesFromResourcesViewEnabled && (
         <Alert kind="outline-info" mb={2}>
-          <InfoIcon color="info" pr={2} />
-          <Text>
-            To request access to a resource, go to the{' '}
-            {/*TODO: Improve ButtonLink to look more like a text, then use it instead of the Link. */}
-            <Link
-              css={`
-                cursor: pointer;
-                color: inherit !important;
-              `}
-              onClick={openClusterDocument}
-            >
-              resources view
-            </Link>{' '}
-            or find it in the search bar.
-          </Text>
+          To request access to a resource, go to the{' '}
+          {/*TODO: Improve ButtonLink to look more like a text, then use it instead of the Link. */}
+          <Link
+            css={`
+              cursor: pointer;
+              color: inherit !important;
+            `}
+            onClick={openClusterDocument}
+          >
+            resources view
+          </Link>{' '}
+          or find it in the search bar.
         </Alert>
       )}
     </Layout>

From fa95107f43096e82fc467289009937f968d5c703 Mon Sep 17 00:00:00 2001
From: Lisa Kim <lisa@goteleport.com>
Date: Tue, 5 Nov 2024 23:33:17 -0800
Subject: [PATCH 2/3] Remove new badage for aws external audit storage
 integration tile

---
 .../src/Integrations/Enroll/IntegrationTiles.tsx | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
index 6ada1cdf83dc7..3f1b98753cbec 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
@@ -38,7 +38,8 @@ export function IntegrationTiles({
   hasIntegrationAccess?: boolean;
   hasExternalAuditStorage?: boolean;
 }) {
-  const externalAuditStorageEnabled = cfg.externalAuditStorage;
+  const externalAuditStorageEnabled =
+    cfg.entitlements.ExternalAuditStorage.enabled;
   const isOnpremEnterprise = cfg.isEnterprise && !cfg.isCloud;
 
   return (
@@ -126,17 +127,4 @@ function renderExternalAuditStorageBadge(
       />
     );
   }
-
-  return (
-    <ToolTipBadge
-      badgeTitle="New"
-      children={
-        <div>
-          Connect your own AWS account to store Audit logs and Session
-          recordings using Athena and S3.
-        </div>
-      }
-      color="success.main"
-    />
-  );
 }

From 2315bb92abd584694afa2bdd429a6936da65da5e Mon Sep 17 00:00:00 2001
From: Lisa Kim <lisa@goteleport.com>
Date: Wed, 6 Nov 2024 12:35:13 -0800
Subject: [PATCH 3/3] Fix lint

---
 .../teleport/src/Integrations/Enroll/IntegrationTiles.tsx      | 2 --
 .../src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx    | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
index 3f1b98753cbec..d23e2914322c5 100644
--- a/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
+++ b/web/packages/teleport/src/Integrations/Enroll/IntegrationTiles.tsx
@@ -27,8 +27,6 @@ import {
 } from 'teleport/components/ToolTipNoPermBadge';
 import { IntegrationKind } from 'teleport/services/integrations';
 
-import { ToolTipBadge } from 'teleport/components/ToolTipBadge';
-
 import { IntegrationTile } from './common';
 
 export function IntegrationTiles({
diff --git a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
index 45af49e03bfb2..f67fe0ddbd16c 100644
--- a/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
+++ b/web/packages/teleterm/src/ui/DocumentAccessRequests/NewRequest/NewRequest.tsx
@@ -18,9 +18,8 @@
 
 import styled from 'styled-components';
 
-import { Alert, Box, Flex, Link, Text, Indicator } from 'design';
+import { Alert, Box, Flex, Link, Indicator } from 'design';
 import { space, SpaceProps, width } from 'design/system';
-import { Info as InfoIcon } from 'design/Icon';
 
 import {
   ShowResources,