Did Harry buy himself a new wand after the war? and if, what happened with Draco's wand? Or did Harry use Draco's wand from then on?

In the film 'Harry Potter and the Deathly Hallows II' we don't see Harry buy himself a new wand after the war, nor do we see him using the Elder Wand to repair his old wand (as he did in the novel).

What, if anything happened with Draco's wand? Did Harry continue to use Draco's wand from then on?