From 5d20df4e56bc03119e26df6e469700e313112739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Wed, 18 May 2022 15:46:26 +0200
Subject: [PATCH] Merge pull request #8025 from overleaf/msm-enable-sso-alerts

[Settings] Enabled SSO Journey alerts

GitOrigin-RevId: 05e3964d79e39d91d02fc9282141dbd374dae5ad
---
 .../features/settings/components/emails/sso-alert.tsx  | 10 +++++++---
 .../frontend/js/features/settings/components/root.tsx  |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/settings/components/emails/sso-alert.tsx b/services/web/frontend/js/features/settings/components/emails/sso-alert.tsx
index 664a09fd7a..e90bab4f2d 100644
--- a/services/web/frontend/js/features/settings/components/emails/sso-alert.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/sso-alert.tsx
@@ -37,7 +37,7 @@ export function SSOAlert() {
   if (samlError) {
     return (
       !errorClosed && (
-        <Alert bsStyle="danger" onDismiss={handleErrorClosed}>
+        <Alert bsStyle="danger" className="mb-0" onDismiss={handleErrorClosed}>
           <p className="text-center">
             <Icon
               type="exclamation-triangle"
@@ -62,7 +62,7 @@ export function SSOAlert() {
   return (
     <>
       {!infoClosed && (
-        <Alert bsStyle="info" onDismiss={handleInfoClosed}>
+        <Alert bsStyle="info" className="mb-0" onDismiss={handleInfoClosed}>
           <p className="text-center">
             <Trans
               i18nKey="institution_acct_successfully_linked_2"
@@ -82,7 +82,11 @@ export function SSOAlert() {
         </Alert>
       )}
       {!warningClosed && institutionEmailNonCanonical && (
-        <Alert bsStyle="warning" onDismiss={handleWarningClosed}>
+        <Alert
+          bsStyle="warning"
+          className="mb-0"
+          onDismiss={handleWarningClosed}
+        >
           <p className="text-center">
             <Icon
               type="exclamation-triangle"
diff --git a/services/web/frontend/js/features/settings/components/root.tsx b/services/web/frontend/js/features/settings/components/root.tsx
index 856ac4ab15..db92f2bfc1 100644
--- a/services/web/frontend/js/features/settings/components/root.tsx
+++ b/services/web/frontend/js/features/settings/components/root.tsx
@@ -15,6 +15,7 @@ import { SSOProvider } from '../context/sso-context'
 import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
 import useScrollToIdOnLoad from '../../../shared/hooks/use-scroll-to-id-on-load'
 import { ExposedSettings } from '../../../../../types/exposed-settings'
+import { SSOAlert } from './emails/sso-alert'
 
 function SettingsPageRoot() {
   const { isReady } = useWaitForI18n()
@@ -47,6 +48,7 @@ function SettingsPageContent() {
         </div>
         <div>
           <EmailsSection />
+          <SSOAlert />
           <div className="row">
             <div className="col-md-5">
               <AccountInfoSection />