Is the trade war with China finally over?

No, it's not. We have a truce now, a temporary truce, a pause in tariff hikes but none of the major issues have been dealt with. Trump could change his mind at any time. I think he realizes though that if he presses on with a trade war, he is looking at a recession going into his re-election. So, we may have a truce that lasts for a while.