Here is my case for your reference.
I entered US with a F1 visa 7 years ago. I have graduated and my current status is H-1B. I never left the US after I graduated. I called USCIS and they told me to put F1 in Class of Admission.
I entered US with a F1 visa 7 years ago. I have graduated and my current status is H-1B. I never left the US after I graduated. I called USCIS and they told me to put F1 in Class of Admission.