fix login

Author: YousefED

packages/editor/src/app/matrix-auth/MatrixAuthStore.ts

@@ -221,6 +221,7 @@ export class MatrixAuthStore extends lifecycle.Disposable {
   private async setLoggedIn(
     credentials: IMatrixClientCreds
   ): Promise<MatrixClient> {
+    this.setLoggedInState(false);
     credentials.freshLogin = true;
     this.stopMatrixClient();
     const pickleKey =
@@ -961,6 +962,7 @@ export class MatrixAuthStore extends lifecycle.Disposable {
     const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(
       cli.getUserId()
     );
+
     if (crossSigningIsSetUp) {
       // if (SecurityCustomisations.SHOW_ENCRYPTION_SETUP_UI === false) {
       // this.onLoggedIn();

packages/editor/src/app/matrix-auth/auth/views/PasswordLogin.tsx

@@ -251,7 +251,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
     //!SdkConfig.get().disable_3pid_login) {
     if (true) {
       const userNameOption = { label: "Username", value: LoginField.MatrixId };
-      const emailOption = { label: "Email Address", value: LoginField.Email };
+      const emailOption = { label: "Email address", value: LoginField.Email };
       // const phoneOption = { label: "Phone", value: LoginField.Phone };
       const options = [userNameOption, emailOption]; //, phoneOption];
       // Perhaps this should not be a <Field> but just a <select>, as it only changes the design of the form,