From 99bfb656766ed523ced14df1c47d3cd8b94c267f Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 9 Oct 2020 11:30:55 +0300
Subject: [PATCH 1/3] Fixes #5086

---
 src/shared/components/Gigs/GigDetails/index.jsx | 8 ++++++--
 src/shared/utils/gigs.js                        | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/Gigs/GigDetails/index.jsx b/src/shared/components/Gigs/GigDetails/index.jsx
index 2471687f42..28bfecb44d 100644
--- a/src/shared/components/Gigs/GigDetails/index.jsx
+++ b/src/shared/components/Gigs/GigDetails/index.jsx
@@ -43,6 +43,7 @@ export default function GigDetails(props) {
   }
   let skills = getCustomField(job.custom_fields, 'Technologies Required');
   if (skills !== 'n/a') skills = skills.split(',').join(', ');
+  const hPerW = getCustomField(job.custom_fields, 'Hours per week');
 
   return (
     <div styleName="container">
@@ -84,7 +85,7 @@ export default function GigDetails(props) {
                 <IconHours />
                 <div styleName="infos-data">
                   Hours
-                  <strong>{getCustomField(job.custom_fields, 'Hours per week')} hours / week</strong>
+                  <strong>{hPerW === 'n/a' ? hPerW : `${hPerW} hours / week`}</strong>
                 </div>
               </div>
               <div styleName="infos-item">
@@ -108,7 +109,10 @@ export default function GigDetails(props) {
                     * Topcoder does not provide visa sponsorship nor will we work with Staffing Agencies.
                   </strong>
                   <strong>
-                    ** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
+                    ** USA Visa Holders - Please consult an attorney before applying to any Topcoder Gig. Some visa statuses will or will not allow you to conduct freelance work with Topcoder.
+                  </strong>
+                  <strong>
+                    *** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
                   </strong>
                 </div>
                 <div styleName="cta-buttons">
diff --git a/src/shared/utils/gigs.js b/src/shared/utils/gigs.js
index 63d42a1201..fa08f36579 100644
--- a/src/shared/utils/gigs.js
+++ b/src/shared/utils/gigs.js
@@ -12,6 +12,7 @@ export function getSalaryType(data) {
   switch (data.id) {
     case 2: return 'annual';
     case 3: return 'week';
+    case 5: return 'hourly';
     default: return 'n/a';
   }
 }

From 9992bb220ead33a9e010d7e7ab3aa3fec6cf5827 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Fri, 9 Oct 2020 11:45:20 +0300
Subject: [PATCH 2/3] 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 cada900bd7..db968e8c4c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -237,7 +237,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - gig-details-fixes
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

From c81569d9e51c56ca3bc1575d860b8157e8863a8c Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 12 Oct 2020 10:26:12 +0300
Subject: [PATCH 3/3] Equal min/max salary fix

---
 src/shared/components/Gigs/GigDetails/index.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Gigs/GigDetails/index.jsx b/src/shared/components/Gigs/GigDetails/index.jsx
index 28bfecb44d..017418648f 100644
--- a/src/shared/components/Gigs/GigDetails/index.jsx
+++ b/src/shared/components/Gigs/GigDetails/index.jsx
@@ -44,6 +44,7 @@ export default function GigDetails(props) {
   let skills = getCustomField(job.custom_fields, 'Technologies Required');
   if (skills !== 'n/a') skills = skills.split(',').join(', ');
   const hPerW = getCustomField(job.custom_fields, 'Hours per week');
+  const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;
 
   return (
     <div styleName="container">
@@ -71,7 +72,7 @@ export default function GigDetails(props) {
                 <IconMoney />
                 <div styleName="infos-data">
                   Compensation
-                  <strong>${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}</strong>
+                  <strong>${compens} / {getSalaryType(job.salary_type)}</strong>
                 </div>
               </div>
               <div styleName="infos-item">