Macron and Trump to discuss Iran deal