Electronics are under the China tariffs (now about 50%, I think).
** But, you see how this is going, right? It's starting to become a personal feud between Trump and Trudeau.
WHICH MEANS, even if Canada does everything Trump wants, Trump cannot settle as long as Trudeau (or his Liberal successor, to be picked in a few weeks) is in power, because then they can claim a victory - which could be a factor in the upcoming election.
The Canadian Federal Election will probably be in early May* (campaign running thru April), so as soon as Trump sees that the Conservatives are set to win, he'll settle ...
* (hasn't been officially called yet, Liberals are still in power)