feat: Improve ExpirationTimePicker component
#7782
Merged
ExpirationTimePicker component
#7782