Soft landing and AVR with H1B i797 and expired F1 stamp

Hi everyone,
I am so grateful for this wonderful community.
I just got my COPR. It expires in April 2023. I am currently on H1B in USA with a valid i797 and only an expired F1 stamp on my passport ( no previous H1B stamp in passport). Also, I have recently renewed my passport, so the expired F1 stamp is on my previous passport. I am soon planning to do a soft landing at via the Niagara Rainbow Bridge and then return back to US the next day using AVR. Has anyone been in a similar situation recently? I am specifically worried about any challenges that could occur during AVR. I would really appreciate your inputs.