latest I 94 online date not matching with I 797 approval notice

[Prashanthanms]

My current H1B visa stamp is valid until 04/16/2018 
My company applied for my visa extension and got it approved until 04/22/2021. I-797 is valid from 04/17/2018 – 04/22/2021.
There is I-94 attached to this approval notice (04/17/2018 – 04/22/2021). This was issued on 11/03/2017

I traveled to India and re-entered USA on 02/18/2018 and got a new I-94 date (04/16/2018 –Only till my current visa stamp validity)
I think this I-94 becomes my current I-94 and not the I-94 attached to the I-797 that was issued on 11/03/2017 (as per our company legal assistant only the latest I-94 is valid)?

I visited my local CBP office and the officer is saying the date on I-94 attached to the I-797 approval notice(issued on 11/03/2017) will kick in when my new I-797 starts(04/17/2018). So according them I don’t have to do anything and I won’t have any I-94 issues(as per them the latest one is I-94 attached to the approved I-797 because the dates are future dates valid from 04/17/2018 – 04/22/2021) and not willing to update the “Admit Until Date” online.
On the other hand our company legal assistant is saying
“The expiration of your status in United States is based on the expiration date of your latest I-94 card (My latest is the one I received on 02/18/2017 and valid only until 04/16/2018) If the new I-94 expiration date is earlier than the date on the I-797 , this new date will become the new deadline for filing an extension”

what exactly is the law here? totally confused

Thanks in advance

[Sree08]

I’m in similar situation please let me know if you have any information on this .

[VamArt]

Could you please advise what was done, I am in the same boat. My legal is ok with it they said the i94 received in extension is future date and we should be ok. Please advise if anything you had to do.