-
Notifications
You must be signed in to change notification settings - Fork 15
Replaced useAxios with useQuery in CooperationNotes #3288
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.
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
base: develop
Are you sure you want to change the base?
Replaced useAxios with useQuery in CooperationNotes #3288
Conversation
|
Write the description for this pr |
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
ShadowOfTheSpace
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, don't forget to fix those comments.
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
tests/unit/containers/my-cooperations/cooperation-notes/CooperationNotes.spec.jsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx
Outdated
Show resolved
Hide resolved
tests/unit/containers/my-cooperations/cooperation-notes/CooperationNotes.spec.jsx
Outdated
Show resolved
Hide resolved
tests/unit/containers/my-cooperations/cooperation-notes/CooperationNotes.spec.jsx
Outdated
Show resolved
Hide resolved
|
src/services/cooperation-service.ts
Outdated
| import { | ||
| type CreateCooperationsParams, | ||
| type GetCooperationsParams, | ||
| type UpdateCooperationsParams, | ||
| type CreateOrUpdateNoteParams, | ||
| type UpdateCooperationsSections, | ||
| type UpdateCooperationsNeedActionMessages, | ||
| type Cooperation, | ||
| type ItemsWithCount, | ||
| type NoteResponse |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you changed that?
fc35099 to
9b37fc8
Compare
|
|
Why do you have resolved conflicts commit? Is it a merge commit or rebase was incorrect and you fixed things there? |
this commit was made because of rebase as it had conflicts with the 'develop' branch |
Have you tried to resolve conflicts while you are doing a rebase? |
yes, I have. Sorry, just realised that this commit was made when I tried to pull the branch locally |






2025-03-22.14-51-30.mp4