|
@@ -77,16 +77,19 @@ const MarkerItem = ({
|
|
|
]}
|
|
]}
|
|
|
onPress={() => toggleSeries(marker)}
|
|
onPress={() => toggleSeries(marker)}
|
|
|
>
|
|
>
|
|
|
- {marker?.visited === 1 && token ? (
|
|
|
|
|
- <View style={styles.completedContainer}>
|
|
|
|
|
|
|
+ <View style={styles.completedContainer}>
|
|
|
|
|
+ <View style={{ display: marker?.visited === 1 && token ? 'flex' : 'none' }}>
|
|
|
<CheckSvg width={14} height={14} fill={Colors.DARK_BLUE} />
|
|
<CheckSvg width={14} height={14} fill={Colors.DARK_BLUE} />
|
|
|
- <Text style={[styles.calloutButtonText, { color: Colors.DARK_BLUE }]}>
|
|
|
|
|
- Completed
|
|
|
|
|
- </Text>
|
|
|
|
|
</View>
|
|
</View>
|
|
|
- ) : (
|
|
|
|
|
- <Text style={styles.calloutButtonText}>To Complete</Text>
|
|
|
|
|
- )}
|
|
|
|
|
|
|
+ <Text
|
|
|
|
|
+ style={[
|
|
|
|
|
+ styles.calloutButtonText,
|
|
|
|
|
+ marker?.visited === 1 && token ? { color: Colors.DARK_BLUE } : {}
|
|
|
|
|
+ ]}
|
|
|
|
|
+ >
|
|
|
|
|
+ {marker?.visited === 1 && token ? 'Completed' : 'To Complete'}
|
|
|
|
|
+ </Text>
|
|
|
|
|
+ </View>
|
|
|
</TouchableOpacity>
|
|
</TouchableOpacity>
|
|
|
|
|
|
|
|
{parsedAvatars && (
|
|
{parsedAvatars && (
|
|
@@ -111,7 +114,7 @@ const MarkerItem = ({
|
|
|
>
|
|
>
|
|
|
{parsedAvatars?.map((avatar: number, index: number) => (
|
|
{parsedAvatars?.map((avatar: number, index: number) => (
|
|
|
<Image
|
|
<Image
|
|
|
- key={index}
|
|
|
|
|
|
|
+ key={avatar}
|
|
|
source={{ uri: API_HOST + '/img/avatars/' + avatar + '.webp' }}
|
|
source={{ uri: API_HOST + '/img/avatars/' + avatar + '.webp' }}
|
|
|
style={styles.userImageSmall}
|
|
style={styles.userImageSmall}
|
|
|
/>
|
|
/>
|
|
@@ -160,16 +163,19 @@ const MarkerItem = ({
|
|
|
]}
|
|
]}
|
|
|
onPressIn={() => toggleSeries(marker)}
|
|
onPressIn={() => toggleSeries(marker)}
|
|
|
>
|
|
>
|
|
|
- {marker?.visited === 1 && token ? (
|
|
|
|
|
- <View style={styles.completedContainer}>
|
|
|
|
|
|
|
+ <View style={styles.completedContainer}>
|
|
|
|
|
+ <View style={{ display: marker?.visited === 1 && token ? 'flex' : 'none' }}>
|
|
|
<CheckSvg width={14} height={14} fill={Colors.DARK_BLUE} />
|
|
<CheckSvg width={14} height={14} fill={Colors.DARK_BLUE} />
|
|
|
- <Text style={[styles.calloutButtonText, { color: Colors.DARK_BLUE }]}>
|
|
|
|
|
- Completed
|
|
|
|
|
- </Text>
|
|
|
|
|
</View>
|
|
</View>
|
|
|
- ) : (
|
|
|
|
|
- <Text style={styles.calloutButtonText}>To Complete</Text>
|
|
|
|
|
- )}
|
|
|
|
|
|
|
+ <Text
|
|
|
|
|
+ style={[
|
|
|
|
|
+ styles.calloutButtonText,
|
|
|
|
|
+ marker?.visited === 1 && token ? { color: Colors.DARK_BLUE } : {}
|
|
|
|
|
+ ]}
|
|
|
|
|
+ >
|
|
|
|
|
+ {marker?.visited === 1 && token ? 'Completed' : 'To Complete'}
|
|
|
|
|
+ </Text>
|
|
|
|
|
+ </View>
|
|
|
</TouchableOpacity>
|
|
</TouchableOpacity>
|
|
|
|
|
|
|
|
{parsedAvatars && (
|
|
{parsedAvatars && (
|
|
@@ -194,7 +200,7 @@ const MarkerItem = ({
|
|
|
>
|
|
>
|
|
|
{parsedAvatars?.map((avatar: number, index: number) => (
|
|
{parsedAvatars?.map((avatar: number, index: number) => (
|
|
|
<Image
|
|
<Image
|
|
|
- key={index}
|
|
|
|
|
|
|
+ key={avatar}
|
|
|
source={{ uri: API_HOST + '/img/avatars/' + avatar + '.webp' }}
|
|
source={{ uri: API_HOST + '/img/avatars/' + avatar + '.webp' }}
|
|
|
style={styles.userImageSmall}
|
|
style={styles.userImageSmall}
|
|
|
/>
|
|
/>
|