makes sense, I-797 bottom section does have I-94 info where end date is set to March 2022. I was looking at my I-94 info in https://i94.cbp.dhs.gov/I94/#/home
So, I guess, whatever I-94 end date is set in latest I-797 overrides the info you see in the CBP website? If so, then I have 60 days grace period?