Skip to content

Commit 0be8e2b

Browse files
committed
fixes #5241
1 parent c8476a3 commit 0be8e2b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/shared/components/GUIKit/JobListCard/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default function JobListCard({
3636
<IconBlackLocation /> {job.country}
3737
</div>
3838
<div styleName="icon-val">
39-
<IconBlackPayment /> ${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}
39+
<IconBlackPayment /> ${job.min_annual_salary} - {job.max_annual_salary} (USD) / {getSalaryType(job.salary_type)}
4040
</div>
4141
<div styleName="icon-val">
4242
<IconBlackDuration /> {getCustomField(job.custom_fields, 'Duration')}

src/shared/components/Gigs/GigDetails/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function GigDetails(props) {
4444
let skills = getCustomField(job.custom_fields, 'Technologies Required');
4545
if (skills !== 'n/a') skills = skills.split(',').join(', ');
4646
const hPerW = getCustomField(job.custom_fields, 'Hours per week');
47-
const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;
47+
const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary} (USD)`;
4848

4949
return (
5050
<div styleName="container">

src/shared/containers/Gigs/RecruitCRMJobs.jsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RecruitCRMJobsContainer extends React.Component {
3131
term: '',
3232
page: 0,
3333
sortBy: 'created_on',
34-
location: 'Any Location',
34+
location: 'All',
3535
};
3636
// binds
3737
this.onSearch = this.onSearch.bind(this);
@@ -121,13 +121,16 @@ class RecruitCRMJobsContainer extends React.Component {
121121
// build current locations dropdown based on all data
122122
// and filter by selected location
123123
jobsToDisplay = _.filter(jobs, (job) => {
124+
const country = job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
124125
// build dropdown
125-
const found = _.find(locations, { label: job.country });
126+
const found = _.find(locations, { label: country });
126127
if (!found) {
127-
locations.push({ label: job.country, selected: location === job.country });
128+
locations.push({
129+
label: country, selected: location.toLowerCase() === country.toLowerCase(),
130+
});
128131
}
129132
// filter
130-
if (location === 'Anywhere' || location === 'Any' || location === 'Any Location') return true;
133+
if (location === 'Anywhere' || location === 'Any' || location === 'All') return true;
131134
return location.toLowerCase() === job.country.toLowerCase();
132135
});
133136
// sort location dropdown

0 commit comments

Comments
 (0)