From 89269452577866cf98c49e02e46cfbc20a83eba9 Mon Sep 17 00:00:00 2001
From: savindi7 <savindi@wso2.com>
Date: Wed, 18 Sep 2024 10:51:03 +0530
Subject: [PATCH 1/3] Add test IDs to branding mode toggle buttons

---
 .../admin.branding.v1/components/branding-page-layout.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/features/admin.branding.v1/components/branding-page-layout.tsx b/features/admin.branding.v1/components/branding-page-layout.tsx
index 58aa58b4791..f82889bba3f 100644
--- a/features/admin.branding.v1/components/branding-page-layout.tsx
+++ b/features/admin.branding.v1/components/branding-page-layout.tsx
@@ -278,7 +278,10 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
                                                 value={ brandingMode }
                                                 disabled={ isBrandingAppsRedirect }
                                             >
-                                                <ToggleButton value={ BrandingModes.ORGANIZATION }>
+                                                <ToggleButton
+                                                    data-componentid={ `${componentId}-organization-mode-button` }
+                                                    value={ BrandingModes.ORGANIZATION }
+                                                >
                                                     <BuildingIcon
                                                         className="toggle-button-icon"
                                                         size={ 14 }
@@ -286,6 +289,7 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
                                                     { t("extensions:develop.branding.pageHeader.organization") }
                                                 </ToggleButton>
                                                 <ToggleButton
+                                                    data-componentid={ `${componentId}-application-mode-button` }
                                                     value={ BrandingModes.APPLICATION }
                                                     onClick={ () => {
                                                         activeTab === BrandingPreferencesConstants.TABS.TEXT_TAB_ID &&

From 7d65f7651d111826f024b600f45297f767e298df Mon Sep 17 00:00:00 2001
From: savindi7 <savindi@wso2.com>
Date: Wed, 18 Sep 2024 10:59:45 +0530
Subject: [PATCH 2/3] Add Changeset

---
 .changeset/fair-nails-burn.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fair-nails-burn.md

diff --git a/.changeset/fair-nails-burn.md b/.changeset/fair-nails-burn.md
new file mode 100644
index 00000000000..433fc270a3c
--- /dev/null
+++ b/.changeset/fair-nails-burn.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.branding.v1": patch
+---
+
+Add Test IDs to the Branding mode toggle buttons.

From 2e02b0bd3f1833af0029d9e9b88201d522bba67d Mon Sep 17 00:00:00 2001
From: savindi7 <savindi@wso2.com>
Date: Wed, 18 Sep 2024 12:12:59 +0530
Subject: [PATCH 3/3] Add test ID to the branding application list dropdown

---
 features/admin.branding.v1/components/branding-page-layout.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/admin.branding.v1/components/branding-page-layout.tsx b/features/admin.branding.v1/components/branding-page-layout.tsx
index f82889bba3f..e9ff266277e 100644
--- a/features/admin.branding.v1/components/branding-page-layout.tsx
+++ b/features/admin.branding.v1/components/branding-page-layout.tsx
@@ -321,6 +321,7 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
                                             layout
                                         >
                                             <Autocomplete
+                                                data-componentId={ `${componentId}-application-dropdown` }
                                                 sx={ { width: 190 } }
                                                 readOnly={ isBrandingAppsRedirect }
                                                 clearIcon={ null }