Merge branch 'integration-v5-challenge-api' into issue-4408

Author: luizrrodrigues

.circleci/config.yml

@@ -209,7 +209,6 @@ workflows:
           filters:
             branches:
               only:
-                - hot-fix
                 - integration-v5-challenge-api
       # This is beta env for production soft releases
       - "build-prod-beta":
@@ -224,7 +223,7 @@ workflows:
           filters:
             branches:
               only:
-                - integration-v5-challenge-api
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap

@@ -60,11 +60,6 @@ exports[`Matches shallow shapshot 1`] = `
   <div
     className="src-shared-components-Dashboard-SRM-___styles__srms-links___JFdeQ"
   >
-    <a
-      href="https://www.topcoder-dev.com/my-srms/"
-    >
-      View Past SRMS
-    </a>
     <a
       href="https://arena.topcoder-dev.com"
     >

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

@@ -49,8 +49,7 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
-  userHandle=""
+  userId=""
 />
 `;
 
@@ -67,6 +66,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
       "currentPhases": Array [
         "Registration",
       ],
+      "events": Array [],
       "id": "1",
       "legacy": Object {
         "track": "DATA_SCIENCE",
@@ -93,8 +93,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
-  userHandle=""
+  userId=""
 />
 `;
 
@@ -111,6 +110,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
       "currentPhases": Array [
         "Registration",
       ],
+      "events": Array [],
       "id": "long id",
       "legacy": Object {
         "track": "DATA_SCIENCE",
@@ -133,7 +133,6 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
-  userHandle=""
+  userId=""
 />
 `;

__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx

@@ -56,6 +56,7 @@ const mockData2 = {
     id: '1',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -76,6 +77,7 @@ const mockData3 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -96,6 +98,7 @@ const mockData4 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 
@@ -116,6 +119,7 @@ const mockData5 = {
     id: 'long id',
     totalPrize: 1800,
     users: {},
+    events: [],
   },
 };
 

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -89,7 +89,7 @@ exports[`Matches shallow shapshot 1`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;
@@ -240,7 +240,7 @@ exports[`Matches shallow shapshot 2`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;
@@ -278,7 +278,7 @@ exports[`Matches shallow shapshot 3`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;