Australian & New Zealand citizens travelling Australia - Hong Kong - Shanghai - Tokyo - Singapore

Hi, I am an Aussie and my friend is from NZ. We will be travelling from Australia and flying from city to city as written above.
We arrive December 25 10am in Shanghai and then fly out Dec 29 1am to Tokyo.
We will both be eligible for the 144 hour twov right?
As far as I understand, we don't need a visa for HK because it's just a small social trip.

Thank you