I tried using the following command to rebase-  However, I did not have any success. How do I solve the conflicts?

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1589047697

Hey @rithviknishad, I've made the requested changes. LMK if there's anything else as well.

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1588912784

@rithviknishad I have merged #5626 and made the requested changes. I have modified the cypress tests as well. Please review it if possible and let me know if it the changes are okay. Thanks!!

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1586085437

Hey @rithviknishad, I changed the DateRangePicker to DateRangeFormField and tried adding a meaningful cypress test. However, I don't understand how to change the 'Assigned to' part. Also could you review the latest [commit ](https://github.com/coronasafe/care_fe/pull/5572/commits/ffff958ec829415e77e1ddb297526756cf950bc3). I'm not sure why this popped up and if it changes any files.

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1576510060

hey, @rithviknishad @khavinshankar I think I have fixed the errors on my end. However cypress tests are failing because they have been written for the older components and hence cannot locate the new components. Should I commit my code?

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1573718679

I tried to modify some functions to match the code in development but it appears that there is some kind of problem with the original code too because of which the filters are not working properly. There are some things which are not clear to me? Some fields have the value "--". Is this a type of valid option or is it just supposed to mean "Show all". The way this has been configured is not clear to me.

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1573569556

I have tried changing the `LegacySelectField` to `SelectFormField`. Could you please review again?

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1570197245

Hey, could you let me know where do I have to go to on my localserver website to view the changes being made in the form.

https://github.com/coronasafe/care_fe/pull/5572#issuecomment-1569978611

Hey, can you assign this to me. I will try to submit a PR.

https://github.com/coronasafe/care_fe/issues/4996#issuecomment-1569878631

Hey, can you assign this issue to me. I will try to work on it ASAP

https://github.com/coronasafe/care_fe/issues/4940#issuecomment-1564126304

Hey, I was going through this issue and I have some doubts. I found that 'Admitted to(Bed Type)' filter in frontend takes it's options from a constant object called ADMITTED_TO in src/Common/constants.tsx. So, along with the backend, that will also need to be modified right? Also, in the backend, we need to append a new choice in the BedTypeChoices and that should suffice right?

https://github.com/coronasafe/care/issues/1184#issuecomment-1563986857

I see the issue with my code. Thanks. I'll check out other issues from the repo.

https://github.com/coronasafe/care_fe/pull/5527#issuecomment-1563164260

Hey, I was going through this and I found the error and applied a fix. I will make a PR for the same if that is fine?

https://github.com/coronasafe/care_fe/issues/5483#issuecomment-1562860878

hey @rithviknishad @nihal467, I am excited about contributing to this project. I have prior experience with react and django. I have set up the frontend repository and am currently trying to understand the codebase while reading the documentation. Is there anything else you'd recommend to get started with this project? With warm regards, Jahnab Dutta

https://github.com/coronasafe/care_fe/issues/5494#issuecomment-1562427192