From 6b927b4456c4b8866a9c9dbf5f37aeeb3fead828 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Tue, 15 Jun 2021 08:45:08 +1000
Subject: [PATCH] Fix bug with importing single item from groups

---
 src/modals/SelectDataModal.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/modals/SelectDataModal.js b/src/modals/SelectDataModal.js
index 2ac30c9..bfe6d46 100644
--- a/src/modals/SelectDataModal.js
+++ b/src/modals/SelectDataModal.js
@@ -249,15 +249,17 @@ function SelectDataModal({
         );
       }
     } else {
-      if (group.items.every((item) => item.id in maps)) {
+      if (group.items.some((item) => item.id in maps)) {
         return renderGroupContainer(
           group,
-          group.items.some((item) => maps[item.id].checked),
+          group.items.some((item) => maps[item.id]?.checked),
           renderMapGroup,
           (e, group) =>
             handleMapsChanged(
               e,
-              group.items.map((group) => maps[group.id])
+              group.items
+                .filter((group) => group.id in maps)
+                .map((group) => maps[group.id])
             )
         );
       }
@@ -290,10 +292,10 @@ function SelectDataModal({
         );
       }
     } else {
-      if (group.items.every((item) => item.id in tokens)) {
+      if (group.items.some((item) => item.id in tokens)) {
         const checked =
           group.items.some(
-            (item) => !(item.id in tokenUsedCount) && tokens[item.id].checked
+            (item) => !(item.id in tokenUsedCount) && tokens[item.id]?.checked
           ) || group.items.every((item) => item.id in tokenUsedCount);
         return renderGroupContainer(
           group,
@@ -302,7 +304,9 @@ function SelectDataModal({
           (e, group) =>
             handleTokensChanged(
               e,
-              group.items.map((group) => tokens[group.id])
+              group.items
+                .filter((group) => group.id in tokens)
+                .map((group) => tokens[group.id])
             )
         );
       }