H4 expired i94 about to expire

[MSM123]

I am a H1B Holder and my wife is on H4. Both our visas expired on 4/30/2020 and extensions were subsequently filed with 5/1/2020 as notice date. Our i-94 date is 6/30/2020. My (H1B) visa has been approved ( still waiting to receive the physical copy) while my wife's H4 documents has been returned back by the USCIS due to incorrect signature by the petitioner. We are being asked to refile a new petition for H4 and H4 EAD. My question is

1. if my attorney fails to refile the H4 and H4 EAD petition by 6/30/2020, would that cause any legal issues to my wife since our i94 is expiring on 6/30/2020? 

2. While I am waiting for my physical H1B extension approval copy, I am not sure if I would receive a I-797A/B since the notice date is on 5/1/2020 and previous visa expired on 4/30/2020. If an I-797B is issued, should I leave the country before the i-94 expiry date?

Please suggest!

Thank you

Edited June 18, 2020 by MSM123

[User099]

1. Its better to file before 6/30. 

2. Most likely you will get an extended I94 as you have filed before you I94 expiry date.