From 2578f6faaef5839556600acd8cade80920e1c72a Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 5 Mar 2021 11:11:42 +0200
Subject: [PATCH 1/3] fix #5422

---
 src/shared/components/Gigs/LoginModal/index.jsx    | 2 +-
 src/shared/components/Gigs/ReferralModal/index.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/Gigs/LoginModal/index.jsx b/src/shared/components/Gigs/LoginModal/index.jsx
index 978cc6bdea..cab74421dd 100644
--- a/src/shared/components/Gigs/LoginModal/index.jsx
+++ b/src/shared/components/Gigs/LoginModal/index.jsx
@@ -40,7 +40,7 @@ function LoginModal({ retUrl, onCancel }) {
             LOGIN
           </PrimaryButton>
         </div>
-        <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+        <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>register</a>!</p>
       </div>
     </Modal>
   );
diff --git a/src/shared/components/Gigs/ReferralModal/index.jsx b/src/shared/components/Gigs/ReferralModal/index.jsx
index 912ac39602..02a39e7c39 100644
--- a/src/shared/components/Gigs/ReferralModal/index.jsx
+++ b/src/shared/components/Gigs/ReferralModal/index.jsx
@@ -105,7 +105,7 @@ function ReferralModal({
               LOGIN
             </PrimaryButton>
           </div>
-          <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>register</a>!</p>
         </div>
       )}
     </Modal>

From d1235a37061bffd5cb2551d06fa590478ea8ca6e Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 8 Mar 2021 16:39:45 +0200
Subject: [PATCH 2/3] Add &mode=signUp to reg link

---
 src/shared/components/Gigs/GigApply/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index 614f96fb97..5fe0ffb14e 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -289,7 +289,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>here</a>.</p>
         </div>
       </div>
     </div>

From c68f815bba5029e48cbbc3c09ee5b9afc5e841b2 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 10 Mar 2021 11:04:47 +0200
Subject: [PATCH 3/3] Gig call tweaks and utm codes

---
 src/shared/actions/recruitCRM.js                   | 3 ++-
 src/shared/components/Gigs/GigApply/index.jsx      | 3 ++-
 src/shared/components/Gigs/GigDetails/index.jsx    | 2 +-
 src/shared/components/Gigs/LoginModal/index.jsx    | 2 +-
 src/shared/components/Gigs/ReferralModal/index.jsx | 2 +-
 src/shared/utils/gigs.js                           | 2 ++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/shared/actions/recruitCRM.js b/src/shared/actions/recruitCRM.js
index 0cd9290b51..1b9b127f25 100644
--- a/src/shared/actions/recruitCRM.js
+++ b/src/shared/actions/recruitCRM.js
@@ -1,6 +1,7 @@
 import { redux } from 'topcoder-react-utils';
 import Service from 'services/recruitCRM';
 import _ from 'lodash';
+import { getCustomField } from 'utils/gigs';
 
 /**
  * Jobs page fetch init
@@ -60,7 +61,7 @@ function normalizeRecruitPayload(job, payload) {
     `Date Available: ${new Date(payload.availFrom).toDateString()}`,
     `Heard About Gig: ${payload.reffereal}`,
     `Why fit: ${payload.whyFit}`,
-    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
+    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(() => getCustomField(job.custom_fields, 'Timezone')).join(',')}`,
     `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
     `Notes: ${payload.notes}`,
   ];
diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index 5fe0ffb14e..9d3cc63dfa 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -121,6 +121,7 @@ export default function GigApply(props) {
                         errorMsg={formErrors.email}
                         value={formData.email}
                         required
+                        readonly
                       />
                       <TextInput
                         placeholder="Phone Including Country Code"
@@ -289,7 +290,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
         </div>
       </div>
     </div>
diff --git a/src/shared/components/Gigs/GigDetails/index.jsx b/src/shared/components/Gigs/GigDetails/index.jsx
index 1eca1ab48d..c6faae5040 100644
--- a/src/shared/components/Gigs/GigDetails/index.jsx
+++ b/src/shared/components/Gigs/GigDetails/index.jsx
@@ -108,7 +108,7 @@ export default function GigDetails(props) {
               <div styleName="infos-item">
                 <IconTimezone />
                 <div styleName="infos-data">
-                  Timezone
+                  Working Hours
                   <strong>{getCustomField(job.custom_fields, 'Timezone')}</strong>
                 </div>
               </div>
diff --git a/src/shared/components/Gigs/LoginModal/index.jsx b/src/shared/components/Gigs/LoginModal/index.jsx
index cab74421dd..7bc255789b 100644
--- a/src/shared/components/Gigs/LoginModal/index.jsx
+++ b/src/shared/components/Gigs/LoginModal/index.jsx
@@ -40,7 +40,7 @@ function LoginModal({ retUrl, onCancel }) {
             LOGIN
           </PrimaryButton>
         </div>
-        <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>register</a>!</p>
+        <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
       </div>
     </Modal>
   );
diff --git a/src/shared/components/Gigs/ReferralModal/index.jsx b/src/shared/components/Gigs/ReferralModal/index.jsx
index 02a39e7c39..25820d8c44 100644
--- a/src/shared/components/Gigs/ReferralModal/index.jsx
+++ b/src/shared/components/Gigs/ReferralModal/index.jsx
@@ -105,7 +105,7 @@ function ReferralModal({
               LOGIN
             </PrimaryButton>
           </div>
-          <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp`}>register</a>!</p>
+          <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
         </div>
       )}
     </Modal>
diff --git a/src/shared/utils/gigs.js b/src/shared/utils/gigs.js
index fa08f36579..3c9ba53a8c 100644
--- a/src/shared/utils/gigs.js
+++ b/src/shared/utils/gigs.js
@@ -10,8 +10,10 @@ import _ from 'lodash';
  */
 export function getSalaryType(data) {
   switch (data.id) {
+    case 1: return 'monthly';
     case 2: return 'annual';
     case 3: return 'week';
+    case 4: return 'daily';
     case 5: return 'hourly';
     default: return 'n/a';
   }