Merge pull request #4656 from topcoder-platform/develop

Updates

Author: sushilshinde

.circleci/config.yml

@@ -231,7 +231,6 @@ workflows:
             branches:
               only:
                 - develop
-                - feature-contentful
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      

.eslintrc

@@ -2,7 +2,8 @@
   "extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
   "rules": {
     "jsx-a11y/anchor-is-valid": false,
-    "import/no-cycle": [2, { "maxDepth": 1 }]
+    "import/no-cycle": [2, { "maxDepth": 1 }],
+    "react/forbid-prop-types": false
   },
   "env": {
     "browser": true

__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

@@ -348,15 +348,6 @@ exports[`Matches shallow shapshot 1`] = `
               Talk to Sales
             </a>
           </li>
-          <li
-            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
-          >
-            <a
-              href="https://www.topcoder-dev.com/community/terms"
-            >
-              Terms
-            </a>
-          </li>
         </ul>
       </div>
       <div
@@ -613,7 +604,7 @@ exports[`Matches shallow shapshot 1`] = `
         © 2020 Topcoder
         <a
           className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
-          href="https://www.topcoder.com/privacy-policy/"
+          href="https://www.topcoder-dev.com/policy"
         >
           Policies
         </a>

__tests__/shared/containers/__snapshots__/TopcoderHeader.jsx.snap

@@ -11,6 +11,7 @@ exports[`Matches shallow snapshot 1`] = `
   closeMobileMenu={[Function]}
   closeSearch={[Function]}
   dismissChallengeNotifications={[Function]}
+  headerMenu={null}
   loadNotifications={[Function]}
   markAllNotificationAsRead={[Function]}
   markAllNotificationAsSeen={[Function]}

config/default.js

@@ -160,7 +160,6 @@ module.exports = {
     COMMUNITY_API: 'http://localhost:8000',
     COMMUNITY_APP_GITHUB_ISSUES: 'https://github.com/topcoder-platform/community-app/issues',
     EMAIL_VERIFY_URL: 'http://www.topcoder-dev.com/settings/account/changeEmail',
-    THRIVE_POLL_FEED: 'https://www.topcoder.com/feed',
   },
 
   /* Information about Topcoder user groups can be cached in various places.
@@ -406,4 +405,5 @@ module.exports = {
   TC_EDU_ARTICLES_PATH: '/articles',
   TC_EDU_SEARCH_PATH: '/search',
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
+  POLICY_PAGES_PATH: '/policy',
 };