recommit bwindels commited changes to refactor check logic after rebase mistake
recommit bwindels commited changes to refactor check logic after rebase mistake

matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk