From 5a438256a4649f7424e3423aaedcbb92db0244df Mon Sep 17 00:00:00 2001
From: John Darragh <darragh@entrotech.net>
Date: Thu, 20 May 2021 21:53:43 -0700
Subject: [PATCH] Bumped version number to 1.0.57 hotfix for Issue #992

---
 client/package.json                           |  2 +-
 client/src/App.js                             |  1 +
 .../src/components/Admin/VerificationAdmin.js | 23 +++++++++++++------
 server/package.json                           |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/client/package.json b/client/package.json
index a264a9e26..744ceffca 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,
diff --git a/client/src/App.js b/client/src/App.js
index 853053b4e..b1600870a 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -219,6 +219,7 @@ function App() {
                     <VerificationAdmin
                       user={user}
                       userCoordinates={userCoordinates}
+                      origin={origin}
                     />
                   </div>
                 </ThemeProvider>
diff --git a/client/src/components/Admin/VerificationAdmin.js b/client/src/components/Admin/VerificationAdmin.js
index a6dc41b2b..e8976690d 100644
--- a/client/src/components/Admin/VerificationAdmin.js
+++ b/client/src/components/Admin/VerificationAdmin.js
@@ -118,10 +118,14 @@ VerificationAdmin.propTypes = {
     latitude: PropTypes.number,
     longitude: PropTypes.number,
   }),
+  origin: PropTypes.shape({
+    latitude: PropTypes.number,
+    longitude: PropTypes.number,
+  }),
 };
 
 function VerificationAdmin(props) {
-  const { user, userCoordinates } = props;
+  const { user, userCoordinates, origin } = props;
   const classes = useStyles();
   const [dialogOpen, setDialogOpen] = useState(false);
   const [assignDialogOpen, setAssignDialogOpen] = useState(false);
@@ -159,8 +163,8 @@ function VerificationAdmin(props) {
       if (!initialCriteria) {
         initialCriteria = {
           ...defaultCriteria,
-          latitude: userCoordinates.latitude,
-          longitude: userCoordinates.longitude,
+          latitude: userCoordinates?.latitude || origin?.latitude || 0,
+          longitude: userCoordinates?.longitude || origin?.longitude || 0,
           verificationStatusId: 0,
         };
       } else {
@@ -180,7 +184,7 @@ function VerificationAdmin(props) {
       }
     };
     execute();
-  }, [userCoordinates, searchCallback]);
+  }, [userCoordinates, origin, searchCallback]);
 
   const search = async () => {
     try {
@@ -326,11 +330,16 @@ function VerificationAdmin(props) {
             <div style={{ overflowY: "scroll" }}>
               <SearchCriteria
                 key={JSON.stringify({
-                  userLatitude: userCoordinates.latitude,
+                  userLatitude:
+                    userCoordinates?.latitude || origin?.latitude || 0,
                   categories,
                 })}
-                userLatitude={userCoordinates.latitude}
-                userLongitude={userCoordinates.longitude}
+                userLatitude={
+                  userCoordinates?.latitude || origin?.latitude || 0
+                }
+                userLongitude={
+                  userCoordinates?.longitude || origin?.longitude || 0
+                }
                 categories={categories && categories.filter((c) => !c.inactive)}
                 neighborhoods={neighborhoods}
                 criteria={criteria}
diff --git a/server/package.json b/server/package.json
index 6c93846f0..458c6c2f6 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foodoasis-web-api",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "author": "Hack for LA",
   "description": "Web API Server for Food Oasis",
   "main": "server.js",