Skip to content

Hide Challenge Email #5177

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
merged 1 commit into from
Nov 10, 2020
Merged

Hide Challenge Email #5177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 46 additions & 12 deletions src/shared/components/Settings/Account/MyAccount/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ export default class MyAccount extends ConsentComponent {
newEmail,
currentEmail,
btnChangeEmailVisible,
btnVerifiEmailVisible,
btnVerifiAgainlVisible,
// btnVerifiEmailVisible,
// btnVerifiAgainlVisible,
focus,
hasLength,
hasLetter,
Expand All @@ -377,11 +377,11 @@ export default class MyAccount extends ConsentComponent {
isMobileView,
showRePasswordTips,
rePasswordValid,
isValidEmail,
// isValidEmail,
isOpen,
} = this.state;

const { updatingPassword, updatingProfile, isEmailConflict = false } = profileState;
const { updatingPassword, /* updatingProfile, */ isEmailConflict = false } = profileState;
const { incorrectPassword } = settingsPageState;

return (
Expand Down Expand Up @@ -481,16 +481,25 @@ export default class MyAccount extends ConsentComponent {
</div>
)
}
{ /* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
<div styleName="row">
<div styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
onClick={this.onChangeEmail}
>
Change Email
</PrimaryButton>
</div>
<div styleName={`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
disabled={!isValidEmail || updatingProfile}
Expand All @@ -499,7 +508,11 @@ export default class MyAccount extends ConsentComponent {
Send Verification Email
</PrimaryButton>
</div>
<div styleName={`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
disabled={!isValidEmail || updatingProfile}
Expand All @@ -508,7 +521,11 @@ export default class MyAccount extends ConsentComponent {
Send Verification Email Again
</PrimaryButton>
</div>
<div styleName={`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
onClick={this.onCancelVerificationEmail}
Expand All @@ -517,6 +534,7 @@ export default class MyAccount extends ConsentComponent {
</PrimaryButton>
</div>
</div>
*/}
</form>
) : (
<form name="email-form-default" styleName="form-default" noValidate autoComplete="off">
Expand Down Expand Up @@ -582,16 +600,23 @@ export default class MyAccount extends ConsentComponent {
</div>
)
}
{/* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
<div styleName="row button-group">
<div styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}
>
<PrimaryButton
styleName="white-label"
onClick={this.onChangeEmail}
>
Change Email
</PrimaryButton>
</div>
<div styleName={`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
disabled={!isValidEmail || updatingProfile}
Expand All @@ -600,7 +625,11 @@ export default class MyAccount extends ConsentComponent {
Send Verification Email
</PrimaryButton>
</div>
<div styleName={`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
disabled={!isValidEmail || updatingProfile}
Expand All @@ -609,7 +638,11 @@ export default class MyAccount extends ConsentComponent {
Send Verification Email Again
</PrimaryButton>
</div>
<div styleName={`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
<div
styleName={
`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
}
>
<PrimaryButton
styleName="white-label"
onClick={this.onCancelVerificationEmail}
Expand All @@ -618,6 +651,7 @@ export default class MyAccount extends ConsentComponent {
</PrimaryButton>
</div>
</div>
*/}
</form>
)
}
Expand Down