From 83a6d017fc0188f6cdbaa9d1581c8e5c0a348bd0 Mon Sep 17 00:00:00 2001
From: M Fikri A <fikzzzy@gmail.com>
Date: Fri, 19 Mar 2021 09:29:33 +0700
Subject: [PATCH 01/16] Implement Secure Identity Verification

---
 config/custom-environment-variables.js |  1 +
 docs/secure-identity-verification.md   |  9 +++++++++
 src/client/index.jsx                   | 25 ++++++++++++++++++++-----
 src/shared/reducers/index.js           | 24 +++++++++++++++++++++++-
 4 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 docs/secure-identity-verification.md

diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js
index 34ffc3cb89..280e961b4f 100644
--- a/config/custom-environment-variables.js
+++ b/config/custom-environment-variables.js
@@ -99,6 +99,7 @@ module.exports = {
     RECRUITCRM_API_KEY: 'RECRUITCRM_API_KEY',
     GROWSURF_API_KEY: 'GROWSURF_API_KEY',
     SENDGRID_API_KEY: 'SENDGRID_API_KEY',
+    CHAMELEON_VERIFICATION_SECRET: 'CHAMELEON_VERIFICATION_SECRET',
   },
   GROWSURF_CAMPAIGN_ID: 'GROWSURF_CAMPAIGN_ID',
   AUTH_CONFIG: {
diff --git a/docs/secure-identity-verification.md b/docs/secure-identity-verification.md
new file mode 100644
index 0000000000..4f5d6bb2a5
--- /dev/null
+++ b/docs/secure-identity-verification.md
@@ -0,0 +1,9 @@
+## Setup
+1. Make sure you have a Chameleon Account and segment.com account
+2. Integrate Chameleon Account with Segment. https://help.trychameleon.com/en/articles/1161770-installing-using-segment
+3. Set Environment secret variable retrieved here https://app.trychameleon.com/settings/integrations/segment. Run the following command
+`export CHAMELEON_VERIFICATION_SECRET=<Your Chameleon Secret>`
+4. Run community app
+
+## Verification
+1. When you reload the page you will notice in the network tab there will be 2 requests POST to https://api.segment.io/v1/i, one will send it to segment and one will send only to chameleon (with request payload `{ integrations: { All: false, Chameleon: true }}`)
diff --git a/src/client/index.jsx b/src/client/index.jsx
index b44745e76e..b879711ac2 100644
--- a/src/client/index.jsx
+++ b/src/client/index.jsx
@@ -23,9 +23,10 @@ const { setErrorsStore } = errors;
  * Performs AnalyticsJS identification of the user.
  * @param {Object} profile TC user profile.
  * @param {Array} roles User roles.
+ * @param {String} userIdHash Unique Hash per user.
  */
-function identify(profile, roles) {
-  analytics.identify(profile.userId, {
+function identify(profile, roles, userIdHash) {
+  const payload = {
     avatar: profile.photoURL,
     createdAt: profile.createdAt,
     email: profile.email,
@@ -39,7 +40,21 @@ function identify(profile, roles) {
     })),
     tracks: profile.tracks || [],
     username: profile.handle,
-  });
+  };
+  analytics.identify(
+    profile.userId,
+    payload,
+    {
+      integrations: { Chameleon: false },
+    },
+  );
+  analytics.identify(
+    profile.userId,
+    { uid_hash: userIdHash, ...payload },
+    {
+      integrations: { All: false, Chameleon: true },
+    },
+  );
 }
 
 /**
@@ -74,7 +89,7 @@ function authenticate(store) {
   }).then(({ tctV2, tctV3 }) => {
     const { auth } = store.getState();
     if (auth.profile && !analyticsIdentitySet) {
-      identify(auth.profile, _.get(auth, 'user.roles'));
+      identify(auth.profile, _.get(auth, 'user.roles'), auth.userIdHash);
       analyticsIdentitySet = true;
     }
     if (auth.tokenV3 !== (tctV3 || null)) {
@@ -85,7 +100,7 @@ function authenticate(store) {
         const userId = profile && profile.userId;
         const prevUserId = _.get(store.getState(), 'auth.profile.userId');
         if (userId && userId !== prevUserId) {
-          identify(profile, _.get(auth, user.roles));
+          identify(profile, _.get(auth, user.roles), auth.userIdHash);
           analyticsIdentitySet = true;
         }
       });
diff --git a/src/shared/reducers/index.js b/src/shared/reducers/index.js
index 518f7de831..2a49d02df0 100644
--- a/src/shared/reducers/index.js
+++ b/src/shared/reducers/index.js
@@ -15,8 +15,9 @@
  */
 
 import _ from 'lodash';
+import crypto from 'crypto';
 import { getCommunityId } from 'server/services/communities';
-import { redux } from 'topcoder-react-utils';
+import { redux, config, isomorphy } from 'topcoder-react-utils';
 import { reducer as toastrReducer } from 'react-redux-toastr';
 import { reducerFactory } from 'topcoder-react-lib';
 import { getAuthTokens } from 'utils/tc';
@@ -113,6 +114,21 @@ function generateSsrOptions(req) {
   return res;
 }
 
+/**
+ * Generate user id hash for secure Identity verification
+ * @param {Object} user
+ * @return {String} User Id Hash.
+ */
+function generateUserIdHash(user) {
+  const secret = _.get(config, 'SECRET.CHAMELEON_VERIFICATION_SECRET');
+  const now = Math.floor(Date.now() / 1000);
+
+  return [
+    crypto.createHmac('sha256', secret).update(`${user.id}-${now}`).digest('hex'),
+    now,
+  ].join('-');
+}
+
 export function factory(req) {
   return redux.resolveReducers({
     standard: reducerFactory(req && generateSsrOptions(req)),
@@ -125,6 +141,12 @@ export function factory(req) {
     page: pageFactory(req),
   }).then(resolvedReducers => redux.combineReducers((state) => {
     const res = { ...state };
+
+    const user = _.get(res, 'auth.user');
+    if (user && isomorphy.isServerSide()) {
+      res.auth.userIdHash = generateUserIdHash(user);
+    }
+
     if (req) {
       res.domain = `${req.protocol}://${req.headers.host || req.hostname}`;
       res.subdomainCommunity = getCommunityId(req.subdomains);

From c416d4e77b8ee708edc16ead6e1458ad472cf329 Mon Sep 17 00:00:00 2001
From: M Fikri A <fikzzzy@gmail.com>
Date: Fri, 19 Mar 2021 10:05:49 +0700
Subject: [PATCH 02/16] Use userId

---
 docs/secure-identity-verification.md | 6 +++++-
 src/shared/reducers/index.js         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/secure-identity-verification.md b/docs/secure-identity-verification.md
index 4f5d6bb2a5..896bc450ad 100644
--- a/docs/secure-identity-verification.md
+++ b/docs/secure-identity-verification.md
@@ -6,4 +6,8 @@
 4. Run community app
 
 ## Verification
-1. When you reload the page you will notice in the network tab there will be 2 requests POST to https://api.segment.io/v1/i, one will send it to segment and one will send only to chameleon (with request payload `{ integrations: { All: false, Chameleon: true }}`)
+1. Log in to topcoder-dev account
+2. Access http://local.topcoder-dev.com/challenges
+3. You will notice in the network tab there will be 2 requests POST to https://api.segment.io/v1/i, one will send it to segment and one will send only to chameleon (with request payload `{ integrations: { All: false, Chameleon: true }}`)
+
+Repeat the proses and log in to different account and make sure the `uid_hash` is different for each different user.
diff --git a/src/shared/reducers/index.js b/src/shared/reducers/index.js
index 2a49d02df0..42fcb4d19c 100644
--- a/src/shared/reducers/index.js
+++ b/src/shared/reducers/index.js
@@ -124,7 +124,7 @@ function generateUserIdHash(user) {
   const now = Math.floor(Date.now() / 1000);
 
   return [
-    crypto.createHmac('sha256', secret).update(`${user.id}-${now}`).digest('hex'),
+    crypto.createHmac('sha256', secret).update(`${user.userId}-${now}`).digest('hex'),
     now,
   ].join('-');
 }

From 38931560832f7fd4be377ab104688ccf7812444d Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Fri, 2 Apr 2021 04:52:01 -0300
Subject: [PATCH 03/16] ci: Deploy update-segment-script to Dev and Stag

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d107a6dc6..a67f61b412 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -276,7 +276,7 @@ workflows:
             branches:
               only:
                 - develop
-                - feature/recommender-sync-develop
+                - update-segment-script
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -305,7 +305,7 @@ workflows:
             branches:
               only:
                 - develop
-                - feature/recommender-sync-develop
+                - update-segment-script
       - "approve-smoke-test-on-staging":
           type: approval
           requires:

From 0922cada0bd34a3f5f206fc5bb954e74964df8ca Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 12 Apr 2021 11:15:34 +0300
Subject: [PATCH 04/16] Implement v1 #5479

---
 config/default.js                             |   3 +
 package.json                                  |   1 +
 src/assets/images/gig-work/tag-dolars.png     | Bin 0 -> 1993 bytes
 src/assets/images/gig-work/tag-hot.png        | Bin 0 -> 1556 bytes
 src/assets/images/gig-work/tag-new.png        | Bin 0 -> 1928 bytes
 .../components/GUIKit/JobListCard/index.jsx   |  12 ++
 .../components/GUIKit/JobListCard/style.scss  |  32 +++-
 src/shared/containers/Gigs/RecruitCRMJobs.jsx |  74 ++++++--
 .../containers/Gigs/jobLisingStyles.scss      | 164 +++++++++++++++++-
 src/shared/containers/GigsPages.jsx           |  23 ++-
 src/shared/routes/index.jsx                   |  25 ++-
 11 files changed, 304 insertions(+), 30 deletions(-)
 create mode 100644 src/assets/images/gig-work/tag-dolars.png
 create mode 100644 src/assets/images/gig-work/tag-hot.png
 create mode 100644 src/assets/images/gig-work/tag-new.png

diff --git a/config/default.js b/config/default.js
index 161136e9e2..ec258f40b2 100644
--- a/config/default.js
+++ b/config/default.js
@@ -426,4 +426,7 @@ module.exports = {
     DEBOUNCE_ON_CHANGE_TIME: 150,
   },
   ENABLE_RECOMMENDER: true,
+  OPTIMIZELY: {
+    SDK_KEY: '7V4CJhurXT3Y3bnzv1hv1',
+  },
 };
diff --git a/package.json b/package.json
index 28e53ff3ad..4c43b84f24 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^16.1.4",
+    "@optimizely/react-sdk": "^2.5.0",
     "@topcoder-platform/tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
     "aos": "^2.3.4",
     "atob": "^2.1.1",
diff --git a/src/assets/images/gig-work/tag-dolars.png b/src/assets/images/gig-work/tag-dolars.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec9ca0030141a9bbd2a2326578215696cce8f8a5
GIT binary patch
literal 1993
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
bM*#i<fZXk?n%0Cv00000NkvXXu0mjfc&p^(

literal 0
HcmV?d00001

diff --git a/src/assets/images/gig-work/tag-hot.png b/src/assets/images/gig-work/tag-hot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bc7676d605fd9e884480f3404aeb94b6c836c1a
GIT binary patch
literal 1556
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
GLSTZbGu~AI

literal 0
HcmV?d00001

diff --git a/src/assets/images/gig-work/tag-new.png b/src/assets/images/gig-work/tag-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..819c49cc10ecfaabc5dd79f8b5e4dc8641ed6ac1
GIT binary patch
literal 1928
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
O0000<MNUMnLSTaWe#R>R

literal 0
HcmV?d00001

diff --git a/src/shared/components/GUIKit/JobListCard/index.jsx b/src/shared/components/GUIKit/JobListCard/index.jsx
index 6502ff43bd..ac5052f261 100644
--- a/src/shared/components/GUIKit/JobListCard/index.jsx
+++ b/src/shared/components/GUIKit/JobListCard/index.jsx
@@ -11,7 +11,15 @@ import IconBlackDuration from 'assets/images/icon-black-duration.svg';
 import IconBlackLocation from 'assets/images/icon-black-location.svg';
 import IconBlackPayment from 'assets/images/icon-black-payment.svg';
 import iconBlackSkills from 'assets/images/icon-skills.png';
+import newTag from 'assets/images/gig-work/tag-new.png';
+import hotTag from 'assets/images/gig-work/tag-hot.png';
+import dolarsTag from 'assets/images/gig-work/tag-dolars.png';
 
+const TAGS = {
+  New: newTag,
+  Hot: hotTag,
+  $$$: dolarsTag,
+};
 export default function JobListCard({
   job,
 }) {
@@ -25,9 +33,13 @@ export default function JobListCard({
       skills = skills.join(', ');
     }
   }
+  const tag = getCustomField(job.custom_fields, 'Job Tag');
 
   return (
     <div styleName="container">
+      {
+        tag !== 'n/a' && <img src={TAGS[tag]} alt="gig-job-tag" styleName="gig-tag" />
+      }
       <Link to={`${config.GIGS_PAGES_PATH}/${job.slug}`} styleName="gig-name">{job.name}</Link>
       <div styleName="job-infos">
         <div styleName="icon-val">
diff --git a/src/shared/components/GUIKit/JobListCard/style.scss b/src/shared/components/GUIKit/JobListCard/style.scss
index 1252ab2fd4..63f8551b5c 100644
--- a/src/shared/components/GUIKit/JobListCard/style.scss
+++ b/src/shared/components/GUIKit/JobListCard/style.scss
@@ -7,13 +7,23 @@
   display: flex;
   flex-direction: column;
   color: #2a2a2a;
-  padding: 25px 35px;
+  padding: 25px 35px 25px 44px;
   margin-bottom: 15px;
+  position: relative;
 
   @include gui-kit-headers;
   @include gui-kit-content;
   @include roboto-regular;
 
+  .gig-tag {
+    position: absolute;
+    top: 0;
+    left: 10px;
+    width: 24px;
+    height: 56px;
+    border-radius: 0;
+  }
+
   .gig-name,
   .gig-name:visited,
   .gig-name:active,
@@ -50,18 +60,38 @@
 
       &:first-child {
         width: 250px;
+
+        @media (max-width: 1280px) {
+          width: auto;
+          margin-right: 20px;
+        }
       }
 
       &:nth-child(2) {
         width: 204px;
+
+        @media (max-width: 1280px) {
+          width: auto;
+          margin-right: 20px;
+        }
       }
 
       &:nth-child(3) {
         width: 263px;
+
+        @media (max-width: 1280px) {
+          width: auto;
+          margin-right: 20px;
+        }
       }
 
       &:nth-child(4) {
         width: 255px;
+
+        @media (max-width: 1280px) {
+          width: auto;
+          margin-right: 20px;
+        }
       }
 
       &:last-child {
diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index eb649611ad..cb7340d45a 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -12,8 +12,12 @@ import Dropdown from 'components/GUIKit/Dropdown';
 import PT from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
+import { getSalaryType, getCustomField } from 'utils/gigs';
+import IconBlackLocation from 'assets/images/icon-black-location.svg';
+import { config, Link } from 'topcoder-react-utils';
 import './jobLisingStyles.scss';
 
+const CONTENT_PREVIEW_LENGTH = 175;
 const GIGS_PER_PAGE = 10;
 // Sort by dropdown
 const sortByOptions = [
@@ -120,6 +124,13 @@ class RecruitCRMJobsContainer extends React.Component {
     }
 
     let jobsToDisplay = jobs;
+    // build hotlist of jobs if present
+    let hotlistJobs = _.filter(jobs, (job) => {
+      const showInHotlist = _.find(job.custom_fields, ['field_name', 'Show in Hotlist']);
+      return showInHotlist && showInHotlist.value;
+    });
+    hotlistJobs = hotlistJobs.sort((a, b) => new Date(b.updated_on) - new Date(a.updated_on));
+    hotlistJobs = _.slice(hotlistJobs, 0, 4);
     // build current locations dropdown based on all data
     // and filter by selected location
     jobsToDisplay = _.filter(jobs, (job) => {
@@ -160,7 +171,14 @@ class RecruitCRMJobsContainer extends React.Component {
       });
     }
     // Sort controlled by sortBy state
-    jobsToDisplay = jobsToDisplay.sort((a, b) => new Date(b[sortBy]) - new Date(a[sortBy]));
+    jobsToDisplay = jobsToDisplay.sort((a, b) => {
+      // sort tags first no matter the sortBy
+      const tagA = getCustomField(a.custom_fields, 'Job Tag');
+      const tagB = getCustomField(b.custom_fields, 'Job Tag');
+      if (tagB !== 'n/a' && tagA === 'n/a') return Number.MAX_VALUE;
+      if (tagB === 'n/a' && tagA !== 'n/a') return -Number.MIN_VALUE;
+      return new Date(b[sortBy]) - new Date(a[sortBy]);
+    });
     // Calc pages
     const pages = Math.ceil(jobsToDisplay.length / GIGS_PER_PAGE);
     // Paginate the results
@@ -170,22 +188,54 @@ class RecruitCRMJobsContainer extends React.Component {
     );
 
     return (
-      <div styleName="container">
-        <div styleName="filters">
-          <SearchCombo placeholder="Search Gig Listings by Name, Skills, or Location" onSearch={this.onSearch} term={term} />
-          <Dropdown label="Location" onChange={this.onLocation} options={locations} size="xs" />
-          <Dropdown label="Sort by" onChange={this.onSort} options={sortByOptions} size="xs" />
-        </div>
-        <div styleName="jobs-list-container">
+      <div styleName={hotlistJobs.length ? 'container-with-hotlist' : 'container'}>
+        <div styleName="gigs">
+          <div styleName="filters">
+            <SearchCombo placeholder="Search Gig Listings by Name or Skills" onSearch={this.onSearch} term={term} />
+            <Dropdown label="Location" onChange={this.onLocation} options={locations} size="xs" />
+            <Dropdown label="Sort by" onChange={this.onSort} options={sortByOptions} size="xs" />
+          </div>
+          <div styleName="jobs-list-container">
+            {
+              jobsToDisplay.length
+                ? jobsToDisplay.map(job => <JobListCard job={job} key={job.slug} />)
+                : <span styleName="no-results">No Results</span>
+            }
+          </div>
           {
             jobsToDisplay.length
-              ? jobsToDisplay.map(job => <JobListCard job={job} key={job.slug} />)
-              : <span styleName="no-results">No Results</span>
+              ? <Paginate onChange={this.onPaginate} pages={pages} page={page} /> : null
           }
         </div>
         {
-          jobsToDisplay.length
-            ? <Paginate onChange={this.onPaginate} pages={pages} page={page} /> : null
+          hotlistJobs.length && (
+            <div styleName="hotlist">
+              <h5>HOT THIS WEEK</h5>
+              <div styleName="hotlist-items">
+                {
+                  hotlistJobs.map((hjob, indx) => (indx <= 1 ? (
+                    <Link styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`}>
+                      <div styleName="location"><IconBlackLocation /> {hjob.country}</div>
+                      <h5 styleName="job-title">{hjob.name}</h5>
+                      <div styleName="job-money">${hjob.min_annual_salary} - ${hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
+                    </Link>
+                  ) : (
+                    <div styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`}>
+                      <div styleName="location"><IconBlackLocation /> {hjob.country}</div>
+                      <h5 styleName="job-title">{hjob.name}</h5>
+                      <div styleName="job-money">${hjob.min_annual_salary} - ${hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
+                      <div styleName="job-desc">
+                        {
+                          `${getCustomField(hjob.custom_fields, 'Hotlist excerpt') === 'n/a' ? '' : `${getCustomField(hjob.custom_fields, 'Hotlist excerpt').substring(0, CONTENT_PREVIEW_LENGTH)}...`}`
+                        }
+                      </div>
+                      <Link styleName={`hotlist-item-button-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`}>Apply Now</Link>
+                    </div>
+                  )))
+                }
+              </div>
+            </div>
+          )
         }
       </div>
     );
diff --git a/src/shared/containers/Gigs/jobLisingStyles.scss b/src/shared/containers/Gigs/jobLisingStyles.scss
index 923c4fe8fb..af7cc32555 100644
--- a/src/shared/containers/Gigs/jobLisingStyles.scss
+++ b/src/shared/containers/Gigs/jobLisingStyles.scss
@@ -1,3 +1,4 @@
+/* stylelint-disable no-descending-specificity */
 @import "~styles/mixins";
 
 .loading-text {
@@ -8,14 +9,19 @@
   text-align: center;
 }
 
-.container {
+.container,
+.container-with-hotlist {
   max-width: $screen-lg;
   margin: auto;
 
-  @include xs-to-sm {
+  @media (max-width: 1280px) {
     padding: 0 15px;
   }
 
+  .gigs {
+    display: block;
+  }
+
   .filters {
     display: flex;
     align-items: flex-end;
@@ -30,6 +36,7 @@
 
       @include xs-to-sm {
         margin-right: 0;
+        margin-bottom: 15px;
       }
 
       &:first-child {
@@ -53,3 +60,156 @@
     }
   }
 }
+
+.container-with-hotlist {
+  display: flex;
+
+  .gigs {
+    width: 956px;
+
+    @media (max-width: 1280px) {
+      max-width: none;
+      flex: 1;
+    }
+  }
+
+  .filters {
+    > div {
+      margin-right: 20px;
+
+      @include xs-to-sm {
+        margin-right: 0;
+      }
+
+      &:nth-child(2) {
+        min-width: 194px;
+      }
+
+      &:last-child {
+        flex: 2;
+        max-width: 223px;
+
+        @include xs-to-sm {
+          max-width: none;
+        }
+      }
+    }
+  }
+
+  .hotlist {
+    display: flex;
+    flex-direction: column;
+    margin-left: 28px;
+    flex: 1;
+
+    @media (max-width: 1280px) {
+      display: none;
+    }
+
+    h5 {
+      font-family: Barlow, sans-serif;
+      font-size: 20px;
+      line-height: 24px;
+      text-transform: uppercase;
+      font-weight: 600;
+      margin: 7px 0 31px 6px;
+      color: #2a2a2a;
+    }
+
+    .hotlist-items {
+      .hotlist-item-1,
+      .hotlist-item-2,
+      .hotlist-item-3,
+      .hotlist-item-4 {
+        display: flex;
+        flex-direction: column;
+        border-radius: 10px;
+        padding: 20px 20px 12px;
+        font-family: Roboto, sans-serif;
+        margin-bottom: 16px;
+        color: #2a2a2a;
+
+        .location {
+          font-size: 14px;
+          display: flex;
+          align-items: center;
+
+          svg {
+            margin-right: 5px;
+            width: 15px;
+            height: 22px;
+          }
+        }
+
+        .job-title {
+          margin: 0;
+        }
+
+        .job-money {
+          line-height: 30px;
+        }
+
+        .job-desc {
+          font-family: Roboto, sans-serif;
+          line-height: 24px;
+          margin-top: 13px;
+        }
+      }
+
+      .hotlist-item-1,
+      .hotlist-item-2,
+      .hotlist-item-4 {
+        color: #fff;
+
+        .location svg g {
+          stroke: #fff;
+        }
+
+        .job-title,
+        .job-desc {
+          color: #fff;
+        }
+      }
+
+      .hotlist-item-1 {
+        background-image: linear-gradient(305.22deg, #9d41c9 0.01%, #ef476f 100%);
+      }
+
+      .hotlist-item-2 {
+        background-image: linear-gradient(140.77deg, #9d41c9 0%, #50ade8 100%);
+      }
+
+      .hotlist-item-3 {
+        background-image: linear-gradient(133.83deg, #f4f4f4 0%, #d4d4d4 100%);
+      }
+
+      .hotlist-item-4 {
+        background-image: linear-gradient(359.14deg, #555 0%, #2a2a2a 100%);
+      }
+
+      .hotlist-item-button-3,
+      .hotlist-item-button-4 {
+        font-family: Roboto, sans-serif;
+        font-size: 12px;
+        letter-spacing: 0.8px;
+        line-height: 30px;
+        padding: 0 15px;
+        text-transform: uppercase;
+        font-weight: bold;
+        margin: 22px 0 9px;
+        max-width: 104px;
+        border-radius: 15px;
+      }
+
+      .hotlist-item-button-3 {
+        background-color: #137d60;
+        color: #fff;
+      }
+
+      .hotlist-item-button-4 {
+        background-color: #fff;
+        color: #229174;
+      }
+    }
+  }
+}
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
index 9945ba4962..78565dc054 100644
--- a/src/shared/containers/GigsPages.jsx
+++ b/src/shared/containers/GigsPages.jsx
@@ -6,19 +6,22 @@ import PT from 'prop-types';
 import Header from 'containers/TopcoderHeader';
 import Footer from 'components/TopcoderFooter';
 import Viewport from 'components/Contentful/Viewport';
-import { config } from 'topcoder-react-utils';
+import { config, isomorphy } from 'topcoder-react-utils';
 import RecruitCRMJobDetails from 'containers/Gigs/RecruitCRMJobDetails';
 import { Helmet } from 'react-helmet';
 import MetaTags from 'components/MetaTags';
+import { OptimizelyProvider, createInstance } from '@optimizely/react-sdk';
 
-
+const optimizelyClient = createInstance({
+  sdkKey: config.OPTIMIZELY.SDK_KEY,
+});
 export default function GigsPagesContainer(props) {
   const { match } = props;
-  const { id } = match.params;
+  const { id, type } = match.params;
   const isApply = `${config.GIGS_PAGES_PATH}/${id}/apply` === match.url;
   const title = 'Gig Work | Topcoder Community | Topcoder';
   const description = 'Compete and build up your profiles and skills! Topcoder members become eligible to work on Gig Work projects by first proving themselves in various skill sets through Topcoder competitions.';
-  return (
+  const inner = (
     <div>
       <Helmet>
         <script type="text/javascript">{`
@@ -41,16 +44,24 @@ window._chatlio = window._chatlio||[];
             id={id}
             isApply={isApply}
           />
-        ) : (
+        ) : null
+      }
+      {
+        !id && !type ? (
           <Viewport
             id="3X6GfJZl3eDU0m4joSJZpN"
             baseUrl={config.GIGS_PAGES_PATH}
           />
-        )
+        ) : null
       }
       <Footer />
     </div>
   );
+  return isomorphy.isClientSide() ? (
+    <OptimizelyProvider optimizely={optimizelyClient} user={{ id: 123 }}>
+      {inner}
+    </OptimizelyProvider>
+  ) : inner;
 }
 
 GigsPagesContainer.defaultProps = {
diff --git a/src/shared/routes/index.jsx b/src/shared/routes/index.jsx
index 34782cdfc0..3468ce0f0b 100644
--- a/src/shared/routes/index.jsx
+++ b/src/shared/routes/index.jsx
@@ -6,6 +6,7 @@ import CommunityLoader from 'containers/tc-communities/Loader';
 import ContentfulRoute from 'components/Contentful/Route';
 import Content from 'components/Content';
 import Footer from 'components/TopcoderFooter';
+import Header from 'containers/TopcoderHeader';
 import React from 'react';
 
 import {
@@ -28,6 +29,8 @@ import TrackHomePages from './TrackHomePages';
 import PolicyPages from './PolicyPages';
 import GigsPages from './GigsPages';
 
+import './Topcoder/styles.scss';
+
 function Routes({ communityId }) {
   const metaTags = (
     <MetaTags
@@ -106,6 +109,19 @@ function Routes({ communityId }) {
           exact
           path={`${config.POLICY_PAGES_PATH}/:slug?`}
         />
+        <Route
+          render={() => (
+            <div styleName="container">
+              <Header />
+              <ContentfulRoute
+                baseUrl={`${config.GIGS_PAGES_PATH}/roles`}
+                id="2UgfR6GJvIO2tmLdo9ITVt"
+              />
+              <Footer />
+            </div>
+          )}
+          path={`${config.GIGS_PAGES_PATH}/roles`}
+        />
         <Route
           component={GigsPages}
           exact
@@ -129,15 +145,6 @@ function Routes({ communityId }) {
           exact
           path={config.START_PAGE_PATH}
         />
-        <Route
-          render={() => (
-            <ContentfulRoute
-              baseUrl="/wipro-apollo"
-              id="4Ie8cLj2OvuFqbU46HBGQM"
-            />
-          )}
-          path="/wipro-apollo"
-        />
         <Topcoder />
       </Switch>
     </div>

From 51d3f8c56d5e89f4ee859c62229e51573b494763 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Mon, 12 Apr 2021 11:16:45 +0300
Subject: [PATCH 05/16] ci: on test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21613be979..4e54b5b731 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -283,7 +283,7 @@ workflows:
           filters:
             branches:
               only:                
-                - FAQ-theme
+                - gig-mkt-ab
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

From 6258b77adfb694bce4a9e2bbb9ad06c851a95a56 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 12 Apr 2021 18:47:44 +0300
Subject: [PATCH 06/16] Add optimizely

---
 .../components/GUIKit/JobListCard/index.jsx   | 14 ++++--
 .../containers/Gigs/RecruitCRMJobApply.jsx    |  8 +++-
 src/shared/containers/Gigs/RecruitCRMJobs.jsx | 21 ++++++--
 src/shared/containers/GigsPages.jsx           | 48 +++++++++++++++++--
 4 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/shared/components/GUIKit/JobListCard/index.jsx b/src/shared/components/GUIKit/JobListCard/index.jsx
index 5d6264c137..536a4f647e 100644
--- a/src/shared/components/GUIKit/JobListCard/index.jsx
+++ b/src/shared/components/GUIKit/JobListCard/index.jsx
@@ -6,6 +6,7 @@ import React from 'react';
 import PT from 'prop-types';
 import { config, Link } from 'topcoder-react-utils';
 import { getSalaryType, getCustomField } from 'utils/gigs';
+import { withOptimizely } from '@optimizely/react-sdk';
 import './style.scss';
 import IconBlackDuration from 'assets/images/icon-black-duration.svg';
 import IconBlackLocation from 'assets/images/icon-black-location.svg';
@@ -20,8 +21,9 @@ const TAGS = {
   Hot: hotTag,
   $$$: dolarsTag,
 };
-export default function JobListCard({
+function JobListCard({
   job,
+  optimizely,
 }) {
   const duration = getCustomField(job.custom_fields, 'Duration');
   let skills = getCustomField(job.custom_fields, 'Technologies Required');
@@ -34,13 +36,16 @@ export default function JobListCard({
     }
   }
   const tag = getCustomField(job.custom_fields, 'Job Tag');
+  const onHotlistApply = () => {
+    optimizely.track('View Details Click');
+  };
 
   return (
     <div styleName="container">
       {
         tag !== 'n/a' && <img src={TAGS[tag]} alt="gig-job-tag" styleName="gig-tag" />
       }
-      <Link to={`${config.GIGS_PAGES_PATH}/${job.slug}`} styleName="gig-name">{job.name}</Link>
+      <Link to={`${config.GIGS_PAGES_PATH}/${job.slug}`} styleName="gig-name" onClick={onHotlistApply}>{job.name}</Link>
       <div styleName="job-infos">
         <div styleName="icon-val">
           <img src={iconBlackSkills} alt="skills-icon" /> {skills}
@@ -55,7 +60,7 @@ export default function JobListCard({
           <IconBlackDuration /> {/^\d+$/.test(duration) ? `${duration} Weeks` : duration}
         </div>
         <div styleName="row-btn">
-          <Link styleName="primary-green-md" to={`${config.GIGS_PAGES_PATH}/${job.slug}`}>VIEW DETAILS</Link>
+          <Link styleName="primary-green-md" to={`${config.GIGS_PAGES_PATH}/${job.slug}`} onClick={onHotlistApply}>VIEW DETAILS</Link>
         </div>
       </div>
     </div>
@@ -68,4 +73,7 @@ JobListCard.defaultProps = {
 
 JobListCard.propTypes = {
   job: PT.shape().isRequired,
+  optimizely: PT.shape().isRequired,
 };
+
+export default withOptimizely(JobListCard);
diff --git a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx
index f418265630..cba026118b 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx
@@ -10,8 +10,10 @@ import PT from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
 import { isValidEmail } from 'utils/tc';
+import { withOptimizely } from '@optimizely/react-sdk';
 import techSkills from './techSkills';
 
+
 const countries = require('i18n-iso-countries');
 countries.registerLocale(require('i18n-iso-countries/langs/en.json'));
 
@@ -120,12 +122,13 @@ class RecruitCRMJobApplyContainer extends React.Component {
   }
 
   onApplyClick() {
-    const { applyForJob, job } = this.props;
+    const { applyForJob, job, optimizely } = this.props;
     const { formData } = this.state;
     this.validateForm();
     this.setState((state) => {
       if (_.isEmpty(state.formErrors)) {
         applyForJob(job, formData);
+        optimizely.track('Submit Application Form');
       }
     });
   }
@@ -269,6 +272,7 @@ RecruitCRMJobApplyContainer.propTypes = {
   application: PT.shape(),
   searchCandidates: PT.func.isRequired,
   recruitProfile: PT.shape(),
+  optimizely: PT.shape().isRequired,
 };
 
 function mapStateToProps(state, ownProps) {
@@ -312,4 +316,4 @@ function mapDispatchToActions(dispatch) {
 export default connect(
   mapStateToProps,
   mapDispatchToActions,
-)(RecruitCRMJobApplyContainer);
+)(withOptimizely(RecruitCRMJobApplyContainer));
diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index e3b3bbcb07..0de31d0863 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -16,6 +16,7 @@ import { getSalaryType, getCustomField } from 'utils/gigs';
 import IconBlackLocation from 'assets/images/icon-black-location.svg';
 import { config, Link } from 'topcoder-react-utils';
 import { getQuery, updateQuery } from 'utils/url';
+import { withOptimizely } from '@optimizely/react-sdk';
 import './jobLisingStyles.scss';
 
 const CONTENT_PREVIEW_LENGTH = 175;
@@ -46,6 +47,7 @@ class RecruitCRMJobsContainer extends React.Component {
     this.onFilter = this.onFilter.bind(this);
     this.onLocation = this.onLocation.bind(this);
     this.onSort = this.onSort.bind(this);
+    this.onHotlistApply = this.onHotlistApply.bind(this);
   }
 
   componentDidMount() {
@@ -119,10 +121,16 @@ class RecruitCRMJobsContainer extends React.Component {
     });
   }
 
+  onHotlistApply() {
+    const { optimizely } = this.props;
+    optimizely.track('Hotlist ads click');
+  }
+
   render() {
     const {
       loading,
       jobs,
+      optimizely,
     } = this.props;
     const {
       term,
@@ -140,6 +148,8 @@ class RecruitCRMJobsContainer extends React.Component {
       );
     }
 
+    // optimizely decide
+    const decision = optimizely.decide('gig_listing_hotlist');
     let jobsToDisplay = jobs;
     // build hotlist of jobs if present
     let hotlistJobs = _.filter(jobs, (job) => {
@@ -205,7 +215,7 @@ class RecruitCRMJobsContainer extends React.Component {
     );
 
     return (
-      <div styleName={hotlistJobs.length ? 'container-with-hotlist' : 'container'}>
+      <div styleName={hotlistJobs.length && decision.enabled ? 'container-with-hotlist' : 'container'}>
         <div styleName="gigs">
           <div styleName="filters">
             <SearchCombo placeholder="Search Gig Listings by Name or Skills" onSearch={this.onSearch} term={term} />
@@ -225,13 +235,13 @@ class RecruitCRMJobsContainer extends React.Component {
           }
         </div>
         {
-          hotlistJobs.length && (
+          hotlistJobs.length && decision.enabled && (
             <div styleName="hotlist">
               <h5>HOT THIS WEEK</h5>
               <div styleName="hotlist-items">
                 {
                   hotlistJobs.map((hjob, indx) => (indx <= 1 ? (
-                    <Link styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`}>
+                    <Link styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`} onClick={this.onHotlistApply}>
                       <div styleName="location"><IconBlackLocation /> {hjob.country}</div>
                       <h5 styleName="job-title">{hjob.name}</h5>
                       <div styleName="job-money">${hjob.min_annual_salary} - ${hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
@@ -246,7 +256,7 @@ class RecruitCRMJobsContainer extends React.Component {
                           `${getCustomField(hjob.custom_fields, 'Hotlist excerpt') === 'n/a' ? '' : `${getCustomField(hjob.custom_fields, 'Hotlist excerpt').substring(0, CONTENT_PREVIEW_LENGTH)}...`}`
                         }
                       </div>
-                      <Link styleName={`hotlist-item-button-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`}>Apply Now</Link>
+                      <Link styleName={`hotlist-item-button-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} onClick={this.onHotlistApply}>Apply Now</Link>
                     </div>
                   )))
                 }
@@ -268,6 +278,7 @@ RecruitCRMJobsContainer.propTypes = {
   getJobs: PT.func.isRequired,
   loading: PT.bool,
   jobs: PT.arrayOf(PT.shape),
+  optimizely: PT.shape().isRequired,
 };
 
 function mapStateToProps(state) {
@@ -291,4 +302,4 @@ function mapDispatchToActions(dispatch) {
 export default connect(
   mapStateToProps,
   mapDispatchToActions,
-)(RecruitCRMJobsContainer);
+)(withOptimizely(RecruitCRMJobsContainer));
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
index 78565dc054..f7abd277e1 100644
--- a/src/shared/containers/GigsPages.jsx
+++ b/src/shared/containers/GigsPages.jsx
@@ -11,12 +11,40 @@ import RecruitCRMJobDetails from 'containers/Gigs/RecruitCRMJobDetails';
 import { Helmet } from 'react-helmet';
 import MetaTags from 'components/MetaTags';
 import { OptimizelyProvider, createInstance } from '@optimizely/react-sdk';
+import { connect } from 'react-redux';
+import _ from 'lodash';
+import { v4 as uuidv4 } from 'uuid';
 
 const optimizelyClient = createInstance({
   sdkKey: config.OPTIMIZELY.SDK_KEY,
 });
-export default function GigsPagesContainer(props) {
-  const { match } = props;
+const cookies = require('browser-cookies');
+
+function GigsPagesContainer(props) {
+  const { match, profile } = props;
+  const optProfile = {
+    attributes: {},
+  };
+  if (!_.isEmpty(profile)) {
+    optProfile.id = String(profile.userId);
+    optProfile.attributes.TC_Handle = profile.handle;
+    optProfile.attributes.HomeCountryCode = profile.homeCountryCode;
+    optProfile.attributes.email = profile.email;
+  } else {
+    const idCookie = cookies.get('_tc.aid');
+    if (idCookie) {
+      optProfile.id = JSON.parse(idCookie).aid;
+    } else {
+      optProfile.id = uuidv4();
+      cookies.set('_tc.aid', JSON.stringify({
+        aid: optProfile.id,
+      }), {
+        secure: true,
+        domain: '',
+        expires: 365, // days
+      });
+    }
+  }
   const { id, type } = match.params;
   const isApply = `${config.GIGS_PAGES_PATH}/${id}/apply` === match.url;
   const title = 'Gig Work | Topcoder Community | Topcoder';
@@ -57,16 +85,30 @@ window._chatlio = window._chatlio||[];
       <Footer />
     </div>
   );
+
   return isomorphy.isClientSide() ? (
-    <OptimizelyProvider optimizely={optimizelyClient} user={{ id: 123 }}>
+    <OptimizelyProvider optimizely={optimizelyClient} user={optProfile} timeout={500}>
       {inner}
     </OptimizelyProvider>
   ) : inner;
 }
 
 GigsPagesContainer.defaultProps = {
+  profile: null,
 };
 
 GigsPagesContainer.propTypes = {
   match: PT.shape().isRequired,
+  profile: PT.shape(),
 };
+
+function mapStateToProps(state) {
+  const profile = state.auth && state.auth.profile ? { ...state.auth.profile } : {};
+  return {
+    profile,
+  };
+}
+
+export default connect(
+  mapStateToProps,
+)(GigsPagesContainer);

From cba907e84c1a89ccf9722c1115c7136d2e6a1bf8 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 12 Apr 2021 19:39:50 +0300
Subject: [PATCH 07/16] fix client side bug

---
 src/shared/containers/Gigs/RecruitCRMJobs.jsx |  7 +++++--
 src/shared/containers/GigsPages.jsx           | 13 +++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index 0de31d0863..45301e06b6 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -14,7 +14,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { getSalaryType, getCustomField } from 'utils/gigs';
 import IconBlackLocation from 'assets/images/icon-black-location.svg';
-import { config, Link } from 'topcoder-react-utils';
+import { config, Link, isomorphy } from 'topcoder-react-utils';
 import { getQuery, updateQuery } from 'utils/url';
 import { withOptimizely } from '@optimizely/react-sdk';
 import './jobLisingStyles.scss';
@@ -149,7 +149,10 @@ class RecruitCRMJobsContainer extends React.Component {
     }
 
     // optimizely decide
-    const decision = optimizely.decide('gig_listing_hotlist');
+    let decision = { enabled: true };
+    if (isomorphy.isClientSide()) {
+      decision = optimizely.decide('gig_listing_hotlist');
+    }
     let jobsToDisplay = jobs;
     // build hotlist of jobs if present
     let hotlistJobs = _.filter(jobs, (job) => {
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
index f7abd277e1..a4c0d9bf01 100644
--- a/src/shared/containers/GigsPages.jsx
+++ b/src/shared/containers/GigsPages.jsx
@@ -30,7 +30,7 @@ function GigsPagesContainer(props) {
     optProfile.attributes.TC_Handle = profile.handle;
     optProfile.attributes.HomeCountryCode = profile.homeCountryCode;
     optProfile.attributes.email = profile.email;
-  } else {
+  } else if (isomorphy.isClientSide()) {
     const idCookie = cookies.get('_tc.aid');
     if (idCookie) {
       optProfile.id = JSON.parse(idCookie).aid;
@@ -86,11 +86,16 @@ window._chatlio = window._chatlio||[];
     </div>
   );
 
-  return isomorphy.isClientSide() ? (
-    <OptimizelyProvider optimizely={optimizelyClient} user={optProfile} timeout={500}>
+  return (
+    <OptimizelyProvider
+      optimizely={optimizelyClient}
+      user={optProfile}
+      timeout={500}
+      isServerSide={isomorphy.isClientSide()}
+    >
       {inner}
     </OptimizelyProvider>
-  ) : inner;
+  );
 }
 
 GigsPagesContainer.defaultProps = {

From 92e826cbe64f636daa147f18c4693e4b9b5e22da Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 13 Apr 2021 00:38:58 +0300
Subject: [PATCH 08/16] fixed serverside

---
 src/shared/containers/GigsPages.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
index a4c0d9bf01..44db1f7058 100644
--- a/src/shared/containers/GigsPages.jsx
+++ b/src/shared/containers/GigsPages.jsx
@@ -91,7 +91,7 @@ window._chatlio = window._chatlio||[];
       optimizely={optimizelyClient}
       user={optProfile}
       timeout={500}
-      isServerSide={isomorphy.isClientSide()}
+      isServerSide={!isomorphy.isClientSide()}
     >
       {inner}
     </OptimizelyProvider>

From 7740b8cc9451decb4663fd751e2038d0557cd36b Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 13 Apr 2021 13:30:15 +0300
Subject: [PATCH 09/16] ENV support for prod

---
 Dockerfile                             | 6 ++++++
 build.sh                               | 1 +
 config/custom-environment-variables.js | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 97e99ee223..522cbc8681 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,6 +72,9 @@ ARG SENDGRID_API_KEY
 ARG GROWSURF_API_KEY
 ARG GROWSURF_CAMPAIGN_ID
 
+# Optimizely
+ARG OPTIMIZELY_SDK_KEY
+
 ################################################################################
 # Setting of environment variables in the Docker image.
 
@@ -131,6 +134,9 @@ ENV GROWSURF_API_KEY=$GROWSURF_API_KEY
 ENV GROWSURF_CAMPAIGN_ID=$GROWSURF_CAMPAIGN_ID
 ENV GSHEETS_API_KEY=$GSHEETS_API_KEY
 
+# Optimizely
+ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
+
 ################################################################################
 # Testing and build of the application inside the container.
 
diff --git a/build.sh b/build.sh
index 32b4414968..7a52674ba8 100755
--- a/build.sh
+++ b/build.sh
@@ -48,6 +48,7 @@ docker build -t $TAG \
   --build-arg GROWSURF_API_KEY=$GROWSURF_API_KEY \
   --build-arg GROWSURF_CAMPAIGN_ID=$GROWSURF_CAMPAIGN_ID \
   --build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
+  --build-arg OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY \
   --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
 
 # Copies "node_modules" from the created image, if necessary for caching.
diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js
index 34ffc3cb89..53674442de 100644
--- a/config/custom-environment-variables.js
+++ b/config/custom-environment-variables.js
@@ -108,4 +108,7 @@ module.exports = {
     TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
   },
   GSHEETS_API_KEY: 'GSHEETS_API_KEY',
+  OPTIMIZELY: {
+    SDK_KEY: 'OPTIMIZELY_SDK_KEY',
+  },
 };

From 5c731c9ef08907f85b5e28b9df5f8a260aa87f88 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 13 Apr 2021 14:37:14 +0300
Subject: [PATCH 10/16] tag position

---
 src/shared/components/GUIKit/JobListCard/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/GUIKit/JobListCard/style.scss b/src/shared/components/GUIKit/JobListCard/style.scss
index 63f8551b5c..9cc3ca808a 100644
--- a/src/shared/components/GUIKit/JobListCard/style.scss
+++ b/src/shared/components/GUIKit/JobListCard/style.scss
@@ -17,7 +17,7 @@
 
   .gig-tag {
     position: absolute;
-    top: 0;
+    top: -1px;
     left: 10px;
     width: 24px;
     height: 56px;

From d29ccc07837bd0936d203d1c4c44a2247fd09a7a Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 14 Apr 2021 15:15:47 +0300
Subject: [PATCH 11/16] final design tweaks

---
 src/shared/containers/Gigs/RecruitCRMJobs.jsx   | 16 ++++++++++------
 src/shared/containers/Gigs/jobLisingStyles.scss |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index 45301e06b6..95cf535155 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -253,12 +253,16 @@ class RecruitCRMJobsContainer extends React.Component {
                     <div styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`}>
                       <div styleName="location"><IconBlackLocation /> {hjob.country}</div>
                       <h5 styleName="job-title">{hjob.name}</h5>
-                      <div styleName="job-money">${hjob.min_annual_salary} - ${hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
-                      <div styleName="job-desc">
-                        {
-                          `${getCustomField(hjob.custom_fields, 'Hotlist excerpt') === 'n/a' ? '' : `${getCustomField(hjob.custom_fields, 'Hotlist excerpt').substring(0, CONTENT_PREVIEW_LENGTH)}...`}`
-                        }
-                      </div>
+                      <div styleName="job-money">${hjob.min_annual_salary} - {hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
+                      {
+                        getCustomField(hjob.custom_fields, 'Hotlist excerpt') !== 'n/a' ? (
+                          <div styleName="job-desc">
+                            {
+                              `${getCustomField(hjob.custom_fields, 'Hotlist excerpt').substring(0, CONTENT_PREVIEW_LENGTH)}${getCustomField(hjob.custom_fields, 'Hotlist excerpt').length > CONTENT_PREVIEW_LENGTH ? '...' : ''}`
+                            }
+                          </div>
+                        ) : null
+                      }
                       <Link styleName={`hotlist-item-button-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} onClick={this.onHotlistApply}>Apply Now</Link>
                     </div>
                   )))
diff --git a/src/shared/containers/Gigs/jobLisingStyles.scss b/src/shared/containers/Gigs/jobLisingStyles.scss
index af7cc32555..535a92cb16 100644
--- a/src/shared/containers/Gigs/jobLisingStyles.scss
+++ b/src/shared/containers/Gigs/jobLisingStyles.scss
@@ -137,7 +137,7 @@
           svg {
             margin-right: 5px;
             width: 15px;
-            height: 22px;
+            height: 17px;
           }
         }
 

From 341ec270f2e2c482407372f91528c4ae9f1f972b Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 14 Apr 2021 16:56:14 +0300
Subject: [PATCH 12/16] $ removed

---
 src/shared/containers/Gigs/RecruitCRMJobs.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index 95cf535155..cfb3f2aadf 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -247,7 +247,7 @@ class RecruitCRMJobsContainer extends React.Component {
                     <Link styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`} onClick={this.onHotlistApply}>
                       <div styleName="location"><IconBlackLocation /> {hjob.country}</div>
                       <h5 styleName="job-title">{hjob.name}</h5>
-                      <div styleName="job-money">${hjob.min_annual_salary} - ${hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
+                      <div styleName="job-money">${hjob.min_annual_salary} - {hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}</div>
                     </Link>
                   ) : (
                     <div styleName={`hotlist-item-${indx + 1}`} to={`${config.GIGS_PAGES_PATH}/${hjob.slug}`} key={`hotlist-item-${indx + 1}`}>

From 6d2a2ea69a55029bb436b7cc86a42f13659b571d Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Thu, 15 Apr 2021 09:45:07 +0300
Subject: [PATCH 13/16] ci: on staging

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be648d373d..d773ce5bcc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -282,7 +282,7 @@ workflows:
           filters:
             branches:
               only:                
-                - gig-mkt-ab
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -296,14 +296,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - gig-mkt-ab
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters:
             branches:
               only:
-                - develop
+                - gig-mkt-ab
       - "approve-smoke-test-on-staging":
           type: approval
           requires:

From f6ca6f8af5e9a8462ee65fdbe8954bee055a9fd6 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Thu, 15 Apr 2021 10:41:22 +0300
Subject: [PATCH 14/16] fixed status bug for closed gigs

---
 src/server/services/recruitCRM.js               | 1 +
 src/shared/components/Gigs/GigDetails/index.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js
index 036271d110..10c9c1f97e 100644
--- a/src/server/services/recruitCRM.js
+++ b/src/server/services/recruitCRM.js
@@ -26,6 +26,7 @@ const JOB_FIELDS_RESPONSE = [
   'salary_type',
   'max_annual_salary',
   'job_description_text',
+  'job_status',
 ];
 const CANDIDATE_FIELDS_RESPONSE = [
   'id',
diff --git a/src/shared/components/Gigs/GigDetails/index.jsx b/src/shared/components/Gigs/GigDetails/index.jsx
index a28eb790af..0da0bca08d 100644
--- a/src/shared/components/Gigs/GigDetails/index.jsx
+++ b/src/shared/components/Gigs/GigDetails/index.jsx
@@ -66,7 +66,7 @@ export default function GigDetails(props) {
   return (
     <div styleName="container">
       {
-        job.error || job.enable_job_application_form !== 1 ? (
+        job.error || job.job_status.id !== 1 || job.enable_job_application_form !== 1 ? (
           <div styleName="error">
             { job.error ? <SadFace /> : null }
             <h3>{ job.error ? 'Gig does not exist' : 'This Gig has been Fulfilled'}</h3>

From 48d046072cd5e72a4d9bad6b2da72a91a73ee1cc Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 15 Apr 2021 06:54:39 -0300
Subject: [PATCH 15/16] Added CHAMELEON_VERIFICATION_SECRET to Dockerfile

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 97e99ee223..4ef22556d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,6 +52,7 @@ ARG MAILCHIMP_BASE_URL
 ARG NODE_CONFIG_ENV
 ARG OPEN_EXCHANGE_RATES_KEY
 ARG SEGMENT_IO_API_KEY
+ARG CHAMELEON_VERIFICATION_SECRET
 ARG SERVER_API_KEY
 
 # TC M2M credentials for Community App server
@@ -108,6 +109,7 @@ ENV MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL
 ENV NODE_CONFIG_ENV=$NODE_CONFIG_ENV
 ENV OPEN_EXCHANGE_RATES_KEY=$OPEN_EXCHANGE_RATES_KEY
 ENV SEGMENT_IO_API_KEY=$SEGMENT_IO_API_KEY
+ENV CHAMELEON_VERIFICATION_SECRET=$CHAMELEON_VERIFICATION_SECRET
 ENV SERVER_API_KEY=$SERVER_API_KEY
 
 # TC M2M credentials for Community App server

From 91d2efd0d4de6076a143379c42960b701610b2b8 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 15 Apr 2021 07:51:58 -0300
Subject: [PATCH 16/16] Added missing build var

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index 32b4414968..e5e7fb59f4 100755
--- a/build.sh
+++ b/build.sh
@@ -32,6 +32,7 @@ docker build -t $TAG \
   --build-arg NODE_CONFIG_ENV=$NODE_CONFIG_ENV \
   --build-arg OPEN_EXCHANGE_RATES_KEY=$OPEN_EXCHANGE_RATES_KEY \
   --build-arg SEGMENT_IO_API_KEY=$SEGMENT_IO_API_KEY \
+  --build-arg CHAMELEON_VERIFICATION_SECRET=$CHAMELEON_VERIFICATION_SECRET \
   --build-arg SERVER_API_KEY=$SERVER_API_KEY \
   --build-arg TC_M2M_CLIENT_ID=$TC_M2M_CLIENT_ID \
   --build-arg TC_M2M_CLIENT_SECRET=$TC_M2M_CLIENT_SECRET \