<P> Andi and Cyrus miss Buffy and try to cope by talking to her time capsule, since they are not hearing from her . Later, Andi invites Walker to her apartment, intending to tell him that she is seeing Jonah . Complicating matters is a pair of shoes Walker gives to her, which he designed from their earlier painting . Although Andi is not inclined to accept the shoes, she reluctantly does after Walker insists she keep them . When Jonah sees Andi wearing the shoes, he becomes upset, aware they came from Walker without her mentioning him by name . Andi worries over Jonah avoiding her afterward, and her anxiety is not eased by his being with Natalie . She wants to talk to Bex about her problem, but with Bex and Celia working on a redesign project for The Fringe, which becomes known as Cloud Ten, Andi feels left out with no one else to talk to . Despite things looking bleak, Andi gets a big surprise when she notices Buffy right outside her apartment . Meanwhile, TJ helps Cyrus deal with his inability to do somersaults . </P> <Tr> <Th> 34 </Th> <Td> 22 </Td> <Td> "Keep a Lid on It" </Td> <Td> Joe Menendez </Td> <Td> Joanne Lee </Td> <Td> July 30, 2018 (2018 - 07 - 30) </Td> <Td> 223 </Td> <Td> 0.70 </Td> </Tr> <Tr> <Td_colspan="8"> <P> With Buffy's return, Andi and Cyrus find out she lives only one hour away from them, much closer than Phoenix, due to government budget cuts changing Pat's assignment . Buffy appreciates her time capsule and wants to peek inside, but the lid is on tight . Andi informs her about the contents, including her basketball jersey and a ball signed by her teammates, which Andi mentions was Jonah's idea . Jonah, meanwhile, tries out for the elite Ultimate team at school, with Cyrus there to support him, and to comfort him when he does not make the team . Cyrus later tells Buffy that he no longer has romantic feelings for Jonah, as his feelings have become those of friendship . That leads Buffy to reveal that she has romantic feelings for someone; when she wants to keep it from Andi, Cyrus immediately believes it is Jonah . </P> <P> Andi works on a new bracelet for Jonah, and while she does, Bex reminds her about the old one, which she thought was discarded but discovers in a memory box Bex started for her . Andi gives Jonah the original bracelet back; they enter into a romantic relationship . </P> <P> Ham informs Andi and Bex that he plans to travel overseas by himself, and while shocked by the news, the women understand he needs the adventure . He lets Celia know during a family dinner . </P> Guest star: Stoney Westmoreland as Ham </Td> </Tr> <P> With Buffy's return, Andi and Cyrus find out she lives only one hour away from them, much closer than Phoenix, due to government budget cuts changing Pat's assignment . Buffy appreciates her time capsule and wants to peek inside, but the lid is on tight . Andi informs her about the contents, including her basketball jersey and a ball signed by her teammates, which Andi mentions was Jonah's idea . Jonah, meanwhile, tries out for the elite Ultimate team at school, with Cyrus there to support him, and to comfort him when he does not make the team . Cyrus later tells Buffy that he no longer has romantic feelings for Jonah, as his feelings have become those of friendship . That leads Buffy to reveal that she has romantic feelings for someone; when she wants to keep it from Andi, Cyrus immediately believes it is Jonah . </P>

How many episodes are there in andi mack