From c08e60ba2d22ab10f3a65b362870c5ec957d21bc Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Sat, 16 Oct 2021 01:58:12 -0400
Subject: [PATCH] Update CatalogGiftView

---
 src/views/catalog/views/gift/CatalogGiftView.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/catalog/views/gift/CatalogGiftView.tsx b/src/views/catalog/views/gift/CatalogGiftView.tsx
index d466d5b6..258d07f5 100644
--- a/src/views/catalog/views/gift/CatalogGiftView.tsx
+++ b/src/views/catalog/views/gift/CatalogGiftView.tsx
@@ -54,8 +54,11 @@ export const CatalogGiftView: FC<{}> = props =>
             if(giftData.colors && giftData.colors.length > 0) newColors.push({ id: colorId, color: `#${giftData.colors[0].toString(16)}` });
         }
 
-        setSelectedColorId(newColors[0].id);
-        setColors(newColors);
+        if(newColors.length)
+        {
+            setSelectedColorId(newColors[0].id);
+            setColors(newColors);
+        }
     }, [ giftConfiguration ]);
 
     const close = useCallback(() =>
@@ -68,7 +71,8 @@ export const CatalogGiftView: FC<{}> = props =>
         setMessage('');
         setSelectedBoxIndex(0);
         setSelectedRibbonIndex(0);
-        setSelectedColorId(colors[0].id);
+        
+        if(colors.length) setSelectedColorId(colors[0].id);
     }, [ colors ]);
 
     const onCatalogEvent = useCallback((event: CatalogEvent) =>