master-merge fix

Signed-off-by: Roman <ixrock@gmail.com>

src/renderer/components/+apps-releases/release-details.tsx

@@ -165,7 +165,7 @@ export class ReleaseDetails extends Component<Props> {
           />
           <MonacoEditor
             className={cssNames({ loading: valuesLoading })}
-            readOnly={valuesLoading || this.showOnlyUserSuppliedValues}
+            readOnly={valuesLoading}
             value={values}
             onChange={text => this.values = text}
           >

src/renderer/components/+custom-resources/crd-details.tsx

@@ -32,7 +32,6 @@ import { Table, TableCell, TableHead, TableRow } from "../table";
 import { Input } from "../input";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { MonacoEditor } from "../monaco-editor";
-import { UserStore } from "../../../common/user-store";
 import logger from "../../../common/logger";
 
 interface Props extends KubeObjectDetailsProps<CustomResourceDefinition> {

src/renderer/utils/__tests__/storageHelper.test.ts

@@ -19,6 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import { jest } from "@jest/globals";
 import { observable, reaction } from "mobx";
 import { StorageHelper } from "../storageHelper";
 import { delay } from "../../../common/utils/delay";