From 5e94b1a71e862a4f26a64ac4a18b229f6dcdc9a7 Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Fri, 19 Jul 2024 15:50:09 -0400
Subject: [PATCH 1/2] - Improve product fruits wrapper for extra checks

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 client/src/App/App.jsx                  |  9 ++++++++-
 client/src/App/ProductFruitsWrapper.jsx | 10 +++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx
index 1864bd623..441359097 100644
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -142,7 +142,14 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         />
       }
     >
-      <ProductFruitsWrapper currentUser={currentUser} />
+      <ProductFruitsWrapper
+        currentUser={currentUser}
+        workspaceCode={InstanceRenderMgr({
+          imex: null,
+          rome: "9BkbEseqNqxw8jUH",
+          promanager: "aoJoEifvezYI0Z0P"
+        })}
+      />
 
       <Routes>
         <Route
diff --git a/client/src/App/ProductFruitsWrapper.jsx b/client/src/App/ProductFruitsWrapper.jsx
index 0dfc59a04..4f6ca5dc8 100644
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -1,18 +1,14 @@
 import React from "react";
 import { ProductFruits } from "react-product-fruits";
-import InstanceRenderMgr from "../utils/instanceRenderMgr";
 
-const ProductFruitsWrapper = React.memo(({ currentUser }) => {
+const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
   return (
+    workspaceCode &&
     currentUser?.authorized === true &&
     currentUser?.email && (
       <ProductFruits
         lifeCycle="unmount"
-        workspaceCode={InstanceRenderMgr({
-          imex: null,
-          rome: "9BkbEseqNqxw8jUH",
-          promanager: "aoJoEifvezYI0Z0P"
-        })}
+        workspaceCode={workspaceCode}
         debug
         language="en"
         user={{

From 97693fbcff19a92012d4de907d3016044ae023eb Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Fri, 19 Jul 2024 16:01:40 -0400
Subject: [PATCH 2/2] - Add Prop Types to ProductFruitsWrapper.jsx

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 client/src/App/ProductFruitsWrapper.jsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/src/App/ProductFruitsWrapper.jsx b/client/src/App/ProductFruitsWrapper.jsx
index 4f6ca5dc8..2d3cfbac7 100644
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { ProductFruits } from "react-product-fruits";
+import PropTypes from "prop-types";
 
 const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
   return (
@@ -21,3 +22,11 @@ const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
 });
 
 export default ProductFruitsWrapper;
+
+ProductFruitsWrapper.propTypes = {
+  currentUser: PropTypes.shape({
+    authorized: PropTypes.bool,
+    email: PropTypes.string
+  }).isRequired,
+  workspaceCode: PropTypes.string.isRequired
+};