Sounds like that you are working using your H1-B which will expire in July.
If you do not intend to renew your H1-B, you have to file EAD application with your I-485. If the EAD has not been approved when your H1-B expires, you may have to stop working until you get the EAD approved.
Maintaining the non-immigrant H1-B visa will give you an alternative way to keep your legal status in case your green card application gets any trouble.