1 files changed, 3 insertions, 10 deletions
diff --git a/src/components/comments/AddComment.tsx b/src/components/comments/AddComment.tsx
index 7576675e..cf5d19ee 100644
--- a/src/components/comments/AddComment.tsx
+++ b/src/components/comments/AddComment.tsx
@@ -16,7 +16,8 @@ import {postComment} from '../../services';
 import {updateReplyPosted} from '../../store/actions';
 import {RootState} from '../../store/rootreducer';
 import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
-import {Avatar, TaggTypeahead} from '../common';
+import {Avatar} from '../common';
+import {mentionPartTypes} from '../../utils/comments';
 
 /**
  * This file provides the add comment view for a user.
@@ -108,15 +109,7 @@ const AddComment: React.FC<AddCommentProps> = ({
             value={comment}
             onChange={setComment}
             inputRef={ref}
-            partTypes={[
-              {
-                trigger: '@',
-                renderSuggestions: (props) => <TaggTypeahead {...props} />,
-                allowedSpacesCount: 0,
-                isInsertSpaceAfterMention: true,
-                textStyle: {color: TAGG_LIGHT_BLUE},
-              },
-            ]}
+            partTypes={mentionPartTypes}
           />
           <View style={styles.submitButton}>
             <TouchableOpacity style={styles.submitButton} onPress={addComment}>