From 45d5a3b9d7f8cc0b2f8953a58de33bb848d500c7 Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidcralph.co.uk>
Date: Thu, 28 Jul 2022 12:41:42 +0100
Subject: [PATCH] fix: sideload tab and file uploads

---
 src/components/modals/main/marketplace/sections/Create.jsx | 2 +-
 src/components/modals/main/settings/FileUpload.jsx         | 4 +++-
 src/modules/helpers/settings/modals.js                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/modals/main/marketplace/sections/Create.jsx b/src/components/modals/main/marketplace/sections/Create.jsx
index cbe98757..5624e91d 100644
--- a/src/components/modals/main/marketplace/sections/Create.jsx
+++ b/src/components/modals/main/marketplace/sections/Create.jsx
@@ -330,7 +330,7 @@ export default class Create extends PureComponent {
             id="file-input"
             type="settings"
             accept="application/json"
-            loadFunction={(e) => this.importSettings(JSON.parse(e.target.result))}
+            loadFunction={(e) => this.importSettings(JSON.parse(e))}
           />
         </SettingsItem>
         <div className="createButtons">
diff --git a/src/components/modals/main/settings/FileUpload.jsx b/src/components/modals/main/settings/FileUpload.jsx
index 13eeef28..089ce464 100644
--- a/src/components/modals/main/settings/FileUpload.jsx
+++ b/src/components/modals/main/settings/FileUpload.jsx
@@ -14,7 +14,9 @@ export default class FileUpload extends PureComponent {
 
       if (this.props.type === 'settings') {
         reader.readAsText(file, 'UTF-8');
-        return this.props.loadFunction(e);
+        reader.onload = (e) => {
+          return this.props.loadFunction(e.target.result);
+        }
       } else {
         // background upload
         const settings = {};
diff --git a/src/modules/helpers/settings/modals.js b/src/modules/helpers/settings/modals.js
index 66f7af63..3add0a77 100644
--- a/src/modules/helpers/settings/modals.js
+++ b/src/modules/helpers/settings/modals.js
@@ -52,7 +52,7 @@ export function exportSettings() {
 }
 
 export function importSettings(e) {
-  const content = JSON.parse(e.target.result);
+  const content = JSON.parse(e);
 
   Object.keys(content).forEach((key) => {
     localStorage.setItem(key, content[key]);