Merge pull request #5180 from topcoder-platform/tcx-202011

Smoke Testing 2020/11/10 - TCX issues

Author: luizrrodrigues

.circleci/config.yml

@@ -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

src/shared/components/Settings/Account/MyAccount/index.jsx

@@ -362,8 +362,8 @@ export default class MyAccount extends ConsentComponent {
       newEmail,
       currentEmail,
       btnChangeEmailVisible,
-      btnVerifiEmailVisible,
-      btnVerifiAgainlVisible,
+      // btnVerifiEmailVisible,
+      // btnVerifiAgainlVisible,
       focus,
       hasLength,
       hasLetter,
@@ -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 (
@@ -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}
@@ -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}
@@ -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}
@@ -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">
@@ -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}
@@ -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}
@@ -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}
@@ -618,6 +651,7 @@ export default class MyAccount extends ConsentComponent {
                       </PrimaryButton>
                     </div>
                   </div>
+                  */}
                 </form>
               )
             }

src/shared/components/Terms/TermDetails.scss

@@ -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 {