RSU Treatment by OR as an out-of-state hybrid worker

I live in WA and commute to OR 1 day a week, so am subject to paying OR taxes on 20% of my earnings. Where this gets a little fuzzier is around non-wage income. How do I treat Restricted Stock Units that change value between grant and distribution date?

 

For example:

RSU grant with a FMV of $10k at grant date

1 year later, it vests and is distributed, but stock has gone up and now is worth $12k

 

What is subject to OR taxes? 20% of the FMV at grant date or distribution date? If the latter, then would I also be subject to OR taxes on any capital gains realized at sale?