Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nt/bot filtered waves #2931

Merged
merged 4 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/comment/view/commentView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ const CommentView = ({
const _currentUsername = currentAccountUsername || currentAccount?.username;

const _showSubCommentsToggle = async (force = false) => {
if (!!handleOnToggleReplies && !!comment.commentKey && ((replies && replies.length > 0) || force)) {
if (
!!handleOnToggleReplies &&
!!comment.commentKey &&
((replies && replies.length > 0) || force)
) {
setIsOpeningReplies(true);
await delay(10); // hack to rendering inidcator first before start loading comments
handleOnToggleReplies(comment.commentKey);
Expand Down
6 changes: 3 additions & 3 deletions src/components/commentsModal/container/commentsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Comments from '../../comments';
import styles from '../styles/commentsModal.styles';

/**
* NOTE: this comments modal is in draft stage, right now rendering of
* content works great but actions do not respond as expected since most
* of action reply on modals and action sheets which causes a conflict with
* NOTE: this comments modal is in draft stage, right now rendering of
* content works great but actions do not respond as expected since most
* of action reply on modals and action sheets which causes a conflict with
* rendering comments in existing modal, similarly some actions require navigation
* to different screen while comments modal is still visible on screen.
*/
Expand Down
3 changes: 1 addition & 2 deletions src/components/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,5 @@ export {
PostTranslationModal,
ImageViewer,
WalkthroughMarker,
ProposalVoteRequest

ProposalVoteRequest,
};
88 changes: 42 additions & 46 deletions src/components/postComments/children/botCommentsPreview.tsx
Original file line number Diff line number Diff line change
@@ -1,63 +1,59 @@
import React, { useRef } from 'react';
import { View, TouchableOpacity, Text } from 'react-native';
import EStyleSheet from 'react-native-extended-stylesheet';
import { CommentsModal, Icon, UserAvatar } from '../..';
import styles from '../styles/botCommentsPreview.styles';
import { useIntl } from 'react-intl';
import { useNavigation } from '@react-navigation/native';
import { CommentsModal, Icon, UserAvatar } from '../..';
import styles from '../styles/botCommentsPreview.styles';
import ROUTES from '../../../constants/routeNames';

interface BotCommentsProps {
comments: any[];
comments: any[];
}

export const BotCommentsPreview = ({ comments }: BotCommentsProps) => {
const intl = useIntl();
const navigation = useNavigation();

const commentsModalRef = useRef<typeof CommentsModal>();
const intl = useIntl();
const navigation = useNavigation();

if (!comments?.length) {
return null;
}
const commentsModalRef = useRef<typeof CommentsModal>();

const _onPress = () => {
navigation.navigate({
name: ROUTES.MODALS.BOT_COMMENTS,
params: {
comments
}
});
}
if (!comments?.length) {
return null;
}

return (
<View style={styles.container}>
<View style={styles.labelWrapper}>
<Text style={styles.label}>
{intl.formatMessage({ id: 'comments.bot_comments' })}
</Text>
<Icon
iconType="AntDesign"
name="right"
size={14}
color={EStyleSheet.value('$primaryDarkText')}
/>
</View>
<TouchableOpacity
onPress={_onPress}
>
<View style={styles.botAvatarsWrapper}>
{comments.map((comment) => {
return (
<View style={styles.item}>
<UserAvatar username={comment.author} noAction />
</View>
);
})}
</View>
</TouchableOpacity>
const _onPress = () => {
navigation.navigate({
name: ROUTES.MODALS.BOT_COMMENTS,
params: {
comments,
},
});
};

<CommentsModal ref={commentsModalRef} />
return (
<View style={styles.container}>
<View style={styles.labelWrapper}>
<Text style={styles.label}>{intl.formatMessage({ id: 'comments.bot_comments' })}</Text>
<Icon
iconType="AntDesign"
name="right"
size={14}
color={EStyleSheet.value('$primaryDarkText')}
/>
</View>
<TouchableOpacity onPress={_onPress}>
<View style={styles.botAvatarsWrapper}>
{comments.map((comment) => {
return (
<View style={styles.item}>
<UserAvatar username={comment.author} noAction />
</View>
);
})}
</View>
);
</TouchableOpacity>

<CommentsModal ref={commentsModalRef} />
</View>
);
};
3 changes: 1 addition & 2 deletions src/components/postsList/container/postsListContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ const postsListContainer = (
}
};

const _renderSeparator = () => <Separator style={styles.separator} />
const _renderSeparator = () => <Separator style={styles.separator} />;

const _renderItem = ({ item }: { item: any }) => {
// get image height from cache if available
Expand All @@ -231,7 +231,6 @@ const postsListContainer = (
}
/>
);

};

return (
Expand Down
8 changes: 4 additions & 4 deletions src/components/postsList/view/postsListStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default EStyleSheet.create({
placeholderWrapper: {
flex: 1,
},
separator:{
backgroundColor:'$primaryLightBackground',
marginBottom:8
}
separator: {
backgroundColor: '$primaryLightBackground',
marginBottom: 8,
},
});
Loading