diff --git a/pages/login.page.test.tsx b/pages/login.page.test.tsx index b66a9ec1b..7675b9811 100644 --- a/pages/login.page.test.tsx +++ b/pages/login.page.test.tsx @@ -10,6 +10,7 @@ import i18n from 'src/lib/i18n'; import theme from 'src/theme'; import Login, { LoginProps, getServerSideProps } from './login.page'; +process.env.HELPJUICE_KNOWLEDGE_BASE_URL = 'help.mpdx.org'; jest.mock('next-auth/react', () => ({ getSession: jest.fn(), signIn: jest.fn(), @@ -176,7 +177,7 @@ describe('Login - OKTA', () => { name: /find help/i, }); await waitFor(() => { - expect(findHelpLink).toHaveAttribute('href', 'https://help.mpdx.org'); + expect(findHelpLink).toHaveAttribute('href', 'help.mpdx.org'); }); }); }); diff --git a/pages/login.page.tsx b/pages/login.page.tsx index 2bb3274d4..4fa97213c 100644 --- a/pages/login.page.tsx +++ b/pages/login.page.tsx @@ -37,6 +37,9 @@ const Login = ({ } }, []); + const helpUrl = + process.env.HELPJUICE_KNOWLEDGE_BASE_URL || process.env.HELPJUICE_ORIGIN; + return ( <> @@ -64,16 +67,18 @@ const Login = ({ > {signInButtonText} - + {helpUrl && ( + + )} {isOkta && ( diff --git a/src/components/Contacts/ContactsLeftPanel/ContactsLeftPanel.test.tsx b/src/components/Contacts/ContactsLeftPanel/ContactsLeftPanel.test.tsx index 542382ff2..7e754f092 100644 --- a/src/components/Contacts/ContactsLeftPanel/ContactsLeftPanel.test.tsx +++ b/src/components/Contacts/ContactsLeftPanel/ContactsLeftPanel.test.tsx @@ -9,6 +9,7 @@ import { ContactsContext, ContactsType, } from 'src/components/Contacts/ContactsContext/ContactsContext'; +import { StatusEnum } from 'src/graphql/types.generated'; import { UserOptionQuery } from 'src/hooks/UserPreference.generated'; import theme from 'src/theme'; import { ContactsLeftPanel } from './ContactsLeftPanel'; @@ -44,6 +45,7 @@ const mocks = { nodes: [ { name: 'Contact 1', + status: StatusEnum.PartnerFinancial, primaryAddress: { geo: '10,20', }, diff --git a/src/components/Welcome/Welcome.stories.tsx b/src/components/Welcome/Welcome.stories.tsx index 721e112dc..6e883e9be 100644 --- a/src/components/Welcome/Welcome.stories.tsx +++ b/src/components/Welcome/Welcome.stories.tsx @@ -40,7 +40,11 @@ export const Default = ({