"Thank you," Chirrut smiles, his aim slightly off but the intent still good, "That is very kind." His proffered wrist is captured again by those professional fingers.

Someone has to show that those from Jedha can have good manners, since someone else is being cranky.

And he definitely helps matters by snaking a hand up and tweaking one of Baze's twisted locks.