After nearly two years of tit-for-tat tariff threats in the U.S.-China trade spat, the market is still not out of the woods even with the so-called "phase one" deal close to being finalized.