Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

fix set password & email flow possible to get stuck and onBlur murdering your email #1982

Merged
merged 3 commits into from
Jun 21, 2018

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jun 16, 2018

if you refresh your browser after the SetPassword dialog, whilst in the SetEmail dialog, your password will have been changed but the NagBar will still nag you to change your password and fail every time because the password it remembers is now wrong.
and onBlur of the EditableText murdering the email you have input

Fixes element-hq/element-web#6366

@dbkr
Copy link
Member

dbkr commented Jun 18, 2018

Looks plausible. Assigning @lukebarnard1 to make sure the change to the dispatch is sensible here.

Copy link
Contributor

@lukebarnard1 lukebarnard1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GH claims that ChatCreateOrReuseDialog.js is changed in this PR and sprouts a strange error when commenting on that particular part of the diff. Not sure why.

@lukebarnard1
Copy link
Contributor

make sure the change to the dispatch is sensible here.

Looks better than before, if anything 👍

@t3chguy
Copy link
Member Author

t3chguy commented Jun 18, 2018

huh I'm not sure why the ChatCreateOrReuseDialog changes are in here, I've gotten lost between all the PRs and not sure whether that was intentional, if you feel it is too tangential I can pull it out

@lukebarnard1 lukebarnard1 removed their assignment Jun 18, 2018
@lukebarnard1
Copy link
Contributor

if you feel it is too tangential I can pull it out

Given the changes do not match the commit messages, it'd be best.

@t3chguy t3chguy force-pushed the t3chguy/nvl/fix_set_password-email_flow branch from b18ed6e to 9109d5b Compare June 18, 2018 17:23
@t3chguy
Copy link
Member Author

t3chguy commented Jun 18, 2018

I redid the commits with basically the same content

@t3chguy t3chguy assigned dbkr and lukebarnard1 and unassigned t3chguy Jun 18, 2018
@t3chguy t3chguy changed the base branch from develop to luke/fix-matrix-to-regex June 18, 2018 20:03
@t3chguy t3chguy changed the base branch from luke/fix-matrix-to-regex to develop June 18, 2018 20:03
@t3chguy
Copy link
Member Author

t3chguy commented Jun 18, 2018

(github's diff was a little weird, tried to unstick it)

Copy link
Contributor

@lukebarnard1 lukebarnard1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are still some unrelated functional changes in this PR.

@@ -169,15 +175,15 @@ export default class ChatCreateOrReuseDialog extends React.Component {
</p>
{ profile }
</div>
<DialogButtons primaryButton={_t('Start Chatting')}
onPrimaryButtonClick={this.props.onNewDMClick} focus="true" />
<DialogButtons primaryButton={_t('Start Chatting')} onCancel={this.onCancel}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a functional change, not delint.

@lukebarnard1 lukebarnard1 assigned t3chguy and unassigned dbkr and lukebarnard1 Jun 21, 2018
@t3chguy t3chguy force-pushed the t3chguy/nvl/fix_set_password-email_flow branch from 4629292 to f2e4e51 Compare June 21, 2018 10:26
@t3chguy t3chguy assigned lukebarnard1 and unassigned t3chguy Jun 21, 2018
@t3chguy
Copy link
Member Author

t3chguy commented Jun 21, 2018

@lukebarnard1 fixed that for you

@t3chguy t3chguy merged commit a0207fb into develop Jun 21, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants