peace of mind, you had better take all the necessary docs with you including the copy of I -797 just in case different IO handles issue differently( you never know, 移民官那,随机性大啦. what happens to your TN or H1B btw US and Canada may be a totally different story btw China and US ),.
I would even bring my CAN citizen card if I were you just preparing for something unexpected.
Do you best to keep worry free. Enjoy your trip.