As I read more about the deal. He called the UK prime minister, got him out of bed and begged him for a deal. From what I can see, Trump made all the concessions.
As to China he agreed to their demands to end the new tariffs before there would be talks. Xi is going to eat Trump's lunch.
Trump will end up begging Xi for a deal like he did with the UK prime minister and China will end up getting a better trade deal than they had before Trump took office. Hopefully, we get access to BYD cars and some Chinese phones out of the deal.
Trump is the stupidest President ever. He knows nothing about history, economics or other countries' culture. He didn't even understand China, like a lot of other Asian countries, has a face saving culture. Meaning for there to be any deal there has to be significant concessions from Trump as he insulted China and upended the status quo. Xi can't make a deal otherwise as it would cause him to lose face and he would appear weak to the Chinese people.