President-elect Donald Trump has invited Chinese President Xi Jinping to attend his inauguration next month — extending a diplomatic olive branch even as Trump threatens to levy massive tariffs on Chinese goods.

In the final year of Trump’s term, the two nations agreed to a truce, signing a trade deal that scrapped some tariffs and reduced others. China also agreed to purchase an additional $200 billion in U.S. goods and services — a pledge it failed to fulfill.

Here's a look at how the showdown between the world's two largest economies played out the last time Trump was in office and where things might be headed now.