From bfb92f016f4808ab3b77a0f28c75bae59fbb4c21 Mon Sep 17 00:00:00 2001
From: Stefan Dragomir <stefand@ENSRO0422.local>
Date: Thu, 23 Oct 2025 19:34:39 +0300
Subject: [PATCH 1/2] FORMS-18724: Programmatic label does not convey purpose
 of control @sunnym @vavarshn

---
 .../v1/termsandconditions/termsandconditions.html               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
index 74e5c110ba..108b4cdaac 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
@@ -39,7 +39,7 @@
          data-cmp-visible="${tnc.showAsPopup ? 'false' : 'true'}">
         <div class="cmp-adaptiveform-termsandcondition__body">
             <div class="cmp-adaptiveform-termsandcondition__header" data-sly-test="${tnc.showAsPopup && !wcmmode.edit}">
-                <button type="button" class="cmp-adaptiveform-termsandcondition__close-button" >
+                <button type="button" class="cmp-adaptiveform-termsandcondition__close-button" aria-label="${'Close terms and conditions document' @ i18n, locale=request.locale}">
                     X
                 </button>
                 <h3>

From 1a0a759763faf0ed5c83e110ee4f7f33db5c9161 Mon Sep 17 00:00:00 2001
From: Stefan Dragomir <stefand@ENSRO0422.local>
Date: Mon, 24 Nov 2025 11:55:27 +0200
Subject: [PATCH 2/2] FORMS-18724: Add test case for aria-label

---
 .../test-module/specs/termsandconditions/tnc.runtime.cy.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.runtime.cy.js b/ui.tests/test-module/specs/termsandconditions/tnc.runtime.cy.js
index 6858432dfd..8668c434be 100644
--- a/ui.tests/test-module/specs/termsandconditions/tnc.runtime.cy.js
+++ b/ui.tests/test-module/specs/termsandconditions/tnc.runtime.cy.js
@@ -103,7 +103,10 @@ describe("Form Runtime with Terms and Conditions", () => {
             expect(model.getState().items[1].enabled).to.equal(true);
             cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
             .invoke('attr', 'data-cmp-visible').should('not.exist');
-            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__close-button`).click()
+            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__close-button`)
+            .should('have.attr', 'aria-label')
+            .and('not.be.empty')
+            .click()
             .then(() => {
                 cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
                 .invoke('attr', 'data-cmp-visible').should('eq', 'false', );