diff options
| author | George Rusu <george@tagg.id> | 2021-05-18 17:01:13 -0700 |
|---|---|---|
| committer | George Rusu <george@tagg.id> | 2021-05-18 17:01:13 -0700 |
| commit | 1ae1359fc2a28230101817fe8037d6fd95e9109f (patch) | |
| tree | 7db98dfccc3128546da55b7ab51143396f09a49b | |
| parent | 8fa476d8c1ee508c252b4d73901a75cb2c39bf75 (diff) | |
fix draggable userID prop
| -rw-r--r-- | src/components/taggs/TaggDraggable.tsx | 15 | ||||
| -rw-r--r-- | src/screens/profile/CaptionScreen.tsx | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/components/taggs/TaggDraggable.tsx b/src/components/taggs/TaggDraggable.tsx index a0872c2d..2c7ae2ce 100644 --- a/src/components/taggs/TaggDraggable.tsx +++ b/src/components/taggs/TaggDraggable.tsx @@ -59,9 +59,9 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( {/* user profile pic */} <TouchableOpacity style={styles.imageRectangle}> <TaggAvatar - screenType={ScreenType.Tagging} + screenType={ScreenType.Profile} editable={false} - userXId={taggedUser.userId} + userXId={undefined} /> {/* @username */} <Text @@ -74,7 +74,7 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( taggedUser, ) }> - {taggedUser} + {taggedUser.userId} </Text> {/* x button */} <Image style={styles.imageTip} source={uriTip} /> @@ -89,6 +89,7 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( if (draggable) { return ( <View style={styles.container}> + {console.log("this guy's userid is: " + taggedUser.userId)} <Draggable minX={minX} minY={minY} @@ -100,11 +101,11 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( }}> <TouchableOpacity style={styles.imageRectangle}> <TaggAvatar - screenType={ScreenType.Tagging} + screenType={ScreenType.Profile} editable={false} - userXId={taggedUser.userId} + userXId={undefined} /> - <Text>{taggedUser}</Text> + <Text>{taggedUser.userId}</Text> <Image style={styles.imageTip} source={uriTip} /> <TouchableOpacity onPress={() => deleteFromList()}> <Image style={styles.imageX} source={uriX} /> @@ -112,7 +113,7 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( </TouchableOpacity> </Draggable> <TouchableOpacity style={styles.imageRectangle}> - <Text>{taggedUser}</Text> + <Text>{taggedUser.userId}</Text> <Image style={styles.imageTip} source={uriTip} /> <TouchableOpacity onPress={() => deleteFromList()}> <Image style={styles.imageX} source={uriX} /> diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx index 50b60024..3fd2e7ef 100644 --- a/src/screens/profile/CaptionScreen.tsx +++ b/src/screens/profile/CaptionScreen.tsx @@ -46,10 +46,10 @@ interface CaptionScreenProps { const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => { const {title, image, screenType} = route.params; + const {user} = useSelector((state: RootState) => state.user); const { user: {userId}, } = useSelector((state: RootState) => state.user); - console.log(userId); const dispatch = useDispatch(); const [caption, setCaption] = useState(''); const [loading, setLoading] = useState(false); |