Use a deferred to await user decision instead of flow

Use a deferred to await user decision instead of flow #210