From ece2807a379a717ec6f20387211ffe9220dc55af Mon Sep 17 00:00:00 2001
From: Pavindu Lakshan <pavindulakshan@gmail.com>
Date: Thu, 3 Oct 2024 14:53:03 +0530
Subject: [PATCH 1/2] Fix roles dropdown being shown on selecting application
 roles option and discarding confirmation.

---
 features/admin.roles.v2/components/application-roles.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/features/admin.roles.v2/components/application-roles.tsx b/features/admin.roles.v2/components/application-roles.tsx
index efb11739552..c315331adff 100755
--- a/features/admin.roles.v2/components/application-roles.tsx
+++ b/features/admin.roles.v2/components/application-roles.tsx
@@ -479,7 +479,10 @@ export const ApplicationRoles: FunctionComponent<ApplicationRolesSettingsInterfa
                 </Grid>
             </EmphasizedSegment>
             <ConfirmationModal
-                onClose={ (): void => setShowSwitchAudienceWarning(false) }
+                onClose={ (): void => {
+                    setTempRoleAudience(undefined);
+                    setShowSwitchAudienceWarning(false);
+                } }
                 type="negative"
                 open={ showSwitchAudienceWarning }
                 assertionHint={ t("extensions:develop.applications.edit.sections." +
@@ -488,6 +491,7 @@ export const ApplicationRoles: FunctionComponent<ApplicationRolesSettingsInterfa
                 primaryAction={ t("common:confirm") }
                 secondaryAction={ t("common:cancel") }
                 onSecondaryActionClick={ (): void => {
+                    setTempRoleAudience(undefined);
                     setShowSwitchAudienceWarning(false);
                 } }
                 onPrimaryActionClick={ (): void => {

From 10515cfe20de56f6ba91ee60c007b393cebc781f Mon Sep 17 00:00:00 2001
From: Pavindu Lakshan <pavindulakshan@gmail.com>
Date: Thu, 3 Oct 2024 14:53:31 +0530
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=8B=20Add=20changeset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/famous-rockets-press.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/famous-rockets-press.md

diff --git a/.changeset/famous-rockets-press.md b/.changeset/famous-rockets-press.md
new file mode 100644
index 00000000000..42c4cd91c73
--- /dev/null
+++ b/.changeset/famous-rockets-press.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.roles.v2": patch
+---
+
+Fix roles dropdown being shown on selecting application roles option and discarding confirmation.