Payment tool updates

__tests__/__snapshots__/index.js.snap

@@ -294,6 +294,10 @@ Object {
       "default": undefined,
       "getService": [Function],
     },
+    "resource": Object {
+      "default": undefined,
+      "getService": [Function],
+    },
     "reviewOpportunities": Object {
       "default": undefined,
       "getReviewOpportunitiesService": [Function],

__tests__/actions/auth.js

@@ -1,17 +1,18 @@
-const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v3/groups?memberId=12345&membershipType=user';
+const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v5/groups?memberId=12345&membershipType=user';
 const MOCK_PROFILE_REQ_URL = 'https://api.topcoder-dev.com/v3/members/username12345';
 
 jest.mock('isomorphic-fetch', () => jest.fn(url => Promise.resolve({
   json: () => {
     let content;
     switch (url) {
-      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2']; break;
-      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 }; break;
+      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2'];
+        return content;
+      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 };
+        return {
+          result: { content, status: 200 },
+        };
       default: throw new Error('Unexpected URL!');
     }
-    return {
-      result: { content, status: 200 },
-    };
   },
 })));
 

config/test.js

@@ -2,6 +2,8 @@ module.exports = {
   API: {
     V2: 'https://api.topcoder-dev.com/v2',
     V3: 'https://api.topcoder-dev.com/v3',
+    V4: 'https://api.topcoder-dev.com/v4',
+    V5: 'https://api.topcoder-dev.com/v5',
   },
   dummyConfigKey: 'Dummy config value',
 };

src/actions/auth.js

@@ -17,11 +17,12 @@ function loadProfileDone(userTokenV3) {
   if (!userTokenV3) return Promise.resolve(null);
   const user = decodeToken(userTokenV3);
   const api = getApi('V3', userTokenV3);
+  const apiV5 = getApi('V5', userTokenV3);
   return Promise.all([
     api.get(`/members/${user.handle}`)
       .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
-    api.get(`/groups?memberId=${user.userId}&membershipType=user`)
-      .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : [])),
+    apiV5.get(`/groups?memberId=${user.userId}&membershipType=user`)
+      .then(res => res.json()).then(res => (res && res.length ? res : [])),
   ]).then(([profile, groups]) => ({ ...profile, groups }));
 }
 

src/actions/direct.js

@@ -79,15 +79,15 @@ function getUserProjectsInit(tokenV3) {
  * @static
  * @desc Creates an action that loads projects related to a user.
  * @param {String} tokenV3 Topcoder auth token v3.
- * @param {Boolean} hasActiveBillingAccount Optional. Defaults to false.
- *  Whether only projects with active billing accounts should be included
- *  into the results.
  * @return {Action}
  */
-async function getUserProjectsDone(tokenV3, hasActiveBillingAccount) {
-  const params = {};
-  if (hasActiveBillingAccount) params.hasActiveBillingAccount = true;
-  const projects = await getService(tokenV3).getUserProjects(params);
+async function getUserProjectsDone(tokenV3) {
+  // Fetches Member's only Active projects
+  const projects = await getService(tokenV3).getUserProjects({
+    memberOnly: true,
+    sort: 'lastActivityAt desc',
+    status: 'active',
+  });
   return { tokenV3, projects };
 }
 

src/actions/member-tasks.js

@@ -59,11 +59,12 @@ function getInit(uuid, pageNum) {
  */
 function getDone(uuid, projectId, pageNum, tokenV3) {
   return getService(tokenV3).getChallenges({
-    isTask: 1,
+    isTask: true,
     projectId,
-  }, {
-    limit: PAGE_SIZE,
-    offset: pageNum * PAGE_SIZE,
+    sortBy: 'updated',
+    sortOrder: 'desc',
+    perPage: PAGE_SIZE,
+    page: pageNum + 1,
   }).then(({ challenges, totalCount }) => ({
     projectId,
     tasks: challenges,

src/reducers/direct.js

@@ -54,7 +54,7 @@ function onGetProjectDetailsDone(state, { error, payload }) {
     logger.error('Failed to load project details', payload);
     throw payload;
   }
-  if (payload.project.projectId !== state.loadingProjectDetailsForId) {
+  if (payload.id !== state.loadingProjectDetailsForId) {
     return state;
   }
   return {