I last entered the US in January 2016. The H1-B visa I had stamped in my passport was expiring in December 2016 and my passport is going to expire in third week of August 2017. After that, when my H1-B visa was about to expire (before December 2016), my employer filed H1-B visa extension for me and we got that approved before my previous H1-B visa expired. New I-797 (H-1B visa approval notice) also has I-94 on the bottom half page on page 1. That has got 'expiry date' of May 2018.
Now, when I checked my electronically generated I-94 recently, it has the 'Admit until date' of August 2017, which matches with my passport expiration date. I have renewed my passport and now I have new passport with me, which is valid till 2027.
Which is my current I-94 and the current Admit until date (one on electronically generated I-94 from CBP or the one on bottom half of I-797 received from USCIS)?
Will I be out of status after 'Admit until date' on electronic I-94?
Please let me know.
Thanks in advance!