* Intelligently adjust field for newly added action

* Remove unnecessary switch case

* Dedupe list of fields

* Remove unnecessary conditionFields prop

* Intelligently adjust field for newly added condition

* Use a less specific condition