PWA-3078::The user is unable to get any message once the account is c… (

#4131) * PWA-3078::The user is unable to get any message once the account is created and they are logged in * PWA-3078::The user is unable to get any message once the account is created and they are logged in * PWA-3078::Resolved lint issues * PWA-3078::Formatted the screen reader message * PWA-3078::Resolved test case * PWA-3078::Resolved test case * PWA-3078::Formatted the code --------- Co-authored-by: Aanchal Pawar <97873570+glo82145@users.noreply.github.com>
magento · Oct 4, 2023 · 3e20773 · 3e20773
1 parent 0c3cd48
commit 3e20773
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js b/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js
@@ -89,7 +89,8 @@ const initialProps = {
     getCartDetailsQuery: 'getCartDetailsQuery',
     setDefaultUsername: jest.fn(),
     showCreateAccount: jest.fn(),
-    showForgotPassword: jest.fn()
+    showForgotPassword: jest.fn(),
+    handleTriggerClick: jest.fn()
 };
 
 const clearCacheData = jest.fn();

diff --git a/packages/peregrine/lib/talons/SignIn/useSignIn.js b/packages/peregrine/lib/talons/SignIn/useSignIn.js
@@ -13,6 +13,7 @@ import { useEventingContext } from '../../context/eventing';
 
 export const useSignIn = props => {
     const {
+        handleTriggerClick,
         getCartDetailsQuery,
         setDefaultUsername,
         showCreateAccount,
@@ -66,6 +67,7 @@ export const useSignIn = props => {
     const handleSubmit = useCallback(
         async ({ email, password }) => {
             setIsSigningIn(true);
+            handleTriggerClick();
             try {
                 // Get source cart id (guest cart id).
                 const sourceCartId = cartId;
@@ -142,7 +144,8 @@ export const useSignIn = props => {
             fetchUserDetails,
             getCartDetails,
             fetchCartDetails,
-            dispatch
+            dispatch,
+            handleTriggerClick
         ]
     );
 

diff --git a/...ages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap b/...ages/venia-ui/lib/components/AccountChip/__tests__/__snapshots__/accountChip.spec.js.snap
@@ -31,7 +31,7 @@ exports[`it renders a loading indicator when appropriate 1`] = `
   </span>
   <span
     aria-atomic="true"
-    aria-label="Toggle My Account Menu"
+    aria-label="Hiundefined"
     aria-live="polite"
     className="text"
   >

diff --git a/packages/venia-ui/lib/components/AccountChip/accountChip.js b/packages/venia-ui/lib/components/AccountChip/accountChip.js
@@ -35,10 +35,13 @@ const AccountChip = props => {
     const classes = useStyle(defaultClasses, props.classes);
     const { formatMessage } = useIntl();
 
-    const ariaLabelMyMenu = formatMessage({
-        id: 'accountTrigger.ariaLabelMyMenu',
-        defaultMessage: 'Toggle My Account Menu'
-    });
+    const ariaLabelMyMenu =
+        currentUser != null
+            ? formatMessage({
+                  id: 'Hi' + currentUser.firstname,
+                  defaultMessage: 'Hi' + currentUser.firstname
+              })
+            : '';
 
     const ariaLabel = isUserSignedIn ? ariaLabelMyMenu : '';
 

diff --git a/packages/venia-ui/lib/components/AccountMenu/accountMenu.js b/packages/venia-ui/lib/components/AccountMenu/accountMenu.js
@@ -10,7 +10,11 @@ import ForgotPassword from '../ForgotPassword';
 import defaultClasses from './accountMenu.module.css';
 
 const AccountMenu = React.forwardRef((props, ref) => {
-    const { accountMenuIsOpen, setAccountMenuIsOpen } = props;
+    const {
+        handleTriggerClick,
+        accountMenuIsOpen,
+        setAccountMenuIsOpen
+    } = props;
     const talonProps = useAccountMenu({
         accountMenuIsOpen,
         setAccountMenuIsOpen
@@ -67,6 +71,7 @@ const AccountMenu = React.forwardRef((props, ref) => {
         default: {
             dropdownContents = (
                 <SignIn
+                    handleTriggerClick={handleTriggerClick}
                     classes={{
                         modal_active: classes.loading
                     }}

diff --git a/packages/venia-ui/lib/components/Header/__tests__/__snapshots__/accountTrigger.spec.js.snap b/packages/venia-ui/lib/components/Header/__tests__/__snapshots__/accountTrigger.spec.js.snap
@@ -19,6 +19,7 @@ Array [
   </div>,
   <require('../AccountMenu')
     accountMenuIsOpen={false}
+    handleTriggerClick={[MockFunction handleTriggerClick]}
   />,
 ]
 `;
diff --git a/packages/venia-ui/lib/components/Header/accountTrigger.js b/packages/venia-ui/lib/components/Header/accountTrigger.js
@@ -63,6 +63,7 @@ const AccountTrigger = props => {
             </div>
             <Suspense fallback={null}>
                 <AccountMenu
+                    handleTriggerClick={handleTriggerClick}
                     ref={accountMenuRef}
                     accountMenuIsOpen={accountMenuIsOpen}
                     setAccountMenuIsOpen={setAccountMenuIsOpen}

diff --git a/packages/venia-ui/lib/components/SignIn/signIn.js b/packages/venia-ui/lib/components/SignIn/signIn.js
@@ -19,6 +19,7 @@ import GoogleRecaptcha from '../GoogleReCaptcha';
 const SignIn = props => {
     const classes = useStyle(defaultClasses, props.classes);
     const {
+        handleTriggerClick,
         setDefaultUsername,
         showCreateAccount,
         showForgotPassword,
@@ -27,6 +28,7 @@ const SignIn = props => {
 
     const { formatMessage } = useIntl();
     const talonProps = useSignIn({
+        handleTriggerClick,
         getCartDetailsQuery: GET_CART_DETAILS_QUERY,
         setDefaultUsername,
         showCreateAccount,