From 21a24e348c8917e1cd5535d68c9562eb84ec4615 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Sat, 7 Nov 2020 06:27:12 +0700
Subject: [PATCH 1/4] fix: the rendering of ordered list numbering and
 unordered list bullet

---
 src/shared/components/Terms/TermDetails.scss | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/shared/components/Terms/TermDetails.scss b/src/shared/components/Terms/TermDetails.scss
index 675274ce3b..433e37c677 100644
--- a/src/shared/components/Terms/TermDetails.scss
+++ b/src/shared/components/Terms/TermDetails.scss
@@ -40,6 +40,20 @@
   br + br {
     display: none;
   }
+
+  ol {
+    list-style-type: decimal;
+    padding: 0 15px;
+  }
+
+  ul {
+    list-style-type: disc;
+    padding: 0 15px;
+  }
+
+  li {
+    list-style-position: outside;
+  }
 }
 
 .frame {

From 4d565fffa0e89787218ed052c7d8833337d927cf Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Sat, 7 Nov 2020 14:01:32 +0700
Subject: [PATCH 2/4] fix: list style to be in the same format as challenge
 spec

---
 src/shared/components/Terms/TermDetails.scss | 38 ++++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/shared/components/Terms/TermDetails.scss b/src/shared/components/Terms/TermDetails.scss
index 433e37c677..93ddaf3a90 100644
--- a/src/shared/components/Terms/TermDetails.scss
+++ b/src/shared/components/Terms/TermDetails.scss
@@ -42,17 +42,41 @@
   }
 
   ol {
-    list-style-type: decimal;
-    padding: 0 15px;
+    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 {
-    list-style-type: disc;
-    padding: 0 15px;
-  }
+    margin: 0 0 5px 20px;
+    font-size: 15px;
+    color: $tc-gray-90;
+    line-height: 25px;
+    list-style: disc outside none;
 
-  li {
-    list-style-position: outside;
+    li {
+      font-weight: 400;
+    }
   }
 }
 

From 185c3196ec7eaae8e18ffe1476c26d6bd8786d0c Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Mon, 9 Nov 2020 23:32:29 -0300
Subject: [PATCH 3/4] Hide Challenge Email

---
 .../Settings/Account/MyAccount/index.jsx      | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/shared/components/Settings/Account/MyAccount/index.jsx b/src/shared/components/Settings/Account/MyAccount/index.jsx
index 33867791f8..b7e688ba22 100644
--- a/src/shared/components/Settings/Account/MyAccount/index.jsx
+++ b/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,8 +481,13 @@ 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}
@@ -490,7 +495,11 @@ export default class MyAccount extends ConsentComponent {
                         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,8 +600,11 @@ 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}
@@ -591,7 +612,11 @@ export default class MyAccount extends ConsentComponent {
                         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>
               )
             }

From 8e6fbd96237c6d3651671018825135391813b3a7 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Mon, 9 Nov 2020 23:42:32 -0300
Subject: [PATCH 4/4] ci: deploy tcx-202011 to Stag env

Issues: #5107 #5168
---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index abe65e8480..7ab9cd7d31 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -261,6 +261,7 @@ workflows:
             branches:
               only:
                 - develop
+                - tcx-202011
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration