chore(views): improve static analysis in river views
Merge pull request #7254 from mrclay/river_static_analysis

chore(views): improve static analysis in river views