Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MPDX-8333 Suggested Tags Fix #1111

Merged
merged 8 commits into from
Oct 4, 2024
Merged

MPDX-8333 Suggested Tags Fix #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2846df2
FIx suggested tasks not geting saved on CompleteModal
caleballdrin Oct 2, 2024
277374e
Fix showing 0 when there is no pledgeAmount
caleballdrin Oct 2, 2024
51b7c11
Make description more clear
caleballdrin Oct 2, 2024
779cb8a
Make Whats new button the same size as others
caleballdrin Oct 2, 2024
f75cd63
Rename to Appeals
caleballdrin Oct 3, 2024
0205443
Fix Navmenu test
caleballdrin Oct 3, 2024
19dfd6a
Refactor test mocks and add test to check suggested tags are saved
caleballdrin Oct 3, 2024
6b2232e
Small test changes
caleballdrin Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/ContactDetails/ContactDetailsHeader/ContactHeaderSection/ContactHeaderStatusSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const ContactHeaderStatusSection: React.FC<Props> = ({
{statusText}
{status === StatusEnum.PartnerFinancial && (
<>
{contact?.pledgeAmount && contact?.pledgeFrequency && (
{!!contact?.pledgeAmount && !!contact?.pledgeFrequency && (
<Typography variant="subtitle1">
{`${
contact.pledgeAmount && contact?.pledgeCurrency
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layouts/Primary/NavBar/NavItem/NavItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const NavItem: FC<NavItemProps> = ({
<img
src={process.env.HELP_WHATS_NEW_IMAGE_URL}
alt={t('Help logo')}
height={36}
height={24}
caleballdrin marked this conversation as resolved.
Show resolved Hide resolved
style={{ marginRight: theme.spacing(1) }}
/>
)}
Expand Down
3 changes: 1 addition & 2 deletions src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ describe('NavMenu', () => {
getByRole('menuitem', { name: 'Partner Giving Analysis' }),
).toBeInTheDocument();
userEvent.click(getByTestId('ToolsMenuToggle'));
expect(getByRole('menuitem', { name: 'Appeal' })).toBeInTheDocument();
expect(getByRole('menuitem', { name: 'Appeals' })).toBeInTheDocument();
expect(
getByRole('menuitem', { name: 'Fix Commitment Info' }),
).toBeInTheDocument();
Expand Down Expand Up @@ -124,7 +124,6 @@ describe('NavMenu', () => {
await findByRole('menuitem', { name: 'Coaching' }),
).toBeInTheDocument();
});

it('does not show coaching link if there are no coaching accounts', async () => {
const { queryByRole } = render(
<TestComponent
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ const NavMenu: React.FC = () => {
<img
src={process.env.HELP_WHATS_NEW_IMAGE_URL}
alt={t('Help logo')}
height={36}
height={24}
style={{ marginRight: theme.spacing(1) }}
/>
)}
Expand Down
163 changes: 0 additions & 163 deletions src/components/Task/Modal/Form/Complete/TaskModalCompleteForm.mock.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading