reactjs code merge and bugfixes (repost)

Please see attached bug reports, and the source code for the project is posted at https://github.com/redzzilla/freelancer. The code has two important branches ("freelancer-main" and "freelancer-230118-redo") which have different bugs as listed in the two bug reports (ATTACHED). I need someone to create and deliver to me a new "bugfix branch" which will merge and resolve all bugs from both branches, without creating new bugs.