resolve conflicts

andela · Mar 28, 2019 · 56ac887 · 56ac887
1 parent fd4946b
commit 56ac887
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/app/Dashboard/components/DashboardContainer.js b/src/app/Dashboard/components/DashboardContainer.js
@@ -76,7 +76,7 @@ export class DashboardContainer extends Component {
 
   render() {
     const {
-      error, loading, pointsEarned, activitiesLogged, userActivities, society, successMessage, showToastMessage, dlevel,,
+      error, loading, pointsEarned, activitiesLogged, userActivities, society, successMessage, showToastMessage, dlevel,
     } = this.props;
     const {
       user, logPoints,

diff --git a/src/app/Dashboard/operations/tests/reducer.test.js b/src/app/Dashboard/operations/tests/reducer.test.js
@@ -194,6 +194,7 @@ describe('handles case LOG_ACTIVITY_TOAST_OPEN', () => {
       error: null,
       society: '',
       loading: false,
+      dlevel: '',
       pointsEarned: 0,
       activitiesLogged: 0,
       activity: {},
@@ -219,6 +220,7 @@ describe('handles case LOG_ACTIVITY_TOAST_CLOSE', () => {
       error: null,
       society: '',
       loading: false,
+      dlevel: '',
       pointsEarned: 0,
       activitiesLogged: 0,
       activity,
@@ -228,4 +230,3 @@ describe('handles case LOG_ACTIVITY_TOAST_CLOSE', () => {
     });
   });
 });
-
diff --git a/src/sagas/index.js b/src/sagas/index.js
@@ -1,7 +1,6 @@
 import { all, fork } from 'redux-saga/effects';
-import { watchFetchSocietyInfoReq } from '../app/Societies/operations';
+import { watchFetchUserRoleRequest } from '../app/Sidebar/operations';
 import watchFetchUserActivitiesRequest, { watchLogActivitySuccess } from '../app/Dashboard/operations/dashboard.data';
-
 import { watchCategoriesLoad, watchLogActivityPoints } from '../app/Dashboard/operations/logPoints.data';
 import { watchFetchSocietyInfoReq, watchFetchSocietyRedemptionsReq } from '../app/Societies/operations';