Create a common function to insert an emoji into a text

src/libs/ReportUtils.js

@@ -1707,6 +1707,17 @@ function canLeaveRoom(report, isPolicyMember) {
     return true;
 }
 
+/**
+ * Replace substring between selection with a text.
+ * @param {String} text
+ * @param {Object} selection
+ * @param {String} textToInsert
+ * @returns {String}
+ */
+function insertText(text, selection, textToInsert) {
+    return text.slice(0, selection.start) + textToInsert + text.slice(selection.end, text.length);
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -1775,4 +1786,5 @@ export {
     getSmallSizeAvatar,
     getMoneyRequestOptions,
     canRequestMoney,
+    insertText,
 };

src/pages/home/report/ReportActionCompose/index.js

@@ -502,15 +502,13 @@ class ReportActionCompose extends React.Component {
      * @param {String} text
      */
     replaceSelectionWithInput(text) {
-        const newComment = this.comment.slice(0, this.state.selection.start)
-            + text
-            + this.comment.slice(this.state.selection.end, this.comment.length);
         this.setState(prevState => ({
             selection: {
                 start: prevState.selection.start + text.length,
                 end: prevState.selection.start + text.length,
             },
-        }), this.updateComment(newComment));
+        }));
+        this.updateComment(ReportUtils.insertText(this.comment, this.state.selection, text));
     }
 
     /**
@@ -519,8 +517,7 @@ class ReportActionCompose extends React.Component {
      * @param {String} emoji
      */
     addEmojiToTextBox(emoji) {
-        const emojiWithSpace = `${emoji} `;
-        this.replaceSelectionWithInput(emojiWithSpace);
+        this.replaceSelectionWithInput(emoji);
     }
 
     /**

src/pages/home/report/ReportActionItemMessageEdit.js

@@ -229,15 +229,13 @@ class ReportActionItemMessageEdit extends React.Component {
      * @param {String} emoji
      */
     addEmojiToTextBox(emoji) {
-        const newComment = this.state.draft.slice(0, this.state.selection.start)
-            + emoji + this.state.draft.slice(this.state.selection.end, this.state.draft.length);
         this.setState(prevState => ({
             selection: {
                 start: prevState.selection.start + emoji.length,
                 end: prevState.selection.start + emoji.length,
             },
         }));
-        this.updateDraft(newComment);
+        this.updateDraft(ReportUtils.insertText(this.state.draft, this.state.selection, emoji));
     }
 
     /**