diff --git a/apps/mobile/android/app/src/main/assets/plaineditor.html b/apps/mobile/android/app/src/main/assets/plaineditor.html index b756b3d0e..06ad84aae 100644 --- a/apps/mobile/android/app/src/main/assets/plaineditor.html +++ b/apps/mobile/android/app/src/main/assets/plaineditor.html @@ -69,6 +69,7 @@ setTheme(); attachEditorListeners(); } + loadAction() diff --git a/apps/mobile/html/Web.bundle/site/plaineditor.html b/apps/mobile/html/Web.bundle/site/plaineditor.html index 53f807d78..61d471f0b 100644 --- a/apps/mobile/html/Web.bundle/site/plaineditor.html +++ b/apps/mobile/html/Web.bundle/site/plaineditor.html @@ -70,6 +70,7 @@ setTheme(); attachEditorListeners(); } + loadAction() diff --git a/apps/mobile/src/components/MergeEditor/index.js b/apps/mobile/src/components/MergeEditor/index.js index 0d339a299..d9ce61df0 100644 --- a/apps/mobile/src/components/MergeEditor/index.js +++ b/apps/mobile/src/components/MergeEditor/index.js @@ -141,10 +141,9 @@ const MergeEditor = () => { }; const onMessageFromPrimaryWebView = (evt) => { - if (evt.nativeEvent.data !== '') { let data = JSON.parse(evt.nativeEvent.data); - + if (data.type === 'delta') { primaryData = data.data; } @@ -152,11 +151,9 @@ const MergeEditor = () => { }; const onMessageFromSecondaryWebView = (evt) => { - if (evt.nativeEvent.data === '') { let data = JSON.parse(evt.nativeEvent.data); if (data.type === 'delta') { - secondaryData = data.data; } } @@ -362,6 +359,7 @@ const MergeEditor = () => { flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', + maxWidth: '50%', }}> { alignItems: 'center', justifyContent: 'space-between', }}> - + Saved on {timeConverter(primaryData.dateEdited)} { onPress={onPressDiscardFromPrimaryWebView} /> ) : null} - {keepContentFrom === 'secondary' ? null : ( -