Conditional hidden fields displaying on Edit

In my form I have a condition for Type of Action to display one of two Form Status fields below. If the Type of Action is Documented Verbal, 1st written warning or 2nd written warning, then it should only show Form Status: Verbal, 1st and 2nd warning. 

It should also display Supervisor email only if Send Link to supervisor is checked. 

When I submit a form it is correct when I submit. However, where the problem is is that when I go back to edit submission, it is 1) showing the Supervisor email (which should only show if Send Link to Supervisor is checked) AND the Form Status: Final Warning or Above/Union in addition to the one that should be displayed. 

Upon reviewing the form and submission you shared, I've made some tests with cloned form.

Unfortunately, I could not reproduce the issue you are reporting. 

Here is the submission I made:

And here is the form in Edit Mode:

As you can see, the Form Status is the same on both submission and edit link. Supervisor's email is also hidden on Edit.

Can you kindly confirm that the issue still persists?