Is there tariffs on China?

I can't keep up with Trump enacting and then taking away tariffs. Most of the talk seems to be on Canada and Mexico, though I know that Trump set an additional 10% tariffs on China. Is this still in effect? I'm trying to plan out my costs with these new tariffs. Thanks!