Skip to content

fix-add-conflict-task #581

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

Open
TerSV86 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix-add-conflict-task #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...entities/task/ui/task/components/task-buttons/components/task-buttons-recipient/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const TaskButtonsRecipient = ({
modalContent={
<ModalContent
type={
isPageActive && !volunteer
isPageActive && !recipientReport
? modalContentType.conflict
: isPageActive
? modalContentType.admin
Expand Down
7 changes: 3 additions & 4 deletions ...entities/task/ui/task/components/task-buttons/components/task-buttons-volunteer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const TaskButtonsVolunteer = ({
modalContent={
<ModalContent
type={
isPageActive && !volunteer
isPageActive && !volunteerReport
? modalContentType.conflict
: isPageActive
? modalContentType.admin
Expand All @@ -122,9 +122,8 @@ export const TaskButtonsVolunteer = ({
buttonType={taskButtonType.conflict}
disabledColor={
!volunteer ||
(volunteerReport && isPageActive) ||
(recipientReport && isPageActive) ||
isPageActive
(!!volunteerReport && isPageActive) ||
(!!recipientReport && isPageActive)
}
/>
</ButtonWithModal>
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/task-buttons-content/components/conflict-modal-content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import styles from './styles.module.css';

export const ConflictModalContent = ({
active = true,
conflict = true,
conflict,
taskId,
userRole,
volunteer,
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/task-buttons-content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const ModalContent = ({
<CloseModalContent date={date} userRole={userRole} taskId={taskId} />
);
case modalContentType.conflict:
return <ConflictModalContent userRole={userRole} volunteer={volunteer} />;
return <ConflictModalContent userRole={userRole} volunteer={volunteer} taskId={taskId} />;
case modalContentType.confirm:
return <ConfirmModalContent userRole={userRole} volunteer={volunteer} />;
case modalContentType.admin:
Expand Down