Merge pull request #6729 from topcoder-platform/develop

Sync with develop branch

Author: luizrrodrigues

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

@@ -48,10 +48,6 @@ exports[`renders account setting page correctly 1`] = `
             "link": "preferences",
             "title": "Preferences",
           },
-          Object {
-            "link": "payment",
-            "title": "Payment",
-          },
         ]
       }
     />
@@ -809,10 +805,6 @@ exports[`renders preferences setting page correctly 1`] = `
             "link": "preferences",
             "title": "Preferences",
           },
-          Object {
-            "link": "payment",
-            "title": "Payment",
-          },
         ]
       }
     />
@@ -1567,10 +1559,6 @@ exports[`renders profile setting page correctly 1`] = `
             "link": "preferences",
             "title": "Preferences",
           },
-          Object {
-            "link": "payment",
-            "title": "Payment",
-          },
         ]
       }
     />
@@ -2331,10 +2319,6 @@ exports[`renders tools setting page correctly 1`] = `
             "link": "preferences",
             "title": "Preferences",
           },
-          Object {
-            "link": "payment",
-            "title": "Payment",
-          },
         ]
       }
     />

__tests__/shared/components/tc-communities/__snapshots__/JoinCommunity.jsx.snap

@@ -65,6 +65,7 @@ exports[`Matches shallow shapshot 2`] = `
         Joining...
       </span>
       <ThemedLoadingIndicator
+        className=""
         composeAdhocTheme="deeply"
         composeContextTheme="softly"
         mapThemrProps={[Function]}

config/default.js

@@ -167,7 +167,7 @@ module.exports = {
     SUBDOMAIN_PROFILE_CONFIG: [{
       groupId: '20000000', communityId: 'wipro', communityName: 'topgear', userProfile: 'https://topgear-app.wipro.com/user-details',
     }],
-    TIMELNE_EVENT_API: 'https://api.topcoder-dev.com/v5/timeline-wall',
+    TIMELINE_WALL_API: 'https://api.topcoder-dev.com/v5/timeline-wall',
   },
 
   /* Information about Topcoder user groups can be cached in various places.
@@ -465,7 +465,8 @@ module.exports = {
   PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder-dev.com',
   DICE_VERIFY_URL: 'https://accounts-auth0.topcoder-dev.com',
   TIMELINE: {
-    REJECTION_EVENT_REASONS: ['Duplicate Event'],
+    REJECTION_EVENT_REASONS: ['Duplicate Event', 'Violates the Topcoder terms', 'Inaccurate or Invalid'],
     ALLOWED_FILETYPES: ['image/jpeg', 'image/png', 'video/mp4', 'video/x-msvideo', 'video/webm'],
+    FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL: 5 * 60 * 1000, // 5 minutes
   },
 };

config/production.js

@@ -62,7 +62,7 @@ module.exports = {
     },
     EMAIL_VERIFY_URL: 'http://www.topcoder.com/settings/account/changeEmail',
     THRIVE_FEED: 'https://topcoder.com/api/feeds/thrive',
-    TIMELNE_EVENT_API: 'https://api.topcoder.com/v5/timeline-wall',
+    TIMELINE_WALL_API: 'https://api.topcoder.com/v5/timeline-wall',
   },
   /* Filestack configuration for uploading Submissions
    * These are for the production back end */