fix user index in popup | fix new entities with unregistered user whe…

…n scanning
pcournut · Jul 5, 2023 · 81223ba · 81223ba
1 parent 7fcb42f
commit 81223ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/types.d.ts b/types.d.ts
@@ -44,8 +44,8 @@ export interface Authentication {
 
 export interface User {
     _id: string
-    first_name: string
-    last_name: string
+    first_name?: string
+    last_name?: string
     authentication?: Authentication
     email?: string
 }

diff --git a/views/ListTab.tsx b/views/ListTab.tsx
@@ -31,12 +31,13 @@ export const ListTab = ({ route }) => {
   // Components
   type EnrichedUserItemProps = {
     enrichedUser: EnrichedUser;
-    index: number;
   };
-  const EnrichedUserItem = ({ enrichedUser, index }: EnrichedUserItemProps) => (
+  const EnrichedUserItem = ({ enrichedUser }: EnrichedUserItemProps) => (
     <TouchableOpacity
       onPress={() => {
-        setSelectedUserIndex(index);
+        setSelectedUserIndex(
+          enrichedUsers.findIndex((user) => user.email === enrichedUser.email)
+        );
         handleCallFunction();
       }}
     >
@@ -131,9 +132,7 @@ export const ListTab = ({ route }) => {
               .toLowerCase()
               .includes(searchParticipantText.toLowerCase())
         )}
-        renderItem={({ item, index }) => (
-          <EnrichedUserItem enrichedUser={item} index={index} />
-        )}
+        renderItem={({ item }) => <EnrichedUserItem enrichedUser={item} />}
         keyExtractor={(item) => item._id}
       />
       <ScanBottomSheet route={route} ref={ref}></ScanBottomSheet>

diff --git a/views/ScanScreen.tsx b/views/ScanScreen.tsx
@@ -118,8 +118,14 @@ export const ScanScreen = ({ navigation, route }) => {
               };
               const enrichedUser: EnrichedUser = {
                 // _id: updatedEntity.owner._id,
-                first_name: updatedEntity.owner.first_name,
-                last_name: updatedEntity.owner.last_name,
+                first_name:
+                  "first_name" in updatedEntity.owner
+                    ? updatedEntity.owner.first_name
+                    : updatedEntity.owner.email,
+                last_name:
+                  "last_name" in updatedEntity.owner
+                    ? updatedEntity.owner.last_name
+                    : "",
                 email: updatedEntity.owner.email,
                 kentoEntities: [kentoEntity],
               };