Kaynağa Gözat

events small changes

Viktoriia 3 hafta önce
ebeveyn
işleme
85eb9806f2

+ 6 - 6
src/screens/InAppScreens/TravelsScreen/EventScreen/index.tsx

@@ -732,7 +732,7 @@ const EventScreen = ({ route }: { route: any }) => {
               flex: 1
             }}
           >
-            {moment(event.settings.date_from, 'YYYY-MM-DD').format('DD MMMM YYYY')}{' '}
+            {moment(event.settings.date_from, 'YYYY-MM-DD').format('DD MMM YYYY')}{' '}
           </Text>
           <Text
             style={{
@@ -742,12 +742,12 @@ const EventScreen = ({ route }: { route: any }) => {
               flex: 1
             }}
           >
-            {moment(event.settings.date_to, 'YYYY-MM-DD').format('DD MMMM YYYY')}
+            {moment(event.settings.date_to, 'YYYY-MM-DD').format('DD MMM YYYY')}
           </Text>
         </View>
       );
     } else {
-      let date = moment(event.date, 'YYYY-MM-DD').format('DD MMMM YYYY');
+      let date = moment(event.date, 'YYYY-MM-DD').format('DD MMM YYYY');
 
       if (event.date_tentative) {
         return (
@@ -1137,7 +1137,7 @@ const EventScreen = ({ route }: { route: any }) => {
                 filteredParticipants.length > 0) ? (
                 <View style={{ gap: 8, flex: 1 }}>
                   <Text style={[styles.travelSeriesTitle, { fontSize: 12 }]}>
-                    Joined{` (${filteredParticipants.length})`}
+                    Going{` (${filteredParticipants.length})`}
                   </Text>
 
                   <View style={[styles.statItem, { justifyContent: 'flex-start' }]}>
@@ -1407,7 +1407,7 @@ const EventScreen = ({ route }: { route: any }) => {
                   {filteredParticipants.length > 0 ? (
                     <View style={{ gap: 8, flex: 1 }}>
                       <Text style={[styles.travelSeriesTitle, { fontSize: 12 }]}>
-                        Joined{` (${filteredParticipants.length})`}
+                        Going{` (${filteredParticipants.length})`}
                       </Text>
 
                       <View style={[styles.statItem, { justifyContent: 'flex-start' }]}>
@@ -1672,7 +1672,7 @@ const EventScreen = ({ route }: { route: any }) => {
                         textTransform: 'uppercase'
                       }}
                     >
-                      Join
+                      Going
                     </Text>
                   </>
                 ) : (

+ 1 - 1
src/screens/InAppScreens/TravelsScreen/EventsScreen/index.tsx

@@ -358,7 +358,7 @@ const EventsScreen = () => {
             {item.joined && token ? (
               <View style={styles.joinedOverlay}>
                 <Text style={{ color: Colors.WHITE, fontSize: 12, fontFamily: 'redhat-700' }}>
-                  Joined
+                  Going
                 </Text>
               </View>
             ) : null}

+ 5 - 4
src/screens/InAppScreens/TravelsScreen/EventsScreen/utils.tsx

@@ -7,7 +7,7 @@ export const renderSpotsText = (e: SingleEvent) => {
       return (
         <Text>
           <Text style={{ fontWeight: '700' }}>{e.interested}</Text> interested /{' '}
-          <Text style={{ fontWeight: '700' }}>{e.joining}</Text> joined
+          <Text style={{ fontWeight: '700' }}>{e.joining}</Text> going
         </Text>
       );
     } else if (e.interested > 0) {
@@ -19,15 +19,16 @@ export const renderSpotsText = (e: SingleEvent) => {
     } else if (e.joining > 0) {
       return (
         <Text>
-          <Text style={{ fontWeight: '700' }}>{e.joining}</Text> joined
+          <Text style={{ fontWeight: '700' }}>{e.joining}</Text> going
         </Text>
       );
     }
   }
-  if (e.type === 1 && e.joining > 0) {
+  // if (e.type === 1 && e.joining > 0) {
+  if (e.joining > 0) {
     return (
       <Text>
-        <Text style={{ fontWeight: '700' }}>{e.joining}</Text> joined
+        <Text style={{ fontWeight: '700' }}>{e.joining}</Text> going
       </Text>
     );
   }

+ 1 - 1
src/screens/InAppScreens/TravelsScreen/ParticipantsListScreen/index.tsx

@@ -83,7 +83,7 @@ const ParticipantsListScreen: FC<Props> = ({ navigation, route }) => {
   return (
     <PageWrapper>
       <Header
-        label={interested ? 'Interested' : 'Joined'}
+        label={interested ? 'Interested' : 'Going'}
         rightElement={<FilterButton onPress={() => setModalVisible(!isModalVisible)} />}
       />
       <View style={styles.container}>