H1B approved. OPT expires in a month. Do i have to apply for OPT Extension?

USA H1B Visa
1

Hi,
My “post-completion OPT” ends around July 10,2020. I got my “H1b approval” on June 11,2020.
Do i still have to apply for “OPT Extension” or will I be eligible for “Cap-gap” automatically