Mistake in uploaded file type after revision
Mistakes can happen.
You should email the editor or they might notice it and ask you to upload the correct one.

"One more question: how long should we wait for the status change from "with journal" to "with editor" or "under review" for the revised manuscript? "
It depends on the journal, you should check the journal website for more information or ask directly the editor.