Codecov Report

Merging #8215 (78f8d38) into develop (3e31fdb) will increase coverage by 0.02%.
The diff coverage is 55.81%.

❗ Current head 78f8d38 differs from pull request most recent head ec16b10. Consider uploading reports for the commit ec16b10 to get more accurate results

@@             Coverage Diff             @@
##           develop    #8215      +/-   ##
===========================================
+ Coverage    30.85%   30.87%   +0.02%     
===========================================
  Files          893      893              
  Lines        50793    50824      +31     
  Branches     12928    12941      +13     
===========================================
+ Hits         15671    15691      +20     
- Misses       35122    35133      +11     

All comments addressed. There is an open discussion on the MSC about whether or not m.topic and m.message should be allowed to deviate in future (and if not, that would affect the key in the event content). I'm not sure if that should block this PR though.

something appears to have gone very wrong with your merge - suggest a reset & rebase before review can really be completed.

something appears to have gone very wrong with your merge - suggest a reset & rebase before review can really be completed.

Yeah, I screwed up after pulling in the suggested and applied changes from GitHub. The final diff was actually correct, just the history messed up. Unfortunately, there were a myriad of commits inbetween so the only sensible way I found to fix this was to reset and commit the diff as a single commit. Hope that's ok.

also you have CI failures + merge conflicts, sorry. Please do a merge commit if possible to avoid having to have the whole thing re-reviewed :)

also you have CI failures + merge conflicts, sorry. Please do a merge commit if possible to avoid having to have the whole thing re-reviewed :)

Builds are green except for the e2e tests. I'm not sure if those failures are due to my changes though as the log doesn't seem related at all:

2022-05-09T18:27:50.219Z  * enterprise_erin logs out:
2022-05-09T18:27:50.219Z    * enterprise_erin navigates to user menu ... done
2022-05-09T18:27:50.269Z    * enterprise_erin clicks the 'Sign Out' button ... done
2022-05-09T18:27:50.323Z  * enterprise_erin waits for redirect to config.json (as external page) ... done
failure:  AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
+ actual - expected

+ '1'
- 'some-new-version'
    at /__w/matrix-react-sdk/matrix-react-sdk/test/end-to-end-tests/lib/src/scenarios/update.js:58:25
    at Generator.next (<anonymous>)
    at fulfilled (/__w/matrix-react-sdk/matrix-react-sdk/test/end-to-end-tests/lib/src/scenarios/update.js:20:58)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:95:5) {
  generatedMessage: true,
  code: 'ERR_ASSERTION',
  actual: '1',
  expected: 'some-new-version',
  operator: 'strictEqual'
}

I also don't have rights to re-run builds so I cannot retrigger them.

Thanks @turt2live! 🙌

And PS: I don't have write access so could you please merge this for me?

@Johennes lets hold this off until tomorrow after the RC, we avoid merging large changes right before an RC cut

Is this safe to merge now?

I'm going to land this without working cypress tests as I believe the CI is just horribly confused about branches or context or something. Will monitor develop.