The Hong Kong law currently going through Congress essentially de-escalates, yet therefore intensifies the Hong Kong issue. Rather than prescribing punitive measures if China escalates Hong Kong into military conflict, the law reassesses the unique standing that made Hong Kong so special in the first place. According to these new laws, if China asserts a policy that "Hong Kong is China" too much, then the US will agree and, more or less, remove the diplomatic relationship with Hong Kong. Then, Hong Kong would truly be "China" and no longer valuable to the world.
As for the Human Rights issues, Congress would need no extra law to intervene. The UN and the US already have enough on the books. And, Trump told Xi in no uncertain terms that there would not be a Tienanmen Square Part II.
Through it all, Western globalist fools are being exposed for what fools they are. While Beijing Communists plot the Sinicizaiton of the world, globalists believe that they must keep doing business with China, otherwise their incomes could be cut in half. They never consider that China's goal of growth is not to grow the incomes of globalists, nor to cut incomes in half, but to take all the globalists' money away, then brainwash them into Mandarin-speaking Communists.
For the globalists to rebuke Trump for his trade war would be like telling Moses to continue Israel's slavery in Egypt so that Pharaoh doesn't double their slave-labor workload. The Israeli slaves in Egypt didn't need lighter slave work loads; they needed freedom. Some globalists still haven't figured that out, but they will, thanks to China.
But, none of that will matter inside China, not this week anyway. Tomorrow, the Chinese will look at evidence of their perfection and greatness—a specific kind of evidence that persuades the Chinese more than anything else. In the midst of protests and trade wars, China is having a parade; and that is why China wants you to believe China should rule the world.