stream-chat-react-native-core 5.40.0 → 5.41.0

package/src/components/Poll/components/PollResults/PollResultItem.tsx

@@ -16,9 +16,9 @@ export type PollResultItemProps<
   option: PollOption<StreamChatGenerics>;
 };
 
-export const PollVote = (vote: PollVoteClass) => {
+export const PollVote = ({ vote }: { vote: PollVoteClass }) => {
   const { t, tDateTimeParser } = useTranslationContext();
-  const { voting_visibility } = usePollState();
+  const { votingVisibility } = usePollState();
   const {
     theme: {
       colors: { black, text_low_emphasis },
@@ -42,12 +42,12 @@ export const PollVote = (vote: PollVoteClass) => {
   );
 
   const isAnonymous = useMemo(
-    () => voting_visibility === VotingVisibility.anonymous,
-    [voting_visibility],
+    () => votingVisibility === VotingVisibility.anonymous,
+    [votingVisibility],
   );
 
   return (
-    <View key={`results_vote_${vote.id}`} style={[styles.voteContainer, container]}>
+    <View style={[styles.voteContainer, container]}>
       <View style={{ flexDirection: 'row' }}>
         {!isAnonymous && vote.user?.image ? (
           <Avatar image={vote.user.image as string} key={vote.id} size={20} />
@@ -61,9 +61,13 @@ export const PollVote = (vote: PollVoteClass) => {
   );
 };
 
+const PollResultsVoteItem = (vote: PollVoteClass) => (
+  <PollVote key={`results_vote_${vote.id}`} vote={vote} />
+);
+
 export const PollResultsItem = ({ option }: PollResultItemProps) => {
   const { t } = useTranslationContext();
-  const { latest_votes_by_option, vote_counts_by_option } = usePollState();
+  const { latestVotesByOption, voteCountsByOption } = usePollState();
 
   const {
     theme: {
@@ -81,12 +85,12 @@ export const PollResultsItem = ({ option }: PollResultItemProps) => {
       <View style={[styles.headerContainer, headerContainer]}>
         <Text style={[styles.title, { color: black }, title]}>{option.text}</Text>
         <Text style={[styles.voteCount, { color: black }, voteCount]}>
-          {t<string>('{{count}} votes', { count: vote_counts_by_option[option.id] ?? 0 })}
+          {t<string>('{{count}} votes', { count: voteCountsByOption[option.id] ?? 0 })}
         </Text>
       </View>
-      {latest_votes_by_option?.[option.id]?.length > 0 ? (
+      {latestVotesByOption?.[option.id]?.length > 0 ? (
         <View style={{ marginTop: 16 }}>
-          {(latest_votes_by_option?.[option.id] ?? []).slice(0, 5).map(PollVote)}
+          {(latestVotesByOption?.[option.id] ?? []).slice(0, 5).map(PollResultsVoteItem)}
         </View>
       ) : null}
       <ShowAllVotesButton option={option} />

package/src/components/Poll/components/PollResults/PollResults.tsx

@@ -16,14 +16,14 @@ export type PollResultsProps = PollContextValue & {
 export const PollResultsContent = ({
   additionalScrollViewProps,
 }: Pick<PollResultsProps, 'additionalScrollViewProps'>) => {
-  const { name, options, vote_counts_by_option } = usePollState();
+  const { name, options, voteCountsByOption } = usePollState();
 
   const sortedOptions = useMemo(
     () =>
       [...options].sort(
-        (a, b) => (vote_counts_by_option[b.id] ?? 0) - (vote_counts_by_option[a.id] ?? 0),
+        (a, b) => (voteCountsByOption[b.id] ?? 0) - (voteCountsByOption[a.id] ?? 0),
       ),
-    [vote_counts_by_option, options],
+    [voteCountsByOption, options],
   );
 
   const {

package/src/components/Poll/hooks/usePollOptionVotesPagination.ts

@@ -22,7 +22,7 @@ export type UsePollVotesReturnType = {
 
 /**
  * A hook that queries votes for a given Poll and returns them in a paginated fashion.
- * Should be used instead of the latest_votes_by_option property within the reactive state in the
+ * Should be used instead of the latestVotesByOption property within the reactive state in the
  * event that we need more than the top 10 votes for an option. The returned property votes will
  * automatically be updated and trigger a state change when paginating further. Querying for votes
  * can only be done on an option by option basis.

package/src/components/Poll/hooks/usePollState.ts

@@ -19,21 +19,21 @@ import { usePollContext } from '../../../contexts';
 import { DefaultStreamChatGenerics } from '../../../types/types';
 
 export type UsePollStateSelectorReturnType = {
-  allow_answers: boolean | undefined;
-  allow_user_suggested_options: boolean | undefined;
-  answers_count: number;
-  created_by: UserResponse | null;
-  enforce_unique_vote: boolean;
-  is_closed: boolean | undefined;
-  latest_votes_by_option: Record<string, PollVote[]>;
-  max_votes_allowed: number;
+  allowAnswers: boolean | undefined;
+  allowUserSuggestedOptions: boolean | undefined;
+  answersCount: number;
+  createdBy: UserResponse | null;
+  enforceUniqueVote: boolean;
+  isClosed: boolean | undefined;
+  latestVotesByOption: Record<string, PollVote[]>;
   maxVotedOptionIds: string[];
+  maxVotesAllowed: number;
   name: string;
   options: PollOption[];
   ownAnswer: PollAnswer | undefined;
   ownVotesByOptionId: Record<string, PollVote>;
-  vote_counts_by_option: Record<string, number>;
-  voting_visibility: VotingVisibility | undefined;
+  voteCountsByOption: Record<string, number>;
+  votingVisibility: VotingVisibility | undefined;
 };
 
 export type UsePollStateReturnType<
@@ -49,41 +49,41 @@ export type UsePollStateReturnType<
 const selector = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
   nextValue: PollState<StreamChatGenerics>,
 ): UsePollStateSelectorReturnType => ({
-  allow_answers: nextValue.allow_answers,
-  allow_user_suggested_options: nextValue.allow_user_suggested_options,
-  answers_count: nextValue.answers_count,
-  created_by: nextValue.created_by,
-  enforce_unique_vote: nextValue.enforce_unique_vote,
-  is_closed: nextValue.is_closed,
-  latest_votes_by_option: nextValue.latest_votes_by_option,
-  max_votes_allowed: nextValue.max_votes_allowed,
+  allowAnswers: nextValue.allow_answers,
+  allowUserSuggestedOptions: nextValue.allow_user_suggested_options,
+  answersCount: nextValue.answers_count,
+  createdBy: nextValue.created_by,
+  enforceUniqueVote: nextValue.enforce_unique_vote,
+  isClosed: nextValue.is_closed,
+  latestVotesByOption: nextValue.latest_votes_by_option,
   maxVotedOptionIds: nextValue.maxVotedOptionIds,
+  maxVotesAllowed: nextValue.max_votes_allowed,
   name: nextValue.name,
   options: nextValue.options,
   ownAnswer: nextValue.ownAnswer,
   ownVotesByOptionId: nextValue.ownVotesByOptionId,
-  vote_counts_by_option: nextValue.vote_counts_by_option,
-  voting_visibility: nextValue.voting_visibility,
+  voteCountsByOption: nextValue.vote_counts_by_option,
+  votingVisibility: nextValue.voting_visibility,
 });
 
 export const usePollState = (): UsePollStateReturnType => {
   const { message, poll } = usePollContext();
   const {
-    allow_answers,
-    allow_user_suggested_options,
-    answers_count,
-    created_by,
-    enforce_unique_vote,
-    is_closed,
-    latest_votes_by_option,
-    max_votes_allowed,
+    allowAnswers,
+    allowUserSuggestedOptions,
+    answersCount,
+    createdBy,
+    enforceUniqueVote,
+    isClosed,
+    latestVotesByOption,
     maxVotedOptionIds,
+    maxVotesAllowed,
     name,
     options,
     ownAnswer,
     ownVotesByOptionId,
-    vote_counts_by_option,
-    voting_visibility,
+    voteCountsByOption,
+    votingVisibility,
   } = usePollStateStore(selector);
 
   const addOption = useCallback(
@@ -102,21 +102,21 @@ export const usePollState = (): UsePollStateReturnType => {
   return {
     addComment,
     addOption,
-    allow_answers,
-    allow_user_suggested_options,
-    answers_count,
-    created_by,
+    allowAnswers,
+    allowUserSuggestedOptions,
+    answersCount,
+    createdBy,
     endVote,
-    enforce_unique_vote,
-    is_closed,
-    latest_votes_by_option,
-    max_votes_allowed,
+    enforceUniqueVote,
+    isClosed,
+    latestVotesByOption,
     maxVotedOptionIds,
+    maxVotesAllowed,
     name,
     options,
     ownAnswer,
     ownVotesByOptionId,
-    vote_counts_by_option,
-    voting_visibility,
+    voteCountsByOption,
+    votingVisibility,
   };
 };

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.40.0"
+  "version": "5.41.0"
 }