Indian Citizen; 23 hours, 40 minutes in Shanghai

I am Indian Citizen. I plan to leave Macau via JuneYao air (HO1296) on 6th January 2018 night at 22:45 to arrive on 7th January 2018 at 00:55 at Shanghai.

My connecting flight from Shanghai to SFO is on 8th January at 00:15 from Shanghai. I have a valid F1 visa, with I-20 to reach SFO

Based on reading the above details, it is my understanding that I fulfil all the criteria for 24-hour TWOV, and I may be granted an entry into Shanghai. I have with me:
- Valid Passport
- Onward Ticket with confirmed seat
- A fully completed Arrival/Departure Card
- Visa for the United States, where I study

Is my understanding correct?

I am concerned.
Best Regards
Aakanksha