@dagnir
Add fixes based on review.
Loading status checks…
4849033 
- Use if let instead of match for Option

- Refactor common code into pick_if_selected_and_reset