Merge branch 'develop' into navi-params

Author: luizrrodrigues

.circleci/config.yml

@@ -364,7 +364,7 @@ workflows:
           filters:
             branches:
               only:
-                - navi-params
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

__tests__/shared/components/Error404.jsx

@@ -5,6 +5,7 @@
 import _ from 'lodash';
 import React from 'react';
 import { Route } from 'react-router-dom';
+import Viewport from 'components/Contentful/Viewport';
 import './style.scss';
 
 export default function Page404() {
@@ -16,12 +17,9 @@ export default function Page404() {
           return null;
         }}
       />
-      <h1 styleName="message">
-        404 HTTP Error
-      </h1>
-      <p styleName="details">
-        The resource you are looking for does not exist in Topcoder community App :(
-      </p>
+      <Viewport
+        id="3fB4UivAs6Nn5WbhREuqrn"
+      />
     </div>
   );
 }

__tests__/shared/components/__snapshots__/Error404.jsx.snap

@@ -7,7 +7,6 @@
   flex-direction: column;
   min-height: 400px;
   text-align: center;
-  padding: 150px 0;
 }
 
 .details {

src/shared/components/Error404/index.jsx

@@ -174,45 +174,13 @@ export default function ChallengeDetailsView(props) {
         <div styleName="challenge-specifications">
           <div styleName={`challenge-specs-main ${accentedStyle}`}>
             {
-              track.toLowerCase() !== 'design' || selfService
+              track.toLowerCase() !== 'design'
                 ? (
                   <div>
                     {
                       description
                       && (
                       <article>
-                        {
-                          selfService && (
-                            <p styleName="note">
-                              <strong>
-                                On Demand Challenges are customer-initiated single round design challenges.
-                              </strong>
-                              <br />
-                              Please note the following important information for Topcoder competitors who participate in this challenge:
-                              <ul>
-                                <li>Any communication needed, should be done directly with the customer in the Challenge Forum.</li>
-                                <li>In order to pass challenge screening and review, all challenge requirements and requested screens must be completed as described below.</li>
-                                <li>Submission source files must be created with the application(s) listed in the requirements.</li>
-                                <li>There will be no appeals or final fixes.</li>
-                                <li>The challenge winner selections will be based upon completed requirements and associated Topcoder review scoring.</li>
-                              </ul>
-                              <br />
-                              <strong>
-                                REQUEST MARVEL PROTOTYPES HERE:
-                              </strong>
-                              <br />
-                              <a href="https://discussions.topcoder.com/15528/request-marvel-access-for-design-challenges?new=1">
-                                Request Marvel for On Demand Challenges
-                              </a>
-                              <br />
-                              <strong>
-                                DO NOT request Marvel access in the challenge forum with the customer.
-                              </strong>
-                              <br />
-                              Figma or XD Prototypes are acceptable for submissions created with those applications.
-                            </p>
-                          )
-                        }
                         <h2>
                           Challenge Overview
                         </h2>
@@ -255,6 +223,38 @@ export default function ChallengeDetailsView(props) {
                       description
                       && (
                       <article>
+                        {
+                          selfService && (
+                            <p styleName="note">
+                              <strong>
+                                On Demand Challenges are customer-initiated single round design challenges.
+                              </strong>
+                              <br />
+                              Please note the following important information for Topcoder competitors who participate in this challenge:
+                              <ul>
+                                <li>Any communication needed, should be done directly with the customer in the Challenge Forum.</li>
+                                <li>In order to pass challenge screening and review, all challenge requirements and requested screens must be completed as described below.</li>
+                                <li>Submission source files must be created with the application(s) listed in the requirements.</li>
+                                <li>There will be no appeals or final fixes.</li>
+                                <li>The challenge winner selections will be based upon completed requirements and associated Topcoder review scoring.</li>
+                              </ul>
+                              <br />
+                              <strong>
+                                REQUEST MARVEL PROTOTYPES HERE:
+                              </strong>
+                              <br />
+                              <a href="https://discussions.topcoder.com/15528/request-marvel-access-for-design-challenges?new=1">
+                                Request Marvel for On Demand Challenges
+                              </a>
+                              <br />
+                              <strong>
+                                DO NOT request Marvel access in the challenge forum with the customer.
+                              </strong>
+                              <br />
+                              Figma or XD Prototypes are acceptable for submissions created with those applications.
+                            </p>
+                          )
+                        }
                         <h2>
                           Challenge Summary
                         </h2>