CBP will issue I94 till the validity of your current I797 provided your passport is valid beyond May 2023.