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

Fix group loan modal #754

Merged
merged 13 commits into from
Dec 27, 2023
Merged

Fix group loan modal #754

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
17b4caa
Open a loan modal when clicking on a non-stacked loan card
Adamik10 Dec 6, 2023
cfe8235
Add a keyboard listener to stackable fees card to improve accessibility
Adamik10 Dec 7, 2023
2da7690
Make sure not to trigger parent events in MaterialInfo component
Adamik10 Dec 7, 2023
c61fc45
Merge branch 'release/2023-50-0' into fix/group-loan-modal
Adamik10 Dec 13, 2023
dd6901f
Merge branch 'release/2024-1-0' into fix/group-loan-modal
Adamik10 Dec 20, 2023
9d1c209
Update dpl-design-system package to have fee list modal container update
Adamik10 Dec 21, 2023
db02787
Add materialNumberText to fee list app & remove unused amountText
Adamik10 Dec 21, 2023
b87984b
Use materialNumberText in stackable fees list to display material number
Adamik10 Dec 21, 2023
c11cdae
Remove the option to pay from fee details content & connected elements
Adamik10 Dec 21, 2023
82c2624
Show reason for getting the fee in stacked fee group modal red rectangle
Adamik10 Dec 21, 2023
4e77ffc
Update fee list test not to look for elements that have been removed
Adamik10 Dec 27, 2023
8581c58
Merge branch 'release/2024-1-0' into fix/group-loan-modal
Adamik10 Dec 27, 2023
30f1084
Create a helper function to handle material info details click
Adamik10 Dec 27, 2023
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: 2 additions & 0 deletions src/apps/loan-list/materials/stackable-material/stackable-material.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ const StackableMaterial: FC<StackableMaterialProps & MaterialProps> = ({
const handleOpenDueDateModal = () => {
if (openDueDateModal && dueDate) {
openDueDateModal(dueDate);
return;
}
openLoanDetailsModal(loan);
Comment on lines 37 to +41
Copy link
Contributor

@JacobArrow JacobArrow Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels weird somehow
Why not just a regular if/else or just
(openDueDateModal && dueDate) ? openDueDateModal(dueDate) : openLoanDetailsModal(loan)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because
image

Copy link
Contributor

@JacobArrow JacobArrow Dec 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, but you can either return the whole statement or remove the curly braces

  const handleOpenDueDateModal = () =>
    openDueDateModal && dueDate
      ? openDueDateModal(dueDate)
      : openDueDateModal(dueDate);

OR

  const handleOpenDueDateModal = () => {
    return openDueDateModal && dueDate
      ? openDueDateModal(dueDate)
      : openDueDateModal(dueDate);
  };

};

return (
Expand Down
Loading