سوال غريب جدااااااا

[mahrousahmed]

will wait is correct because wait is one of waiting verbs.
subject + didn't + Inf........till or until + subject + had + P.P
subject + had + waited,remained, stayed........till or until + subject + past simple

subject + won't+ Inf........till or until + subject + present simple or present perfect
subject + will wait, remain, stay........till or until + subject + present simple or present perfect