Merge pull request #6954 from pavinduLakshan/fix_role_switch_edge_case

wso2 · Oct 3, 2024 · c839daa · c839daa
2 parents 094ab0f + 10515cf
commit c839daa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changeset/famous-rockets-press.md 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.
diff --git 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 => {