From 42d9121fd56619d01fc68ce4f511a68867512d54 Mon Sep 17 00:00:00 2001
From: Rashmini <rashmini.dkn@gmail.com>
Date: Wed, 1 Nov 2023 09:33:15 +0530
Subject: [PATCH] Change message to oxygen UI component

---
 .../edit-organization-discovery-domains.tsx      | 16 +++++++---------
 .../organization-discovery-domains-page.tsx      | 14 +++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx b/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
index 3b84d545692..68320052897 100644
--- a/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
+++ b/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+import Alert from "@oxygen-ui/react/Alert";
 import Autocomplete, {
     AutocompleteRenderGetTagProps,
     AutocompleteRenderInputParams
@@ -32,11 +33,12 @@ import {
 } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
 import { FinalForm, FinalFormField, FormRenderProps, TextFieldAdapter } from "@wso2is/form";
-import { ContentLoader, EmphasizedSegment, Hint, Message, PrimaryButton } from "@wso2is/react-components";
+import { ContentLoader, EmphasizedSegment, Hint, PrimaryButton } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
+import { Divider } from "semantic-ui-react";
 import { AppState, FeatureConfigInterface } from "../../core";
 import updateOrganizationDiscoveryAttributes from "../api/update-organization-email-domains";
 import {
@@ -185,6 +187,10 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov
 
     return (
         <EmphasizedSegment padded="very" key={ organization?.id }>
+            <Alert severity="warning">
+                { t("console:manage.features.organizationDiscovery.edit.form.message") }
+            </Alert>
+            <Divider hidden />
             <FinalForm
                 initialValues={ {
                     organizationName: organization.name
@@ -200,14 +206,6 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov
                             onSubmit={ handleSubmit }
                             className="edit-organization-discovery-domains-form"
                         >
-                            <Message
-                                type="warning"
-                                content={ (
-                                    <>
-                                        { t("console:manage.features.organizationDiscovery.edit.form.message") }
-                                    </>
-                                ) }
-                            />
                             <FinalFormField
                                 fullWidth
                                 FormControlProps={ {
diff --git a/apps/console/src/features/organization-discovery/pages/organization-discovery-domains-page.tsx b/apps/console/src/features/organization-discovery/pages/organization-discovery-domains-page.tsx
index d3b8a0b16cf..5fb69e39fba 100644
--- a/apps/console/src/features/organization-discovery/pages/organization-discovery-domains-page.tsx
+++ b/apps/console/src/features/organization-discovery/pages/organization-discovery-domains-page.tsx
@@ -16,11 +16,12 @@
  * under the License.
  */
 
+import Alert from "@oxygen-ui/react/Alert";
 import { AccessControlConstants, Show } from "@wso2is/access-control";
 import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
 import { I18n } from "@wso2is/i18n";
-import { ListLayout, Message, PageLayout, PrimaryButton } from "@wso2is/react-components";
+import { ListLayout, PageLayout, PrimaryButton } from "@wso2is/react-components";
 import find from "lodash-es/find";
 import isEmpty from "lodash-es/isEmpty";
 import React, {
@@ -362,14 +363,9 @@ const OrganizationDiscoveryDomainsPage: FunctionComponent<OrganizationDiscoveryD
         >
             { discoveryToggle() }
             <Divider hidden />
-            <Message
-                type="info"
-                content={ (
-                    <>
-                        { t("console:manage.features.organizationDiscovery.message") }
-                    </>
-                ) }
-            />
+            <Alert severity="info">
+                { t("console:manage.features.organizationDiscovery.message") }
+            </Alert>
             <Divider hidden />
             { isOrganizationDiscoveryEnabled && (
                 <ListLayout