Improve import state functionality

Author: zalmoxisus

src/app/api/importState.js

@@ -6,14 +6,16 @@ export default function importState(state, { deserializeState, deserializeAction
   let preloadedState;
   let nextLiftedState = parse(state);
   if (nextLiftedState.payload) {
-    if (nextLiftedState.preloadedState) preloadedState = parse(nextLiftedState.preloadedState);
-    nextLiftedState = parse(nextLiftedState.payload);
+    if (nextLiftedState.preloadedState) preloadedState = nextLiftedState.preloadedState;
+    nextLiftedState = nextLiftedState.payload;
   }
   if (deserializeState) {
-    nextLiftedState.computedStates = nextLiftedState.computedStates.map(computedState => ({
-      ...computedState,
-      state: deserializeState(computedState.state)
-    }));
+    if (typeof nextLiftedState.computedStates !== 'undefined') {
+      nextLiftedState.computedStates = nextLiftedState.computedStates.map(computedState => ({
+        ...computedState,
+        state: deserializeState(computedState.state)
+      }));
+    }
     if (typeof nextLiftedState.committedState !== 'undefined') {
       nextLiftedState.committedState = deserializeState(nextLiftedState.committedState);
     }

src/browser/extension/background/logging.js

@@ -19,7 +19,7 @@ export function getReport(reportId, tabId, instanceId) {
       window.store.dispatch({
         type: LIFTED_ACTION,
         message: 'IMPORT',
-        state: JSON.stringify({ payload, preloadedState }),
+        state: `{"payload":${payload}, "preloadedState":${preloadedState}}`,
         id: tabId,
         instanceId
       });