Here's your Help article:

https://proconnect.intuit.com/community/corporation/help/how-to-enter-forgiven-ppp-loans-in-lacerte/...

It seems you will enter the Grant now and the Loan still is a Loan until forgiven.

For CA, I suspect the program has not been updated. EIDL advance was taxable in CA until April 29. I've not seen anything on this forum for CA update for that issue.