Merge branch 'feature/edit-er-before-approval-or-rejection' of https:…

…//github.com/tanu-chahal/website-dashboard into feature/edit-er-before-approval-or-rejection