src/notifications/notification/view/LikeView.js

@@ -48,8 +48,10 @@ export default class LikeView extends PureComponent {
  params.group = this.props.entity.params.parent;
  params.hydrate = true;
  params.tab = 'conversation';
+ params.focusedUrn = this.props.entity.params.focusedCommentUrn;
  } else {
  params.guid = this.props.entity.entity.entity_guid;
+ params.focusedUrn = this.props.entity.params.focusedCommentUrn;
  screen = 'Activity';
  }
 

src/notifications/notification/view/TagView.js

@@ -25,13 +25,13 @@ export default class TagView extends PureComponent {
  if (isComment) {
  if (this.props.entity.params && this.props.entity.params.parent) {
  if (this.props.entity.params.parent.type === 'group') {
- this.props.navigation.push('GroupView', { guid: this.props.entity.params.parent.guid });
+ this.props.navigation.push('GroupView', { guid: this.props.entity.params.parent.guid, focusedUrn: this.props.entity.params.focusedCommentUrn, tab: 'conversation' });
  } else if (this.props.entity.params.parent.subtype === 'blog') {
- this.props.navigation.push('BlogView', { guid: this.props.entity.params.parent.guid });
+ this.props.navigation.push('BlogView', { guid: this.props.entity.params.parent.guid, focusedUrn: this.props.entity.params.focusedCommentUrn });
  } else {
  entityService.getEntity(this.props.entity.params.parent.guid)
  .then((entity) => {
- this.props.navigation.push('Activity', { entity });
+ this.props.navigation.push('Activity', { entity, focusedUrn: this.props.entity.params.focusedCommentUrn });
  })
  .catch(err => {
  logService.exception('[TagView]', err);
@@ -52,10 +52,11 @@ export default class TagView extends PureComponent {
  const styles = this.props.styles;
 
  const isComment = entity.entityObj.type === 'comment';
+ const isConversation = this.props.entity.params.parent && this.props.entity.params.parent.type === 'group';
 
  return (
  <TouchableOpacity style={styles.bodyContents} onPress={this.navToActivity}>
- <Text>{entity.fromObj.name} {isComment ? i18n.t('notification.tagComment') : i18n.t('notification.tagPost')}</Text>
+ <Text>{entity.fromObj.name} {isComment ? (isConversation ? i18n.t('notification.tagConversation') : i18n.t('notification.tagComment')) : i18n.t('notification.tagPost')}</Text>
  </TouchableOpacity>
  )
  }