From efc6415a0c24675a01617c5b089fa7b5758d195b Mon Sep 17 00:00:00 2001
From: PioBar <72926984+Pio-Bar@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:31:27 +0200
Subject: [PATCH] fix: (CXSPA-1087) - Role presentation for cx-message wrapper
 (#19044)

Co-authored-by: Miguel Estrada <15113219+developpeurweb@users.noreply.github.com>
---
 .../cancellations/cancel-order/cancel-order.component.html  | 5 ++++-
 .../cancellations/cancel-order/cancel-order.module.ts       | 4 +++-
 .../feature-toggles/config/feature-toggles.ts               | 6 ++++++
 .../src/app/spartacus/spartacus-features.module.ts          | 1 +
 .../cms-components/misc/message/message.component.html      | 6 +++---
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.html b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.html
index 37f7432fb47..2d06401a13e 100644
--- a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.html
+++ b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.html
@@ -11,7 +11,10 @@
   <cx-amend-order-items *ngIf="entries$ | async as entries" [entries]="entries">
   </cx-amend-order-items>
 
-  <cx-form-errors [control]="form.get('entries')"></cx-form-errors>
+  <cx-form-errors
+    *cxFeature="'!a11yRepeatedCancelOrderError'"
+    [control]="form.get('entries')"
+  ></cx-form-errors>
 
   <ng-container *ngTemplateOutlet="actions"></ng-container>
 
diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.module.ts b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.module.ts
index f84f5f780a5..2d7603e9345 100644
--- a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.module.ts
+++ b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.module.ts
@@ -9,8 +9,9 @@ import { NgModule } from '@angular/core';
 import {
   AuthGuard,
   CmsConfig,
-  provideDefaultConfig,
+  FeaturesConfigModule,
   I18nModule,
+  provideDefaultConfig,
 } from '@spartacus/core';
 import {
   FormErrorsModule,
@@ -30,6 +31,7 @@ import { CancelOrderComponent } from './cancel-order.component';
     AmendOrderActionsModule,
     FormErrorsModule,
     MessageComponentModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
index 57fd5368640..9122fc07a32 100644
--- a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
+++ b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
@@ -438,6 +438,11 @@ export interface FeatureTogglesInterface {
    */
   a11yLinkBtnsToTertiaryBtns?: boolean;
 
+  /**
+   * Removes duplicated error message from 'CancelOrderComponent'.
+   */
+  a11yRepeatedCancelOrderError?: boolean;
+
   /**
    * Mofifies the template of 'AddedToCartDialogComponent' to retain the focus after the cart is updated.
    * Improves its screen reader readout.
@@ -530,6 +535,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yCxMessageFocus: false,
   a11yLinkBtnsToTertiaryBtns: false,
   a11yDeliveryModeRadiogroup: false,
+  a11yRepeatedCancelOrderError: false,
   a11yAddedToCartActiveDialog: false,
   a11yNgSelectMobileReadout: false,
   occCartNameAndDescriptionInHttpRequestBody: false,
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index fd5a982089e..545448763f4 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -344,6 +344,7 @@ if (environment.cpq) {
         occCartNameAndDescriptionInHttpRequestBody: true,
         a11yLinkBtnsToTertiaryBtns: true,
         a11yDeliveryModeRadiogroup: true,
+        a11yRepeatedCancelOrderError: true,
         a11yAddedToCartActiveDialog: true,
         a11yNgSelectMobileReadout: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
diff --git a/projects/storefrontlib/cms-components/misc/message/message.component.html b/projects/storefrontlib/cms-components/misc/message/message.component.html
index ea681906407..8a15457805f 100644
--- a/projects/storefrontlib/cms-components/misc/message/message.component.html
+++ b/projects/storefrontlib/cms-components/misc/message/message.component.html
@@ -6,9 +6,9 @@
   tabindex="0"
 >
   <div class="cx-message-content">
-    <div class="cx-message-header">
-      <span class="cx-message-icon">
-        <cx-icon [type]="getIconType"></cx-icon>
+    <div role="presentation" class="cx-message-header">
+      <span role="presentation" class="cx-message-icon">
+        <cx-icon role="presentation" [type]="getIconType"></cx-icon>
       </span>
 
       <span class="cx-message-text">