unique key for map markers, removed fetch button, now triggered by ma…

…p move
Trustroots · Oct 18, 2024 · 34417fa · 34417fa
1 parent 0488084
commit 34417fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/nr-app/app/(tabs)/list.tsx b/nr-app/app/(tabs)/list.tsx
@@ -1,42 +1,20 @@
 // import Ionicons from "@expo/vector-icons/Ionicons";
-import {
-  Button,
-  SafeAreaView,
-  ScrollView,
-  StyleSheet,
-  Text,
-  View,
-} from "react-native";
+import { SafeAreaView, ScrollView, StyleSheet, Text, View } from "react-native";
 
 import { ThemedText } from "@/components/ThemedText";
 import { ThemedView } from "@/components/ThemedView";
-import { startSubscription } from "@/redux/actions/subscription.actions";
-import { useAppDispatch, useAppSelector } from "@/redux/hooks";
+import { useAppSelector } from "@/redux/hooks";
 import { eventsSelectors } from "@/redux/slices/events.slice";
 
 export default function TabTwoScreen() {
   const events = useAppSelector(eventsSelectors.selectAll);
-  const dispatch = useAppDispatch();
 
   return (
     <SafeAreaView>
       <ScrollView>
         <ThemedView style={styles.titleContainer}>
           <ThemedText type="title">Stream of notes</ThemedText>
         </ThemedView>
-        <View>
-          <Button
-            title="LOAD 10 NOTES (this button should disappear and notes on this pane should be the notes you see on the map pane)"
-            onPress={async () => {
-              dispatch(
-                startSubscription({
-                  filter: { kinds: [397], limit: 10 },
-                  relayUrls: ["wss://relay.damus.io"],
-                }),
-              );
-            }}
-          />
-        </View>
         <View>
           <Text style={styles.note}>
             We have a total of {events.length} notes.

diff --git a/nr-app/src/components/Map.tsx b/nr-app/src/components/Map.tsx
@@ -7,7 +7,8 @@ import { StyleSheet, View, Text } from "react-native";
 
 import MapView, { Marker, Callout } from "react-native-maps";
 import { eventsSelectors } from "@/redux/slices/events.slice";
-import { useAppSelector } from "@/redux/hooks";
+import { useAppDispatch, useAppSelector } from "@/redux/hooks";
+import { startSubscription } from "@/redux/actions/subscription.actions";
 
 import React, { useState } from "react";
 import { Modal, TextInput, Button } from "react-native";
@@ -48,6 +49,7 @@ export default function Map() {
     setSelectedCoordinate(event.nativeEvent.coordinate);
     setModalVisible(true);
   };
+  const dispatch = useAppDispatch();
 
   return (
     <View style={styles.mapContainer}>
@@ -58,6 +60,14 @@ export default function Map() {
         onLongPress={handleLongPress}
         onRegionChangeComplete={(region, details) => {
           console.log("#rIMmxg Map move completed", region, details);
+
+          dispatch(
+            startSubscription({
+              filter: { kinds: [397], limit: 10 },
+              relayUrls: ["wss://relay.damus.io"],
+            }),
+          );
+
           const topRightCoordinates = {
             latitude: region.latitude + region.latitudeDelta,
             longitude: region.longitude + region.longitudeDelta,
@@ -78,7 +88,7 @@ export default function Map() {
         <Marker coordinate={{ latitude: 52, longitude: 13 }} title="A marker" />
 
         {events.map((event) => (
-          <NoteMarker event={event} />
+          <NoteMarker event={event} key={event.event.sig} />
         ))}
       </MapView>