Also they now seem to be warming up to conflct with Iran.

That is not quite accurate. What Trump said was that if Iran did not stop violating the terms of the agreement, there would be consequences. Kinda like Obama drew that red line in the sand with Syria over the use of chemical weapons. Oh. Wait a minute. That red line was crossed and what did Obama do? Nothing. Unfortunately for the Iranians, Trump is not Obama - if they continue to violate the terms of the Iran Deal, Trump WILL take action.