merge with develop branch

Author: skyhit

.circleci/config.yml

@@ -183,15 +183,15 @@ workflows:
             branches:
               only:
                 - develop
-                - hot-fix-x-button-to-clear-search
+                - feature-contentful
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - hot-fix-profile-issue
+                - hotfix-legacy-mm
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

__tests__/shared/components/Contentful/SearchBar/__snapshots__/SearchBar.jsx.snap

@@ -13,7 +13,7 @@ exports[`Matches shallow shapshot 1`] = `
       onBlur={[Function]}
       onChange={[Function]}
       onFocus={[Function]}
-      placeholder="Search.."
+      placeholder="Search..."
       type="text"
       value=""
     />

__tests__/shared/components/Header/__snapshots__/index.jsx.snap

@@ -143,7 +143,7 @@ exports[`Default render 1`] = `
               "separator": true,
             },
             Object {
-              "href": "https://community-app.topcoder-dev.com/thrive/tracks?track=Topcoder",
+              "href": "/thrive/tracks?track=Topcoder",
               "title": "Help",
             },
             Object {

__tests__/shared/components/Settings/Preferences/__snapshots__/index.jsx.snap

@@ -23,31 +23,17 @@ exports[`renders preferences setting page correctly 1`] = `
             width="30"
             xmlns="http://www.w3.org/2000/svg"
           />,
-          "invitation letter": <Invletter
-            height="30"
-            viewBox="0 0 30 30"
-            width="30"
-            xmlns="http://www.w3.org/2000/svg"
-          />,
           "payment": <Payment
             viewBox="0 0 34 30"
             xmlns="http://www.w3.org/2000/svg"
           />,
-          "referrals": <Referral
-            height="30"
-            viewBox="0 0 30 30"
-            width="30"
-            xmlns="http://www.w3.org/2000/svg"
-          />,
         }
       }
       names={
         Array [
           "e-mail",
           "forum",
           "payment",
-          "invitation letter",
-          "referrals",
         ]
       }
       toggle={[Function]}