wxc1031b, thanks for your reply. Do you mean that you still got three years on I797, although your passport will expire before that? My understanding from your post is that I will still get 3 years on I797 now. I just need to replace my passport when it expires. At that time, my H1B is still valid and I do not need to do anything about it. Is it correct?
Thank you for your help.