Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile

2021-06-02 10:45:35 +02:00
parent 3331e7bfbe 50994735d9
commit 466a52e238
26 changed files with 3458 additions and 567 deletions
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -112,7 +112,7 @@ interface IProps {
 const MAX_PER_ROW = 6;

 const SSOButtons: React.FC<IProps> = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
-    const providers = flow["org.matrix.msc2858.identity_providers"] || [];
+    const providers = flow.identity_providers || [];
    if (providers.length < 2) {
        return <div className="mx_SSOButtons">
            <SSOButton