If this wait for is because the button changes due to the form input, it should be covered by the new form observer functionality which looks to make sure that all observed fields are waited for before continuing.