They're both right. In fact, I think the second one sounds more natural.
7 พฤษภาคม 2018
0
4
3
They are both right. Don't listen to that other person.
7 พฤษภาคม 2018
0
3
1
@Casey
Thanks for your question to let me brush up the application of "until" again.
7 พฤษภาคม 2018
0
1
1
The first one is more grammatically correct, but you will hear both in spoken language, especially colloquially. What you really need in this scenario (someone correct me if they have the actual terminology down because i might be wrong) is an imperfect tense, but English doesn't quite have an imperfect tense (or a subjunctive), so you will see both forms in colloquial English.