fix(datepickermodal): Pull Requests 2980 and 2733