Merge pull request #302 from Bit-Nation/feature/refactor-reducers-act…

…ions Feature/refactor reducers actions
Bit-Nation · Mar 17, 2018 · df9ad02 · df9ad02
2 parents c235966 + 28c497f
commit df9ad02
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 23 deletions.
diff --git a/__tests__/src/actions/modifyNation.js b/__tests__/src/actions/modifyNation.js
@@ -44,7 +44,7 @@ describe('modify nation action creators', () => {
     });
   });
 
-  test('startNationEditing', () => {
+  test('resetNationCreation', () => {
     expect(resetNationCreation()).toEqual({
       type: RESET_NATION_CREATION,
     });

diff --git a/__tests__/src/actions/profile.js b/__tests__/src/actions/profile.js
@@ -1,6 +1,20 @@
 import {
-  startUserCreating, startUserEditing, changeEditingUser, setUserProfile, cancelUserEditing, doneUserEditing, requestProfileUpdate, getUserProfile,
-  START_USER_CREATING, START_USER_EDITING, CHANGE_EDITING_USER, SET_USER_PROFILE, CANCEL_USER_EDITING, DONE_USER_EDITING, REQUEST_PROFILE_UPDATE, REQUEST_GET_PROFILE,
+  startUserCreating,
+  startUserEditing,
+  changeEditingUser,
+  setUserProfile,
+  cancelUserEditing,
+  doneUserEditing,
+  requestProfileUpdate,
+  getUserProfile,
+  START_USER_CREATING,
+  START_USER_EDITING,
+  CHANGE_EDITING_USER,
+  SET_USER_PROFILE,
+  CANCEL_USER_EDITING,
+  DONE_USER_EDITING,
+  REQUEST_PROFILE_UPDATE,
+  REQUEST_GET_PROFILE,
 } from '../../../src/actions/profile';
 
 test('actions - startUserCreating', (done) => {

diff --git a/__tests__/src/actions/testingMode.js b/__tests__/src/actions/testingMode.js
@@ -8,7 +8,6 @@ import {
 } from '../../../src/actions/testingMode';
 
 describe('testing mode action creators', () => {
-
   test('makeStep', () => {
     expect(makeStep()).toEqual({
       type: MAKE_STEP,
@@ -26,5 +25,4 @@ describe('testing mode action creators', () => {
       type: EMPTY_WALLET,
     });
   });
-
 });
diff --git a/__tests__/src/reducers/modifyNation.js b/__tests__/src/reducers/modifyNation.js
@@ -1,7 +1,12 @@
 import reducer, { emptyNation, initialState } from '../../../src/reducers/modifyNation';
 import {
-  cancelNationCreation, deleteNationDraft,
-  editingNationFieldChange, nationDraftDeleteResult, nationDraftSaveResult, nationSubmitResult, resetNationCreation,
+  cancelNationCreation,
+  deleteNationDraft,
+  editingNationFieldChange,
+  nationDraftDeleteResult,
+  nationDraftSaveResult,
+  nationSubmitResult,
+  resetNationCreation,
   saveNationDraft,
   startNationCreation,
   startNationEditing, submitNation,

diff --git a/__tests__/src/reducers/profile.js b/__tests__/src/reducers/profile.js
@@ -1,4 +1,11 @@
-import { startUserCreating, startUserEditing, changeEditingUser, setUserProfile, cancelUserEditing, doneUserEditing, requestProfileUpdate, getUserProfile } from '../../../src/actions/profile';
+import {
+  startUserCreating,
+  startUserEditing,
+  changeEditingUser,
+  setUserProfile,
+  cancelUserEditing,
+  doneUserEditing,
+} from '../../../src/actions/profile';
 import reducer, { emptyProfile, initialState } from '../../../src/reducers/profile';
 
 test('reducer - user profile creation', (done) => {

diff --git a/__tests__/src/reducers/testingMode.js b/__tests__/src/reducers/testingMode.js
@@ -10,7 +10,6 @@ test('testing mode initial state has isActive set to false', () => {
 });
 
 describe('testing mode reducer action handling', () => {
-
   test('resetSteps', () => {
     const stateBefore = { initialState, stepsLeftToToggle: stepsCountToToggle - 1 };
     const stateAfter = reducer(stateBefore, resetSteps());
@@ -21,7 +20,6 @@ describe('testing mode reducer action handling', () => {
   });
 
   describe('emptyWallet', () => {
-
     const testChangeWalletEmptyTo = (value) => {
       const stateBefore = { ...initialState, walletEmpty: !value };
       const stateAfter = reducer(stateBefore, emptyWallet());
@@ -38,11 +36,9 @@ describe('testing mode reducer action handling', () => {
     test('walletEmpty changed to true', () => {
       testChangeWalletEmptyTo(true);
     });
-
   });
 
   describe('makeStep', () => {
-
     const testChangeIsActiveTo = (value) => {
       const stateBefore = { ...initialState, isActive: !value };
       let stateAfter = stateBefore;
@@ -74,7 +70,5 @@ describe('testing mode reducer action handling', () => {
         stepsLeftToToggle: initialValue - 1,
       });
     });
-
   });
-
 });
diff --git a/src/actions/chat.js b/src/actions/chat.js
@@ -5,8 +5,8 @@ type ShowSpinnerAction = { +type: 'SHOW_CHAT_SPINNER' };
 type HideSpinnerAction = { +type: 'HIDE_CHAT_SPINNER' };
 
 export type Action =
-	| ShowSpinnerAction
-	| HideSpinnerAction;
+  | ShowSpinnerAction
+  | HideSpinnerAction;
 
 /**
  * @desc Action for an action that shows spinner while processing in background
@@ -26,4 +26,4 @@ export function hideSpinner(): HideSpinnerAction {
   return {
     type: HIDE_CHAT_SPINNER,
   };
-}
+}
diff --git a/src/reducers/chat.js b/src/reducers/chat.js
@@ -1,11 +1,9 @@
 // @flow
 
-import _ from 'lodash';
-
 import {
   type Action,
   SHOW_CHAT_SPINNER,
-  HIDE_CHAT_SPINNER
+  HIDE_CHAT_SPINNER,
 } from '../actions/chat';
 
 type State = {
@@ -27,12 +25,12 @@ export default (state: State = initialState, action: Action): State => {
     case SHOW_CHAT_SPINNER:
       return {
         ...state,
-        isFetching: true
+        isFetching: true,
       };
     case HIDE_CHAT_SPINNER:
       return {
         ...state,
-        isFetching: false
+        isFetching: false,
       };
     default:
       return state;

diff --git a/src/reducers/index.js b/src/reducers/index.js
@@ -18,7 +18,7 @@ const rootReducer = {
   key,
   activity,
   testingMode,
-  chat
+  chat,
 };
 
 export default combineReducers(rootReducer);