https://linear.app/comm/issue/ENG-10205/update-flow-to-02691
Depends on D15059
Flow
Rebase
We should avoid using nested ternaries
Rebase & review changes