From 95157e267965bd39f0af535e0f6d6a7129e0957f Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Wed, 4 Feb 2026 22:47:19 +0530
Subject: [PATCH 01/15] adding display data property for populate consent auth
 response

---
 .../impl/ExternalAPIConsentRetrievalStep.java |  12 +-
 .../authorize/model/DisplayDataDTO.java       |  60 ++++++++++
 .../PopulateConsentAuthorizeScreenDTO.java    |  37 +++----
 .../util/ConsentAuthorizeConstants.java       |   1 +
 .../extensions/authservlet/utils/Utils.java   |   4 +
 .../src/main/webapp/css/custom-common.css     |  17 +++
 .../webapp/fs_default_account_selection.jsp   |  43 ++++++++
 .../src/main/webapp/js/auth-functions.js      |   3 +-
 .../src/main/webapp/js/tooltip-functions.js   |  27 +++++
 .../package-lock.json                         | 104 +++++++++++++-----
 10 files changed, 256 insertions(+), 52 deletions(-)
 create mode 100644 financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
 create mode 100644 financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
index 470ad7391..ca71a8e7b 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
@@ -22,6 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigParser;
 import org.wso2.financial.services.accelerator.common.constant.FinancialServicesConstants;
@@ -157,6 +158,15 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
                         new JSONObject(objectMapper.writeValueAsString(responseDTO.getConsumerData())));
             }
 
+            // Append display data, if exists, to json object
+            if (responseDTO.getDisplayData() != null) {
+                jsonObject.put(
+                        ConsentAuthorizeConstants.DISPLAY_DATA,
+                        new JSONArray(responseDTO.getDisplayData().getDisplayData())
+                );
+            }
+
+
             // Set request parameters as metadata to be used in persistence extension
             consentData.addData(ConsentExtensionConstants.REQUEST_PARAMETERS, requestParameters);
 
@@ -258,6 +268,6 @@ private PopulateConsentAuthorizeScreenDTO callExternalService(
         JSONObject responseJson = new JSONObject(externalServiceResponse.getData().toString());
         return objectMapper.readValue(responseJson.toString(), PopulateConsentAuthorizeScreenDTO.class);
     }
-    
+
 
 }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
new file mode 100644
index 000000000..b8bc2e6a4
--- /dev/null
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
@@ -0,0 +1,60 @@
+package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Display data object for authorization UI consent retrieval.
+ * Stores dynamic UI display items such as unavailable / blocked accounts.
+ */
+public class DisplayDataDTO {
+
+    /**
+     * List of display data items.
+     *
+     * Example JSON:
+     * [
+     *   { "accountId": "123", "displayName": "Blocked Account" }
+     * ]
+     */
+    @Valid
+    private List<Map<String, Object>> displayData = new ArrayList<>();
+
+    public DisplayDataDTO() {
+    }
+
+    public List<Map<String, Object>> getDisplayData() {
+        return displayData;
+    }
+
+    public void setDisplayData(List<Map<String, Object>> displayData) {
+        this.displayData = displayData;
+    }
+
+    /**
+     * Convenience method to add a display item.
+     *
+     * @param item display data item
+     * @return this instance for chaining
+     */
+    public DisplayDataDTO addItem(Map<String, Object> item) {
+        this.displayData.add(item);
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DisplayDataDTO that = (DisplayDataDTO) o;
+        return Objects.equals(displayData, that.displayData);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(displayData);
+    }
+}
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
index 398bd152c..749f319ea 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
@@ -1,26 +1,10 @@
-/**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
- * <p>
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
 import javax.validation.Valid;
 
 /**
- * Wrapper for pre consent authorize flow external response data.
+ * Wrapper for pre-consent authorize flow external response data.
+ * Now includes display data for UI sections like blocked accounts.
  */
 public class PopulateConsentAuthorizeScreenDTO {
 
@@ -30,12 +14,14 @@ public class PopulateConsentAuthorizeScreenDTO {
     @Valid
     private ConsumerDataDTO consumerData;
 
+    @Valid
+    private DisplayDataDTO displayData;
+
     public ConsentDataDTO getConsentData() {
         return consentData;
     }
 
-    public void setConsentData(
-            ConsentDataDTO consentData) {
+    public void setConsentData(ConsentDataDTO consentData) {
         this.consentData = consentData;
     }
 
@@ -43,8 +29,15 @@ public ConsumerDataDTO getConsumerData() {
         return consumerData;
     }
 
-    public void setConsumerData(
-            ConsumerDataDTO consumerData) {
+    public void setConsumerData(ConsumerDataDTO consumerData) {
         this.consumerData = consumerData;
     }
+
+    public DisplayDataDTO getDisplayData() {
+        return displayData;
+    }
+
+    public void setDisplayData(DisplayDataDTO displayData) {
+        this.displayData = displayData;
+    }
 }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
index e68d73a6f..ee8e37754 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
@@ -52,6 +52,7 @@ public class ConsentAuthorizeConstants {
     public static final String HANDLE_ACCOUNT_SELECTION_SEPARATELY = "handleAccountSelectionSeparately";
     public static final String CONSUMER_ACCOUNTS = "consumerAccounts";
     public static final String UID = "uid";
+    public static final String DISPLAY_DATA = "displayData";
 
     // For payload to persist authorized consent
     public static final String REQUEST_PARAMETERS = "requestParameters";
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
index d0627d1fe..057cf32c6 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
@@ -205,6 +205,9 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
                     ConsentAuthorizeConstants.ACCOUNTS);
         }
 
+        List<Map<String, Object>> displayData = (List<Map<String, Object>>)
+                dataSetMap.get(ConsentAuthorizeConstants.DISPLAY_DATA);
+
         attributeMap.put(ConsentAuthorizeConstants.BASIC_CONSENT_DATA, basicConsentData);
         attributeMap.put(ConsentAuthorizeConstants.PERMISSIONS, permissions);
         attributeMap.put(ConsentAuthorizeConstants.INITIATED_ACCOUNTS_FOR_CONSENT, initiatedAccountsForConsent);
@@ -214,6 +217,7 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
                 handleAccountSelectionSeparately);
         attributeMap.put(ConsentAuthorizeConstants.IS_REAUTHORIZATION, isReauthorization);
         attributeMap.put(ConsentAuthorizeConstants.TYPE, type);
+        attributeMap.put(ConsentAuthorizeConstants.DISPLAY_DATA, displayData);
         attributeMap.put(ConsentAuthorizeConstants.HAS_MULTIPLE_PERMISSIONS,
                 (permissions != null && permissions.size() > 1));
     }
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
index d4e1c49ba..1cd041426 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
@@ -605,3 +605,20 @@ li.sub::before {
     padding: 5;
     border-radius: 5px;
 }
+
+/* Hide the source text from the main page layout */
+.hide {
+    display: none;
+}
+
+/* Ensure the popover box is visible above the login form */
+.popover {
+    z-index: 1060 !important;
+}
+
+/* Optional: Style the info icon */
+#unavailablePopoverContentElement {
+    color: #007bff;
+    font-weight: bold;
+    padding: 0 5px;
+}
\ No newline at end of file
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index e60347220..16afa4783 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -49,6 +49,7 @@
     session.setAttribute("handleAccountSelectionSeparately", request.getAttribute("handleAccountSelectionSeparately"));
     session.setAttribute("onFollowingAccounts", request.getAttribute("onFollowingAccounts"));
     session.setAttribute("buttonConfirm", request.getAttribute("buttonConfirm"));
+    session.setAttribute("displayData", request.getAttribute("displayData"));
 %>
 
 <html>
@@ -91,6 +92,47 @@
                                                     value="${buttonNext}"/>
                                         </div>
                                     </div>
+                                    <c:if test="${not empty displayData}">
+                                        <div class="form-group ui form select">
+                                            <hr class="separator">
+
+                                            <h4 class="ui body col-md-12">
+                                                Accounts Unavailable To Share:
+                                            </h4>
+
+                                            <div class="col-md-12 padding-bottom-double">
+                                                <p id="UnavailableAccountPopover" class="hide" style="text-align:left">
+                                                    There are a range of reasons why certain accounts may not be available to share.
+                                                    Please call the bank for more details.
+                                                    <br><br>
+                                                    &#8211; For joint accounts, all account holders must elect to make the account available for sharing.
+                                                    <br>
+                                                    &#8211; For secondary user accounts, the account holder(s) must give you secondary user
+                                                    data sharing rights before you can share data from this account.
+                                                    <br><br>
+                                                    These can be done via the Data Sharing dashboard in Internet Banking or the app.
+                                                </p>
+                                                <p>
+                                                    Why can't I share these?
+                                                    <a id="unavailablePopoverContentElement"
+                                                    title="Why can't I share these?"
+                                                    style="cursor: help; text-decoration: none;">&#9432;</a>
+                                                </p>
+                                            </div>
+
+                                            <br><br>
+
+                                            <div class="col-md-12">
+                                                <%-- Display unavailable accounts from displayData --%>
+                                                <c:forEach var="record" items="${displayData}">
+                                                    <label>
+                                                        ${record.displayName}
+                                                    </label>
+                                                    <br/>
+                                                </c:forEach>
+                                            </div>
+                                        </div>
+                                    </c:if>
 
                                     <jsp:include page="includes/privacy-footer.jsp"/>
                                 </div>
@@ -101,6 +143,7 @@
             </div>
 
             <jsp:include page="includes/footer.jsp"/>
+            <script src="js/tooltip-functions.js"></script>
         </div>
     </body>
 </html>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/auth-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/auth-functions.js
index b5853e752..4683134c9 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/auth-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/auth-functions.js
@@ -56,7 +56,7 @@ function updateAccountNamesFromPermissions() {
     // Handle unindexed "accounts"
     const standalonePermission = document.querySelector('input[type="hidden"][name="permission"]');
     const standaloneAccounts = document.querySelectorAll('[name="accounts"]');
-    if (standalonePermission && standaloneAccount.length > 0) {
+    if (standalonePermission && standaloneAccounts.length > 0) {
         standaloneAccounts.forEach(standaloneAccount => {
             standaloneAccount.setAttribute('name', standalonePermission.value);
         });
@@ -94,3 +94,4 @@ function denyDefaultClaim() {
     document.getElementById('consent').value = "deny";
     document.getElementById("profile").submit();
 }
+
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
new file mode 100644
index 000000000..672019069
--- /dev/null
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -0,0 +1,27 @@
+(function ($) {
+    $(document).ready(function () {
+        var $infoIcon = $('#unavailablePopoverContentElement');
+        var $hiddenContent = $('#UnavailableAccountPopover');
+
+        if ($ && typeof $.fn.popover === 'function' && $infoIcon.length && $hiddenContent.length) {
+
+            // We pull the HTML content first to avoid the e.hasOwnProperty bug
+            // triggered by certain internal Bootstrap option merging.
+            var popoverHtml = $hiddenContent.html();
+
+            $infoIcon.popover({
+                html: true,
+                container: 'body',
+                placement: 'right',
+                trigger: 'click',
+                content: popoverHtml // Pass the pre-retrieved HTML string
+            });
+
+            $(document).on('click', function (e) {
+                if (!$infoIcon.is(e.target) && $infoIcon.has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
+                    $infoIcon.popover('hide');
+                }
+            });
+        }
+    });
+})(window.jQuery);
\ No newline at end of file
diff --git a/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json b/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
index 55a3f0417..1cde115f9 100644
--- a/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
+++ b/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
@@ -97,6 +97,7 @@
       "version": "7.20.12",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
       "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -1974,6 +1975,7 @@
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
       "integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==",
       "hasInstallScript": true,
+      "peer": true,
       "dependencies": {
         "@fortawesome/fontawesome-common-types": "^0.2.32"
       },
@@ -3154,6 +3156,7 @@
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -3780,6 +3783,7 @@
       "version": "19.2.7",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -4027,6 +4031,7 @@
       "version": "4.41.40",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
       "integrity": "sha512-u6kMFSBM9HcoTpUXnL6mt2HSzftqb3JgYV6oxIgL2dl6sX6aCa5k6SOkzv5DuZjBTPUE/dJltKtwwuqrkZHpfw==",
+      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "@types/tapable": "^1",
@@ -4080,6 +4085,7 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
       "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.33.0",
         "@typescript-eslint/scope-manager": "4.33.0",
@@ -4145,6 +4151,7 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
       "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "4.33.0",
         "@typescript-eslint/types": "4.33.0",
@@ -4562,6 +4569,7 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4641,6 +4649,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5274,6 +5283,7 @@
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -6236,6 +6246,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -7792,6 +7803,7 @@
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
       "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
+      "peer": true,
       "engines": {
         "node": ">=0.11"
       },
@@ -8828,6 +8840,7 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -8958,6 +8971,7 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz",
       "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==",
+      "peer": true,
       "dependencies": {
         "lodash": "^4.17.15",
         "string-natural-compare": "^3.0.1"
@@ -8973,6 +8987,7 @@
       "version": "2.32.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -9024,6 +9039,7 @@
       "version": "24.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
       "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       },
@@ -9044,6 +9060,7 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
       "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "peer": true,
       "dependencies": {
         "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
@@ -9080,6 +9097,7 @@
       "version": "7.37.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
       "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -9111,6 +9129,7 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
       "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -9149,6 +9168,7 @@
       "version": "3.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz",
       "integrity": "sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA==",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^3.10.1"
       },
@@ -12686,6 +12706,7 @@
       "version": "26.6.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.0.tgz",
       "integrity": "sha512-jxTmrvuecVISvKFFhOkjsWRZV7sFqdSUAd1ajOKY+/QE/aLBVstsJ/dX8GczLzwiT6ZEwwmZqtCUHLHHQVzcfA==",
+      "peer": true,
       "dependencies": {
         "@jest/core": "^26.6.0",
         "import-local": "^3.0.2",
@@ -18175,6 +18196,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -18439,6 +18461,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
       "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -18714,6 +18737,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -18742,8 +18766,7 @@
     "node_modules/react-is": {
       "version": "19.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
-      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
-      "peer": true
+      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA=="
     },
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
@@ -18792,6 +18815,7 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
       "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -19965,19 +19989,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-scripts/node_modules/type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/react-scripts/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -20012,6 +20023,7 @@
       "version": "4.44.2",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
       "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.9.0",
         "@webassemblyjs/helper-module-context": "1.9.0",
@@ -20078,6 +20090,7 @@
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
       "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "peer": true,
       "dependencies": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
@@ -21047,6 +21060,7 @@
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
       "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
+      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/node": "*",
@@ -21662,6 +21676,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -22383,6 +22398,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
       "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "peer": true,
       "dependencies": {
         "debug": "^3.2.5",
         "eventsource": "^1.0.7",
@@ -23108,6 +23124,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz",
       "integrity": "sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==",
+      "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -24850,6 +24867,7 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -24897,6 +24915,7 @@
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
       "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.0.1",
@@ -25123,6 +25142,7 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -25240,6 +25260,7 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -25892,6 +25913,7 @@
       "version": "7.20.12",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
       "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "peer": true,
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -27134,6 +27156,7 @@
       "version": "1.2.32",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
       "integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==",
+      "peer": true,
       "requires": {
         "@fortawesome/fontawesome-common-types": "^0.2.32"
       }
@@ -27997,6 +28020,7 @@
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "peer": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -28560,6 +28584,7 @@
       "version": "19.2.7",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
+      "peer": true,
       "requires": {
         "csstype": "^3.2.2"
       }
@@ -28782,6 +28807,7 @@
       "version": "4.41.40",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
       "integrity": "sha512-u6kMFSBM9HcoTpUXnL6mt2HSzftqb3JgYV6oxIgL2dl6sX6aCa5k6SOkzv5DuZjBTPUE/dJltKtwwuqrkZHpfw==",
+      "peer": true,
       "requires": {
         "@types/node": "*",
         "@types/tapable": "^1",
@@ -28834,6 +28860,7 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
       "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.33.0",
         "@typescript-eslint/scope-manager": "4.33.0",
@@ -28869,6 +28896,7 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
       "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+      "peer": true,
       "requires": {
         "@typescript-eslint/scope-manager": "4.33.0",
         "@typescript-eslint/types": "4.33.0",
@@ -29211,7 +29239,8 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "peer": true
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -29268,6 +29297,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -29743,6 +29773,7 @@
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "peer": true,
       "requires": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -30548,6 +30579,7 @@
       "version": "4.28.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz",
       "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
+      "peer": true,
       "requires": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -31739,7 +31771,8 @@
     "date-fns": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
-      "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA=="
+      "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
+      "peer": true
     },
     "debug": {
       "version": "4.4.3",
@@ -32542,6 +32575,7 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "peer": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -32731,6 +32765,7 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz",
       "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==",
+      "peer": true,
       "requires": {
         "lodash": "^4.17.15",
         "string-natural-compare": "^3.0.1"
@@ -32740,6 +32775,7 @@
       "version": "2.32.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+      "peer": true,
       "requires": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -32784,6 +32820,7 @@
       "version": "24.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
       "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
+      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       }
@@ -32792,6 +32829,7 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
       "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "peer": true,
       "requires": {
         "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
@@ -32821,6 +32859,7 @@
       "version": "7.37.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
       "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "peer": true,
       "requires": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -32866,12 +32905,14 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
       "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "peer": true,
       "requires": {}
     },
     "eslint-plugin-testing-library": {
       "version": "3.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz",
       "integrity": "sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA==",
+      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^3.10.1"
       },
@@ -35344,6 +35385,7 @@
       "version": "26.6.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.0.tgz",
       "integrity": "sha512-jxTmrvuecVISvKFFhOkjsWRZV7sFqdSUAd1ajOKY+/QE/aLBVstsJ/dX8GczLzwiT6ZEwwmZqtCUHLHHQVzcfA==",
+      "peer": true,
       "requires": {
         "@jest/core": "^26.6.0",
         "import-local": "^3.0.2",
@@ -39623,6 +39665,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "peer": true,
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -39838,6 +39881,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
       "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==",
+      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -40055,6 +40099,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==",
+      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -40077,8 +40122,7 @@
     "react-is": {
       "version": "19.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
-      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
-      "peer": true
+      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA=="
     },
     "react-lifecycles-compat": {
       "version": "3.0.4",
@@ -40117,7 +40161,8 @@
     "react-refresh": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
-      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
+      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
+      "peer": true
     },
     "react-router": {
       "version": "5.2.0",
@@ -41030,13 +41075,6 @@
             "repeat-string": "^1.6.1"
           }
         },
-        "type-fest": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-          "optional": true,
-          "peer": true
-        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -41062,6 +41100,7 @@
           "version": "4.44.2",
           "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
           "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+          "peer": true,
           "requires": {
             "@webassemblyjs/ast": "1.9.0",
             "@webassemblyjs/helper-module-context": "1.9.0",
@@ -41155,6 +41194,7 @@
           "version": "3.11.0",
           "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
           "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+          "peer": true,
           "requires": {
             "ansi-html": "0.0.7",
             "bonjour": "^3.5.0",
@@ -41869,6 +41909,7 @@
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
       "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
+      "peer": true,
       "requires": {
         "@types/estree": "*",
         "@types/node": "*",
@@ -42321,6 +42362,7 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
           "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
           "dev": true,
+          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.3",
             "fast-uri": "^3.0.1",
@@ -42911,6 +42953,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
       "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "peer": true,
       "requires": {
         "debug": "^3.2.5",
         "eventsource": "^1.0.7",
@@ -43501,6 +43544,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz",
       "integrity": "sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==",
+      "peer": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -44874,6 +44918,7 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "peer": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -44909,7 +44954,8 @@
         "acorn": {
           "version": "8.15.0",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-          "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="
+          "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+          "peer": true
         },
         "acorn-import-assertions": {
           "version": "1.9.0",
@@ -44977,6 +45023,7 @@
               "version": "8.17.1",
               "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
               "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+              "peer": true,
               "requires": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -45017,6 +45064,7 @@
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
       "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
       "dev": true,
+      "peer": true,
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.0.1",

From ae8e122185d46b5edf6222a9a7d6ab21186c6cf5 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Thu, 5 Feb 2026 22:39:30 +0530
Subject: [PATCH 02/15] fix checkstyle issues

---
 .../extension/model/ExternalServiceRequest.java       |  2 +-
 .../extension/model/ExternalServiceResponse.java      |  2 +-
 .../extension/model/ServiceExtensionTypeEnum.java     |  2 +-
 .../common/extension/model/StatusEnum.java            |  2 +-
 .../common/util/ServiceExtensionUtils.java            |  2 +-
 .../validator/validationgroups/AttributeChecks.java   |  4 ++--
 .../validator/validationgroups/MandatoryChecks.java   |  4 ++--
 .../validator/validationgroups/SignatureCheck.java    |  4 ++--
 .../validator/validationgroups/ValidationOrder.java   |  2 +-
 .../mgt/dao/util/ConsentManagementDAOUtil.java        |  2 +-
 .../util/ConsentManagementDAOTestDataProvider.java    |  2 +-
 .../extensions/authorize/model/DisplayDataDTO.java    | 11 ++++++++---
 .../consent/mgt/service/ConsentCoreService.java       |  2 +-
 .../mgt/service/util/ConsentCoreServiceTestUtils.java |  2 +-
 .../mgt/service/util/ConsentMgtServiceTestData.java   |  2 +-
 .../grant/type/handlers/FSGrantHandler.java           |  2 +-
 .../FSDefaultIntrospectionDataProvider.java           |  2 +-
 .../util/IdentityServiceExtensionUtils.java           |  2 +-
 .../webapp/exception/TokenGenerationException.java    |  2 +-
 .../accelerator/scp/webapp/service/OAuthService.java  |  2 +-
 .../webapp/service/ResourceInterceptorService.java    |  2 +-
 21 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceRequest.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceRequest.java
index f013916e8..8561a5dab 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceRequest.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceRequest.java
@@ -21,7 +21,7 @@
 import org.json.JSONObject;
 
 /**
- * Model class to represent the external service request
+ * Model class to represent the external service request.
  */
 public class ExternalServiceRequest {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceResponse.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceResponse.java
index 4bd4ad3fa..3161c0273 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceResponse.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ExternalServiceResponse.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 
 /**
- * Model class to represent the external service response
+ * Model class to represent the external service response.
  */
 public class ExternalServiceResponse {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ServiceExtensionTypeEnum.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ServiceExtensionTypeEnum.java
index afba501c0..2c673c468 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ServiceExtensionTypeEnum.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/ServiceExtensionTypeEnum.java
@@ -19,7 +19,7 @@
 package org.wso2.financial.services.accelerator.common.extension.model;
 
 /**
- * Service extension type enum
+ * Service extension type enum.
  */
 public enum ServiceExtensionTypeEnum {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/StatusEnum.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/StatusEnum.java
index 8070f80c1..535d1142c 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/StatusEnum.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/extension/model/StatusEnum.java
@@ -19,7 +19,7 @@
 package org.wso2.financial.services.accelerator.common.extension.model;
 
 /**
- * Status enum
+ * Status enum.
  */
 public enum StatusEnum {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/util/ServiceExtensionUtils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/util/ServiceExtensionUtils.java
index c12cc3434..f20e9c25a 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/util/ServiceExtensionUtils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/util/ServiceExtensionUtils.java
@@ -195,7 +195,7 @@ private static boolean isRetryableException(Exception e) {
     }
 
     /**
-     * Method to map a json object to a model class
+     * Method to map a json object to a model class.
      *
      * @param jsonResponse   JSON response string to be mapped
      * @param clazz          Class type to which the JSON response should be mapped
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/AttributeChecks.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/AttributeChecks.java
index 1fbf1c30b..06d6b0034 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/AttributeChecks.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/AttributeChecks.java
@@ -10,8 +10,8 @@
 package org.wso2.financial.services.accelerator.common.validator.validationgroups;
 
 /**
- * Interface for grouping the validation annotations
- * Groups the validations for attributes
+ * Interface for grouping the validation annotations.
+ * Groups the validations for attributes.
  */
 public interface AttributeChecks {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/MandatoryChecks.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/MandatoryChecks.java
index 2f045395a..abcfcbfbb 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/MandatoryChecks.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/MandatoryChecks.java
@@ -10,8 +10,8 @@
 package org.wso2.financial.services.accelerator.common.validator.validationgroups;
 
 /**
- * Interface for grouping the validation annotations
- * Grouping the mandatory check constraints
+ * Interface for grouping the validation annotations.
+ * Grouping the mandatory check constraints.
  */
 public interface MandatoryChecks {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/SignatureCheck.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/SignatureCheck.java
index 2aff5a5a3..49ac2d032 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/SignatureCheck.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/SignatureCheck.java
@@ -10,8 +10,8 @@
 package org.wso2.financial.services.accelerator.common.validator.validationgroups;
 
 /**
- * Interface for grouping the validation annotations
- * Groups the validation for signature
+ * Interface for grouping the validation annotations.
+ * Groups the validation for signature.
  */
 public interface SignatureCheck {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/ValidationOrder.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/ValidationOrder.java
index a54f33dbe..b8f32ae69 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/ValidationOrder.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/validator/validationgroups/ValidationOrder.java
@@ -12,7 +12,7 @@
 import javax.validation.GroupSequence;
 
 /**
- * Class to define the order of execution for the hibernate validation groups
+ * Class to define the order of execution for the hibernate validation groups.
  */
 @GroupSequence({MandatoryChecks.class, AttributeChecks.class, SignatureCheck.class})
 public interface ValidationOrder {
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
index 132a1b985..7c019af80 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
@@ -346,7 +346,7 @@ public static String constructUserIdListFilterCondition(Map<String, ArrayList<St
      * @return ordered parameters map
      */
     public static TreeMap<Integer, ArrayList<String>> determineOrderOfParamsToSet(String preparedStatement,
-                            Map<String, ArrayList<String>> applicableConditionsMap, Map<String, String> columnsMap) {
+                                                                                  Map<String, ArrayList<String>> applicableConditionsMap, Map<String, String> columnsMap) {
 
         int indexOfConsentIDsList;
         int indexOfClientIdsList;
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOTestDataProvider.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOTestDataProvider.java
index 2def01aec..e23079600 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOTestDataProvider.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOTestDataProvider.java
@@ -24,7 +24,7 @@
 import java.util.UUID;
 
 /**
- * Data provider class for Consent Management DAO Test
+ * Data provider class for Consent Management DAO Test.
  */
 public class ConsentManagementDAOTestDataProvider {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
index b8bc2e6a4..1b70158e0 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
@@ -1,11 +1,12 @@
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import javax.validation.Valid;
+
 /**
  * Display data object for authorization UI consent retrieval.
  * Stores dynamic UI display items such as unavailable / blocked accounts.
@@ -47,8 +48,12 @@ public DisplayDataDTO addItem(Map<String, Object> item) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         DisplayDataDTO that = (DisplayDataDTO) o;
         return Objects.equals(displayData, that.displayData);
     }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/service/ConsentCoreService.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/service/ConsentCoreService.java
index 6496d28b1..87046a3f9 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/service/ConsentCoreService.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/service/ConsentCoreService.java
@@ -764,7 +764,7 @@ DetailedConsentResource amendDetailedConsent(String consentID, String consentRec
             throws ConsentManagementException;
 
     /**
-     * This method is used to fetch consents which has a expiring time as a consent attribute
+     * This method is used to fetch consents which has a expiring time as a consent attribute.
      * (eligible for expiration)
      * @param statusesEligibleForExpiration
      * @return
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentCoreServiceTestUtils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentCoreServiceTestUtils.java
index 9171daa9c..04f4acac1 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentCoreServiceTestUtils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentCoreServiceTestUtils.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 /**
- * Utility class for Consent Core Services tests
+ * Utility class for Consent Core Services tests.
  */
 public class ConsentCoreServiceTestUtils {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentMgtServiceTestData.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentMgtServiceTestData.java
index 3fc9a7bf0..9fac234eb 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentMgtServiceTestData.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.service/src/test/java/org/wso2/financial/services/accelerator/consent/mgt/service/util/ConsentMgtServiceTestData.java
@@ -38,7 +38,7 @@
 import java.util.UUID;
 
 /**
- * Data class for Consent Management Service Tests
+ * Data class for Consent Management Service Tests.
  */
 public class ConsentMgtServiceTestData {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/grant/type/handlers/FSGrantHandler.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/grant/type/handlers/FSGrantHandler.java
index b64ebb890..010cf224d 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/grant/type/handlers/FSGrantHandler.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/grant/type/handlers/FSGrantHandler.java
@@ -26,7 +26,7 @@
 public interface FSGrantHandler {
 
     /**
-     * Return should issue refresh token and optionally update the token request context
+     * Return should issue refresh token and optionally update the token request context.
      *
      * @return should issue refresh token
      */
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/interceptor/FSDefaultIntrospectionDataProvider.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/interceptor/FSDefaultIntrospectionDataProvider.java
index a7e51bdb8..30aa55148 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/interceptor/FSDefaultIntrospectionDataProvider.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/interceptor/FSDefaultIntrospectionDataProvider.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 /**
- * FS specific default introspection data provider implementation
+ * FS specific default introspection data provider implementation.
  */
 public class FSDefaultIntrospectionDataProvider extends FSIntrospectionDataProvider {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/util/IdentityServiceExtensionUtils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/util/IdentityServiceExtensionUtils.java
index facf86a2c..c26cd1105 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/util/IdentityServiceExtensionUtils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.identity.extensions/src/main/java/org/wso2/financial/services/accelerator/identity/extensions/util/IdentityServiceExtensionUtils.java
@@ -48,7 +48,7 @@ public class IdentityServiceExtensionUtils {
             IdentityExtensionsDataHolder.getInstance();
 
     /**
-     * Validates the action status of the external service response
+     * Validates the action status of the external service response.
      *
      * @param response External service response
      * @throws IdentityOAuth2Exception
diff --git a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/exception/TokenGenerationException.java b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/exception/TokenGenerationException.java
index b510d8e8e..37b7dd77e 100644
--- a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/exception/TokenGenerationException.java
+++ b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/exception/TokenGenerationException.java
@@ -21,7 +21,7 @@
 /**
  * TokenGenerationException
  *
- * Throws if errors occurred during the request forwarding process
+ * Throws if errors occurred during the request forwarding process.
  */
 public class TokenGenerationException extends Exception {
     private static final long serialVersionUID = -6044462346016688554L;
diff --git a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/OAuthService.java b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/OAuthService.java
index 3c61f95a4..8c78565d5 100644
--- a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/OAuthService.java
+++ b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/OAuthService.java
@@ -51,7 +51,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * OAuthService
+ * OAuthService.
  * <p>
  * This specifies service methods to use in oauth2 flow
  */
diff --git a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/ResourceInterceptorService.java b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/ResourceInterceptorService.java
index 719f8173f..d95e70f83 100644
--- a/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/ResourceInterceptorService.java
+++ b/financial-services-accelerator/react-apps/self-care-portal/src/main/java/org/wso2/financial/services/accelerator/scp/webapp/service/ResourceInterceptorService.java
@@ -46,7 +46,7 @@
 import javax.ws.rs.HttpMethod;
 
 /**
- * ResourceInterceptorService
+ * ResourceInterceptorService.
  * <p>
  * Contains methods to process requests that are forwarding to IS
  */

From 933c6c220b90c6fd8c1f8fcb757e4f75d639991b Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Fri, 13 Feb 2026 19:23:58 +0530
Subject: [PATCH 03/15] added the displaydata DTO to
 populateConsentAuthorizeScreenDTO as a list of sections that can be
 customized

---
 .../repository/conf/financial-services.xml    |   1 +
 .../repository/conf/financial-services.xml.j2 |   5 +
 .../resources/wso2is-7.0.0-deployment.toml    |   1 +
 .../resources/wso2is-7.1.0-deployment.toml    |   1 +
 .../pom.xml                                   |   2 +-
 .../ConsentEnforcementPayloadMediator.java    |   8 +-
 .../ConsentEnforcementConstants.java          |   1 +
 .../utils/ConsentEnforcementUtils.java        |   1 +
 .../config/FinancialServicesConfigParser.java |   7 ++
 .../constant/FinancialServicesConstants.java  |   1 +
 .../dao/util/ConsentManagementDAOUtil.java    |   5 +-
 .../impl/ExternalAPIConsentRetrievalStep.java |   7 +-
 .../authorize/model/DisplayDataDTO.java       |  37 ++-----
 .../model/DisplayDataInnerItemDTO.java        | 103 ++++++++++++++++++
 .../extensions/authservlet/utils/Utils.java   |  13 ++-
 .../webapp/fs_default_account_selection.jsp   |  78 ++++++-------
 .../api/ConsentValidationEndpoint.java        |   9 +-
 .../mgt/endpoint/utils/ConsentUtils.java      |   9 ++
 18 files changed, 204 insertions(+), 85 deletions(-)
 create mode 100644 financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java

diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
index b06288f9b..c09f72c2b 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
@@ -38,6 +38,7 @@
             <Validator>org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator</Validator>
             <RequestSignatureAlias>wso2carbon</RequestSignatureAlias>
             <JWTPayloadValidation>true</JWTPayloadValidation>
+            <IsCDSDeployment>false</IsCDSDeployment>
         </Validation>
         <AdminHandler>org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
         <ConsentAPICredentials>
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
index 5ffdb8ff4..2d174969b 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -133,6 +133,11 @@
             {% else %}
             <JWTPayloadValidation>true</JWTPayloadValidation>
             {% endif %}
+            {% if financial_services.consent.validation.is_cds_deployment is defined %}
+            <IsCDSDeployment>{{financial_services.consent.validation.is_cds_deployment}}</IsCDSDeployment>
+            {% else %}
+            <IsCDSDeployment>false</IsCDSDeployment>
+            {% endif %}
         </Validation>
         {% if financial_services.consent.admin.handler is defined %}
         <AdminHandler>{{financial_services.consent.admin.handler}}</AdminHandler>
diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
index c2269ea79..d53697df8 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
@@ -549,6 +549,7 @@ priority = 1
 validator="org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator"
 signature.alias="wso2carbon"
 jwt.payload.enabled=true
+is_cds_deployment=false
 
 [financial_services.consent.admin]
 handler="org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler"
diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
index d7904a88e..0e0c5205a 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
@@ -549,6 +549,7 @@ priority = 1
 validator="org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator"
 signature.alias="wso2carbon"
 jwt.payload.enabled=true
+is_cds_deployment=false
 
 [financial_services.consent.admin]
 handler="org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler"
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
index b661ff42e..88414ffcf 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
@@ -108,7 +108,7 @@
                                         <limit implementation="org.jacoco.report.check.Limit">
                                             <counter>INSTRUCTION</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.8</minimum>
+                                            <minimum>0.7</minimum>
                                         </limit>
                                     </limits>
                                 </rule>
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/ConsentEnforcementPayloadMediator.java b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/ConsentEnforcementPayloadMediator.java
index f129b987c..0479d6801 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/ConsentEnforcementPayloadMediator.java
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/ConsentEnforcementPayloadMediator.java
@@ -80,10 +80,10 @@ public boolean mediate(MessageContext messageContext) {
                 messageContext.getProperty(ConsentEnforcementConstants.API_ELECTED_RESOURCE));
         additionalParams.put(ConsentEnforcementConstants.RESOURCE_PARAMS_TAG,
                 ConsentEnforcementUtils.getResourceParamMap(messageContext));
-         additionalParams.put(ConsentEnforcementConstants.USER_ID_TAG,
-                 messageContext.getProperty(ConsentEnforcementConstants.USER_ID));
-         additionalParams.put(ConsentEnforcementConstants.CLIENT_ID_TAG,
-                 messageContext.getProperty(ConsentEnforcementConstants.CONSUMER_KEY));
+        additionalParams.put(ConsentEnforcementConstants.USER_ID_TAG,
+                messageContext.getProperty(ConsentEnforcementConstants.USER_ID));
+        additionalParams.put(ConsentEnforcementConstants.CLIENT_ID_TAG,
+                messageContext.getProperty(ConsentEnforcementConstants.CONSUMER_KEY));
 
         JSONObject validationRequest;
         try {
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
index e52865830..47594b7ec 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
@@ -42,6 +42,7 @@ public class ConsentEnforcementConstants {
     public static final String KEYSTORE_PASSWORD_TAG = "Security.InternalKeyStore.Password";
     public static final String SIGNING_ALIAS_TAG = "Security.InternalKeyStore.KeyAlias";
     public static final String SIGNING_KEY_PASSWORD = "Security.InternalKeyStore.KeyPassword";
+    public static final String DOMS_ENABLED = "";
 
     // Additional param keys
     public static final String ELECTED_RESOURCE_TAG = "electedResource";
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
index 8d808e656..ae8e83205 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
@@ -182,4 +182,5 @@ private static JSONObject decodeBase64(String payload) throws UnsupportedEncodin
         return new JSONObject(new String(java.util.Base64.getDecoder().decode(payload),
                 String.valueOf(StandardCharsets.UTF_8)));
     }
+
 }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
index 0d2542b7f..bc15833d1 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
@@ -744,6 +744,13 @@ public String getConsentValidationConfig() {
         return source.map(String::trim).orElse("");
     }
 
+    public String getCdsDeploymentConfig() {
+
+        Optional<String> source = getConfigurationFromKeyAsString(
+                FinancialServicesConstants.CONSENT_CDS_DEPLOYMENT);
+        return source.map(String::trim).orElse("false");
+    }
+
     //Event notifications configurations.
     public String getEventNotificationTokenIssuer() {
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
index d97b149b1..c768fa338 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
@@ -59,6 +59,7 @@ public class FinancialServicesConstants {
     public static final String CONSENT_JWT_PAYLOAD_VALIDATION = "Consent.Validation.JWTPayloadValidation";
     public static final String SIGNATURE_ALIAS = "Consent.Validation.RequestSignatureAlias";
     public static final String CONSENT_VALIDATOR = "Consent.Validation.Validator";
+    public static final String CONSENT_CDS_DEPLOYMENT = "Consent.Validation.IsCDSDeployment";
     public static final String ADMIN_HANDLER = "Consent.AdminHandler";
     public static final String PRESERVE_CONSENT = "Consent.PreserveConsentLink";
     public static final String ADMIN_USERNAME = "Admin.Username";
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
index 7c019af80..2c820a6c5 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.dao/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/dao/util/ConsentManagementDAOUtil.java
@@ -345,8 +345,9 @@ public static String constructUserIdListFilterCondition(Map<String, ArrayList<St
      * @param columnsMap                map of columns
      * @return ordered parameters map
      */
-    public static TreeMap<Integer, ArrayList<String>> determineOrderOfParamsToSet(String preparedStatement,
-                                                                                  Map<String, ArrayList<String>> applicableConditionsMap, Map<String, String> columnsMap) {
+    public static TreeMap<Integer, ArrayList<String>> determineOrderOfParamsToSet(
+            String preparedStatement,
+            Map<String, ArrayList<String>> applicableConditionsMap, Map<String, String> columnsMap) {
 
         int indexOfConsentIDsList;
         int indexOfClientIdsList;
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
index ca71a8e7b..fe153da69 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigParser;
 import org.wso2.financial.services.accelerator.common.constant.FinancialServicesConstants;
@@ -160,10 +159,8 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
 
             // Append display data, if exists, to json object
             if (responseDTO.getDisplayData() != null) {
-                jsonObject.put(
-                        ConsentAuthorizeConstants.DISPLAY_DATA,
-                        new JSONArray(responseDTO.getDisplayData().getDisplayData())
-                );
+                jsonObject.put(ConsentAuthorizeConstants.DISPLAY_DATA,
+                        new JSONObject(objectMapper.writeValueAsString(responseDTO.getDisplayData())));
             }
 
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
index 1b70158e0..dd099b333 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
@@ -2,47 +2,32 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import javax.validation.Valid;
 
 /**
  * Display data object for authorization UI consent retrieval.
- * Stores dynamic UI display items such as unavailable / blocked accounts.
+ * Contains a list of display data sections.
  */
 public class DisplayDataDTO {
 
-    /**
-     * List of display data items.
-     *
-     * Example JSON:
-     * [
-     *   { "accountId": "123", "displayName": "Blocked Account" }
-     * ]
-     */
     @Valid
-    private List<Map<String, Object>> displayData = new ArrayList<>();
+    private List<DisplayDataInnerItemDTO> items = new ArrayList<>();
 
     public DisplayDataDTO() {
     }
 
-    public List<Map<String, Object>> getDisplayData() {
-        return displayData;
+    public List<DisplayDataInnerItemDTO> getItems() {
+        return items;
     }
 
-    public void setDisplayData(List<Map<String, Object>> displayData) {
-        this.displayData = displayData;
+    public void setItems(List<DisplayDataInnerItemDTO> items) {
+        this.items = items;
     }
 
-    /**
-     * Convenience method to add a display item.
-     *
-     * @param item display data item
-     * @return this instance for chaining
-     */
-    public DisplayDataDTO addItem(Map<String, Object> item) {
-        this.displayData.add(item);
+    public DisplayDataDTO addItem(DisplayDataInnerItemDTO item) {
+        this.items.add(item);
         return this;
     }
 
@@ -51,15 +36,15 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof DisplayDataDTO)) {
             return false;
         }
         DisplayDataDTO that = (DisplayDataDTO) o;
-        return Objects.equals(displayData, that.displayData);
+        return Objects.equals(items, that.items);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(displayData);
+        return Objects.hash(items);
     }
 }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
new file mode 100644
index 000000000..e519ccf0f
--- /dev/null
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
@@ -0,0 +1,103 @@
+package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.validation.Valid;
+
+/**
+ * Display data object for authorization UI consent retrieval.
+ * Stores UI metadata and dynamic display items such as unavailable accounts.
+ */
+public class DisplayDataInnerItemDTO {
+
+    /**
+     * UI Heading.
+     */
+    private String heading;
+
+    /**
+     * UI Sub heading.
+     */
+    private String subHeading;
+
+    /**
+     * Tooltip/help description.
+     */
+    private String description;
+
+    /**
+     * Dynamic display items.
+     */
+    @Valid
+    private List<Map<String, Object>> displayList = new ArrayList<>();
+
+    public DisplayDataInnerItemDTO() {
+    }
+
+    // Heading
+    public String getHeading() {
+        return heading;
+    }
+
+    public void setHeading(String heading) {
+        this.heading = heading;
+    }
+
+    // SubHeading
+    public String getSubHeading() {
+        return subHeading;
+    }
+
+    public void setSubHeading(String subHeading) {
+        this.subHeading = subHeading;
+    }
+
+    // Tooltip Description
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    // Display Data
+    public List<Map<String, Object>> getDisplayList() {
+        return displayList;
+    }
+
+    public void setDisplayList(List<Map<String, Object>> displayList) {
+        this.displayList = displayList;
+    }
+
+    /**
+     * Convenience method to add a display item.
+     */
+    public DisplayDataInnerItemDTO addItem(Map<String, Object> item) {
+        this.displayList.add(item);
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof DisplayDataInnerItemDTO)) {
+            return false;
+        }
+        DisplayDataInnerItemDTO that = (DisplayDataInnerItemDTO) o;
+        return Objects.equals(heading, that.heading) &&
+                Objects.equals(subHeading, that.subHeading) &&
+                Objects.equals(description, that.description) &&
+                Objects.equals(displayList, that.displayList);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(heading, subHeading, description, displayList);
+    }
+}
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
index 057cf32c6..5af8fd327 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
@@ -205,8 +205,13 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
                     ConsentAuthorizeConstants.ACCOUNTS);
         }
 
-        List<Map<String, Object>> displayData = (List<Map<String, Object>>)
-                dataSetMap.get(ConsentAuthorizeConstants.DISPLAY_DATA);
+        Map<String, Object> displayDataObj =
+                (Map<String, Object>) dataSetMap.get(ConsentAuthorizeConstants.DISPLAY_DATA);
+
+        List<Map<String, Object>> displayDataItems = null;
+        if (displayDataObj != null) {
+            displayDataItems = (List<Map<String, Object>>) displayDataObj.get("items");
+        }
 
         attributeMap.put(ConsentAuthorizeConstants.BASIC_CONSENT_DATA, basicConsentData);
         attributeMap.put(ConsentAuthorizeConstants.PERMISSIONS, permissions);
@@ -217,9 +222,11 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
                 handleAccountSelectionSeparately);
         attributeMap.put(ConsentAuthorizeConstants.IS_REAUTHORIZATION, isReauthorization);
         attributeMap.put(ConsentAuthorizeConstants.TYPE, type);
-        attributeMap.put(ConsentAuthorizeConstants.DISPLAY_DATA, displayData);
         attributeMap.put(ConsentAuthorizeConstants.HAS_MULTIPLE_PERMISSIONS,
                 (permissions != null && permissions.size() > 1));
+
+        // multi section list for the UI
+        attributeMap.put("displayDataItems", displayDataItems);
     }
 
     private static void appendI18nAttributes(Map<String, Object> dataSetMap, Map<String, Object> attributeMap) {
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index 16afa4783..7bc94434c 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -49,7 +49,7 @@
     session.setAttribute("handleAccountSelectionSeparately", request.getAttribute("handleAccountSelectionSeparately"));
     session.setAttribute("onFollowingAccounts", request.getAttribute("onFollowingAccounts"));
     session.setAttribute("buttonConfirm", request.getAttribute("buttonConfirm"));
-    session.setAttribute("displayData", request.getAttribute("displayData"));
+    session.setAttribute("displayDataItems", request.getAttribute("displayDataItems"));
 %>
 
 <html>
@@ -85,6 +85,41 @@
                                         </div>
                                     </div>
 
+                                    <c:if test="${not empty displayDataItems}">
+                                        <c:forEach var="section" items="${displayDataItems}">
+                                            <div class="form-group ui form select">
+                                                <hr class="separator">
+
+                                                <h4 class="ui body col-md-12">
+                                                    ${section.heading}
+                                                </h4>
+
+                                                <c:if test="${not empty section.subHeading}">
+                                                    <div class="col-md-12 pb-1">
+                                                        <p id="UnavailableAccountPopover" class="hide" style="text-align:left">
+                                                            ${section.description}
+                                                        </p>
+
+                                                        <p>
+                                                            ${section.subHeading}
+                                                            <a id="unavailablePopoverContentElement"
+                                                               title="${section.subHeading}"
+                                                               style="cursor: help; text-decoration: none;">&#9432;</a>
+                                                        </p>
+                                                    </div>
+                                                </c:if>
+                                                <div class="col-md-12">
+                                                    <c:forEach var="record" items="${section.displayList}">
+                                                        <label>${record.displayName}</label>
+                                                        <br/>
+                                                    </c:forEach>
+                                                </div>
+                                            </div>
+                                        </c:forEach>
+                                    </c:if>
+
+                                    <br><br>
+
                                     <div class="form-group ui form row">
                                         <div class="ui body col-md-12">
                                             <input type="button" class="btn btn-primary" id="next" name="next"
@@ -92,47 +127,6 @@
                                                     value="${buttonNext}"/>
                                         </div>
                                     </div>
-                                    <c:if test="${not empty displayData}">
-                                        <div class="form-group ui form select">
-                                            <hr class="separator">
-
-                                            <h4 class="ui body col-md-12">
-                                                Accounts Unavailable To Share:
-                                            </h4>
-
-                                            <div class="col-md-12 padding-bottom-double">
-                                                <p id="UnavailableAccountPopover" class="hide" style="text-align:left">
-                                                    There are a range of reasons why certain accounts may not be available to share.
-                                                    Please call the bank for more details.
-                                                    <br><br>
-                                                    &#8211; For joint accounts, all account holders must elect to make the account available for sharing.
-                                                    <br>
-                                                    &#8211; For secondary user accounts, the account holder(s) must give you secondary user
-                                                    data sharing rights before you can share data from this account.
-                                                    <br><br>
-                                                    These can be done via the Data Sharing dashboard in Internet Banking or the app.
-                                                </p>
-                                                <p>
-                                                    Why can't I share these?
-                                                    <a id="unavailablePopoverContentElement"
-                                                    title="Why can't I share these?"
-                                                    style="cursor: help; text-decoration: none;">&#9432;</a>
-                                                </p>
-                                            </div>
-
-                                            <br><br>
-
-                                            <div class="col-md-12">
-                                                <%-- Display unavailable accounts from displayData --%>
-                                                <c:forEach var="record" items="${displayData}">
-                                                    <label>
-                                                        ${record.displayName}
-                                                    </label>
-                                                    <br/>
-                                                </c:forEach>
-                                            </div>
-                                        </div>
-                                    </c:if>
 
                                     <jsp:include page="includes/privacy-footer.jsp"/>
                                 </div>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
index cb1108e59..32a699a2a 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
@@ -199,8 +199,13 @@ public Response validate(@Context HttpServletRequest request, @Context HttpServl
         JSONObject responsePayload;
         try {
             responsePayload = validationResult.generatePayload();
-            responsePayload.put(ConsentExtensionConstants.CONSENT_INFO,
-                    ConsentUtils.signJWTWithDefaultKey(validationResult.getConsentInformation().toString()));
+            String consentInfoPayload = validationResult.getConsentInformation().toString();
+            if (ConsentUtils.isCdsDeploymentEnabled()) {
+                responsePayload.put(ConsentExtensionConstants.CONSENT_INFO, consentInfoPayload);
+            } else {
+                responsePayload.put(ConsentExtensionConstants.CONSENT_INFO,
+                        ConsentUtils.signJWTWithDefaultKey(consentInfoPayload));
+            }
         } catch (Exception e) {
             log.error("Error occurred while getting private key", e);
             throw new ConsentException(ResponseStatus.INTERNAL_SERVER_ERROR, "Error while getting private key");
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
index e2e840d8f..2c26a930d 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
@@ -471,6 +471,15 @@ public static boolean getConsentJWTPayloadValidatorConfigEnabled() {
         return Boolean.parseBoolean(FinancialServicesConfigParser.getInstance().getConsentValidationConfig());
     }
 
+    /**
+     * This method returns the configuration value on whether the deployment is CDS.
+     *
+     * @return config value
+     */
+    public static boolean isCdsDeploymentEnabled() {
+        return Boolean.parseBoolean(FinancialServicesConfigParser.getInstance().getCdsDeploymentConfig());
+    }
+
     /**
      * Extract and add query parameters from a URL to existing resource map.
      * Resource parameter map will contain the resource path(ex:

From 92d19104190b41342e7c6759472b79588e4b1013 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Sat, 14 Feb 2026 17:40:00 +0530
Subject: [PATCH 04/15] checkstyle fixes

---
 .../consent-enforcement-payload-mediator/pom.xml                | 2 +-
 .../enforcement/constants/ConsentEnforcementConstants.java      | 1 -
 .../consent/enforcement/utils/ConsentEnforcementUtils.java      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
index 88414ffcf..b661ff42e 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/pom.xml
@@ -108,7 +108,7 @@
                                         <limit implementation="org.jacoco.report.check.Limit">
                                             <counter>INSTRUCTION</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.7</minimum>
+                                            <minimum>0.8</minimum>
                                         </limit>
                                     </limits>
                                 </rule>
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
index 47594b7ec..e52865830 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/constants/ConsentEnforcementConstants.java
@@ -42,7 +42,6 @@ public class ConsentEnforcementConstants {
     public static final String KEYSTORE_PASSWORD_TAG = "Security.InternalKeyStore.Password";
     public static final String SIGNING_ALIAS_TAG = "Security.InternalKeyStore.KeyAlias";
     public static final String SIGNING_KEY_PASSWORD = "Security.InternalKeyStore.KeyPassword";
-    public static final String DOMS_ENABLED = "";
 
     // Additional param keys
     public static final String ELECTED_RESOURCE_TAG = "electedResource";
diff --git a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
index ae8e83205..8d808e656 100644
--- a/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
+++ b/financial-services-accelerator/common-mediation-policies/consent-enforcement/consent-enforcement-payload-mediator/src/main/java/org/wso2/financial/services/apim/mediation/policies/consent/enforcement/utils/ConsentEnforcementUtils.java
@@ -182,5 +182,4 @@ private static JSONObject decodeBase64(String payload) throws UnsupportedEncodin
         return new JSONObject(new String(java.util.Base64.getDecoder().decode(payload),
                 String.valueOf(StandardCharsets.UTF_8)));
     }
-
 }

From f8bb953fc8a8c626a2579424a579dd35f8cc130b Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Sat, 14 Feb 2026 17:52:00 +0530
Subject: [PATCH 05/15] fixes in the code

---
 .../repository/resources/wso2is-7.0.0-deployment.toml      | 1 -
 .../repository/resources/wso2is-7.1.0-deployment.toml      | 1 -
 .../src/main/webapp/css/custom-common.css                  | 3 ---
 .../src/main/webapp/js/tooltip-functions.js                | 7 +++----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
index d53697df8..c2269ea79 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
@@ -549,7 +549,6 @@ priority = 1
 validator="org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator"
 signature.alias="wso2carbon"
 jwt.payload.enabled=true
-is_cds_deployment=false
 
 [financial_services.consent.admin]
 handler="org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler"
diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
index 0e0c5205a..d7904a88e 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.1.0-deployment.toml
@@ -549,7 +549,6 @@ priority = 1
 validator="org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator"
 signature.alias="wso2carbon"
 jwt.payload.enabled=true
-is_cds_deployment=false
 
 [financial_services.consent.admin]
 handler="org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler"
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
index 1cd041426..0164954c4 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
@@ -606,17 +606,14 @@ li.sub::before {
     border-radius: 5px;
 }
 
-/* Hide the source text from the main page layout */
 .hide {
     display: none;
 }
 
-/* Ensure the popover box is visible above the login form */
 .popover {
     z-index: 1060 !important;
 }
 
-/* Optional: Style the info icon */
 #unavailablePopoverContentElement {
     color: #007bff;
     font-weight: bold;
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index 672019069..39efdcb26 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -5,8 +5,6 @@
 
         if ($ && typeof $.fn.popover === 'function' && $infoIcon.length && $hiddenContent.length) {
 
-            // We pull the HTML content first to avoid the e.hasOwnProperty bug
-            // triggered by certain internal Bootstrap option merging.
             var popoverHtml = $hiddenContent.html();
 
             $infoIcon.popover({
@@ -14,11 +12,12 @@
                 container: 'body',
                 placement: 'right',
                 trigger: 'click',
-                content: popoverHtml // Pass the pre-retrieved HTML string
+                content: popoverHtml
             });
 
             $(document).on('click', function (e) {
-                if (!$infoIcon.is(e.target) && $infoIcon.has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
+                if (!$infoIcon.is(e.target) &&
+                $infoIcon.has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
                     $infoIcon.popover('hide');
                 }
             });

From c2692d78764536ffa666a2a3f20330412148f7d3 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Sun, 15 Feb 2026 20:22:15 +0530
Subject: [PATCH 06/15] fix in consent auth screen tooltip.

---
 .../webapp/fs_default_account_selection.jsp   |  4 +--
 .../src/main/webapp/js/tooltip-functions.js   | 32 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index 7bc94434c..bb0061bcb 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -96,13 +96,13 @@
 
                                                 <c:if test="${not empty section.subHeading}">
                                                     <div class="col-md-12 pb-1">
-                                                        <p id="UnavailableAccountPopover" class="hide" style="text-align:left">
+                                                        <p class="unavailable-account-popover hide" style="text-align:left">
                                                             ${section.description}
                                                         </p>
 
                                                         <p>
                                                             ${section.subHeading}
-                                                            <a id="unavailablePopoverContentElement"
+                                                            <a class="unavailable-popover-content-element"
                                                                title="${section.subHeading}"
                                                                style="cursor: help; text-decoration: none;">&#9432;</a>
                                                         </p>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index 39efdcb26..8ad68bedd 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -1,25 +1,23 @@
 (function ($) {
     $(document).ready(function () {
-        var $infoIcon = $('#unavailablePopoverContentElement');
-        var $hiddenContent = $('#UnavailableAccountPopover');
+        var $infoIcons = $('.unavailable-popover-content-element');
 
-        if ($ && typeof $.fn.popover === 'function' && $infoIcon.length && $hiddenContent.length) {
+        if ($ && typeof $.fn.popover === 'function' && $infoIcons.length) {
+            $infoIcons.each(function () {
+                var $infoIcon = $(this);
+                var $hiddenContent = $infoIcon.closest('.pb-1').find('.unavailable-account-popover');
 
-            var popoverHtml = $hiddenContent.html();
-
-            $infoIcon.popover({
-                html: true,
-                container: 'body',
-                placement: 'right',
-                trigger: 'click',
-                content: popoverHtml
-            });
-
-            $(document).on('click', function (e) {
-                if (!$infoIcon.is(e.target) &&
-                $infoIcon.has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
-                    $infoIcon.popover('hide');
+                if (!$hiddenContent.length) {
+                    return;
                 }
+
+                $infoIcon.popover({
+                    html: true,
+                    container: 'body',
+                    placement: 'right',
+                    trigger: 'hover focus',
+                    content: $hiddenContent.html()
+                });
             });
         }
     });

From 1fb0bc28e41f3eb02e1979e869c7da23f0538bab Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Wed, 18 Feb 2026 19:18:33 +0530
Subject: [PATCH 07/15] add license header

---
 .../authorize/model/DisplayDataDTO.java       | 18 ++++++++++++++++
 .../model/DisplayDataInnerItemDTO.java        | 18 ++++++++++++++++
 .../webapp/fs_default_account_selection.jsp   |  6 ++----
 .../src/main/webapp/js/tooltip-functions.js   | 21 +++++++++++++++++++
 4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
index dd099b333..d1a1698cc 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
@@ -1,3 +1,21 @@
+/**
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
+ * <p>
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
 import java.util.ArrayList;
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
index e519ccf0f..e44559821 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
@@ -1,3 +1,21 @@
+/**
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
+ * <p>
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
 import java.util.ArrayList;
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index bb0061bcb..54596bae7 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -1,5 +1,5 @@
 <%--
-~ Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+~ Copyright (c) 2025-2026, WSO2 LLC. (https://www.wso2.com).
 ~
 ~ WSO2 LLC. licenses this file to you under the Apache License,
 ~ Version 2.0 (the "License"); you may not use this file except
@@ -110,7 +110,7 @@
                                                 </c:if>
                                                 <div class="col-md-12">
                                                     <c:forEach var="record" items="${section.displayList}">
-                                                        <label>${record.displayName}</label>
+                                                        <label>${record.displayText}</label>
                                                         <br/>
                                                     </c:forEach>
                                                 </div>
@@ -118,8 +118,6 @@
                                         </c:forEach>
                                     </c:if>
 
-                                    <br><br>
-
                                     <div class="form-group ui form row">
                                         <div class="ui body col-md-12">
                                             <input type="button" class="btn btn-primary" id="next" name="next"
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index 8ad68bedd..a6d7733f4 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -1,4 +1,25 @@
+/**
+ * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 (function ($) {
+    if (typeof $ !== 'function') {
+       return;
+    }
     $(document).ready(function () {
         var $infoIcons = $('.unavailable-popover-content-element');
 

From 7d904028d366f1f9979255d050bc3219235cf6e4 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Fri, 20 Feb 2026 12:25:26 +0530
Subject: [PATCH 08/15] configuration name using for stopping resigning in DOMS
 policy is changed.

---
 .../repository/conf/financial-services.xml           |  4 +++-
 .../repository/conf/financial-services.xml.j2        | 12 +++++++-----
 .../common/config/FinancialServicesConfigParser.java |  4 ++--
 .../common/constant/FinancialServicesConstants.java  |  2 +-
 .../mgt/endpoint/api/ConsentValidationEndpoint.java  |  6 +++---
 .../consent/mgt/endpoint/utils/ConsentUtils.java     |  6 +++---
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
index c09f72c2b..69796399f 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
@@ -38,7 +38,9 @@
             <Validator>org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator</Validator>
             <RequestSignatureAlias>wso2carbon</RequestSignatureAlias>
             <JWTPayloadValidation>true</JWTPayloadValidation>
-            <IsCDSDeployment>false</IsCDSDeployment>
+            <ResponsePayloadSigning>
+                <Enabled>false</Enabled>
+            </ResponsePayloadSigning>
         </Validation>
         <AdminHandler>org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
         <ConsentAPICredentials>
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
index 2d174969b..0f4ed2c8c 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -133,11 +133,13 @@
             {% else %}
             <JWTPayloadValidation>true</JWTPayloadValidation>
             {% endif %}
-            {% if financial_services.consent.validation.is_cds_deployment is defined %}
-            <IsCDSDeployment>{{financial_services.consent.validation.is_cds_deployment}}</IsCDSDeployment>
-            {% else %}
-            <IsCDSDeployment>false</IsCDSDeployment>
-            {% endif %}
+            <ResponsePayloadSigning>
+                {% if financial_services.consent.validation.response_payload_signing.enabled is defined %}
+                <Enabled>{{financial_services.consent.validation.response_payload_signing.enabled}}</Enabled>
+                {% else %}
+                <Enabled>false</Enabled>
+                {% endif %}
+            </ResponsePayloadSigning>
         </Validation>
         {% if financial_services.consent.admin.handler is defined %}
         <AdminHandler>{{financial_services.consent.admin.handler}}</AdminHandler>
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
index bc15833d1..c4f58eb3d 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
@@ -744,10 +744,10 @@ public String getConsentValidationConfig() {
         return source.map(String::trim).orElse("");
     }
 
-    public String getCdsDeploymentConfig() {
+    public String getResponsePayloadSigningConfig() {
 
         Optional<String> source = getConfigurationFromKeyAsString(
-                FinancialServicesConstants.CONSENT_CDS_DEPLOYMENT);
+                FinancialServicesConstants.CONSENT_RESPONSE_PAYLOAD_SIGNING);
         return source.map(String::trim).orElse("false");
     }
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
index c768fa338..d4bfcb8d5 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
@@ -59,7 +59,7 @@ public class FinancialServicesConstants {
     public static final String CONSENT_JWT_PAYLOAD_VALIDATION = "Consent.Validation.JWTPayloadValidation";
     public static final String SIGNATURE_ALIAS = "Consent.Validation.RequestSignatureAlias";
     public static final String CONSENT_VALIDATOR = "Consent.Validation.Validator";
-    public static final String CONSENT_CDS_DEPLOYMENT = "Consent.Validation.IsCDSDeployment";
+    public static final String CONSENT_RESPONSE_PAYLOAD_SIGNING = "Consent.Validation.ResponsePayloadSigning.Enabled";
     public static final String ADMIN_HANDLER = "Consent.AdminHandler";
     public static final String PRESERVE_CONSENT = "Consent.PreserveConsentLink";
     public static final String ADMIN_USERNAME = "Admin.Username";
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
index 32a699a2a..bab3e72bd 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/api/ConsentValidationEndpoint.java
@@ -200,11 +200,11 @@ public Response validate(@Context HttpServletRequest request, @Context HttpServl
         try {
             responsePayload = validationResult.generatePayload();
             String consentInfoPayload = validationResult.getConsentInformation().toString();
-            if (ConsentUtils.isCdsDeploymentEnabled()) {
-                responsePayload.put(ConsentExtensionConstants.CONSENT_INFO, consentInfoPayload);
-            } else {
+            if (ConsentUtils.isResponsePayloadSigningEnabled()) {
                 responsePayload.put(ConsentExtensionConstants.CONSENT_INFO,
                         ConsentUtils.signJWTWithDefaultKey(consentInfoPayload));
+            } else {
+                responsePayload.put(ConsentExtensionConstants.CONSENT_INFO, consentInfoPayload);
             }
         } catch (Exception e) {
             log.error("Error occurred while getting private key", e);
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
index 2c26a930d..e7e29460d 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/endpoint/utils/ConsentUtils.java
@@ -472,12 +472,12 @@ public static boolean getConsentJWTPayloadValidatorConfigEnabled() {
     }
 
     /**
-     * This method returns the configuration value on whether the deployment is CDS.
+     * This method returns whether consent validation response payload signing is enabled.
      *
      * @return config value
      */
-    public static boolean isCdsDeploymentEnabled() {
-        return Boolean.parseBoolean(FinancialServicesConfigParser.getInstance().getCdsDeploymentConfig());
+    public static boolean isResponsePayloadSigningEnabled() {
+        return Boolean.parseBoolean(FinancialServicesConfigParser.getInstance().getResponsePayloadSigningConfig());
     }
 
     /**

From c3feb24bcf889adfb944b90b0abfc42eb9053d37 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Fri, 20 Feb 2026 16:57:54 +0530
Subject: [PATCH 09/15] Changed the name of the display data property to
 additionalDisplayData

---
 .../impl/ExternalAPIConsentRetrievalStep.java |  7 +-
 ...DTO.java => AdditionalDisplayDataDTO.java} | 10 +--
 .../authorize/model/DisplayDataDTO.java       | 68 -------------------
 .../PopulateConsentAuthorizeScreenDTO.java    | 12 ++--
 .../util/ConsentAuthorizeConstants.java       |  3 +-
 .../extensions/authservlet/utils/Utils.java   | 13 ++--
 .../webapp/fs_default_account_selection.jsp   |  6 +-
 7 files changed, 25 insertions(+), 94 deletions(-)
 rename financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/{DisplayDataInnerItemDTO.java => AdditionalDisplayDataDTO.java} (91%)
 delete mode 100644 financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
index fe153da69..ddea82d25 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
@@ -22,6 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigParser;
 import org.wso2.financial.services.accelerator.common.constant.FinancialServicesConstants;
@@ -158,9 +159,9 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
             }
 
             // Append display data, if exists, to json object
-            if (responseDTO.getDisplayData() != null) {
-                jsonObject.put(ConsentAuthorizeConstants.DISPLAY_DATA,
-                        new JSONObject(objectMapper.writeValueAsString(responseDTO.getDisplayData())));
+            if (responseDTO.getAdditionalDisplayData() != null) {
+                jsonObject.put(ConsentAuthorizeConstants.ADDITIONAL_DISPLAY_DATA,
+                        new JSONArray(objectMapper.writeValueAsString(responseDTO.getAdditionalDisplayData())));
             }
 
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AdditionalDisplayDataDTO.java
similarity index 91%
rename from financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
rename to financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AdditionalDisplayDataDTO.java
index e44559821..d49f20e9a 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataInnerItemDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AdditionalDisplayDataDTO.java
@@ -29,7 +29,7 @@
  * Display data object for authorization UI consent retrieval.
  * Stores UI metadata and dynamic display items such as unavailable accounts.
  */
-public class DisplayDataInnerItemDTO {
+public class AdditionalDisplayDataDTO {
 
     /**
      * UI Heading.
@@ -52,7 +52,7 @@ public class DisplayDataInnerItemDTO {
     @Valid
     private List<Map<String, Object>> displayList = new ArrayList<>();
 
-    public DisplayDataInnerItemDTO() {
+    public AdditionalDisplayDataDTO() {
     }
 
     // Heading
@@ -94,7 +94,7 @@ public void setDisplayList(List<Map<String, Object>> displayList) {
     /**
      * Convenience method to add a display item.
      */
-    public DisplayDataInnerItemDTO addItem(Map<String, Object> item) {
+    public AdditionalDisplayDataDTO addItem(Map<String, Object> item) {
         this.displayList.add(item);
         return this;
     }
@@ -104,10 +104,10 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DisplayDataInnerItemDTO)) {
+        if (!(o instanceof AdditionalDisplayDataDTO)) {
             return false;
         }
-        DisplayDataInnerItemDTO that = (DisplayDataInnerItemDTO) o;
+        AdditionalDisplayDataDTO that = (AdditionalDisplayDataDTO) o;
         return Objects.equals(heading, that.heading) &&
                 Objects.equals(subHeading, that.subHeading) &&
                 Objects.equals(description, that.description) &&
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
deleted file mode 100644
index d1a1698cc..000000000
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/DisplayDataDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com).
- * <p>
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.validation.Valid;
-
-/**
- * Display data object for authorization UI consent retrieval.
- * Contains a list of display data sections.
- */
-public class DisplayDataDTO {
-
-    @Valid
-    private List<DisplayDataInnerItemDTO> items = new ArrayList<>();
-
-    public DisplayDataDTO() {
-    }
-
-    public List<DisplayDataInnerItemDTO> getItems() {
-        return items;
-    }
-
-    public void setItems(List<DisplayDataInnerItemDTO> items) {
-        this.items = items;
-    }
-
-    public DisplayDataDTO addItem(DisplayDataInnerItemDTO item) {
-        this.items.add(item);
-        return this;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof DisplayDataDTO)) {
-            return false;
-        }
-        DisplayDataDTO that = (DisplayDataDTO) o;
-        return Objects.equals(items, that.items);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(items);
-    }
-}
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
index 749f319ea..1f45e3a71 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
@@ -1,5 +1,7 @@
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 /**
@@ -15,7 +17,7 @@ public class PopulateConsentAuthorizeScreenDTO {
     private ConsumerDataDTO consumerData;
 
     @Valid
-    private DisplayDataDTO displayData;
+    private List<AdditionalDisplayDataDTO> additionalDisplayData;
 
     public ConsentDataDTO getConsentData() {
         return consentData;
@@ -33,11 +35,11 @@ public void setConsumerData(ConsumerDataDTO consumerData) {
         this.consumerData = consumerData;
     }
 
-    public DisplayDataDTO getDisplayData() {
-        return displayData;
+    public List<AdditionalDisplayDataDTO> getAdditionalDisplayData() {
+        return additionalDisplayData;
     }
 
-    public void setDisplayData(DisplayDataDTO displayData) {
-        this.displayData = displayData;
+    public void setAdditionalDisplayData(List<AdditionalDisplayDataDTO> additionalDisplayData) {
+        this.additionalDisplayData = additionalDisplayData;
     }
 }
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
index ee8e37754..e1ffefb81 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/util/ConsentAuthorizeConstants.java
@@ -52,7 +52,8 @@ public class ConsentAuthorizeConstants {
     public static final String HANDLE_ACCOUNT_SELECTION_SEPARATELY = "handleAccountSelectionSeparately";
     public static final String CONSUMER_ACCOUNTS = "consumerAccounts";
     public static final String UID = "uid";
-    public static final String DISPLAY_DATA = "displayData";
+    public static final String ADDITIONAL_DISPLAY_DATA = "additionalDisplayData";
+    public static final String ADDITIONAL_DISPLAY_SECTION_TAG = "additionalSections";
 
     // For payload to persist authorized consent
     public static final String REQUEST_PARAMETERS = "requestParameters";
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
index 5af8fd327..9752ad069 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authservlet/utils/Utils.java
@@ -205,13 +205,8 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
                     ConsentAuthorizeConstants.ACCOUNTS);
         }
 
-        Map<String, Object> displayDataObj =
-                (Map<String, Object>) dataSetMap.get(ConsentAuthorizeConstants.DISPLAY_DATA);
-
-        List<Map<String, Object>> displayDataItems = null;
-        if (displayDataObj != null) {
-            displayDataItems = (List<Map<String, Object>>) displayDataObj.get("items");
-        }
+        List<Map<String, Object>> sections =
+                (List<Map<String, Object>>) dataSetMap.get(ConsentAuthorizeConstants.ADDITIONAL_DISPLAY_DATA);
 
         attributeMap.put(ConsentAuthorizeConstants.BASIC_CONSENT_DATA, basicConsentData);
         attributeMap.put(ConsentAuthorizeConstants.PERMISSIONS, permissions);
@@ -225,8 +220,8 @@ private static void appendCustomizationAttributes(Map<String, Object> dataSetMap
         attributeMap.put(ConsentAuthorizeConstants.HAS_MULTIPLE_PERMISSIONS,
                 (permissions != null && permissions.size() > 1));
 
-        // multi section list for the UI
-        attributeMap.put("displayDataItems", displayDataItems);
+        // multisection list for the UI
+        attributeMap.put(ConsentAuthorizeConstants.ADDITIONAL_DISPLAY_SECTION_TAG, sections);
     }
 
     private static void appendI18nAttributes(Map<String, Object> dataSetMap, Map<String, Object> attributeMap) {
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index 54596bae7..80de9aa38 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -49,7 +49,7 @@
     session.setAttribute("handleAccountSelectionSeparately", request.getAttribute("handleAccountSelectionSeparately"));
     session.setAttribute("onFollowingAccounts", request.getAttribute("onFollowingAccounts"));
     session.setAttribute("buttonConfirm", request.getAttribute("buttonConfirm"));
-    session.setAttribute("displayDataItems", request.getAttribute("displayDataItems"));
+    session.setAttribute("additionalSections", request.getAttribute("additionalSections"));
 %>
 
 <html>
@@ -85,8 +85,8 @@
                                         </div>
                                     </div>
 
-                                    <c:if test="${not empty displayDataItems}">
-                                        <c:forEach var="section" items="${displayDataItems}">
+                                    <c:if test="${not empty additionalSections}">
+                                        <c:forEach var="section" items="${additionalSections}">
                                             <div class="form-group ui form select">
                                                 <hr class="separator">
 

From 78a334c977c25bf14010ce099fe4c120a6ffa670 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Sat, 21 Feb 2026 01:56:54 +0530
Subject: [PATCH 10/15] fix PR comments

---
 .../PopulateConsentAuthorizeScreenDTO.java      | 17 +++++++++++++++++
 .../src/main/webapp/css/custom-common.css       |  2 +-
 .../src/main/webapp/js/tooltip-functions.js     |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
index 1f45e3a71..784a91f83 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/PopulateConsentAuthorizeScreenDTO.java
@@ -1,3 +1,20 @@
+/**
+ * Copyright (c) 2025-2026, WSO2 LLC. (https://www.wso2.com).
+ * <p>
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.model;
 
 import java.util.List;
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
index 0164954c4..f0d330952 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
@@ -618,4 +618,4 @@ li.sub::before {
     color: #007bff;
     font-weight: bold;
     padding: 0 5px;
-}
\ No newline at end of file
+}
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index a6d7733f4..95f3a8fcc 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -42,4 +42,4 @@
             });
         }
     });
-})(window.jQuery);
\ No newline at end of file
+})(window.jQuery);

From 928c2db108b4fa42563c6230f065275fb442fe2a Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Tue, 24 Feb 2026 00:56:51 +0530
Subject: [PATCH 11/15] PR comment fix

---
 .../carbon-home/repository/conf/financial-services.xml      | 2 +-
 .../templates/repository/conf/financial-services.xml.j2     | 2 +-
 .../common/config/FinancialServicesConfigParser.java        | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
index 69796399f..e22913d16 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
@@ -39,7 +39,7 @@
             <RequestSignatureAlias>wso2carbon</RequestSignatureAlias>
             <JWTPayloadValidation>true</JWTPayloadValidation>
             <ResponsePayloadSigning>
-                <Enabled>false</Enabled>
+                <Enabled>true</Enabled>
             </ResponsePayloadSigning>
         </Validation>
         <AdminHandler>org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
index 0f4ed2c8c..2f52abd5c 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -137,7 +137,7 @@
                 {% if financial_services.consent.validation.response_payload_signing.enabled is defined %}
                 <Enabled>{{financial_services.consent.validation.response_payload_signing.enabled}}</Enabled>
                 {% else %}
-                <Enabled>false</Enabled>
+                <Enabled>true</Enabled>
                 {% endif %}
             </ResponsePayloadSigning>
         </Validation>
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
index c4f58eb3d..a3027804c 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
@@ -744,6 +744,12 @@ public String getConsentValidationConfig() {
         return source.map(String::trim).orElse("");
     }
 
+    /**
+     * Method to retrieve the configuration value indicating whether
+     * consent response payload signing is enabled.
+     *
+     * @return String value ("true" or "false") indicating the configuration state
+     */
     public String getResponsePayloadSigningConfig() {
 
         Optional<String> source = getConfigurationFromKeyAsString(

From 26a9221ad6ebd27154dee06b88e230c0c0482903 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Thu, 5 Mar 2026 15:04:18 +0530
Subject: [PATCH 12/15] removed the extra line

---
 .../authorize/impl/ExternalAPIConsentRetrievalStep.java        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
index ddea82d25..539554a3e 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/impl/ExternalAPIConsentRetrievalStep.java
@@ -164,7 +164,6 @@ public void execute(ConsentData consentData, JSONObject jsonObject) throws Conse
                         new JSONArray(objectMapper.writeValueAsString(responseDTO.getAdditionalDisplayData())));
             }
 
-
             // Set request parameters as metadata to be used in persistence extension
             consentData.addData(ConsentExtensionConstants.REQUEST_PARAMETERS, requestParameters);
 
@@ -266,6 +265,4 @@ private PopulateConsentAuthorizeScreenDTO callExternalService(
         JSONObject responseJson = new JSONObject(externalServiceResponse.getData().toString());
         return objectMapper.readValue(responseJson.toString(), PopulateConsentAuthorizeScreenDTO.class);
     }
-
-
 }

From dacfbd735fe73a0d97d29cfd8e279c489bf24289 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Tue, 10 Mar 2026 14:12:41 +0530
Subject: [PATCH 13/15] add per-account tooltip title and description in
 authorization screen

- Extend account model to carry tooltip title and description
- Render tooltip icon and hidden tooltip content for account entries
- Support tooltip content updates for select-based account picker
- Rename generic tooltip content class for reuse across tooltip scenarios
---
 .../authorize/model/AccountDTO.java           | 18 +++++
 .../src/main/webapp/css/custom-common.css     |  5 --
 .../src/main/webapp/fs_default.jsp            |  1 +
 .../webapp/fs_default_account_selection.jsp   |  2 +-
 .../webapp/includes/account-selection.jsp     | 42 +++++++---
 .../includes/accounts-with-permissions.jsp    | 26 ++++++-
 .../src/main/webapp/includes/accounts.jsp     | 13 +++-
 .../src/main/webapp/js/tooltip-functions.js   | 76 ++++++++++++++++---
 8 files changed, 151 insertions(+), 32 deletions(-)

diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AccountDTO.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AccountDTO.java
index 3020ae78d..73e67468c 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AccountDTO.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.consent.mgt.extensions/src/main/java/org/wso2/financial/services/accelerator/consent/mgt/extensions/authorize/model/AccountDTO.java
@@ -33,6 +33,8 @@ public class AccountDTO {
     @NotEmpty(message = "Display name in Account Object cannot be empty")
     private String displayName;
     private String accountId;
+    private String title;
+    private String description;
     
     private final Map<String, Object> additionalProperties = new HashMap<>();
 
@@ -52,6 +54,22 @@ public void setDisplayName(String displayName) {
         this.displayName = displayName;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
         return additionalProperties;
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
index f0d330952..d56f789e6 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
@@ -614,8 +614,3 @@ li.sub::before {
     z-index: 1060 !important;
 }
 
-#unavailablePopoverContentElement {
-    color: #007bff;
-    font-weight: bold;
-    padding: 0 5px;
-}
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default.jsp
index de7e749cd..e8e1d9409 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default.jsp
@@ -86,6 +86,7 @@
             </div>
 
             <jsp:include page="includes/footer.jsp"/>
+            <script src="js/tooltip-functions.js"></script>
         </div>
     </body>
 </html>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index 80de9aa38..e533e6fdc 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -96,7 +96,7 @@
 
                                                 <c:if test="${not empty section.subHeading}">
                                                     <div class="col-md-12 pb-1">
-                                                        <p class="unavailable-account-popover hide" style="text-align:left">
+                                                        <p class="tooltip-popover-content hide" style="text-align:left">
                                                             ${section.description}
                                                         </p>
 
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
index 9a045397d..703804ada 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
@@ -29,15 +29,28 @@
         <div class="${accountSelectorClass}">
             <c:forEach items="${consumerAccounts}" var="account" varStatus="accountIdx">
                 <%-- Display checkboxes for each account if multiple account selection is allowed --%>
-                <label for="<c:choose><c:when test='${not empty idSuffix}'>${account.displayName}-${idSuffix}</c:when><c:otherwise>${account.displayName}</c:otherwise></c:choose>">
-                    <input type="checkbox"
-                        id="<c:choose><c:when test='${not empty idSuffix}'>${account.displayName}-${idSuffix}</c:when><c:otherwise>${account.displayName}</c:otherwise></c:choose>"
-                        name="<c:choose><c:when test='${not empty idSuffix}'>accounts-${idSuffix}</c:when><c:otherwise>accounts</c:otherwise></c:choose>"
-                        value="${account.displayName}"
-                        <c:if test="${ignorePreSelect ne 'true' and account.selected}">checked</c:if>
-                    />
-                    ${account.displayName}
-                </label>
+                <div class="tooltip-content-wrapper">
+                    <c:if test="${not empty account.description}">
+                        <p class="tooltip-popover-content hide" style="text-align:left">
+                            ${account.description}
+                        </p>
+                    </c:if>
+                    <label for="<c:choose><c:when test='${not empty idSuffix}'>${account.displayName}-${idSuffix}</c:when><c:otherwise>${account.displayName}</c:otherwise></c:choose>">
+                        <input type="checkbox"
+                            id="<c:choose><c:when test='${not empty idSuffix}'>${account.displayName}-${idSuffix}</c:when><c:otherwise>${account.displayName}</c:otherwise></c:choose>"
+                            name="<c:choose><c:when test='${not empty idSuffix}'>accounts-${idSuffix}</c:when><c:otherwise>accounts</c:otherwise></c:choose>"
+                            value="${account.displayName}"
+                            <c:if test="${ignorePreSelect ne 'true' and account.selected}">checked</c:if>
+                        />
+                        ${account.displayName}
+                        <c:if test="${not empty account.description}">
+                            <a class="unavailable-popover-content-element"
+                               title="${account.title}"
+                               style="cursor: help; text-decoration: none;">&#9432;
+                            </a>
+                        </c:if>
+                    </label>
+                </div>
                 <br>
             </c:forEach>
         </div>
@@ -46,15 +59,22 @@
     <c:otherwise>
         <div class="${accountSelectorClass}">
             <%-- Display an account select for all accounts if multiple account selection is not allowed --%>
-            <select class="account-select"
+            <select class="account-select account-select-with-tooltip"
                 name="<c:choose><c:when test='${not empty idSuffix}'>accounts-${idSuffix}</c:when><c:otherwise>accounts</c:otherwise></c:choose>">
                 <option hidden disabled selected value>${defaultSelect}</option>
                 <c:forEach items="${consumerAccounts}" var="account" varStatus="accountIdx">
-                    <option value="${account.displayName}">
+                    <option value="${account.displayName}" data-tooltip-description="<c:out value='${account.description}'/>">
                         ${account['displayName']}
                     </option>
                 </c:forEach>
             </select>
+            <div class="account-select-tooltip-container" style="padding-top: 6px;">
+                <p class="tooltip-popover-content account-select-tooltip-content hide" style="text-align:left"></p>
+                <a class="unavailable-popover-content-element account-select-tooltip-trigger hide"
+                   title="${defaultSelect}"
+                   style="cursor: help; text-decoration: none;">&#9432;
+                </a>
+            </div>
         </div>
     </c:otherwise>
 </c:choose>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
index f5d31d427..14f963b52 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
@@ -36,7 +36,18 @@
                 <b>${onFollowingAccounts}</b>
                 <ul class="scopes-list padding">
                     <c:forEach items="${initiatedAccountsForConsent}" var="account">
-                        <li>${account.displayName}</li>
+                        <li class="tooltip-content-wrapper">
+                            ${account.displayName}
+                            <c:if test="${not empty account.description}">
+                                <p class="tooltip-popover-content hide" style="text-align:left">
+                                    ${account.description}
+                                </p>
+                                <a class="unavailable-popover-content-element"
+                                   title="${account.title}"
+                                   style="cursor: help; text-decoration: none;">&#9432;
+                                </a>
+                            </c:if>
+                        </li>
                     </c:forEach>
                 </ul>
             </c:when>
@@ -45,7 +56,18 @@
                 <b>${onFollowingAccounts}</b>
                 <ul class="scopes-list padding">
                     <c:forEach items="${permission.initiatedAccounts}" var="account">
-                        <li>${account.displayName}</li>
+                        <li class="tooltip-content-wrapper">
+                            ${account.displayName}
+                            <c:if test="${not empty account.description}">
+                                <p class="tooltip-popover-content hide" style="text-align:left">
+                                    ${account.description}
+                                </p>
+                                <a class="unavailable-popover-content-element"
+                                   title="${account.title}"
+                                   style="cursor: help; text-decoration: none;">&#9432;
+                                </a>
+                            </c:if>
+                        </li>
                     </c:forEach>
                 </ul>
             </c:when>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
index 7c5a3bd90..b6a1c26b1 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
@@ -31,7 +31,18 @@
         <b>
             <ul class="scopes-list padding padding-left-triple">
                 <c:forEach items="${initiatedAccountsForConsent}" var="account">
-                    <li>${account.displayName}</li>
+                    <li class="tooltip-content-wrapper">
+                        ${account.displayName}
+                        <c:if test="${not empty account.description}">
+                            <p class="tooltip-popover-content hide" style="text-align:left">
+                                ${account.description}
+                            </p>
+                            <a class="unavailable-popover-content-element"
+                               title="${account.title}"
+                               style="cursor: help; text-decoration: none;">&#9432;
+                            </a>
+                        </c:if>
+                    </li>
                 </c:forEach>
             </ul>
         </b>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index 95f3a8fcc..b51e035ff 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -21,24 +21,76 @@
        return;
     }
     $(document).ready(function () {
+        var getTooltipContent = function ($infoIcon) {
+            var $tooltipWrapper = $infoIcon.closest('.tooltip-content-wrapper, .pb-1, .account-select-tooltip-container');
+
+            if (!$tooltipWrapper.length) {
+                return $();
+            }
+
+            return $tooltipWrapper.find('.tooltip-popover-content').first();
+        };
+
+        var initializePopover = function ($infoIcon) {
+            var $hiddenContent = getTooltipContent($infoIcon);
+
+            if (!$hiddenContent.length || !$hiddenContent.text().trim()) {
+                return;
+            }
+
+            $infoIcon.popover({
+                html: true,
+                container: 'body',
+                placement: 'right',
+                trigger: 'hover focus',
+                content: function () {
+                    return $hiddenContent.html();
+                }
+            });
+        };
+
+        var updateAccountSelectTooltip = function ($accountSelect) {
+            var $tooltipContainer = $accountSelect.siblings('.account-select-tooltip-container');
+            if (!$tooltipContainer.length) {
+                return;
+            }
+
+            var $selectedOption = $accountSelect.find('option:selected');
+            var tooltipText = $selectedOption.data('tooltipDescription') || '';
+            var hasTooltipText = String(tooltipText).trim().length > 0;
+            var $tooltipContent = $tooltipContainer.find('.account-select-tooltip-content');
+            var $tooltipTrigger = $tooltipContainer.find('.account-select-tooltip-trigger');
+
+            $tooltipContent.text(tooltipText);
+            $tooltipTrigger.attr('title', $selectedOption.text());
+
+            if (hasTooltipText) {
+                if (!$tooltipTrigger.data('bs.popover')) {
+                    initializePopover($tooltipTrigger);
+                }
+                $tooltipTrigger.removeClass('hide');
+            } else {
+                $tooltipTrigger.popover('hide');
+                $tooltipTrigger.addClass('hide');
+            }
+        };
+
         var $infoIcons = $('.unavailable-popover-content-element');
+        var $accountSelects = $('.account-select-with-tooltip');
 
         if ($ && typeof $.fn.popover === 'function' && $infoIcons.length) {
             $infoIcons.each(function () {
-                var $infoIcon = $(this);
-                var $hiddenContent = $infoIcon.closest('.pb-1').find('.unavailable-account-popover');
+                initializePopover($(this));
+            });
+        }
 
-                if (!$hiddenContent.length) {
-                    return;
-                }
+        if ($accountSelects.length) {
+            $accountSelects.each(function () {
+                updateAccountSelectTooltip($(this));
+            });
 
-                $infoIcon.popover({
-                    html: true,
-                    container: 'body',
-                    placement: 'right',
-                    trigger: 'hover focus',
-                    content: $hiddenContent.html()
-                });
+            $accountSelects.on('change', function () {
+                updateAccountSelectTooltip($(this));
             });
         }
     });

From e47d000b7d86a54fde362c85abb0e7ff07510da6 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Thu, 12 Mar 2026 12:02:56 +0530
Subject: [PATCH 14/15] rename tooltip CSS classes to generic names

---
 .../src/main/webapp/css/custom-common.css          |  1 -
 .../main/webapp/fs_default_account_selection.jsp   |  4 ++--
 .../src/main/webapp/includes/account-selection.jsp | 14 +++++++-------
 .../webapp/includes/accounts-with-permissions.jsp  | 12 ++++++------
 .../src/main/webapp/includes/accounts.jsp          |  6 +++---
 .../src/main/webapp/js/tooltip-functions.js        | 14 +++++++-------
 6 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
index d56f789e6..3bfebbe98 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/css/custom-common.css
@@ -613,4 +613,3 @@ li.sub::before {
 .popover {
     z-index: 1060 !important;
 }
-
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
index e533e6fdc..920eb8220 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/fs_default_account_selection.jsp
@@ -96,13 +96,13 @@
 
                                                 <c:if test="${not empty section.subHeading}">
                                                     <div class="col-md-12 pb-1">
-                                                        <p class="tooltip-popover-content hide" style="text-align:left">
+                                                        <p class="fs-tooltip-content hide" style="text-align:left">
                                                             ${section.description}
                                                         </p>
 
                                                         <p>
                                                             ${section.subHeading}
-                                                            <a class="unavailable-popover-content-element"
+                                                            <a class="fs-tooltip-trigger"
                                                                title="${section.subHeading}"
                                                                style="cursor: help; text-decoration: none;">&#9432;</a>
                                                         </p>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
index 703804ada..e752c6417 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/account-selection.jsp
@@ -29,9 +29,9 @@
         <div class="${accountSelectorClass}">
             <c:forEach items="${consumerAccounts}" var="account" varStatus="accountIdx">
                 <%-- Display checkboxes for each account if multiple account selection is allowed --%>
-                <div class="tooltip-content-wrapper">
+                <div class="fs-tooltip-wrapper">
                     <c:if test="${not empty account.description}">
-                        <p class="tooltip-popover-content hide" style="text-align:left">
+                        <p class="fs-tooltip-content hide" style="text-align:left">
                             ${account.description}
                         </p>
                     </c:if>
@@ -44,7 +44,7 @@
                         />
                         ${account.displayName}
                         <c:if test="${not empty account.description}">
-                            <a class="unavailable-popover-content-element"
+                            <a class="fs-tooltip-trigger"
                                title="${account.title}"
                                style="cursor: help; text-decoration: none;">&#9432;
                             </a>
@@ -59,7 +59,7 @@
     <c:otherwise>
         <div class="${accountSelectorClass}">
             <%-- Display an account select for all accounts if multiple account selection is not allowed --%>
-            <select class="account-select account-select-with-tooltip"
+            <select class="account-select fs-select-with-tooltip"
                 name="<c:choose><c:when test='${not empty idSuffix}'>accounts-${idSuffix}</c:when><c:otherwise>accounts</c:otherwise></c:choose>">
                 <option hidden disabled selected value>${defaultSelect}</option>
                 <c:forEach items="${consumerAccounts}" var="account" varStatus="accountIdx">
@@ -68,9 +68,9 @@
                     </option>
                 </c:forEach>
             </select>
-            <div class="account-select-tooltip-container" style="padding-top: 6px;">
-                <p class="tooltip-popover-content account-select-tooltip-content hide" style="text-align:left"></p>
-                <a class="unavailable-popover-content-element account-select-tooltip-trigger hide"
+            <div class="fs-select-tooltip-container" style="padding-top: 6px;">
+                <p class="fs-tooltip-content fs-select-tooltip-content hide" style="text-align:left"></p>
+                <a class="fs-tooltip-trigger fs-select-tooltip-trigger hide"
                    title="${defaultSelect}"
                    style="cursor: help; text-decoration: none;">&#9432;
                 </a>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
index 14f963b52..108891706 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts-with-permissions.jsp
@@ -36,13 +36,13 @@
                 <b>${onFollowingAccounts}</b>
                 <ul class="scopes-list padding">
                     <c:forEach items="${initiatedAccountsForConsent}" var="account">
-                        <li class="tooltip-content-wrapper">
+                        <li class="fs-tooltip-wrapper">
                             ${account.displayName}
                             <c:if test="${not empty account.description}">
-                                <p class="tooltip-popover-content hide" style="text-align:left">
+                                <p class="fs-tooltip-content hide" style="text-align:left">
                                     ${account.description}
                                 </p>
-                                <a class="unavailable-popover-content-element"
+                                <a class="fs-tooltip-trigger"
                                    title="${account.title}"
                                    style="cursor: help; text-decoration: none;">&#9432;
                                 </a>
@@ -56,13 +56,13 @@
                 <b>${onFollowingAccounts}</b>
                 <ul class="scopes-list padding">
                     <c:forEach items="${permission.initiatedAccounts}" var="account">
-                        <li class="tooltip-content-wrapper">
+                        <li class="fs-tooltip-wrapper">
                             ${account.displayName}
                             <c:if test="${not empty account.description}">
-                                <p class="tooltip-popover-content hide" style="text-align:left">
+                                <p class="fs-tooltip-content hide" style="text-align:left">
                                     ${account.description}
                                 </p>
-                                <a class="unavailable-popover-content-element"
+                                <a class="fs-tooltip-trigger"
                                    title="${account.title}"
                                    style="cursor: help; text-decoration: none;">&#9432;
                                 </a>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
index b6a1c26b1..498526fef 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/includes/accounts.jsp
@@ -31,13 +31,13 @@
         <b>
             <ul class="scopes-list padding padding-left-triple">
                 <c:forEach items="${initiatedAccountsForConsent}" var="account">
-                    <li class="tooltip-content-wrapper">
+                    <li class="fs-tooltip-wrapper">
                         ${account.displayName}
                         <c:if test="${not empty account.description}">
-                            <p class="tooltip-popover-content hide" style="text-align:left">
+                            <p class="fs-tooltip-content hide" style="text-align:left">
                                 ${account.description}
                             </p>
-                            <a class="unavailable-popover-content-element"
+                            <a class="fs-tooltip-trigger"
                                title="${account.title}"
                                style="cursor: help; text-decoration: none;">&#9432;
                             </a>
diff --git a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
index b51e035ff..73e8b1e64 100644
--- a/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
+++ b/financial-services-accelerator/internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/src/main/webapp/js/tooltip-functions.js
@@ -22,13 +22,13 @@
     }
     $(document).ready(function () {
         var getTooltipContent = function ($infoIcon) {
-            var $tooltipWrapper = $infoIcon.closest('.tooltip-content-wrapper, .pb-1, .account-select-tooltip-container');
+            var $tooltipWrapper = $infoIcon.closest('.fs-tooltip-wrapper, .pb-1, .fs-select-tooltip-container');
 
             if (!$tooltipWrapper.length) {
                 return $();
             }
 
-            return $tooltipWrapper.find('.tooltip-popover-content').first();
+            return $tooltipWrapper.find('.fs-tooltip-content').first();
         };
 
         var initializePopover = function ($infoIcon) {
@@ -50,7 +50,7 @@
         };
 
         var updateAccountSelectTooltip = function ($accountSelect) {
-            var $tooltipContainer = $accountSelect.siblings('.account-select-tooltip-container');
+            var $tooltipContainer = $accountSelect.siblings('.fs-select-tooltip-container');
             if (!$tooltipContainer.length) {
                 return;
             }
@@ -58,8 +58,8 @@
             var $selectedOption = $accountSelect.find('option:selected');
             var tooltipText = $selectedOption.data('tooltipDescription') || '';
             var hasTooltipText = String(tooltipText).trim().length > 0;
-            var $tooltipContent = $tooltipContainer.find('.account-select-tooltip-content');
-            var $tooltipTrigger = $tooltipContainer.find('.account-select-tooltip-trigger');
+            var $tooltipContent = $tooltipContainer.find('.fs-select-tooltip-content');
+            var $tooltipTrigger = $tooltipContainer.find('.fs-select-tooltip-trigger');
 
             $tooltipContent.text(tooltipText);
             $tooltipTrigger.attr('title', $selectedOption.text());
@@ -75,8 +75,8 @@
             }
         };
 
-        var $infoIcons = $('.unavailable-popover-content-element');
-        var $accountSelects = $('.account-select-with-tooltip');
+        var $infoIcons = $('.fs-tooltip-trigger');
+        var $accountSelects = $('.fs-select-with-tooltip');
 
         if ($ && typeof $.fn.popover === 'function' && $infoIcons.length) {
             $infoIcons.each(function () {

From 0c4b8a2ac27cc5437b75e7206db0fda449a2a3d5 Mon Sep 17 00:00:00 2001
From: duleepa <duleepa24@gmail.com>
Date: Tue, 24 Mar 2026 19:15:53 +0530
Subject: [PATCH 15/15] added the changed accelerator-extensions swagger file

---
 .../apis/accelerator-extensions-v1.0.4.yaml   | 2573 +++++++++++++++++
 .../package-lock.json                         |  104 +-
 2 files changed, 2601 insertions(+), 76 deletions(-)
 create mode 100644 financial-services-accelerator/accelerators/fs-is/repository/resources/apis/accelerator-extensions-v1.0.4.yaml

diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/apis/accelerator-extensions-v1.0.4.yaml b/financial-services-accelerator/accelerators/fs-is/repository/resources/apis/accelerator-extensions-v1.0.4.yaml
new file mode 100644
index 000000000..cb71e931f
--- /dev/null
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/apis/accelerator-extensions-v1.0.4.yaml
@@ -0,0 +1,2573 @@
+openapi: 3.0.1
+info:
+  title: API contract for financial accelerator extension points in WSO2 IS and APIM
+  description: This API defines the REST API contract for services that implements logic to extend the Open Data accelerator flow.
+  contact:
+    name: WSO2
+    url: https://wso2.com/solutions/financial-services/open-banking/
+  license:
+    name: Apache 2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
+  version: v1.0.4
+servers:
+  - url: https://virtserver.swaggerhub.com/wso2-f5b/OB4/1.0.0
+    description: SwaggerHub API Auto Mocking
+security:
+  - BasicAuth: []
+  - OAuth2: []
+tags:
+  - name: Dynamic Client Registration
+    description: APIs for dynamically registering/updating client  related extensions
+  - name: Manual Client Registration
+    description: APIs for registering/updating applications through devportal related extensions
+  - name: Consent
+    description: APIs for consent flow extensions
+  - name: Token
+    description: APIs for token flow extensions
+  - name: Authorize
+    description: APIs for authorize flow extensions
+  - name: Error Handling
+    description: APIs for handling accelerator errors
+paths:
+  /map-accelerator-error-response:
+    post:
+      tags:
+        - Error Handling
+      summary: map accelerator level error formats to custom error formats
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ErrorMapperRequestBody'
+            example:
+              requestId: Ec1wMjmiG8
+              data:
+                error:
+                  code: "401"
+                  description: Invalid client ID provided.
+                  operation: consent_create
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForErrorMapper'
+              example:
+                responseId: Ec1wMjmiG8
+                errorCode: 400
+                data:
+                  customErrorCode: invalid
+                  customErrorDescription: Invalid client ID provided.
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /pre-process-client-creation:
+    post:
+      tags:
+        - Dynamic Client Registration
+      summary: handle pre validations & obtain custom data to store in dynamic client registration step
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ClientProcessRequestBody'
+            examples:
+              ProcessClientCreation:
+                summary: ProcessClientCreation
+                value:
+                  requestId: Ec1wMjmiG8
+                  data:
+                    clientData:
+                      key: value
+                    softwareStatement:
+                      key: value
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForClientProcess'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      clientData:
+                        key: value
+                failedExample:
+                  summary: Failed response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: ERROR
+                    errorCode: 401
+                    data:
+                      error: invalid_client_metadata
+                      errorDescription: Invalid scope values found
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /pre-process-client-update:
+    post:
+      tags:
+        - Dynamic Client Registration
+      summary: handle pre validations & obtain  custom data to store in dynamic client update step
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ClientProcessRequestBody'
+            examples:
+              ProcessClientUpdate:
+                summary: ProcessClientUpdate
+                value:
+                  requestId: Ec1wMjmiG8
+                  data:
+                    clientData:
+                      key: value
+                    softwareStatement:
+                      key: value
+                    existingClientData:
+                      key: value
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForClientProcess'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      clientData:
+                        key: value
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: invalid_client_metadata
+                      errorDescription: Invalid scope values found
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /pre-process-client-retrieval:
+    post:
+      tags:
+        - Dynamic Client Registration
+      summary: handle post dynamic client retrieval response generation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ClientProcessRequestBody'
+            examples:
+              ProcessClientRetrieval:
+                summary: ProcessClientRetrieval
+                value:
+                  requestId: Ec1wMjmiG8
+                  data:
+                    existingClientData:
+                      key: value
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForClientProcess'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      clientData:
+                        key: value
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: invalid_client_metadata
+                      errorDescription: Invalid scope values found
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /pre-process-application-creation:
+    post:
+      tags:
+        - Manual Client Registration
+      summary: handle pre validations & changes to the manual application creation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AppCreateProcessRequestBody'
+            examples:
+              ProcessApplicationCreation:
+                summary: ProcessApplicationCreation
+                value:
+                  requestId: Ec1wMjmiG8
+                  data:
+                    appData:
+                      key: value
+                    additionalProperties:
+                      key: value
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForApplicationCreation'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      clientId: value
+                      additionalAppData:
+                        key: value
+                failedExample:
+                  summary: Failed response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: ERROR
+                    errorMessage: Invalid certificate found
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /pre-process-application-update:
+    post:
+      tags:
+        - Manual Client Registration
+      summary: handle pre validations & changes to the manual client application update
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AppUpdateProcessRequestBody'
+            examples:
+              ProcessApplicationUpdate:
+                summary: ProcessApplicationUpdate
+                value:
+                  requestId: Ec1wMjmiG8
+                  data:
+                    appData:
+                      key: value
+                    additionalProperties:
+                      key: value
+                    existingAppData:
+                      key: value
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForApplicationUpdate'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      additionalAppData:
+                        key: value
+                failedExample:
+                  summary: Failed response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: ERROR
+                    errorMessage: Invalid certificate found
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /pre-process-consent-creation:
+    post:
+      tags:
+        - Consent
+      summary: handle pre validations & obtain custom consent data to be stored
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PreProcessConsentCreationRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForPreProcessConsentCreation'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /enrich-consent-creation-response:
+    post:
+      tags:
+        - Consent
+      summary: "handle post-consent generation -response generation,validations"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EnrichConsentCreationRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForResponseAlternation'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /pre-process-consent-file-upload:
+    post:
+      tags:
+        - Consent
+      summary: Handle pre validations related to file upload requests.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PreProcessFileUploadRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForPreProcessFileUpload'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /enrich-consent-file-response:
+    post:
+      tags:
+        - Consent
+      summary: Modify the response sent in the file upload request after successfully storing the file.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EnrichFileUploadResponseRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForResponseAlternation'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /pre-process-consent-retrieval:
+    post:
+      tags:
+        - Consent
+      summary: handle pre-consent retrieval validations
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PreProcessConsentRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForResponseAlternation'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /validate-consent-file-retrieval:
+    post:
+      tags:
+        - Consent
+      summary: Handle validations related to file retrieval and return a response
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PreProcessConsentRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /pre-process-consent-revoke:
+    post:
+      tags:
+        - Consent
+      summary: handle pre-consent revocation validations when a TPP calls consent /DELETE
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PreProcessConsentRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForConsentRevocation'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /enrich-consent-search-response:
+    post:
+      tags:
+        - Consent
+      summary: handle consent search required extension to fetch additional data
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EnrichConsentSearchRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForConsentSearch'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /populate-consent-authorize-screen:
+    post:
+      tags:
+        - Consent
+      summary: handle validations before consent  authorization and consent data to load in consent authorization UI
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PopulateConsentAuthorizeScreenRequestBody'
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForPopulateConsentAuthorizeScreen'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Permissions are missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /persist-authorized-consent:
+    post:
+      tags:
+        - Consent
+      summary: handle consent persistence logic and enrich response with user authorization and account mapping data
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PersistAuthorizedConsentRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForPersistAuthorizedConsent'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Bad Request
+                  errorDescription: Request does not comply with the schema
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: Internal server error
+                  errorDescription: Error occurred while handling the request
+  /validate-consent-access:
+    post:
+      tags:
+        - Consent
+      summary: handle custom consent data validations before data access
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValidateConsentAccessRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 401
+                    data:
+                      errorMessage: invalid_permissions
+                      errorDescription: "The requested  permissions are invalid, unknown"
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Permissions are missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: server_error
+                  errorDescription: Failed to process the response
+  /issue-refresh-token:
+    post:
+      tags:
+        - Token
+      summary: Handles refresh token issuance and validations
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/IssueRefreshTokenRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForIssueRefreshToken'
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Permissions are missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /validate-authorization-request:
+    post:
+      tags:
+        - Authorize
+      summary: Handles pre-user authorization requests
+      operationId: preUserAuthorization
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValidateAuthorizationRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForValidateAuthorizationRequest'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 401
+                    errorMessage: invalid_permissions
+                    errorDescription: "The requested  permissions are invalid, unknown"
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Permissions are missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /validate-event-subscription:
+    post:
+      tags:
+        - Event Subscription
+      summary: handle event subscription validations & storing data
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventSubscriptionRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForEventSubscriptionValidation'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                successExampleWithDetails:
+                  summary: Success response With Details
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      callbackUrl: https://test.com
+                      version: "3.1"
+                      eventTypes:
+                        - eventType
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: Invalid Request
+                      errorMessage: Invalid event subscription payload
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /enrich-event-subscription-response:
+    post:
+      tags:
+        - Event Subscription
+      summary: handle post event-subscription-creation response generation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventSubscriptionRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForEnrichEventSubscription'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      eventSubscriptionResponse: {}
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: Invalid Request
+                      errorMessage: Invalid event subscription payload
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /validate-event-creation:
+    post:
+      tags:
+        - Event Creation
+      summary: handle event creation validations & storing data
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventCreationRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForEventValidation'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: Invalid Request
+                      errorMessage: Invalid event creation payload
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /validate-event-polling:
+    post:
+      tags:
+        - Event Polling
+      summary: handle event polling validations & storing data
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventPollingRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForEventValidation'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: Invalid Request
+                      errorMessage: Invalid event polling payload
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                data:
+                  errorMessage: invalid_request
+                  errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+  /enrich-event-polling-response:
+    post:
+      tags:
+        - Event Polling
+      summary: handle post event-polling response generation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventPollingRequestBody'
+        required: true
+      responses:
+        "200":
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Response200ForEnrichEventPolling'
+              examples:
+                successExample:
+                  summary: Success response
+                  value:
+                    responseId: Ec1wMjmiG8
+                    status: SUCCESS
+                    data:
+                      eventPollingResponse: {}
+                failedExample:
+                  summary: Failed response
+                  value:
+                    status: ERROR
+                    errorCode: 400
+                    data:
+                      error: Invalid Request
+                      errorMessage: Invalid event polling payload
+        "400":
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: invalid_request
+                errorDescription: Data is missing
+        "500":
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+              example:
+                responseId: Ec1wMjmiG8
+                status: ERROR
+                errorMessage: server_error
+                errorDescription: Failed to process the response
+components:
+  schemas:
+    Response200ForErrorMapper:
+      type: object
+      required:
+        - responseId
+        - data
+      properties:
+        responseId:
+          type: string
+        errorCode:
+          type: integer
+        data:
+          type: object
+          description: Defines the custom error response.
+    ErrorMapperRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/ErrorMapperData'
+    ErrorMapperData:
+      type: object
+      properties:
+        error:
+          $ref: '#/components/schemas/Error'
+      description: Defines the context data related to the errors.
+    Error:
+      type: object
+      properties:
+        code:
+          type: string
+          description: Error code identifying the specific issue.
+        description:
+          type: string
+          description: Detailed description of the error.
+        operation:
+          type: string
+          description: The operation where the error occurred.
+      description: Defines an error object with details.
+    Request:
+      type: object
+      properties:
+        consentInitiationData:
+          type: object
+          description: The initiation payload used by third parties which includes detailed information on data access request.
+        requestHeaders:
+          $ref: '#/components/schemas/RequestHeaders'
+        consentResourcePath:
+          type: string
+          description: To identify requested consent type
+    RequestForEnrichConsentCreationResponse:
+      type: object
+      properties:
+        consentId:
+          type: string
+          description: To identify requested
+        consentResource:
+          $ref: '#/components/schemas/StoredDetailedConsentResourceData'
+        consentResourcePath:
+          type: string
+          description: consent resource path
+    RequestForPreProcessFileUpload:
+      type: object
+      properties:
+        consentId:
+          type: string
+          description: To identify requested
+        consentResource:
+          $ref: '#/components/schemas/StoredDetailedConsentResourceData'
+        fileContent:
+          type: string
+          description: content of the uploaded file
+        consentResourcePath:
+          type: string
+          description: consent resource path
+        requestHeaders:
+          $ref: '#/components/schemas/RequestHeaders'
+    RequestForEnrichFileUploadResponse:
+      type: object
+      properties:
+        consentId:
+          type: string
+          description: To identify consent.
+        fileUploadCreatedTime:
+          type: string
+          description: Timestamp which the file was stored in the database.
+    PreProcessConsentRetrievalData:
+      type: object
+      properties:
+        consentId:
+          type: string
+          description: The consent id
+        consentResource:
+          $ref: '#/components/schemas/StoredBasicConsentResourceData'
+        requestHeaders:
+          $ref: '#/components/schemas/RequestHeaders'
+        consentResourcePath:
+          type: string
+          description: Resource url
+    ConsentSearchData:
+      type: object
+      properties:
+        searchType:
+          type: string
+          enum:
+            - BULK_SEARCH
+            - AMENDMENT_HISTORY
+        searchResult:
+          type: object
+          description: payload
+        enrichmentParams:
+          type: object
+          description: query params
+    PopulateConsentAuthorizeScreenData:
+      type: object
+      properties:
+        consentId:
+          type: string
+          example: An UUID
+        userId:
+          type: string
+          example: Username
+        requestParameters:
+          type: object
+          description: Custom object with request parameters
+        consentResource:
+          $ref: '#/components/schemas/StoredDetailedConsentResourceData'
+    ValidateConsentAccessData:
+      type: object
+      properties:
+        consentId:
+          type: string
+          description: The consent id
+        consentResource:
+          $ref: '#/components/schemas/StoredDetailedConsentResourceData'
+        dataRequestPayload:
+          type: object
+          description: The receipt used by Third parties which includes detailed information on data access request
+    SuccessResponse:
+      type: object
+      required:
+        - responseId
+        - status
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+    SuccessResponseConsentRevocation:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseConsentRevocationData'
+    SuccessResponsePopulateConsentAuthorizeScreen:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponsePopulateConsentAuthorizeScreenData'
+    SuccessResponseForResponseAlternation:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseForResponseAlternationData'
+    SuccessResponseForConsentSearch:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseForConsentSearchData'
+    SuccessResponsePreProcessConsentCreation:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseWithDetailedConsentData'
+    SuccessResponsePreProcessFileUpload:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponsePreProcessFileUploadData'
+    FailedResponse:
+      required:
+        - responseId
+        - data
+        - errorCode
+        - status
+      type: object
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          description: "Indicates the outcome of the request. For a failed operation, this should be set to ERROR."
+          enum:
+            - ERROR
+        errorCode:
+          type: integer
+          description: If any HTTP error code to return.
+        data:
+          type: object
+          description: :"Custom error object to response back"
+    FailedResponseInConsentAuthorize:
+      type: object
+      required:
+        - responseId
+        - data
+        - status
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          description: "Indicates the outcome of the request. For a failed operation, this should be set to ERROR."
+          enum:
+            - ERROR
+        data:
+          $ref: '#/components/schemas/FailedResponseInConsentAuthorizeData'
+    FailedResponseInConsentAuthorizeData:
+      required:
+        - errorMessage
+      type: object
+      properties:
+        errorMessage:
+          type: string
+          description: Error message to be displayed in the URL
+        newConsentStatus:
+          type: string
+          description: New consent status to be set to the consent
+    ErrorResponse:
+      required:
+        - data
+        - status
+      type: object
+      properties:
+        status:
+          type: string
+          description: "Indicates the outcome of the request. For an error operation, this should be set to ERROR."
+          enum:
+            - ERROR
+        data:
+          type: object
+          description: :"Custom error object to response back"
+    PreProcessConsentCreationRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/Request'
+    EnrichConsentCreationRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/RequestForEnrichConsentCreationResponse'
+    EnrichFileUploadResponseRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/RequestForEnrichFileUploadResponse'
+    PreProcessFileUploadRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/RequestForPreProcessFileUpload'
+    PreProcessConsentRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/PreProcessConsentRetrievalData'
+    EnrichConsentSearchRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/ConsentSearchData'
+    PopulateConsentAuthorizeScreenRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/PopulateConsentAuthorizeScreenData'
+    ValidateConsentAccessRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/ValidateConsentAccessData'
+    IssueRefreshTokenRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/IssueRefreshTokenRequestData'
+    IssueRefreshTokenRequestData:
+      type: object
+      properties:
+        grantType:
+          type: string
+          example: authorization_code
+        consentCreatedTime:
+          type: integer
+          format: int64
+        consentValidityPeriod:
+          type: integer
+          format: int64
+        defaultRefreshTokenValidityPeriod:
+          type: integer
+          format: int64
+    Response200ForPreProcessConsentCreation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponsePreProcessConsentCreation'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForPreProcessFileUpload:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponsePreProcessFileUpload'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForResponseAlternation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseForResponseAlternation'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForConsentSearch:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseForConsentSearch'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponse'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForIssueRefreshToken:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseIssueRefreshToken'
+        - $ref: '#/components/schemas/FailedResponse'
+    SuccessResponseIssueRefreshToken:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseIssueRefreshTokenData'
+    SuccessResponseIssueRefreshTokenData:
+      type: object
+      properties:
+        issueRefreshToken:
+          type: boolean
+        refreshTokenValidityPeriod:
+          type: integer
+          format: int64
+    Response200ForValidateAuthorizationRequest:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponse'
+        - $ref: '#/components/schemas/FailedResponse'
+    ValidateAuthorizationRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/ValidateAuthorizationRequestBodyData'
+    ValidateAuthorizationRequestBodyData:
+      type: object
+      properties:
+        requestObject:
+          type: object
+      description: full request object
+    Response200ForConsentRevocation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseConsentRevocation'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForPopulateConsentAuthorizeScreen:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponsePopulateConsentAuthorizeScreen'
+        - $ref: '#/components/schemas/FailedResponseInConsentAuthorize'
+    SuccessResponseConsentRevocationData:
+      type: object
+      properties:
+        revocationStatusName:
+          type: string
+          description: Name for the revoked status
+        requireTokenRevocation:
+          type: string
+          description: Require access token to be revoked
+    SuccessResponseForResponseAlternationData:
+      type: object
+      properties:
+        responseHeaders:
+          type: object
+          description: Headers to be included in the response.
+        modifiedResponse:
+          type: object
+          description: Generated custom response body
+    SuccessResponseForConsentSearchData:
+      type: object
+      properties:
+        enrichedSearchResult:
+          type: object
+          description: Enriched search result
+    SuccessResponseWithDetailedConsentData:
+      type: object
+      properties:
+        consentResource:
+          $ref: '#/components/schemas/DetailedConsentResourceData'
+    SuccessResponsePreProcessFileUploadData:
+      type: object
+      properties:
+        consentStatus:
+          type: string
+          description: "New consent status after the file upload is successful."
+        userId:
+          type: string
+          description: "Id of the user doing the file upload. Used for auditing purposes."
+    PersistAuthorizedConsentRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/PersistAuthorizedConsent'
+    PersistAuthorizedConsent:
+      type: object
+      properties:
+        consentId:
+          type: string
+        isApproved:
+          type: boolean
+        userGrantedData:
+          $ref: '#/components/schemas/UserGrantedData'
+        consentResource:
+          $ref: '#/components/schemas/StoredDetailedConsentResourceData'
+    UserGrantedData:
+      type: object
+      properties:
+        requestParameters:
+          type: object
+        authorizedResources:
+          $ref: '#/components/schemas/AuthorizedResources'
+        userId:
+          type: string
+    Response200ForPersistAuthorizedConsent:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponsePersistAuthorizedConsent'
+        - $ref: '#/components/schemas/FailedResponseInConsentAuthorize'
+    SuccessResponsePersistAuthorizedConsent:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          oneOf:
+            - $ref: '#/components/schemas/SuccessResponseWithDetailedConsentData'
+            - $ref: '#/components/schemas/SuccessResponseWithDetailedConsentDataAndAmendments'
+    SuccessResponseWithDetailedConsentDataAndAmendments:
+      type: object
+      properties:
+        consentResource:
+          $ref: '#/components/schemas/DetailedConsentResourceDataWithAmendments'
+    DetailedConsentResourceData:
+      type: object
+      properties:
+        type:
+          type: string
+        status:
+          type: string
+        validityTime:
+          type: integer
+          format: int64
+        recurringIndicator:
+          type: boolean
+        frequency:
+          type: integer
+        receipt:
+          type: object
+        attributes:
+          type: object
+        authorizations:
+          type: array
+          items:
+            $ref: '#/components/schemas/Authorization'
+    DetailedConsentResourceDataWithAmendments:
+      type: object
+      properties:
+        type:
+          type: string
+        status:
+          type: string
+        validityTime:
+          type: integer
+          format: int64
+        recurringIndicator:
+          type: boolean
+        frequency:
+          type: integer
+        receipt:
+          type: object
+        attributes:
+          type: object
+        authorizations:
+          type: array
+          items:
+            $ref: '#/components/schemas/Authorization'
+        amendments:
+          type: array
+          items:
+            $ref: '#/components/schemas/AmendedAuthorization'
+    StoredBasicConsentResourceData:
+      type: object
+      properties:
+        id:
+          type: string
+        receipt:
+          type: object
+        createdTime:
+          type: integer
+          format: int32
+        updatedTime:
+          type: integer
+          format: int32
+        clientId:
+          type: string
+        type:
+          type: string
+        status:
+          type: string
+        frequency:
+          type: integer
+        validityTime:
+          type: integer
+          format: int32
+        recurringIndicator:
+          type: boolean
+        attributes:
+          type: object
+    StoredDetailedConsentResourceData:
+      type: object
+      properties:
+        id:
+          type: string
+        receipt:
+          type: object
+        createdTime:
+          type: integer
+          format: int32
+        updatedTime:
+          type: integer
+          format: int32
+        clientId:
+          type: string
+        type:
+          type: string
+        status:
+          type: string
+        frequency:
+          type: integer
+        validityTime:
+          type: integer
+          format: int32
+        recurringIndicator:
+          type: boolean
+        attributes:
+          type: object
+        authorizations:
+          type: array
+          items:
+            $ref: '#/components/schemas/StoredAuthorization'
+        fileContent:
+          type: string
+    Authorization:
+      type: object
+      properties:
+        userId:
+          type: string
+        type:
+          type: string
+        status:
+          type: string
+        resources:
+          type: array
+          items:
+            $ref: '#/components/schemas/Resource'
+    AmendedAuthorization:
+      type: object
+      properties:
+        id:
+          type: string
+        type:
+          type: string
+        status:
+          type: string
+        resources:
+          type: array
+          items:
+            $ref: '#/components/schemas/Resource'
+        amendedResources:
+          type: array
+          items:
+            $ref: '#/components/schemas/AmendedResource'
+    StoredAuthorization:
+      type: object
+      properties:
+        id:
+          type: string
+        userId:
+          type: string
+        type:
+          type: string
+        status:
+          type: string
+        resources:
+          type: array
+          items:
+            $ref: '#/components/schemas/StoredResource'
+    Resource:
+      type: object
+      properties:
+        accountId:
+          type: string
+        permission:
+          type: string
+        status:
+          type: string
+    AmendedResource:
+      type: object
+      properties:
+        id:
+          type: string
+        permission:
+          type: string
+        status:
+          type: string
+    StoredResource:
+      type: object
+      properties:
+        id:
+          type: string
+        accountId:
+          type: string
+        permission:
+          type: string
+        status:
+          type: string
+    Response200ForClientProcess:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseClientProcess'
+        - $ref: '#/components/schemas/FailedResponseClientProcess'
+    ClientProcessRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/ClientProcessData'
+    ClientProcessData:
+      type: object
+      properties:
+        clientData:
+          type: object
+          description: Client Registration Data. Mandatory for pre-process-client-creation and pre-process-client-update.
+        softwareStatement:
+          type: object
+          description: "Parameters of the decoded SSA. Mandatory for pre-process-client-creation, pre-process-client-update and pre-process-client-retrieval."
+        existingClientData:
+          type: object
+          description: properties of the existing client application. Mandatory for pre-process-client-update.
+      description: Defines the context data related to the client registration.
+    SuccessResponseClientProcess:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseClientProcess_data'
+    SuccessResponseClientProcess_data:
+      type: object
+      properties:
+        clientData:
+          type: object
+      description: Defines the success response.
+    FailedResponseClientProcess:
+      required:
+        - data
+        - status
+      type: object
+      properties:
+        status:
+          type: string
+          description: "Indicates the outcome of the request. For a failed operation, this should be set to ERROR."
+          enum:
+            - ERROR
+        errorCode:
+          type: integer
+          description: If any HTTP error code to return.
+        data:
+          $ref: '#/components/schemas/FailedResponseClientProcess_data'
+    FailedResponseClientProcess_data:
+      type: object
+      properties:
+        error:
+          type: string
+          description: Provides the error code for error.
+          enum:
+            - invalid_client_metadata
+            - invalid_redirect_uri
+            - invalid_software_statement
+        errorDescription:
+          type: string
+          description: Offers a detailed explanation of the error.
+    EventSubscriptionRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/EventSubscriptionRequest'
+    EventSubscriptionRequest:
+      type: object
+      properties:
+        eventType:
+          type: string
+          enum:
+            - SubscriptionCreation
+            - SingleSubscriptionRetrieval
+            - BulkSubscriptionRetrieval
+            - SubscriptionRetrievalForEventTypes
+            - SubscriptionUpdate
+            - SubscriptionDelete
+        eventSubscriptionData:
+          type: object
+          description: Event Subscription Payload
+    EventCreationRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/EventCreationRequest'
+    EventCreationRequest:
+      type: object
+      properties:
+        eventData:
+          type: object
+          description: Event creation Payload
+    EventPollingRequestBody:
+      type: object
+      required:
+        - requestId
+        - data
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/EventPollingRequest'
+    EventPollingRequest:
+      type: object
+      properties:
+        eventPollingData:
+          type: object
+          description: Event polling data
+    Response200ForEventSubscriptionValidation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponse'
+        - $ref: '#/components/schemas/SuccessResponseForEventWithDetails'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForEventValidation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponse'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForEnrichEventSubscription:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseForEnrichEventSubscription'
+        - $ref: '#/components/schemas/FailedResponse'
+    Response200ForEnrichEventPolling:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseForEnrichEventPolling'
+        - $ref: '#/components/schemas/FailedResponse'
+    SuccessResponseForEventWithDetails:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseForEventWithDetails_data'
+    SuccessResponseForEventWithDetails_data:
+      type: object
+      properties:
+        callbackUrl:
+          type: string
+        version:
+          type: string
+        eventTypes:
+          type: array
+          items:
+            type: string
+    SuccessResponseForEnrichEventSubscription:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseForEnrichEventSubscription_data'
+    SuccessResponseForEnrichEventSubscription_data:
+      type: object
+      properties:
+        eventSubscriptionResponse:
+          type: object
+          description: Event Subscription Response
+    SuccessResponseForEnrichEventPolling:
+      type: object
+      required:
+        - responseId
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseForEnrichEventPolling_data'
+    SuccessResponseForEnrichEventPolling_data:
+      type: object
+      properties:
+        eventPollingResponse:
+          type: object
+          description: Event Polling Response
+    RequestHeaders:
+      type: object
+      description: Request headers sent by the TPP. Filtered set of headers are sent to the external service.
+    SuccessResponsePopulateConsentAuthorizeScreenData:
+      type: object
+      properties:
+        consentData:
+          type: object
+          additionalProperties: true
+          properties:
+            type:
+              type: string
+              description: The type of consent
+            basicConsentData:
+              type: object
+              description: Structured descriptive text shown on the consent page, split into sections. Each key is a section title, and its value is a list of bullet points displayed under that section.
+              additionalProperties:
+                items:
+                  type: string
+            permissions:
+              type: array
+              description: List of permissions for the consent (optional)
+              items:
+                type: object
+                required:
+                  - uid
+                  - displayValues
+                properties:
+                  uid:
+                    type: string
+                    description: Unique ID for the permission
+                  displayValues:
+                    type: array
+                    description: Permission display values
+                    items:
+                      type: string
+                  initiatedAccounts:
+                    type: array
+                    description: Accounts initiated with this permission
+                    items:
+                      $ref: '#/components/schemas/Account'
+            initiatedAccountsForConsent:
+              type: array
+              description: Initialized accounts for the overall consent (optional)
+              items:
+                $ref: '#/components/schemas/Account'
+            allowMultipleAccounts:
+              type: boolean
+              description: Indicates if multiple consumer accounts can be selected per consent / permission
+            handleAccountSelectionSeparately:
+              type: boolean
+              description: Indicates if account selection must be handled separately in the UI
+            isReauthorization:
+              type: boolean
+              description: Indicates if this is a reauthorization flow (optional)
+            consentMetadata:
+              type: object
+              description: Hidden consent metadata to be forwarded to consent persistence.
+        consumerData:
+          type: object
+          additionalProperties: true
+          description: Consumer related data fetched from the banking backend.
+          properties:
+            accounts:
+              type: array
+              description: List of all user accounts/resources selectable in the UI
+              items:
+                type: object
+                required:
+                  - displayName
+                  - selected
+                allOf:
+                  - $ref: '#/components/schemas/Account'
+                properties:
+                  selected:
+                    type: boolean
+                    description: Whether the account is selected by default
+        additionalDisplayData:
+          type: array
+          description: Additional display data sections for the authorization screen
+          items:
+            $ref: '#/components/schemas/AdditionalDisplayDataSection'
+
+    AdditionalDisplayDataSection:
+      type: object
+      description: A section of additional display data with heading, subheading, description and display list
+      properties:
+        heading:
+          type: string
+          description: Section heading
+        subHeading:
+          type: string
+          description: Section sub-heading
+        description:
+          type: string
+          description: Descriptive text displayed in a tooltip adjacent to the sub-heading
+        displayList:
+          type: array
+          description: List of display items
+          items:
+            $ref: '#/components/schemas/DisplayListItem'
+
+    DisplayListItem:
+      type: object
+      description: Individual display list item
+      properties:
+        displayText:
+          type: string
+          description: Text to display in the list
+      required:
+        - displayText
+
+    AuthorizedResources:
+      type: object
+      additionalProperties: true
+      properties:
+        approval:
+          type: boolean
+          description: Whether the user approved the consent
+        isReauthorization:
+          type: boolean
+          description: Indicates if this was a reauthorization flow (optional)
+        type:
+          type: string
+          description: Type of consent granted (e.g., 'accounts', 'payments', etc.)
+        authorizedData:
+          type: array
+          description: List of granted permissions and corresponding user-selected account data
+          items:
+            type: object
+            required:
+              - accounts
+            properties:
+              permissions:
+                type: array
+                description: Granted permissions (optional if no permissions exist)
+                items:
+                  type: string
+              accounts:
+                type: array
+                description: Accounts selected for the permissions
+                items:
+                  $ref: '#/components/schemas/Account'
+        metadata:
+          type: object
+          description: Consent authorization related metadata.
+    Account:
+      type: object
+      description: A user account or resource representation
+      required:
+        - displayName
+      properties:
+        displayName:
+          type: string
+          description: Account display name
+        title:
+          type: string
+          description: Account title
+        description:
+          type: string
+          description: Account description
+      additionalProperties: true
+
+    AppCreateProcessRequestBody:
+      type: object
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/AppCreateProcessData'
+    AppCreateProcessData:
+      type: object
+      required:
+        - appData
+        - additionalProperties
+      properties:
+        appData:
+          type: object
+          description: OAuth Application Data. Mandatory for pre-process-application-creation.
+        additionalProperties:
+          type: object
+          description: Additional properties retrieved from devportal UI. Mandatory for pre-process-application-creation.
+      description: Defines the context data related to the application registration.
+    AppUpdateProcessRequestBody:
+      type: object
+      properties:
+        requestId:
+          type: string
+          description: A unique correlation identifier
+          example: Ec1wMjmiG8
+        data:
+          $ref: '#/components/schemas/AppUpdateProcessData'
+    AppUpdateProcessData:
+      type: object
+      required:
+        - appData
+        - additionalProperties
+        - existingAppData
+      properties:
+        appData:
+          type: object
+          description: OAuth Application Data. Mandatory for pre-process-application-update.
+        additionalProperties:
+          type: object
+          description: Additional properties retrieved from devportal UI. Mandatory for pre-process-application-update.
+        existingAppData:
+          type: object
+          description: Existing OAuth Application Data. Mandatory for pre-process-application-update.
+      description: Defines the context data related to the application update.
+    Response200ForApplicationCreation:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseApplicationCreation'
+        - $ref: '#/components/schemas/FailedResponseApplicationProcess'
+    SuccessResponseApplicationCreation:
+      type: object
+      required:
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseApplicationCreation_data'
+    SuccessResponseApplicationCreation_data:
+      type: object
+      properties:
+        clientId:
+          type: string
+          description: Unique id to be stored as the clientId
+        additionalAppData:
+          type: object
+          description: Defines the additional properties to store against the application.
+    Response200ForApplicationUpdate:
+      oneOf:
+        - $ref: '#/components/schemas/SuccessResponseApplicationUpdate'
+        - $ref: '#/components/schemas/FailedResponseApplicationProcess'
+    SuccessResponseApplicationUpdate:
+      type: object
+      required:
+        - status
+        - data
+      properties:
+        responseId:
+          type: string
+        status:
+          type: string
+          enum:
+            - SUCCESS
+        data:
+          $ref: '#/components/schemas/SuccessResponseApplicationUpdate_data'
+    SuccessResponseApplicationUpdate_data:
+      type: object
+      properties:
+        additionalAppData:
+          type: object
+          description: Defines the additional properties to store against the application.
+    FailedResponseApplicationProcess:
+      required:
+        - data
+        - status
+      type: object
+      properties:
+        status:
+          type: string
+          description: "Indicates the outcome of the request. For a failed operation, this should be set to ERROR."
+          enum:
+            - ERROR
+        errorMessage:
+          $ref: '#/components/schemas/FailedResponseApplicationProcessData'
+    FailedResponseApplicationProcessData:
+      required:
+        - errorMessage
+      type: object
+      properties:
+        errorMessage:
+          type: string
+          description: Error message to be returned
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+    OAuth2:
+      type: oauth2
+      flows:
+        clientCredentials:
+          tokenUrl: https://example.com/oauth/token
+          scopes:
+            process: process request generate response
diff --git a/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json b/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
index 1cde115f9..55a3f0417 100644
--- a/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
+++ b/financial-services-accelerator/react-apps/self-care-portal/self-care-portal-frontend/package-lock.json
@@ -97,7 +97,6 @@
       "version": "7.20.12",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
       "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -1975,7 +1974,6 @@
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
       "integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==",
       "hasInstallScript": true,
-      "peer": true,
       "dependencies": {
         "@fortawesome/fontawesome-common-types": "^0.2.32"
       },
@@ -3156,7 +3154,6 @@
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -3783,7 +3780,6 @@
       "version": "19.2.7",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -4031,7 +4027,6 @@
       "version": "4.41.40",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
       "integrity": "sha512-u6kMFSBM9HcoTpUXnL6mt2HSzftqb3JgYV6oxIgL2dl6sX6aCa5k6SOkzv5DuZjBTPUE/dJltKtwwuqrkZHpfw==",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "@types/tapable": "^1",
@@ -4085,7 +4080,6 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
       "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "4.33.0",
         "@typescript-eslint/scope-manager": "4.33.0",
@@ -4151,7 +4145,6 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
       "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "4.33.0",
         "@typescript-eslint/types": "4.33.0",
@@ -4569,7 +4562,6 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4649,7 +4641,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5283,7 +5274,6 @@
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -6246,7 +6236,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -7803,7 +7792,6 @@
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
       "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
-      "peer": true,
       "engines": {
         "node": ">=0.11"
       },
@@ -8840,7 +8828,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -8971,7 +8958,6 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz",
       "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==",
-      "peer": true,
       "dependencies": {
         "lodash": "^4.17.15",
         "string-natural-compare": "^3.0.1"
@@ -8987,7 +8973,6 @@
       "version": "2.32.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -9039,7 +9024,6 @@
       "version": "24.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
       "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       },
@@ -9060,7 +9044,6 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
       "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
-      "peer": true,
       "dependencies": {
         "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
@@ -9097,7 +9080,6 @@
       "version": "7.37.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
       "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
-      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -9129,7 +9111,6 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
       "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -9168,7 +9149,6 @@
       "version": "3.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz",
       "integrity": "sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA==",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^3.10.1"
       },
@@ -12706,7 +12686,6 @@
       "version": "26.6.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.0.tgz",
       "integrity": "sha512-jxTmrvuecVISvKFFhOkjsWRZV7sFqdSUAd1ajOKY+/QE/aLBVstsJ/dX8GczLzwiT6ZEwwmZqtCUHLHHQVzcfA==",
-      "peer": true,
       "dependencies": {
         "@jest/core": "^26.6.0",
         "import-local": "^3.0.2",
@@ -18196,7 +18175,6 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -18461,7 +18439,6 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
       "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -18737,7 +18714,6 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -18766,7 +18742,8 @@
     "node_modules/react-is": {
       "version": "19.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
-      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA=="
+      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
+      "peer": true
     },
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
@@ -18815,7 +18792,6 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
       "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -19989,6 +19965,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-scripts/node_modules/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/react-scripts/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -20023,7 +20012,6 @@
       "version": "4.44.2",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
       "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.9.0",
         "@webassemblyjs/helper-module-context": "1.9.0",
@@ -20090,7 +20078,6 @@
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
       "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
-      "peer": true,
       "dependencies": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
@@ -21060,7 +21047,6 @@
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
       "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/node": "*",
@@ -21676,7 +21662,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -22398,7 +22383,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
       "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-      "peer": true,
       "dependencies": {
         "debug": "^3.2.5",
         "eventsource": "^1.0.7",
@@ -23124,7 +23108,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz",
       "integrity": "sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==",
-      "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -24867,7 +24850,6 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -24915,7 +24897,6 @@
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
       "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.0.1",
@@ -25142,7 +25123,6 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -25260,7 +25240,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -25913,7 +25892,6 @@
       "version": "7.20.12",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
       "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
-      "peer": true,
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -27156,7 +27134,6 @@
       "version": "1.2.32",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
       "integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==",
-      "peer": true,
       "requires": {
         "@fortawesome/fontawesome-common-types": "^0.2.32"
       }
@@ -28020,7 +27997,6 @@
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
-      "peer": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -28584,7 +28560,6 @@
       "version": "19.2.7",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
-      "peer": true,
       "requires": {
         "csstype": "^3.2.2"
       }
@@ -28807,7 +28782,6 @@
       "version": "4.41.40",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.40.tgz",
       "integrity": "sha512-u6kMFSBM9HcoTpUXnL6mt2HSzftqb3JgYV6oxIgL2dl6sX6aCa5k6SOkzv5DuZjBTPUE/dJltKtwwuqrkZHpfw==",
-      "peer": true,
       "requires": {
         "@types/node": "*",
         "@types/tapable": "^1",
@@ -28860,7 +28834,6 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
       "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
-      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "4.33.0",
         "@typescript-eslint/scope-manager": "4.33.0",
@@ -28896,7 +28869,6 @@
       "version": "4.33.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
       "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
-      "peer": true,
       "requires": {
         "@typescript-eslint/scope-manager": "4.33.0",
         "@typescript-eslint/types": "4.33.0",
@@ -29239,8 +29211,7 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "peer": true
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -29297,7 +29268,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "peer": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -29773,7 +29743,6 @@
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "peer": true,
       "requires": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -30579,7 +30548,6 @@
       "version": "4.28.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz",
       "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
-      "peer": true,
       "requires": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -31771,8 +31739,7 @@
     "date-fns": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
-      "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
-      "peer": true
+      "integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA=="
     },
     "debug": {
       "version": "4.4.3",
@@ -32575,7 +32542,6 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "peer": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -32765,7 +32731,6 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz",
       "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==",
-      "peer": true,
       "requires": {
         "lodash": "^4.17.15",
         "string-natural-compare": "^3.0.1"
@@ -32775,7 +32740,6 @@
       "version": "2.32.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
-      "peer": true,
       "requires": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -32820,7 +32784,6 @@
       "version": "24.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
       "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
-      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       }
@@ -32829,7 +32792,6 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
       "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
-      "peer": true,
       "requires": {
         "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
@@ -32859,7 +32821,6 @@
       "version": "7.37.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
       "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
-      "peer": true,
       "requires": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -32905,14 +32866,12 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
       "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
-      "peer": true,
       "requires": {}
     },
     "eslint-plugin-testing-library": {
       "version": "3.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz",
       "integrity": "sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA==",
-      "peer": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^3.10.1"
       },
@@ -35385,7 +35344,6 @@
       "version": "26.6.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.0.tgz",
       "integrity": "sha512-jxTmrvuecVISvKFFhOkjsWRZV7sFqdSUAd1ajOKY+/QE/aLBVstsJ/dX8GczLzwiT6ZEwwmZqtCUHLHHQVzcfA==",
-      "peer": true,
       "requires": {
         "@jest/core": "^26.6.0",
         "import-local": "^3.0.2",
@@ -39665,7 +39623,6 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "peer": true,
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -39881,7 +39838,6 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
       "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==",
-      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -40099,7 +40055,6 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==",
-      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -40122,7 +40077,8 @@
     "react-is": {
       "version": "19.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
-      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA=="
+      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
+      "peer": true
     },
     "react-lifecycles-compat": {
       "version": "3.0.4",
@@ -40161,8 +40117,7 @@
     "react-refresh": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
-      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
-      "peer": true
+      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
     },
     "react-router": {
       "version": "5.2.0",
@@ -41075,6 +41030,13 @@
             "repeat-string": "^1.6.1"
           }
         },
+        "type-fest": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+          "optional": true,
+          "peer": true
+        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -41100,7 +41062,6 @@
           "version": "4.44.2",
           "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
           "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
-          "peer": true,
           "requires": {
             "@webassemblyjs/ast": "1.9.0",
             "@webassemblyjs/helper-module-context": "1.9.0",
@@ -41194,7 +41155,6 @@
           "version": "3.11.0",
           "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
           "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
-          "peer": true,
           "requires": {
             "ansi-html": "0.0.7",
             "bonjour": "^3.5.0",
@@ -41909,7 +41869,6 @@
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
       "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
-      "peer": true,
       "requires": {
         "@types/estree": "*",
         "@types/node": "*",
@@ -42362,7 +42321,6 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
           "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
           "dev": true,
-          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.3",
             "fast-uri": "^3.0.1",
@@ -42953,7 +42911,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
       "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-      "peer": true,
       "requires": {
         "debug": "^3.2.5",
         "eventsource": "^1.0.7",
@@ -43544,7 +43501,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz",
       "integrity": "sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==",
-      "peer": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -44918,7 +44874,6 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "peer": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -44954,8 +44909,7 @@
         "acorn": {
           "version": "8.15.0",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-          "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-          "peer": true
+          "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="
         },
         "acorn-import-assertions": {
           "version": "1.9.0",
@@ -45023,7 +44977,6 @@
               "version": "8.17.1",
               "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
               "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-              "peer": true,
               "requires": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -45064,7 +45017,6 @@
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
       "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.0.1",