Xhaka has been good this season. He was signed as a project and now he has turned into a steady if unspectacular player.
I'd give him a new deal.
Steady in general but rash moments arguably costing us up to 9 points in the PL this season, although of course that will be offset by routine stuff that has quietly won us some points.
This summer he has two years left on his contract, like Leno. I would give it until Jan next year after we have brought in another CM like Bissouma to decide whether to give Xhaka another contract rather than giving him.one this summer. I would renew Leno this summer because GK's are not rotated, top ones can be quite expensive, and Leno is still below peak age for most GK's.