Merge from git

store/store.js

@@ -1,10 +1,11 @@
 import { createStore, applyMiddleware, combineReducers } from "redux";
-import { createWrapper, HYDRATE } from "next-redux-wrapper";
+import { createWrapper, HYDRATE, REHYDRATE } from "next-redux-wrapper";
 import thunkMiddleware from "redux-thunk";
 import { reducer as formReducer } from "redux-form";
 import autoMergeLevel2 from "redux-persist/lib/stateReconciler/autoMergeLevel2";
 import autoMergeLevel1 from "redux-persist/lib/stateReconciler/autoMergeLevel1";
-import storage from "redux-persist/lib/storage";
+//import storage from "redux-persist/lib/storage";
+import storage from "./storage";
 import currentView from "./currentView/reducer";
 import search from "./search/reducer";
 import searchResultsObj from "./searchOutput/reducer";
@@ -103,11 +104,11 @@ const makeStore = ({ isServer }) => {
         const storage = require("redux-persist/lib/storage").default;
 
         const persistConfig = {
-            key: "acp_" + Math.floor(100000 + Math.random() * 900000),
+            key: "acp",
             whitelist: [
                 "currentView",
                 "search",
-                "searchResults",
+                "searchResultsObj",
                 "formData",
                 "appealType",
                 "LPAData",