Fix profile page pull to refresh (#129)

* Fix profile page pull to refresh * Remove logs
AudiusProject · Dec 2, 2020 · e8afe94 · e8afe94
1 parent 7dafb01
commit e8afe94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/containers/profile-page/store/reducer.js b/src/containers/profile-page/store/reducer.js
@@ -49,12 +49,17 @@ const initialState = {
 
 const actionsMap = {
   [FETCH_PROFILE](state, action) {
-    return {
+    const newState = {
       ...state,
-      handle: action.handle,
-      userId: action.userId,
       status: action.shouldSetLoading ? Status.LOADING : state.status
     }
+    if (action.handle) {
+      newState.handle = action.handle
+    }
+    if (action.userId) {
+      newState.userId = action.userId
+    }
+    return newState
   },
   [FETCH_PROFILE_SUCCEEDED](state, action) {
     return {

diff --git a/src/containers/profile-page/store/sagas.js b/src/containers/profile-page/store/sagas.js
@@ -52,7 +52,6 @@ function* fetchProfileAsync(action) {
   try {
     let user
     if (action.handle) {
-      yield fork(fetchUserSocials, action.handle)
       user = yield call(
         fetchUserByHandle,
         action.handle,
@@ -79,7 +78,12 @@ function* fetchProfileAsync(action) {
       return
     }
     yield put(profileActions.fetchProfileSucceeded(user.handle, user.user_id))
+
+    // Fetch user socials and collections after fetching the user itself
+    yield fork(fetchUserSocials, action.handle)
     yield fork(fetchUserCollections, user.user_id)
+
+    // Get current user notification & subscription status
     const isSubscribed = yield call(
       AudiusBackend.getUserSubscribed,
       user.user_id