Progress

app/javascript/gabsocial/reducers/compose.js

@@ -36,7 +36,7 @@ import {
   COMPOSE_POLL_OPTION_REMOVE,
   COMPOSE_POLL_SETTINGS_CHANGE,
   COMPOSE_SCHEDULED_AT_CHANGE,
-  COMPOSE_RICH_TEXT_EDITOR_CONTROLS_VISIBILITY
+  COMPOSE_RICH_TEXT_EDITOR_CONTROLS_VISIBILITY,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';

app/javascript/gabsocial/reducers/modal.js

@@ -1,17 +1,24 @@
-import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal';
+import Immutable from 'immutable'
+import {
+  MODAL_OPEN,
+  MODAL_CLOSE,
+} from '../actions/modal'
 
-const initialState = {
+const initialState = Immutable.Map({
   modalType: null,
-  modalProps: {},
-};
+  modalProps: null,
+})
 
 export default function modal(state = initialState, action) {
   switch(action.type) {
   case MODAL_OPEN:
-    return { modalType: action.modalType, modalProps: action.modalProps };
+    return state.withMutations(map => {
+      map.set('modalType', action.modalType)
+      map.set('modalProps', action.modalProps)
+    })
   case MODAL_CLOSE:
-    return initialState;
+    return initialState
   default:
-    return state;
+    return state
   }
-};
+}

app/javascript/gabsocial/reducers/popover.js

@@ -6,19 +6,19 @@ import {
 
 const initialState = Immutable.Map({
   popoverType: null,
-  placement: null,
+  popoverProps: null,
 })
 
 export default function popoverMenu(state = initialState, action) {
   switch (action.type) {
-    case POPOVER_OPEN:
-      return {
-        popoverType: action.popoverType,
-        popoverProps: action.popoverProps,
-      }
-    case POPOVER_CLOSE:
-      return initialState
-    default:
-      return state
+  case POPOVER_OPEN:
+    return state.withMutations(map => {
+      map.set('popoverType', action.popoverType)
+      map.set('popoverProps', action.popoverProps)
+    })
+  case POPOVER_CLOSE:
+    return initialState
+  default:
+    return state
   }
 }

app/javascript/gabsocial/reducers/tenor.js

@@ -7,7 +7,7 @@ import {
   GIF_RESULTS_FETCH_FAIL,
   GIF_CATEGORIES_FETCH_REQUEST,
   GIF_CATEGORIES_FETCH_SUCCESS,
-  GIF_CATEGORIES_FETCH_FAIL
+  GIF_CATEGORIES_FETCH_FAIL,
 } from '../actions/tenor'
 import { Map as ImmutableMap } from 'immutable'
 
@@ -22,34 +22,34 @@ const initialState = ImmutableMap({
 
 export default function (state = initialState, action) {
   switch (action.type) {
-    case GIF_RESULTS_FETCH_REQUEST:
-    case GIF_CATEGORIES_FETCH_REQUEST:
-      return state.set('loading', true)
-    case GIF_RESULTS_FETCH_SUCCESS:
-      return state.withMutations(map => {
-        map.set('results', action.results);
-        map.set('error', false);
-        map.set('loading', false);
-      });
-    case GIF_CATEGORIES_FETCH_SUCCESS:
-      return state.withMutations(map => {
-        map.set('categories', action.categories);
-        map.set('error', false);
-        map.set('loading', false);
-      });
-    case GIF_RESULTS_FETCH_FAIL:
-    case GIF_CATEGORIES_FETCH_FAIL:
-      return state.withMutations(map => {
-        map.set('error', !!action.error);
-        map.set('loading', false);
-      });
-    case GIFS_CLEAR_RESULTS:
-      return state.set('results', [])
-    case GIF_SET_SELECTED:
-      return state.set('chosenUrl', action.url)
-    case GIF_CHANGE_SEARCH_TEXT:
-      return state.set('searchText', action.text.trim());
-    default:
-      return state
+  case GIF_RESULTS_FETCH_REQUEST:
+  case GIF_CATEGORIES_FETCH_REQUEST:
+    return state.set('loading', true)
+  case GIF_RESULTS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.set('results', action.results);
+      map.set('error', false);
+      map.set('loading', false);
+    });
+  case GIF_CATEGORIES_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.set('categories', action.categories);
+      map.set('error', false);
+      map.set('loading', false);
+    });
+  case GIF_RESULTS_FETCH_FAIL:
+  case GIF_CATEGORIES_FETCH_FAIL:
+    return state.withMutations(map => {
+      map.set('error', !!action.error);
+      map.set('loading', false);
+    });
+  case GIFS_CLEAR_RESULTS:
+    return state.set('results', [])
+  case GIF_SET_SELECTED:
+    return state.set('chosenUrl', action.url)
+  case GIF_CHANGE_SEARCH_TEXT:
+    return state.set('searchText', action.text.trim());
+  default:
+    return state
   }
 }