Skip to content

Smoke Testing 2020/11/10 - TCX issues #5180

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 7 commits into from
Nov 10, 2020
Merged

Smoke Testing 2020/11/10 - TCX issues #5180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21a24e3
fix: the rendering of ordered list numbering and unordered list bullet
gets0ul Nov 6, 2020
4d565ff
fix: list style to be in the same format as challenge spec
gets0ul Nov 7, 2020
c8c6634
Merge pull request #5170 from gets0ul/issue_5168
luizrrodrigues Nov 10, 2020
185c319
Hide Challenge Email
luizrrodrigues Nov 10, 2020
6cc5989
Merge pull request #5177 from topcoder-platform/issue-5107
luizrrodrigues Nov 10, 2020
8e6fbd9
ci: deploy tcx-202011 to Stag env
luizrrodrigues Nov 10, 2020
6d0f941
Merge branch 'develop' into tcx-202011
luizrrodrigues Nov 10, 2020
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
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ workflows:
branches:
only:
- develop
- bug-bash-develop-sync
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
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
38 changes: 38 additions & 0 deletions src/shared/components/Terms/TermDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,44 @@
br + br {
display: none;
}

ol {
margin: 0 0 5px;
counter-reset: item;
font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
display: table;

li {
list-style-type: none;
font-weight: 400;
counter-increment: item;
display: table-row;
white-space: normal;

&::before {
display: table-cell;
font-weight: 700;
text-align: right;
content: counter(item) ".";
padding: 0 10px 0 0;
width: 32px;
}
}
}

ul {
margin: 0 0 5px 20px;
font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
list-style: disc outside none;

li {
font-weight: 400;
}
}
}

.frame {
Expand Down