H1B Stamp Expired, Current I797 about to expire, Applying for extension

My H1B from previous employer expired on May 2019. In 2018 I moved to new employer who transferred and extended my Visa until Oct 2021.

My new employer will be applying for my H1B Extension on 1st April 2021.
I am planning to travel to India in May 2021 and get my Visa Stamped.

Will my Visa be stamped with current I-797 whose validity is Oct 2021 or will Visa be stamped with new extension I-797?
Will there be issues if I travel?