waitFor is a code smell to be honest. Switching to a flux implementation that makes it unnecessary is your best bet (like redux)