Merge branch 'develop' into signup-button

Author: luizrrodrigues

.circleci/config.yml

@@ -289,14 +289,14 @@ workflows:
           filters:
             branches:
               only:
-                - signup-button
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - signup-button
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

src/shared/components/Contentful/TracksFilter/TracksFilter.jsx

@@ -50,8 +50,16 @@ export class TracksFilterInner extends Component {
           const { authorList } = this.state;
           this.setState({
             authorList: _.concat(authorList, _.map(
-              _.sortBy(results.items, i => i.fields.name.toLowerCase()),
-              item => ({ label: item.fields.name, selected: false }),
+              _.sortBy(
+                results.items,
+                i => (i.fields.tcHandle
+                  ? i.fields.tcHandle.toLowerCase() : i.fields.name.toLowerCase()),
+              ),
+              item => ({
+                label: item.fields.tcHandle
+                  ? item.fields.tcHandle : item.fields.name,
+                selected: false,
+              }),
             )),
           });
         }
@@ -149,6 +157,7 @@ export class TracksFilterInner extends Component {
               {mediaMatches => (
                 <Dropdown
                   label="Authors"
+                  placeholder="Type author name or handle"
                   options={updatedAuthorList}
                   size="xs"
                   onChange={(authors) => {
@@ -231,8 +240,8 @@ export class TracksFilterInner extends Component {
 TracksFilterInner.defaultProps = {
   onClose: () => {},
   onApply: () => {},
-  selectedAuthor: DEF_SELECTED_AUTHOR,
-  authorList: [{ label: DEF_SELECTED_AUTHOR, selected: true }],
+  selectedAuthor: '',
+  authorList: [{ label: DEF_SELECTED_AUTHOR, selected: false }],
   startDate: moment('2001-01-02'),
   endDate: moment(),
   tags: [],

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

@@ -116,7 +116,7 @@ export default function GigDetails(props) {
             </div>
             <div styleName="content">
               <div styleName="left">
-                <h4>Skills</h4>
+                <h4>Required Skills</h4>
                 <p styleName="skills"><img src={iconSkills} alt="skills-icon" /> {skills}</p>
                 <h4>Description</h4>
                 <p>{ReactHtmlParser(job.job_description_text, ReactHtmlParserOptions)}