Merge remote-tracking branch 'upstream/develop' into task/structures-ts

2021-09-14 06:31:43 +02:00
parent 8a86407a4c 298fb49017
commit eae45d8a7e
6 changed files with 18 additions and 6 deletions
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -143,7 +143,7 @@ export enum Views {
    SOFT_LOGOUT,
 }

-const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas", "welcome"];

 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require