From a019feca54724c0506c041f3564e1e4345cc1f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?=
 <juan.guervos@polypoly.net>
Date: Mon, 10 Oct 2022 07:56:20 +0200
Subject: [PATCH 1/4] :coffin: result of this is never used

---
 feature-utils/poly-import/src/storage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feature-utils/poly-import/src/storage.js b/feature-utils/poly-import/src/storage.js
index f222becbe7..080ca3aec1 100644
--- a/feature-utils/poly-import/src/storage.js
+++ b/feature-utils/poly-import/src/storage.js
@@ -17,7 +17,6 @@ export class FeatureFileStorage {
             statResults[file.id] = await polyOut.stat(file.id);
         }
         this._files = statResults;
-        return files;
     }
 
     async readFile(path) {

From cc9ce2853489d4974b0a77c161a8127ed8aa10c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?=
 <juan.guervos@polypoly.net>
Date: Mon, 10 Oct 2022 08:36:43 +0200
Subject: [PATCH 2/4] No need to await a const

---
 .../poly-look/src/react-components/contexts/poly-import.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
index 0909705e52..a51961374b 100644
--- a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
+++ b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
@@ -38,7 +38,7 @@ export const PolyImportProvider = ({
           return;
         }
         for (const file of storage.files) {
-          resolvedFiles.push(await file);
+          resolvedFiles.push(file);
         }
         setFiles(resolvedFiles);
         setIsLoading(false);

From 21c56ba52749279412601317e9cf7d873fe2bc10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?=
 <juan.guervos@polypoly.net>
Date: Mon, 10 Oct 2022 08:53:50 +0200
Subject: [PATCH 3/4] Does not return anything

Plus it's async, but can't use it as such here
---
 .../poly-look/src/react-components/contexts/poly-import.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
index a51961374b..ae6376a7dd 100644
--- a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
+++ b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
@@ -48,7 +48,7 @@ export const PolyImportProvider = ({
 
   const handleRemoveFile = (fileID) => {
     setAccount(null);
-    return storage.removeFile(fileID);
+    storage.removeFile(fileID);
   };
 
   useEffect(() => {

From fff0b9c3304c65eb17e13ed6825cf68f70290103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?=
 <juan.guervos@polypoly.net>
Date: Mon, 17 Oct 2022 08:49:08 +0200
Subject: [PATCH 4/4] Address comments

Also :recycle: for consistency
---
 .../src/react-components/contexts/poly-import.jsx  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
index b6e838303f..cf3b26001d 100644
--- a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
+++ b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
@@ -32,14 +32,11 @@ export const PolyImportProvider = ({
     storage
       .refreshFiles()
       .then(async () => {
-        const resolvedFiles = [];
         if (!storage.files) {
           setFiles(null);
           return;
         }
-        for (const file of storage.files) {
-          resolvedFiles.push(file);
-        }
+        const resolvedFiles = await Promise.all(storage.files);
         setFiles(resolvedFiles);
         setIsLoading(false);
       })
@@ -48,17 +45,14 @@ export const PolyImportProvider = ({
 
   const handleRemoveFile = (fileID) => {
     setAccount(null);
-    storage.removeFile(fileID);
+    return storage.removeFile(fileID);
   };
 
   useEffect(() => {
     if (!pod) return;
     const storage = new FeatureFileStorage(pod, async () => {
-      const resolvedFiles = [];
-      for (const file of storage.files) {
-        resolvedFiles.push(await file);
-      }
-      setFiles(Object.values(resolvedFiles));
+      const resolvedFiles = await Promise.all(storage.files);
+      setFiles(resolvedFiles);
     });
     setStorage(storage);
   }, [pod]);