As much as I like the show, I can't help but not trust it. Since they're always throwing surprises or plot twists at us I'm thinking that they might just be intentionally making Cyrus seem like he has a crush on Jonah, but then they're going to reveal that it's actually been Andi this whole time.
Nah. I trust Terri Minsky (Disney, not as much, but they seem to be letting her do her thing).
Based on what we’ve seen and that season 2 preview (aka the unaired 1x13), I think Andi and Jonah will sort of get together. Buffy asks Cyrus if he’s happy for Andi and we see Cyrus be all like “yeah sure…” (so obviously he’s not really). Iris asks Cyrus out again and Cyrus agrees but he’s all awkward about it (see the scenes in the promo) and they kiss but it’s weird for him. Buffy notices Cyrus acting strange and thinks it has to do with Andi dating Jonah (she’s half right) so she asks Cyrus if he likes Andi (as seen in that one promo). Cue Cyrus to admit that actually he thinks he likes Jonah and explicit verbal confirmation of 1x12 showed us.