Merge branch 'develop' into reskin-challenge-details

Author: dedywahyudi

.circleci/config.yml

@@ -349,35 +349,36 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - free
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
           filters:
             branches:
               only:
-                - tco23
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global
           filters:
             branches:
               only:
-                - free
+                - reskin-profile-settings
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - reskin-challenge-details
+                - beta-demo
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters: &filters-staging
             branches:
               only:
                 - develop
+                - old-mm-fix
       # Production builds are exectuted
       # when PR is merged to the master
       # Don't change anything in this configuration
@@ -397,6 +398,7 @@ workflows:
             branches:
               ignore:
                 - develop
+                - submission_delete_button
 
   Smoke Testing:
     when: << pipeline.parameters.run_smoketesting >>

.gitignore

@@ -45,6 +45,8 @@ jspm_packages
 # macOS system files
 *.DS_Store
 
+.env.sh
+
 # Misc files
 .build-info
 .vscode

Dockerfile

@@ -78,6 +78,9 @@ ARG GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
 # Optimizely
 ARG OPTIMIZELY_SDK_KEY
 
+# Gamification
+ARG GAMIFICATION_ORG_ID
+
 ################################################################################
 # Setting of environment variables in the Docker image.
 
@@ -143,6 +146,8 @@ ENV GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
 # Optimizely
 ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
 
+ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
+
 ################################################################################
 # Testing and build of the application inside the container.
 

__tests__/shared/__snapshots__/index.jsx.snap

@@ -31,6 +31,7 @@ exports[`Snapshot match 1`] = `
     position="top-center"
     preventDuplicates={true}
     progressBar={false}
+    showCloseButton={true}
     transitionIn="fadeIn"
     transitionOut="fadeOut"
   />
@@ -69,6 +70,7 @@ exports[`Snapshot match 2`] = `
     position="top-center"
     preventDuplicates={true}
     progressBar={false}
+    showCloseButton={true}
     transitionIn="fadeIn"
     transitionOut="fadeOut"
   />

__tests__/shared/components/GUIKit/Datepicker/__snapshots__/index.jsx.snap

@@ -102,7 +102,7 @@ exports[`Default render 1`] = `
     regular={false}
     renderCalendarInfo={null}
     renderDayContents={[Function]}
-    renderMonthElement={null}
+    renderMonthElement={[Function]}
     renderMonthText={null}
     reopenPickerOnClearDate={false}
     required={false}

__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

@@ -70,7 +70,6 @@ exports[`Matches shallow shapshot 1`] = `
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
         >
           <span>
-            0
              points
           </span>
           <span>
@@ -84,7 +83,7 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
       >
-        0.00
+        NaN
       </td>
     </tr>
     <tr>
@@ -125,7 +124,6 @@ exports[`Matches shallow shapshot 1`] = `
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
         >
           <span>
-            0
              points
           </span>
           <span>
@@ -139,7 +137,7 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
       >
-        0.00
+        NaN
       </td>
     </tr>
     <tr>
@@ -180,7 +178,6 @@ exports[`Matches shallow shapshot 1`] = `
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
         >
           <span>
-            0
              points
           </span>
           <span>
@@ -194,7 +191,7 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
       >
-        0.00
+        NaN
       </td>
     </tr>
     <tr>
@@ -235,7 +232,6 @@ exports[`Matches shallow shapshot 1`] = `
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
         >
           <span>
-            0
              points
           </span>
           <span>
@@ -249,7 +245,7 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
       >
-        0.00
+        NaN
       </td>
     </tr>
   </tbody>

__tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap

@@ -47,7 +47,7 @@ exports[`Matches shallow shapshot 1`] = `
       <span
         className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"
       >
-        0.00
+        NaN
       </span>
       <span
         className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value-title___1Jf_7"
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 2`] = `
       <span
         className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"
       >
-        0.00
+        NaN
       </span>
       <span
         className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value-title___1Jf_7"

__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

@@ -58,6 +58,7 @@ exports[`renders a full Profile correctly 1`] = `
       },
     ]
   }
+  badges={Object {}}
   challenges={null}
   clearSubtrackChallenges={[Function]}
   copilot={true}
@@ -720,6 +721,7 @@ exports[`renders a full Profile correctly 1`] = `
 exports[`renders an empty Profile correctly 1`] = `
 <ProfilePage
   achievements={Array []}
+  badges={Object {}}
   challenges={null}
   clearSubtrackChallenges={[Function]}
   copilot={false}