Skip to content

Commit 483adf8

Browse files
authored
Merge branch 'release-1.0.0' into fix/daniel-fix-403-1869
2 parents 752a0dd + a73fc53 commit 483adf8

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

frontend/src/constants/common.js

+3
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ export const DEFAULT_CI_FUEL = {
6060

6161
export const PHONE_REGEX =
6262
/^((\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4})?$/
63+
64+
export const HELP_GUIDE_URL =
65+
'https://www2.gov.bc.ca/gov/content?id=7A58AF3855154747A0793F0C9A6E9089'

frontend/src/views/Dashboard/components/cards/bceid/OrgUserSettingsCard.jsx

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import BCTypography from '@/components/BCTypography'
77
import withRole from '@/utils/withRole'
88
import { nonGovRoles } from '@/constants/roles'
99
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
10-
import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons'
10+
import { faShareFromSquare } from '@fortawesome/free-solid-svg-icons'
1111
import { useCurrentUser } from '@/hooks/useCurrentUser'
1212
import { ROUTES } from '@/constants/routes'
13+
import { HELP_GUIDE_URL } from '@/constants/common.js'
1314

1415
const linkStyle = {
1516
textDecoration: 'underline',
@@ -59,6 +60,16 @@ const OrgUserSettingsCard = () => {
5960
>
6061
{t('dashboard:orgUserSettings.configureNotifications')}
6162
</UserSettingsLink>
63+
64+
<a href={HELP_GUIDE_URL} target="_blank" rel="noreferrer">
65+
<UserSettingsLink>
66+
{t('dashboard:orgUserSettings.help')}
67+
<FontAwesomeIcon
68+
icon={faShareFromSquare}
69+
style={{ color: '#547D59', marginLeft: 6 }}
70+
/>
71+
</UserSettingsLink>
72+
</a>
6273
</List>
6374
</Stack>
6475
}

frontend/src/views/Dashboard/components/cards/idir/UserSettingsCard.jsx

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import BCTypography from '@/components/BCTypography'
77
import withRole from '@/utils/withRole'
88
import { govRoles } from '@/constants/roles'
99
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
10-
import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons'
10+
import { faShareFromSquare } from '@fortawesome/free-solid-svg-icons'
1111
import { useCurrentUser } from '@/hooks/useCurrentUser'
1212
import { ROUTES } from '@/constants/routes'
13+
import { HELP_GUIDE_URL } from '@/constants/common.js'
1314

1415
const linkStyle = {
1516
textDecoration: 'underline',
@@ -59,6 +60,16 @@ const UserSettingsCard = () => {
5960
>
6061
{t('dashboard:userSettings.configureNotifications')}
6162
</UserSettingsLink>
63+
64+
<a href={HELP_GUIDE_URL} target="_blank" rel="noreferrer">
65+
<UserSettingsLink>
66+
{t('dashboard:userSettings.help')}
67+
<FontAwesomeIcon
68+
icon={faShareFromSquare}
69+
style={{ color: '#547D59', marginLeft: 6 }}
70+
/>
71+
</UserSettingsLink>
72+
</a>
6273
</List>
6374
</Stack>
6475
}

0 commit comments

Comments
 (0)