Skip to content

Commit 33f7fa4

Browse files
authored
Merge pull request #10840 from google/fix/10428-warning-notices
Fix / 10428 Warning Notices
2 parents ad7fed2 + fd7f37c commit 33f7fa4

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

assets/js/components/dashboard-sharing/DashboardSharingSettings/ModuleViewAccess.js

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
* WordPress dependencies
2121
*/
2222
import { __ } from '@wordpress/i18n';
23-
import { forwardRef } from '@wordpress/element';
23+
import { createInterpolateElement, forwardRef } from '@wordpress/element';
2424

2525
/**
2626
* Internal dependencies
2727
*/
2828
import PropTypes from 'prop-types';
2929
import UserRoleSelect from '../UserRoleSelect';
3030
import Notice from '../../Notice';
31+
import Link from '../../Link';
3132

3233
const ModuleViewAccess = forwardRef(
3334
(
@@ -53,17 +54,24 @@ const ModuleViewAccess = forwardRef(
5354
if ( recoverable ) {
5455
return (
5556
<Notice
57+
className="googlesitekit-notice--small"
5658
type={ Notice.TYPES.WARNING }
57-
description={ __(
58-
'Managing user required to manage view access.',
59-
'google-site-kit'
59+
description={ createInterpolateElement(
60+
__(
61+
'Managing user required to manage view access. <a>Learn more</a>',
62+
'google-site-kit'
63+
),
64+
{
65+
a: (
66+
<Link
67+
href={ recoverableModuleSupportLink }
68+
external
69+
hideExternalIndicator
70+
/>
71+
),
72+
}
6073
) }
61-
ctaButton={ {
62-
label: 'Learn more',
63-
href: recoverableModuleSupportLink,
64-
external: true,
65-
hideExternalIndicator: true,
66-
} }
74+
hideIcon
6775
/>
6876
);
6977
}

assets/js/components/settings/EntityOwnershipChangeNotice.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ export default function EntityOwnershipChangeNotice( { slug } ) {
9797

9898
return (
9999
<Notice
100+
className="googlesitekit-notice--bottom-margin"
100101
type={ Notice.TYPES.WARNING }
101-
title={ sprintf(
102+
description={ sprintf(
102103
/* translators: %s: module name. */
103104
__(
104105
'By clicking confirm changes, you’re granting other users view-only access to data from %s via your Google account. You can always manage this later in the dashboard sharing settings.',

0 commit comments

Comments
 (0)