From a27eefd89338cf1546f859bdae434afc4052d30e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 3 Aug 2017 15:20:44 +0100
Subject: [PATCH] Fix a couple of more errors due to API changes

---
 src/RichText.js                                    | 3 ++-
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/RichText.js b/src/RichText.js
index 6a183b31be..9876fcc93f 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -51,7 +51,8 @@ export const contentStateToHTML = (contentState: ContentState) => {
 };
 
 export function htmlToContentState(html: string): ContentState {
-    return ContentState.createFromBlockArray(convertFromHTML(html));
+    const blockArray = convertFromHTML(html).contentBlocks;
+    return ContentState.createFromBlockArray(blockArray);
 }
 
 function unicodeToEmojiUri(str) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 938caa0969..c16348300f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -735,7 +735,7 @@ export default class MessageComposerInput extends React.Component {
             const pt = contentState.getBlocksAsArray().map((block) => {
                 let blockText = block.getText();
                 let offset = 0;
-                this.findLinkEntities(block, (start, end) => {
+                this.findLinkEntities(contentState, block, (start, end) => {
                     const entity = contentState.getEntity(block.getEntityAt(start));
                     if (entity.getType() !== 'LINK') {
                         return;