
            re-add linting rule react/sort-comp and fix resulting errors

3ca2402