Merge pull request #3347 from omnivore-app/fix/android-library-labels

Syncing improvements for highlight changes on android

packages/appreader/src/index.jsx

@@ -14,7 +14,6 @@ const mutation = async (name, input) => {
         actionID: name,
         ...input,
       })
-    console.log('action result', name, result, result.result)
     return result.result
   } else {
     // Send android a message
@@ -33,6 +32,7 @@ const mutation = async (name, input) => {
       case 'mergeHighlight':
         return {
           id: input['id'],
+          type: input['type'],
           shortID: input['shortId'],
           quote: input['quote'],
           patch: input['patch'],

packages/web/lib/highlights/createHighlight.ts

@@ -8,7 +8,10 @@ import {
 } from './highlightGenerator'
 import type { HighlightLocation } from './highlightGenerator'
 import { extendRangeToWordBoundaries } from './normalizeHighlightRange'
-import type { Highlight } from '../networking/fragments/highlightFragment'
+import type {
+  Highlight,
+  HighlightType,
+} from '../networking/fragments/highlightFragment'
 import { removeHighlights } from './deleteHighlight'
 import { ArticleMutations } from '../articleActions'
 import { NodeHtmlMarkdown } from 'node-html-markdown'
@@ -103,6 +106,7 @@ export async function createHighlight(
     id,
     shortId: nanoid(8),
     patch,
+    type: 'HIGHLIGHT' as HighlightType,
 
     color: input.color,
     prefix: highlightAttributes.prefix,