Skip to content

Make sure we unsubscribe the pressOnEnter handler for the login form when we render the password form #10418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuwenmemon merged 2 commits into from
Aug 17, 2022
Merged

Make sure we unsubscribe the pressOnEnter handler for the login form when we render the password form #10418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ea5a5
Make sure we unsubscribe the pressOnEnter handler for the login form …
yuwenmemon Aug 17, 2022
c6aac38
Remove pressOnEnter prop
yuwenmemon Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/pages/signin/LoginForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,21 @@ class LoginForm extends React.Component {
{this.props.account.success}
</Text>
)}
<View style={[styles.mt5]}>
<FormAlertWithSubmitButton
buttonText={this.props.translate('common.continue')}
isLoading={this.props.account.isLoading}
onSubmit={this.validateAndSubmitForm}
message={error}
isAlertVisible={!_.isEmpty(error)}
containerStyles={[styles.mh0]}
/>
</View>
{ // We need to unmount the submit button when the component is not visible so that the Enter button
// key handler gets unsubscribed and does not conflict with the Password Form
this.props.isVisible && (
<View style={[styles.mt5]}>
<FormAlertWithSubmitButton
buttonText={this.props.translate('common.continue')}
isLoading={this.props.account.isLoading}
onSubmit={this.validateAndSubmitForm}
message={error}
isAlertVisible={!_.isEmpty(error)}
containerStyles={[styles.mh0]}
/>
</View>
)
}
<OfflineIndicator containerStyles={[styles.mv1]} />
</>
);
Expand Down