https://www.oregon.gov/dor/programs/taxpro/Documents/2020-Oregon-New-Law-Update-for-Attendees.pdf
Check page 17 here. You'll see, according to the Dept of Revenue's own course, that both stimuli are to be be used to reduce the federal tax subtraction.
