From 7e4c19d9b65bf5e37fe5da3e460846e5231ecf46 Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Thu, 21 Oct 2021 12:31:25 -0400
Subject: [PATCH] attempt to fix immer/merge bug

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
---
 src/renderer/utils/storageHelper.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/utils/storageHelper.ts b/src/renderer/utils/storageHelper.ts
index 80c5df8fba..5e417b2162 100755
--- a/src/renderer/utils/storageHelper.ts
+++ b/src/renderer/utils/storageHelper.ts
@@ -22,7 +22,7 @@
 // Helper for working with storages (e.g. window.localStorage, NodeJS/file-system, etc.)
 import { action, comparer, makeObservable, observable, toJS, when, } from "mobx";
 import produce, { Draft, isDraft } from "immer";
-import { isEqual } from "lodash";
+import { isEqual, isPlainObject } from "lodash";
 import logger from "../../main/logger";
 
 export interface StorageAdapter<T> {
@@ -159,7 +159,7 @@ export class StorageHelper<T> {
         if (newValue && !isDraft(newValue)) {
           Object.assign(draft, newValue);
         }
-      } else {
+      } else if (isPlainObject(value)) {
         Object.assign(draft, value);
       }
     });