Merge branch 'UIREQMED-74' of github.com:folio-org/ui-requests-mediat…

…ed into UIREQMED-74
folio-org · Jan 21, 2025 · 881671c · 881671c
2 parents f7599b9 + 8071b44
commit 881671c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js b/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js
@@ -1,6 +1,9 @@
 import PropTypes from 'prop-types';
 import { useMemo } from 'react';
-import { FormattedMessage } from 'react-intl';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
 
 import { useStripes } from '@folio/stripes/core';
 import { ProxyManager } from '@folio/stripes/smart-components';
@@ -29,6 +32,7 @@ const UserForm = ({
   isUserPreselected,
 }) => {
   const stripes = useStripes();
+  const { formatMessage } = useIntl();
   const name = getRequesterName(user);
   const ConnectedProxyManager = useMemo(() => stripes.connect(ProxyManager), [stripes]);
   const proxyInformation = getProxyInformation(proxy, request?.proxyUserId);
@@ -40,7 +44,7 @@ const UserForm = ({
       name={name}
       id={user.id}
       barcode={user.barcode}
-      ariaLabel={<FormattedMessage id="ui-requests-mediated.form.requester.ariaLabel" />}
+      ariaLabel={formatMessage({ id: 'ui-requests-mediated.form.requester.ariaLabel' }) }
     />;
   const proxySection = (isProxyAvailable && proxyInformation.id) ?
     <UserHighlightBox

diff --git a/src/utils.js b/src/utils.js
@@ -284,9 +284,13 @@ export const formatNoteReferrerEntityData = (entityData) => {
 };
 
 export const getUserHighlightBoxLink = (linkText, id, ariaLabel) => {
+  const additionalProps = {
+    ...(ariaLabel ? { ariaLabel } : {}),
+  };
+
   return linkText ?
     <Link
-      {...(ariaLabel ? { ariaLabel } : {})}
+      {...additionalProps}
       to={`/users/view/${id}`}
     >
       {linkText}