From 8ad59098d1a6a9987c1da45c7d93d13b8b208e87 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Wed, 1 Dec 2021 19:30:11 +0500
Subject: [PATCH 01/24] change color of link

---
 apps/mobile/html/Web.bundle/site/constants.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/html/Web.bundle/site/constants.js b/apps/mobile/html/Web.bundle/site/constants.js
index d6ac5522e..7421f313a 100755
--- a/apps/mobile/html/Web.bundle/site/constants.js
+++ b/apps/mobile/html/Web.bundle/site/constants.js
@@ -221,7 +221,10 @@ function setTheme() {
     .tox .tox-toolbar__primary {
       background: none !important;
       border-bottom: 1px solid ${pageTheme.colors.nav} !important;
-    }`;
+    }
+    
+ 
+    `;
 
   let node2 = `
   .mce-content-body table[data-mce-selected], {
@@ -250,6 +253,17 @@ function setTheme() {
   opacity:0.5;
 }
 
+.mce-content-body a {
+  color: ${pageTheme.colors.accent} !important;
+}
+
+.mce-content-body [data-mce-selected="inline-boundary"] {
+  background-color: ${pageTheme.colors.shade} !important;
+}
+.mce-content-body a[data-mce-selected] {
+  box-shadow: none !important;
+}
+
 span.attachment {
   overflow: hidden;
   position: relative;

From a4c2471f93eb96742aacd35fca70ae59a4a89fa9 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Wed, 1 Dec 2021 19:30:53 +0500
Subject: [PATCH 02/24] editor: set keep_styles to false

---
 apps/mobile/html/Web.bundle/site/init.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/html/Web.bundle/site/init.js b/apps/mobile/html/Web.bundle/site/init.js
index 8a49b3667..93059ba6a 100755
--- a/apps/mobile/html/Web.bundle/site/init.js
+++ b/apps/mobile/html/Web.bundle/site/init.js
@@ -136,6 +136,7 @@ function init_tiny(size) {
       'media imagetools table paste wordcount autoresize directionality blockescape contenthandler'
     ],
     toolbar: false,
+    keep_styles:false,
     paste_data_images: true,
     statusbar: false,
     textpattern_patterns: markdownPatterns,

From ad5c3882a435f66a12946243d2b71259e900e688 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Wed, 1 Dec 2021 19:31:27 +0500
Subject: [PATCH 03/24] fix link input cannot be focused

---
 apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js b/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
index 28fe97ad6..d0ebce224 100644
--- a/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
+++ b/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
@@ -36,11 +36,6 @@ const ToolbarLinkInput = ({format, value, setVisible}) => {
     properties.inputMode = value ? INPUT_MODE.NO_EDIT : INPUT_MODE.EDITING;
     editing.tooltip = format;
     properties.userBlur = false;
-    if (properties.pauseSelectionChange) {
-      setTimeout(() => {
-        properties.pauseSelectionChange = false;
-      }, 100);
-    }
     return () => {
       properties.inputMode = null;
       editing.tooltip = null;
@@ -53,7 +48,7 @@ const ToolbarLinkInput = ({format, value, setVisible}) => {
       if (properties.pauseSelectionChange) {
         setTimeout(() => {
           properties.pauseSelectionChange = false;
-        }, 100);
+        }, 500);
       }
       inputRef.current?.focus();
       return;

From fd272c13727d288bc84b9f80bd72145d1c2dc8ee Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Wed, 1 Dec 2021 19:44:04 +0500
Subject: [PATCH 04/24] change selection color to accent color

---
 apps/mobile/html/Web.bundle/site/constants.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/mobile/html/Web.bundle/site/constants.js b/apps/mobile/html/Web.bundle/site/constants.js
index 7421f313a..59f3ba6fd 100755
--- a/apps/mobile/html/Web.bundle/site/constants.js
+++ b/apps/mobile/html/Web.bundle/site/constants.js
@@ -222,6 +222,12 @@ function setTheme() {
       background: none !important;
       border-bottom: 1px solid ${pageTheme.colors.nav} !important;
     }
+
+    ::selection {
+      color: white !important;
+      background: ${pageTheme.colors.accent} !important;
+    }
+    
     
  
     `;
@@ -260,6 +266,13 @@ function setTheme() {
 .mce-content-body [data-mce-selected="inline-boundary"] {
   background-color: ${pageTheme.colors.shade} !important;
 }
+
+::selection {
+  color: white !important;
+  background: ${pageTheme.colors.accent} !important;
+}
+  
+
 .mce-content-body a[data-mce-selected] {
   box-shadow: none !important;
 }

From e163a546648d9925b6c0abeb0509ca089b20e172 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Wed, 1 Dec 2021 21:35:36 +0500
Subject: [PATCH 05/24] update notes-core


From 4ed808bad1a64f912bc3eed28e3895e25b567eaa Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 09:35:29 +0500
Subject: [PATCH 06/24] defer updating screen on changing sort direction

---
 .../mobile/src/components/SortDialog/index.js | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/src/components/SortDialog/index.js b/apps/mobile/src/components/SortDialog/index.js
index efe82477c..44eef5163 100644
--- a/apps/mobile/src/components/SortDialog/index.js
+++ b/apps/mobile/src/components/SortDialog/index.js
@@ -66,8 +66,10 @@ class SortDialog extends React.Component {
     this.setState({
       groupOptions: _groupOptions
     });
-    Navigation.setRoutesToUpdate([this.props.screen]);
-    eSendEvent('groupOptionsUpdate');
+    setTimeout(() => {
+      Navigation.setRoutesToUpdate([this.props.screen]);
+      eSendEvent('groupOptionsUpdate');
+    }, 1);
   };
 
   render() {
@@ -145,7 +147,11 @@ class SortDialog extends React.Component {
               paddingHorizontal: 12
             }}>
             {this.state.groupOptions.groupBy === 'abc' ? (
-              <Paragraph color={colors.icon}>
+              <Paragraph
+                style={{
+                  height: 40
+                }}
+                color={colors.icon}>
                 No sort options available.
               </Paragraph>
             ) : (
@@ -162,7 +168,6 @@ class SortDialog extends React.Component {
                       : 'checkbox-blank-circle-outline'
                   }
                   textStyle={{
-                    fontWeight: 'normal',
                     color: colors.pri
                   }}
                   fontSize={SIZE.sm}
@@ -183,13 +188,16 @@ class SortDialog extends React.Component {
           </View>
           <View
             style={{
-              paddingHorizontal: 12
+              paddingHorizontal: 0,
+              borderRadius: 0
             }}>
             {Object.keys(GROUP).map((item, index) => (
               <PressableButton
                 key={item}
                 testID={'btn-' + item}
-                type={groupOptions.groupBy === GROUP[item] ? 'shade' : 'gray'}
+                type={
+                  groupOptions.groupBy === GROUP[item] ? 'transparent' : 'gray'
+                }
                 onPress={async () => {
                   let _groupOptions = {
                     ...groupOptions,
@@ -198,6 +206,7 @@ class SortDialog extends React.Component {
 
                   if (item === 'alphabetical') {
                     _groupOptions.sortBy = 'title';
+                    _groupOptions.sortDirection = 'asc';
                   } else {
                     if (this.state.groupOptions.sortBy === 'title') {
                       _groupOptions.sortBy = 'dateEdited';
@@ -219,8 +228,10 @@ class SortDialog extends React.Component {
                 <Paragraph
                   size={SIZE.sm}
                   style={{
-                    fontWeight:
-                      groupOptions.groupBy === GROUP[item] ? 'bold' : 'normal'
+                    fontFamily:
+                      groupOptions.groupBy === GROUP[item]
+                        ? 'OpenSans-SemiBold'
+                        : 'OpenSans-Regular'
                   }}
                   color={
                     groupOptions.groupBy === GROUP[item]
@@ -229,6 +240,7 @@ class SortDialog extends React.Component {
                   }>
                   {item.slice(0, 1).toUpperCase() + item.slice(1, item.length)}
                 </Paragraph>
+
                 {groupOptions.groupBy === GROUP[item] ? (
                   <Icon color={colors.accent} name="check" size={SIZE.lg} />
                 ) : null}

From f221cf8275304adf471d91af5146a677318095f1 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 11:52:08 +0500
Subject: [PATCH 07/24] update note item ui

---
 apps/mobile/src/components/NoteItem/index.js | 107 +++++++------------
 apps/mobile/src/utils/TimeUtils.js           |  24 +++--
 2 files changed, 54 insertions(+), 77 deletions(-)

diff --git a/apps/mobile/src/components/NoteItem/index.js b/apps/mobile/src/components/NoteItem/index.js
index 5942d9eb6..b0b5fa394 100644
--- a/apps/mobile/src/components/NoteItem/index.js
+++ b/apps/mobile/src/components/NoteItem/index.js
@@ -123,9 +123,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                 fontSize={SIZE.xs + 1}
                 iconSize={SIZE.sm}
                 textStyle={{
-                  marginRight: 0,
-                  fontWeight: 'normal',
-                  fontFamily: null
+                  marginRight: 0
                 }}
                 style={{
                   borderRadius: 5,
@@ -137,31 +135,6 @@ const NoteItem = ({item, isTrash, tags}) => {
                 onPress={() => navigateToTopic(_item.topic)}
               />
             ))}
-            {!isTrash && tags
-              ? tags.slice(0, 2)?.map(item => (
-                  <Button
-                    title={'#' + db.tags.alias(item)}
-                    key={item}
-                    height={20}
-                    textStyle={{
-                      marginRight: 0,
-                      fontWeight: 'normal',
-                      fontFamily: null
-                    }}
-                    type="grayBg"
-                    fontSize={SIZE.xs + 1}
-                    style={{
-                      borderRadius: 5,
-                      marginRight: 5,
-                      borderWidth: 0.5,
-                      borderColor: colors.icon,
-                      paddingHorizontal: 6,
-                      zIndex: 10
-                    }}
-                    onPress={() => navigateToTag(item)}
-                  />
-                ))
-              : null}
           </View>
         )}
 
@@ -196,11 +169,21 @@ const NoteItem = ({item, isTrash, tags}) => {
           }}>
           {!isTrash ? (
             <>
+              {item.conflicted ? (
+                <Icon
+                  name="alert-circle"
+                  style={{
+                    marginRight: 6
+                  }}
+                  size={SIZE.sm}
+                  color={colors.red}
+                />
+              ) : null}
               <TimeSince
                 style={{
                   fontSize: SIZE.xs + 1,
                   color: colors.icon,
-                  marginRight: 10
+                  marginRight: 6
                 }}
                 time={item.dateCreated}
                 updateFrequency={
@@ -208,27 +191,13 @@ const NoteItem = ({item, isTrash, tags}) => {
                 }
               />
 
-              {item.color ? (
-                <View
-                  key={item}
-                  style={{
-                    width: SIZE.xs,
-                    height: SIZE.xs,
-                    borderRadius: 100,
-                    backgroundColor: COLORS_NOTE[item.color.toLowerCase()],
-                    marginRight: -4.5,
-                    marginRight: 10
-                  }}
-                />
-              ) : null}
-
               {item.pinned ? (
                 <Icon
                   style={{marginRight: 10}}
                   name="pin"
                   size={SIZE.sm}
                   style={{
-                    marginRight: 5
+                    marginRight: 6
                   }}
                   color={
                     COLORS_NOTE[item.color?.toLowerCase()] || colors.accent
@@ -242,7 +211,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                   name="lock"
                   size={SIZE.sm}
                   style={{
-                    marginRight: 10
+                    marginRight: 6
                   }}
                   color={colors.icon}
                 />
@@ -253,35 +222,35 @@ const NoteItem = ({item, isTrash, tags}) => {
                   name="star"
                   size={SIZE.md}
                   style={{
-                    marginRight: 10
+                    marginRight: 6
                   }}
                   color="orange"
                 />
               ) : null}
 
-              {item.conflicted ? (
-                <View
-                  style={{
-                    marginRight: 10,
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    justifyContent: 'space-between'
-                  }}>
-                  <Icon
-                    name="alert-circle"
-                    size={SIZE.xs + 1}
-                    color={colors.red}
-                  />
-                  <Heading
-                    size={SIZE.xs}
-                    style={{
-                      color: colors.red,
-                      marginLeft: 2
-                    }}>
-                    CONFLICTS
-                  </Heading>
-                </View>
-              ) : null}
+              {!isTrash && !compactMode && tags
+                ? tags.slice(0, 3)?.map(item => (
+                    <Button
+                      title={'#' + db.tags.alias(item)}
+                      key={item}
+                      height={20}
+                      type="gray"
+                      textStyle={{
+                        textDecorationLine: 'underline'
+                      }}
+                      hitSlop={{top: 8, bottom: 12, left: 0, right: 0}}
+                      fontSize={SIZE.xs + 1}
+                      style={{
+                        borderRadius: 5,
+                        paddingHorizontal: 2,
+                        marginRight: 4,
+                        zIndex: 10,
+                        maxWidth: 120
+                      }}
+                      onPress={() => navigateToTag(item)}
+                    />
+                  ))
+                : null}
             </>
           ) : (
             <>
diff --git a/apps/mobile/src/utils/TimeUtils.js b/apps/mobile/src/utils/TimeUtils.js
index a8a8fe6f9..9c849dea7 100644
--- a/apps/mobile/src/utils/TimeUtils.js
+++ b/apps/mobile/src/utils/TimeUtils.js
@@ -1,33 +1,41 @@
+
 export const sleep = (duration) =>
   new Promise((resolve) => setTimeout(() => resolve(), duration));
 
 export function timeSince(date) {
   let seconds = Math.floor((new Date() - date) / 1000);
-
+  seconds = seconds  + (86400 * 7 * 4);
   let interval = Math.floor(seconds / 31536000);
 
   if (interval > 0.9) {
-    return interval < 2 ? interval + ' year ago' : interval + ' years ago';
+    return interval < 2 ? interval + 'yr ago' : interval + 'yr ago';
   }
   interval = Math.floor(seconds / 2592000);
   if (interval > 0.9) {
-    return interval < 2 ? interval + ' month ago' : interval + ' months ago';
+    return interval < 2 ? interval + 'mo ago' : interval + 'mo ago';
   }
+
+  interval = Math.floor(seconds / (86400 * 7));
+  if (interval > 0.9) {
+    if (interval === 4) return "1mo ago";
+    return interval < 2 ? interval + 'w ago' : interval + 'w ago';
+  }
+
   interval = Math.floor(seconds / 86400);
   if (interval > 0.9) {
-    return interval < 2 ? interval + ' day ago' : interval + ' days ago';
+    return interval < 2 ? interval + 'd ago' : interval + 'd ago';
   }
   interval = Math.floor(seconds / 3600);
   if (interval > 0.9) {
-    return interval < 2 ? interval + ' hour ago' : interval + ' hours ago';
+    return interval < 2 ? interval + 'h ago' : interval + 'h ago';
   }
   interval = Math.floor(seconds / 60);
   if (interval > 0.9) {
-    return interval < 2 ? interval + ' min ago' : interval + ' min ago';
+    return interval < 2 ? interval + 'm ago' : interval + 'm ago';
   }
   return Math.floor(seconds) < 0
-    ? '0 secs ago'
-    : Math.floor(seconds) + ' secs ago';
+    ? '0s ago'
+    : Math.floor(seconds) + 's ago';
 }
 
 export const timeConverter = (timestamp) => {

From e39e2b4fdbaf0a7c0c2bdd90e504b0bb4c8777e2 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 11:57:35 +0500
Subject: [PATCH 08/24] use variable width for tags on note item

---
 apps/mobile/src/components/NoteItem/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/src/components/NoteItem/index.js b/apps/mobile/src/components/NoteItem/index.js
index b0b5fa394..8d7bcf236 100644
--- a/apps/mobile/src/components/NoteItem/index.js
+++ b/apps/mobile/src/components/NoteItem/index.js
@@ -245,7 +245,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                         paddingHorizontal: 2,
                         marginRight: 4,
                         zIndex: 10,
-                        maxWidth: 120
+                        maxWidth:tags?.slice(0, 3)?.length > 1 ? 130 : null
                       }}
                       onPress={() => navigateToTag(item)}
                     />

From babded04a3c318f9f12049fd21deeb61cb245373 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 12:08:18 +0500
Subject: [PATCH 09/24] fix margins between items

---
 apps/mobile/src/components/NoteItem/index.js | 22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/src/components/NoteItem/index.js b/apps/mobile/src/components/NoteItem/index.js
index 8d7bcf236..302299af9 100644
--- a/apps/mobile/src/components/NoteItem/index.js
+++ b/apps/mobile/src/components/NoteItem/index.js
@@ -191,9 +191,22 @@ const NoteItem = ({item, isTrash, tags}) => {
                 }
               />
 
+              {/*     {db.attachments?.ofNote(item.id)?.length === 0 ? (
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                    marginRight: 6
+                  }}>
+                  <Icon name="attachment" size={SIZE.md} color={colors.icon} />
+                  <Paragraph color={colors.icon} size={SIZE.xs + 1}>
+                    10
+                  </Paragraph>
+                </View>
+              ) : null} */}
+
               {item.pinned ? (
                 <Icon
-                  style={{marginRight: 10}}
                   name="pin"
                   size={SIZE.sm}
                   style={{
@@ -207,7 +220,6 @@ const NoteItem = ({item, isTrash, tags}) => {
 
               {item.locked ? (
                 <Icon
-                  style={{marginRight: 10}}
                   name="lock"
                   size={SIZE.sm}
                   style={{
@@ -245,7 +257,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                         paddingHorizontal: 2,
                         marginRight: 4,
                         zIndex: 10,
-                        maxWidth:tags?.slice(0, 3)?.length > 1 ? 130 : null
+                        maxWidth: tags?.slice(0, 3)?.length > 1 ? 130 : null
                       }}
                       onPress={() => navigateToTag(item)}
                     />
@@ -258,7 +270,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                 color={colors.icon}
                 size={SIZE.xs}
                 style={{
-                  marginRight: 10
+                  marginRight: 6
                 }}>
                 Deleted on{' '}
                 {item && item.dateDeleted
@@ -270,7 +282,7 @@ const NoteItem = ({item, isTrash, tags}) => {
                 color={colors.accent}
                 size={SIZE.xs}
                 style={{
-                  marginRight: 10
+                  marginRight: 6
                 }}>
                 {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
               </Paragraph>

From f95be78113fcf2bd13f956fcfec391ce48b74958 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 12:21:57 +0500
Subject: [PATCH 10/24] add url validation in link input

---
 .../views/Editor/tiny/toolbar/linkinput.js    | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js b/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
index d0ebce224..791a3e978 100644
--- a/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
+++ b/apps/mobile/src/views/Editor/tiny/toolbar/linkinput.js
@@ -2,7 +2,7 @@ import React, {useEffect, useRef, useState} from 'react';
 import {TextInput, View} from 'react-native';
 import {Button} from '../../../../components/Button';
 import {useTracked} from '../../../../provider';
-import {eSendEvent} from '../../../../services/EventManager';
+import {eSendEvent, ToastEvent} from '../../../../services/EventManager';
 import {editing} from '../../../../utils';
 import {normalize, SIZE} from '../../../../utils/SizeUtils';
 import {EditorWebView} from '../../Functions';
@@ -15,6 +15,7 @@ import {
   properties
 } from './constants';
 import LinkPreview from './linkpreview';
+import validator from 'validator';
 
 let inputValue = null;
 
@@ -48,10 +49,16 @@ const ToolbarLinkInput = ({format, value, setVisible}) => {
       if (properties.pauseSelectionChange) {
         setTimeout(() => {
           properties.pauseSelectionChange = false;
-        }, 500);
+        }, 1000);
       }
       inputRef.current?.focus();
       return;
+    } else {
+      if (properties.pauseSelectionChange) {
+        setTimeout(() => {
+          properties.pauseSelectionChange = false;
+        }, 1000);
+      }
     }
   }, [mode]);
 
@@ -63,11 +70,21 @@ const ToolbarLinkInput = ({format, value, setVisible}) => {
     if (value === 'clear') {
       inputValue = null;
     }
-    properties.userBlur = true;
     if (inputValue === '' || !inputValue) {
+      properties.userBlur = true;
       formatSelection(execCommands.unlink);
       setVisible(false);
     } else {
+      if (!inputValue.includes('://')) inputValue = 'https://' + inputValue;
+      if (!validator.isURL(inputValue)) {
+        ToastEvent.show({
+          heading: 'Invalid url',
+          message: 'Please enter a valid url',
+          type: 'error'
+        });
+        return;
+      }
+      properties.userBlur = true;
       formatSelection(execCommands[format](inputValue));
     }
 
@@ -110,8 +127,8 @@ const ToolbarLinkInput = ({format, value, setVisible}) => {
               flexWrap: 'wrap',
               fontSize: SIZE.sm,
               flexShrink: 1,
-              minWidth:'80%',
-              fontFamily:"OpenSans-Regular"
+              minWidth: '80%',
+              fontFamily: 'OpenSans-Regular'
             }}
             autoCapitalize="none"
             autoCorrect={false}

From 0394432da01767423250a0397e2698c1fdf0323c Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 12:28:05 +0500
Subject: [PATCH 11/24] minor improvements to link preview

---
 .../views/Editor/tiny/toolbar/linkpreview.js  | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/apps/mobile/src/views/Editor/tiny/toolbar/linkpreview.js b/apps/mobile/src/views/Editor/tiny/toolbar/linkpreview.js
index aa6dc765b..9c7b1116a 100644
--- a/apps/mobile/src/views/Editor/tiny/toolbar/linkpreview.js
+++ b/apps/mobile/src/views/Editor/tiny/toolbar/linkpreview.js
@@ -1,14 +1,14 @@
-import { getLinkPreview } from 'link-preview-js';
-import React, { useEffect, useState } from 'react';
-import { Image, ScrollView, TouchableOpacity, View } from 'react-native';
+import {getLinkPreview} from 'link-preview-js';
+import React, {useEffect, useState} from 'react';
+import {Image, ScrollView, TouchableOpacity, View} from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-import { ActionIcon } from '../../../../components/ActionIcon';
+import {ActionIcon} from '../../../../components/ActionIcon';
 import Heading from '../../../../components/Typography/Heading';
 import Paragraph from '../../../../components/Typography/Paragraph';
-import { useTracked } from '../../../../provider';
-import { openLinkInBrowser } from '../../../../utils/functions';
-import { SIZE } from '../../../../utils/SizeUtils';
-import { INPUT_MODE, properties, reFocusEditor } from './constants';
+import {useTracked} from '../../../../provider';
+import {openLinkInBrowser} from '../../../../utils/functions';
+import {SIZE} from '../../../../utils/SizeUtils';
+import {INPUT_MODE, properties, reFocusEditor} from './constants';
 
 let prevLink = {};
 let prevHeight = 50;
@@ -21,9 +21,8 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
   useEffect(() => {
     console.log('previewing', value);
     if (value && prevLink.value !== value) {
-     
       getLinkPreview(value)
-        .then((r) => {
+        .then(r => {
           if (r.contentType?.includes('text/html')) {
             prevLink = {
               value: value,
@@ -31,12 +30,12 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
               title: r.title,
               description: r.description,
               image: r.images[0],
-              favicon: r.favicons[0],
+              favicon: r.favicons[0]
             };
             setLink(prevLink);
           }
         })
-        .catch((e) => console.log);
+        .catch(e => console.log);
     }
   }, [value]);
 
@@ -50,9 +49,9 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
           marginVertical: 5,
           borderWidth: 1,
           borderColor: colors.nav,
-          backgroundColor: colors.nav,
+          backgroundColor: colors.nav
         }}
-        resizeMode="center"
+        resizeMode="contain"
         source={{uri: imageLink}}
       />
     ) : faviconLink ? (
@@ -62,12 +61,12 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
           backgroundColor: colors.nav,
           borderWidth: 1,
           marginVertical: 5,
-          borderRadius: 5,
+          borderRadius: 5
         }}>
         <Image
           style={{
             width: height,
-            height: height,
+            height: height
           }}
           resizeMode="center"
           source={{uri: faviconLink}}
@@ -82,7 +81,7 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
           justifyContent: 'center',
           alignItems: 'center',
           backgroundColor: colors.shade,
-          borderRadius: 5,
+          borderRadius: 5
         }}>
         <Icon size={height - 4} color={colors.accent} name="web" />
       </View>
@@ -91,8 +90,8 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
 
   const openLink = () => {
     openLinkInBrowser(value, colors)
-      .catch((e) => {})
-      .then(async (r) => {
+      .catch(e => {})
+      .then(async r => {
         console.log('closed browser now');
         await reFocusEditor();
       });
@@ -101,17 +100,17 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
   const renderText = (name, title, description) => {
     return (
       <View
-        onLayout={(e) => {
+        onLayout={e => {
           prevHeight = e.nativeEvent.layout.height;
           e.nativeEvent && setHeight(prevHeight);
         }}
         style={{
-          flex: 1,
+          flex: 1
         }}>
         <TouchableOpacity onPress={openLink} activeOpacity={1}>
           <ScrollView
             style={{
-              marginRight: 10,
+              marginRight: 10
             }}
             horizontal
             showsHorizontalScrollIndicator={false}>
@@ -142,7 +141,7 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
       <View
         style={{
           flexDirection: 'row',
-          alignItems: 'center',
+          alignItems: 'center'
         }}>
         <ActionIcon
           onPress={() => {
@@ -150,10 +149,10 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
           }}
           customStyle={{
             width: 40,
-            marginHorizontal: 10,
-            height: 40,
+            marginRight: 10,
+            height: 40
           }}
-          name="delete"
+          name="link-off"
           size={SIZE.xl}
           color={colors.pri}
         />
@@ -165,8 +164,7 @@ const LinkPreview = ({setMode, value, onSubmit}) => {
           }}
           customStyle={{
             width: 40,
-            marginHorizontal: 10,
-            height: 40,
+            height: 40
           }}
           name="pencil"
           size={SIZE.xl}

From 9875e6ef001a7ecbdd8ec59881b8ad18f2591736 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:14:31 +0500
Subject: [PATCH 12/24] fix some issues with editor on ios

---
 apps/mobile/html/Web.bundle/site/index.css | 6 ++++--
 apps/mobile/html/Web.bundle/site/init.js   | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/mobile/html/Web.bundle/site/index.css b/apps/mobile/html/Web.bundle/site/index.css
index 1061feb58..3a9173e4d 100644
--- a/apps/mobile/html/Web.bundle/site/index.css
+++ b/apps/mobile/html/Web.bundle/site/index.css
@@ -17,6 +17,8 @@ body {
   resize: none;
   font-size: 25px;
   height: 45x;
+  padding-top:0px;
+  padding-bottom:0px;
 }
 
 #formBox {
@@ -49,9 +51,9 @@ body {
   font-size: 11.5px;
   height: 13px;
   display: flex;
-  padding-left: 4px !important;
+  padding-left: 14px !important;
   justify-content: space-between;
-  margin-top: 5px;
+  margin-top: 0px;
 }
 
 .info-bar a {
diff --git a/apps/mobile/html/Web.bundle/site/init.js b/apps/mobile/html/Web.bundle/site/init.js
index 93059ba6a..83692caa7 100755
--- a/apps/mobile/html/Web.bundle/site/init.js
+++ b/apps/mobile/html/Web.bundle/site/init.js
@@ -292,7 +292,6 @@ function init_tiny(size) {
       });
 
       editor.on('SetContent', function (event) {
-        console.log('content set', event.paste, globalThis.isClearingNoteData);
         if (globalThis.isClearingNoteData) {
           globalThis.isClearingNoteData = false;
           return;
@@ -303,10 +302,6 @@ function init_tiny(size) {
         if (!event.paste) {
           reactNativeEventHandler('noteLoaded', true);
         }
-        if (event.paste) {
-          isLoading = false;
-          onChange(event);
-        }
       });
 
       editor.on('NewBlock', function (e) {

From 618dd8b02b6d349b22442c3c388abc266fa44bf8 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:14:44 +0500
Subject: [PATCH 13/24] update issue creation

---
 apps/mobile/src/components/Github/issue.js | 66 ++++++++++++++--------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/apps/mobile/src/components/Github/issue.js b/apps/mobile/src/components/Github/issue.js
index 3763d3456..dca7c5c14 100644
--- a/apps/mobile/src/components/Github/issue.js
+++ b/apps/mobile/src/components/Github/issue.js
@@ -1,17 +1,19 @@
-import React, {useRef, useState} from 'react';
-import {Linking, Platform, Text, TextInput, View} from 'react-native';
-import deviceInfoModule from 'react-native-device-info';
-import {useTracked} from '../../provider';
-import {eSendEvent, ToastEvent} from '../../services/EventManager';
-import {APP_VERSION} from '../../utils';
-import {db} from '../../utils/database';
-import {eCloseProgressDialog} from '../../utils/Events';
-import {openLinkInBrowser} from '../../utils/functions';
-import {SIZE} from '../../utils/SizeUtils';
-import {sleep} from '../../utils/TimeUtils';
-import {Button} from '../Button';
+import Clipboard from '@react-native-clipboard/clipboard';
+import React, { useRef, useState } from 'react';
+import { Linking, Platform, Text, TextInput, View } from 'react-native';
+import { useTracked } from '../../provider';
+import { useUserStore } from '../../provider/stores';
+import { eSendEvent, ToastEvent } from '../../services/EventManager';
+import PremiumService from '../../services/PremiumService';
+import { APP_VERSION } from '../../utils';
+import { db } from '../../utils/database';
+import { eCloseProgressDialog } from '../../utils/Events';
+import { openLinkInBrowser } from '../../utils/functions';
+import { SIZE } from '../../utils/SizeUtils';
+import { sleep } from '../../utils/TimeUtils';
+import { Button } from '../Button';
 import DialogHeader from '../Dialog/dialog-header';
-import {presentDialog} from '../Dialog/functions';
+import { presentDialog } from '../Dialog/functions';
 import Seperator from '../Seperator';
 import Paragraph from '../Typography/Paragraph';
 
@@ -20,6 +22,7 @@ export const Issue = () => {
   const colors = state.colors;
   const body = useRef(null);
   const title = useRef(null);
+  const user = useUserStore(state => state.user);
   const [loading, setLoading] = useState(false);
 
   const onPress = async () => {
@@ -30,15 +33,21 @@ export const Issue = () => {
     try {
       setLoading(true);
 
-      let issue_url = await db.debug.report(
-        title.current,
-        body.current +
+      let issue_url = await db.debug.report({
+        title: title.current,
+        body:
+          body.current +
           `\n_______________
 **Device information:**
 App version: ${APP_VERSION}
 Platform: ${Platform.OS}
-Model: ${Platform.constants.Brand}-${Platform.constants.Model}-${Platform.constants.Version}`
-      );
+Model: ${Platform.constants.Brand}-${Platform.constants.Model}-${
+            Platform.constants.Version
+          }
+Pro: ${PremiumService.get()}
+Logged in: ${user ? 'yes' : 'no'}`,
+        userId: user?.id
+      });
       setLoading(false);
       eSendEvent(eCloseProgressDialog);
       await sleep(300);
@@ -55,10 +64,21 @@ Model: ${Platform.constants.Brand}-${Platform.constants.Model}-${Platform.consta
               onPress={() => {
                 Linking.openURL(issue_url);
               }}>
-              {issue_url}
-            </Text>
+              {issue_url}.
+            </Text>{' '}
+            Please note that we will respond to your issue on the given link. We
+            recommend that you save it.
           </Text>
         ),
+        positiveText: 'Copy link',
+        positivePress: () => {
+          Clipboard.setString(issue_url);
+          ToastEvent.show({
+            heading: 'Issue url copied!',
+            type: 'success',
+            context: 'global'
+          });
+        },
         negativeText: 'Close'
       });
     } catch (e) {
@@ -141,7 +161,7 @@ For example:
           marginTop: 10,
           textAlign: 'center'
         }}>
-        The information above will be is publically available on{' '}
+        The information above will be publically available at{' '}
         <Text
           onPress={() => {
             Linking.openURL('https://github.com/streetwriters/notesnook');
@@ -152,8 +172,8 @@ For example:
           }}>
           github.com/streetwriters/notesnook.
         </Text>{' '}
-        If you want to ask something general or need some assistance, we would
-        suggest that you{' '}
+        If you want to ask something in general or need some assistance, we
+        would suggest that you{' '}
         <Text
           style={{
             textDecorationLine: 'underline',

From 8a1c5bcbeb8960e0a3a87e5249501ef798ee3576 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:15:00 +0500
Subject: [PATCH 14/24] make notebook header similar to web app

---
 .../components/SimpleList/notebookheader.js   | 69 +++++--------------
 1 file changed, 19 insertions(+), 50 deletions(-)

diff --git a/apps/mobile/src/components/SimpleList/notebookheader.js b/apps/mobile/src/components/SimpleList/notebookheader.js
index e74efef24..d1e39a752 100644
--- a/apps/mobile/src/components/SimpleList/notebookheader.js
+++ b/apps/mobile/src/components/SimpleList/notebookheader.js
@@ -1,8 +1,9 @@
 import React, {useState} from 'react';
-import {View} from 'react-native';
+import {Platform, View} from 'react-native';
 import {useTracked} from '../../provider';
 import {useMenuStore} from '../../provider/stores';
 import {ToastEvent} from '../../services/EventManager';
+import {getTotalNotes} from '../../utils';
 import {db} from '../../utils/database';
 import {SIZE} from '../../utils/SizeUtils';
 import {ActionIcon} from '../ActionIcon';
@@ -17,6 +18,7 @@ export const NotebookHeader = ({notebook, onPress, onEditNotebook}) => {
     db.settings.isPinned(notebook.id)
   );
   const setMenuPins = useMenuStore(state => state.setMenuPins);
+  const totalNotes = getTotalNotes(notebook);
 
   const onPinNotebook = async () => {
     try {
@@ -46,6 +48,9 @@ export const NotebookHeader = ({notebook, onPress, onEditNotebook}) => {
         borderRadius: 10,
         paddingTop: 25
       }}>
+      <Paragraph color={colors.icon} size={SIZE.xs + 1}>
+        {new Date(notebook.dateEdited).toLocaleString()}
+      </Paragraph>
       <View
         style={{
           flexDirection: 'row',
@@ -59,27 +64,26 @@ export const NotebookHeader = ({notebook, onPress, onEditNotebook}) => {
             flexDirection: 'row'
           }}>
           <ActionIcon
-            name="link-variant"
+            name={isPinnedToMenu ? 'link-variant-off' : 'link-variant'}
             onPress={onPinNotebook}
             customStyle={{
               marginRight: 15,
-              width:40,
-              height:40
+              width: 40,
+              height: 40
             }}
-            type={isPinnedToMenu ?  "transparent" : "grayBg"}
+            type={isPinnedToMenu ? 'grayBg' : 'grayBg'}
             color={isPinnedToMenu ? colors.accent : colors.icon}
             size={SIZE.lg}
           />
           <ActionIcon
             size={SIZE.lg}
-
             onPress={onEditNotebook}
             name="pencil"
             type="grayBg"
             color={colors.icon}
             customStyle={{
-              width:40,
-              height:40
+              width: 40,
+              height: 40
             }}
           />
         </View>
@@ -90,57 +94,22 @@ export const NotebookHeader = ({notebook, onPress, onEditNotebook}) => {
           {notebook.description}
         </Paragraph>
       )}
-      {/*   <View
-        style={{
-          marginTop: 15,
-          flexDirection: 'row'
-        }}>
-        <Button
-          title="Edit notebook"
-          width={null}
-          height={null}
-          type="transparent"
-          icon="pencil"
-          fontSize={SIZE.sm}
-          onPress={onEditNotebook}
-          style={{
-            alignSelf: 'flex-start',
-            paddingHorizontal: 12,
-            borderRadius: 100,
-            height: 30,
-            marginRight: 10
-          }}
-        />
-
-        <Button
-          width={null}
-          height={null}
-          type={isPinnedToMenu ? 'shade' : 'transparent'}
-          icon="link-variant"
-          onPress={onPinNotebook}
-          style={{
-            alignSelf: 'flex-start',
-            paddingVertical: 0,
-            paddingHorizontal: 0,
-            width: 30,
-            height: 30,
-            borderColor: isPinnedToMenu ? colors.accent : colors.icon,
-            marginRight: 10
-          }}
-        />
-      </View> */}
 
       <Paragraph
         style={{
           marginTop: 10,
-          fontStyle: 'italic'
+          fontStyle: 'italic',
+          fontFamily: null
         }}
         size={SIZE.xs + 1}
         color={colors.icon}>
         {notebook.topics.length === 1
           ? '1 topic'
-          : `${notebook.topics.length} topics`}
-        , last modified on {new Date(notebook.dateEdited).toLocaleString()}
+          : `${notebook.topics.length} topics`}, {notebook && totalNotes > 1
+          ? totalNotes + ' notes'
+          : totalNotes === 1
+          ? totalNotes + ' note'
+          : '0 notes'}
       </Paragraph>
     </View>
   );

From 6fe302e61240d16e4cc464f64807a16da189899f Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:15:15 +0500
Subject: [PATCH 15/24] add minor margin

---
 apps/mobile/src/components/NoteItem/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/src/components/NoteItem/index.js b/apps/mobile/src/components/NoteItem/index.js
index 302299af9..ed18d3224 100644
--- a/apps/mobile/src/components/NoteItem/index.js
+++ b/apps/mobile/src/components/NoteItem/index.js
@@ -111,7 +111,8 @@ const NoteItem = ({item, isTrash, tags}) => {
               flexDirection: 'row',
               alignItems: 'center',
               zIndex: 10,
-              elevation: 10
+              elevation: 10,
+              marginBottom:2.5
             }}>
             {getNotebook().map(_item => (
               <Button

From 2e30159572f52d2453db385dc46c0f1c3fd90ad8 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:17:48 +0500
Subject: [PATCH 16/24] fix incorrect font size on notebook items

---
 .../src/components/NotebookItem/index.js      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/mobile/src/components/NotebookItem/index.js b/apps/mobile/src/components/NotebookItem/index.js
index c6a070cba..e98c608b3 100644
--- a/apps/mobile/src/components/NotebookItem/index.js
+++ b/apps/mobile/src/components/NotebookItem/index.js
@@ -124,9 +124,9 @@ export const NotebookItem = ({item, isTopic = false, notebookID, isTrash}) => {
           }}>
           <Paragraph
             color={colors.accent}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             style={{
-              marginRight: 10
+              marginRight: 6
             }}>
             {isTopic ? 'Topic' : 'Notebook'}
           </Paragraph>
@@ -135,20 +135,20 @@ export const NotebookItem = ({item, isTopic = false, notebookID, isTrash}) => {
             <>
               <Paragraph
                 color={colors.icon}
-                size={SIZE.xs}
+                size={SIZE.xs + 1}
                 style={{
                   textAlignVertical: 'center',
-                  marginRight: 10
+                  marginRight: 6
                 }}>
                 {'Deleted on ' +
                   new Date(item.dateDeleted).toISOString().slice(0, 10)}
               </Paragraph>
               <Paragraph
                 color={colors.accent}
-                size={SIZE.xs}
+                size={SIZE.xs + 1}
                 style={{
                   textAlignVertical: 'center',
-                  marginRight: 10
+                  marginRight: 6
                 }}>
                 {item.itemType[0].toUpperCase() + item.itemType.slice(1)}
               </Paragraph>
@@ -156,18 +156,18 @@ export const NotebookItem = ({item, isTopic = false, notebookID, isTrash}) => {
           ) : (
             <Paragraph
               color={colors.icon}
-              size={SIZE.xs}
+              size={SIZE.xs + 1}
               style={{
-                marginRight: 10
+                marginRight: 6
               }}>
               {new Date(item.dateCreated).toDateString().substring(4)}
             </Paragraph>
           )}
           <Paragraph
             color={colors.icon}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             style={{
-              marginRight: 10
+              marginRight: 6
             }}>
             {item && totalNotes > 1
               ? totalNotes + ' notes'
@@ -178,7 +178,7 @@ export const NotebookItem = ({item, isTopic = false, notebookID, isTrash}) => {
 
           {item.pinned ? (
             <Icon
-              style={{marginRight: 10}}
+              style={{marginRight: 6}}
               name="pin"
               size={SIZE.sm}
               style={{

From 67c1582bc5f30448cf143529e88810c808318d67 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:19:38 +0500
Subject: [PATCH 17/24] bump version to 1.6.8

---
 .../ios/Notesnook.xcodeproj/project.pbxproj   | 24 +++++++++----------
 apps/mobile/src/utils/index.js                |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj
index 40dce2b16..0304faa66 100644
--- a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj
+++ b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj
@@ -1118,7 +1118,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1191,7 +1191,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1219,7 +1219,7 @@
 				CODE_SIGN_ENTITLEMENTS = Notesnook/Notesnook.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -1291,7 +1291,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1449,7 +1449,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1460,7 +1460,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1490,7 +1490,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1501,7 +1501,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1530,7 +1530,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1603,7 +1603,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1633,7 +1633,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1670;
+				CURRENT_PROJECT_VERSION = 1680;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1706,7 +1706,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.70;
+				MARKETING_VERSION = 1.6.80;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/apps/mobile/src/utils/index.js b/apps/mobile/src/utils/index.js
index 6bdf61459..68acfcad2 100755
--- a/apps/mobile/src/utils/index.js
+++ b/apps/mobile/src/utils/index.js
@@ -16,7 +16,7 @@ import {MMKV} from './mmkv';
 import {tabBarRef} from './Refs';
 import {SIZE} from './SizeUtils';
 
-export const APP_VERSION = 1670;
+export const APP_VERSION = 1680;
 
 export const Tracker = ackeeTracker.create('https://sa.streetwriters.co', {
   ignoreLocalhost: true

From 5f091340e91cf62ae9ffae751e392bea782c020d Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:20:16 +0500
Subject: [PATCH 18/24] change font size on tagitem

---
 apps/mobile/src/components/TagItem/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/src/components/TagItem/index.js b/apps/mobile/src/components/TagItem/index.js
index cdcbc4178..09c8dcbed 100644
--- a/apps/mobile/src/components/TagItem/index.js
+++ b/apps/mobile/src/components/TagItem/index.js
@@ -65,7 +65,7 @@ const TagItem = ({item, index}) => {
         </Heading>
         <Paragraph
           color={colors.icon}
-          size={SIZE.xs}
+          size={SIZE.xs + 1}
           style={{
             marginTop: 5
           }}>

From 71eb86da1145c576fe001190fb824fc756b9d3d0 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 14:23:37 +0500
Subject: [PATCH 19/24] update notes-core


From 606b5548c9e953bed5ab1666f93116526f956505 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 15:12:14 +0500
Subject: [PATCH 20/24] call check status with delay

---
 apps/mobile/src/views/Editor/Functions.js | 44 ++++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/apps/mobile/src/views/Editor/Functions.js b/apps/mobile/src/views/Editor/Functions.js
index 1bd5e26c2..53bc0b8cf 100644
--- a/apps/mobile/src/views/Editor/Functions.js
+++ b/apps/mobile/src/views/Editor/Functions.js
@@ -1,8 +1,8 @@
-import { createRef } from 'react';
-import { Platform } from 'react-native';
-import { presentDialog } from '../../components/Dialog/functions';
-import { useEditorStore, useMenuStore } from '../../provider/stores';
-import { DDS } from '../../services/DeviceDetection';
+import {createRef} from 'react';
+import {Platform} from 'react-native';
+import {presentDialog} from '../../components/Dialog/functions';
+import {useEditorStore, useMenuStore} from '../../provider/stores';
+import {DDS} from '../../services/DeviceDetection';
 import {
   eSendEvent,
   eSubscribeEvent,
@@ -10,23 +10,23 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import PremiumService from '../../services/PremiumService';
-import { editing } from '../../utils';
-import { COLORS_NOTE, COLOR_SCHEME } from '../../utils/Colors';
-import { hexToRGBA } from '../../utils/ColorUtils';
-import { db } from '../../utils/database';
+import {editing} from '../../utils';
+import {COLORS_NOTE, COLOR_SCHEME} from '../../utils/Colors';
+import {hexToRGBA} from '../../utils/ColorUtils';
+import {db} from '../../utils/database';
 import {
   eOnLoadNote,
   eShowGetPremium,
   eShowMergeDialog
 } from '../../utils/Events';
 import filesystem from '../../utils/filesystem';
-import { openLinkInBrowser } from '../../utils/functions';
-import { MMKV } from '../../utils/mmkv';
-import { tabBarRef } from '../../utils/Refs';
-import { normalize } from '../../utils/SizeUtils';
-import { sleep, timeConverter } from '../../utils/TimeUtils';
+import {openLinkInBrowser} from '../../utils/functions';
+import {MMKV} from '../../utils/mmkv';
+import {tabBarRef} from '../../utils/Refs';
+import {normalize} from '../../utils/SizeUtils';
+import {sleep, timeConverter} from '../../utils/TimeUtils';
 import tiny from './tiny/tiny';
-import { IMAGE_TOOLTIP_CONFIG } from './tiny/toolbar/config';
+import {IMAGE_TOOLTIP_CONFIG} from './tiny/toolbar/config';
 
 export let EditorWebView = createRef();
 export const editorTitleInput = createRef();
@@ -285,27 +285,32 @@ export const loadNote = async item => {
     checkStatus();
   } else {
     if (id === item.id && !item.forced) {
+      console.log('return from here duhh.');
       return;
     }
     eSendEvent('loadingNote', item);
     if (getNote()) {
+      console.log('clearing');
       await clearEditor(true, false, true);
     }
+    console.log('done clearing');
     closingSession = false;
     disableSaving = false;
     noteEdited = false;
     await setNote(item);
     webviewInit = false;
     editing.isFocused = false;
+    console.log('opening note');
     setTimeout(async () => {
       if (await checkStatus(true)) {
+        console.log('status checked');
         requestedReload = true;
         EditorWebView.current?.reload();
       } else {
         eSendEvent('webviewreset');
       }
+      useEditorStore.getState().setCurrentlyEditingNote(item.id);
     }, 1);
-    useEditorStore.getState().setCurrentlyEditingNote(item.id);
   }
 };
 
@@ -323,7 +328,12 @@ const checkStatus = async noreset => {
       eUnSubscribeEvent('webviewOk', onWebviewOk);
     };
     eSubscribeEvent('webviewOk', onWebviewOk);
-    EditorWebView.current?.injectJavaScript(CHECK_STATUS);
+    setTimeout(
+      () => {
+        EditorWebView.current?.injectJavaScript(CHECK_STATUS);
+      },
+      Platform.OS === 'ios' ? 300 : 1
+    );
 
     webviewTimer = setTimeout(() => {
       if (!webviewOK && !noreset) {

From a1970e67508c17f5e0f78430f84aff1be5582280 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 18:38:00 +0500
Subject: [PATCH 21/24] check for app version in announcement

---
 apps/mobile/src/provider/stores.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/src/provider/stores.ts b/apps/mobile/src/provider/stores.ts
index a8c4ec291..958a4c824 100644
--- a/apps/mobile/src/provider/stores.ts
+++ b/apps/mobile/src/provider/stores.ts
@@ -2,7 +2,7 @@ import {Platform} from 'react-native';
 import {Dimensions} from 'react-native';
 import create from 'zustand';
 import PremiumService from '../services/PremiumService';
-import {history, SUBSCRIPTION_STATUS} from '../utils';
+import {APP_VERSION, history, SUBSCRIPTION_STATUS} from '../utils';
 import {db} from '../utils/database';
 import {MMKV} from '../utils/mmkv';
 import {
@@ -417,6 +417,11 @@ async function shouldShowAnnouncement(announcement) {
   let show = announcement.platforms.some(
     platform => allowedPlatforms.indexOf(platform) > -1
   );
+
+  if (announcement.version) {
+    return announcement.version === APP_VERSION;
+  }
+
   if (!show) return false;
   const subStatus = PremiumService.getUser()?.subscription?.type;
   show = announcement.userTypes.some(userType => {

From 798b4908bebb26816681d92a1152849059307e51 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 19:19:15 +0500
Subject: [PATCH 22/24] make sure editor is reloaded whenever a new note is
 created

---
 apps/mobile/src/views/Editor/Functions.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/apps/mobile/src/views/Editor/Functions.js b/apps/mobile/src/views/Editor/Functions.js
index 53bc0b8cf..aab40c4b9 100644
--- a/apps/mobile/src/views/Editor/Functions.js
+++ b/apps/mobile/src/views/Editor/Functions.js
@@ -136,14 +136,11 @@ export async function clearTimer(clear) {
 }
 
 export const CHECK_STATUS = `(function() {
-       setTimeout(() => {
         let msg = JSON.stringify({
           data: true,
           type: 'running',
         });
         window.ReactNativeWebView.postMessage(msg)
-
-       },${Platform.OS === 'ios' ? '300' : '1'})
 })();`;
 
 const request_content = `(function() {
@@ -302,15 +299,12 @@ export const loadNote = async item => {
     editing.isFocused = false;
     console.log('opening note');
     setTimeout(async () => {
-      if (await checkStatus(true)) {
-        console.log('status checked');
-        requestedReload = true;
-        EditorWebView.current?.reload();
-      } else {
-        eSendEvent('webviewreset');
-      }
-      useEditorStore.getState().setCurrentlyEditingNote(item.id);
+      requestedReload = true;
+      EditorWebView.current?.reload();
     }, 1);
+    setTimeout(() => {
+      useEditorStore.getState().setCurrentlyEditingNote(item.id);
+    }, 300);
   }
 };
 
@@ -336,6 +330,7 @@ const checkStatus = async noreset => {
     );
 
     webviewTimer = setTimeout(() => {
+      console.log('timeout has ended');
       if (!webviewOK && !noreset) {
         console.log('webview not ok', 'ERROR');
         webviewInit = false;
@@ -361,7 +356,6 @@ export const _onMessage = async evt => {
       eSendEvent('historyEvent', message.value);
       break;
     case 'tiny':
-      console.log(message.value);
       if (message.value === '<br>') return;
       if (message.value !== content.data) {
         if (prevNoteContent && message.value === prevNoteContent) {
@@ -422,6 +416,7 @@ export const _onMessage = async evt => {
       if (!requestedReload && getNote()) return;
       requestedReload = false;
       setColors(COLOR_SCHEME);
+      eSendEvent('webviewOk');
       webviewInit = true;
       webviewOK = true;
       if (PremiumService.get()) {
@@ -734,7 +729,6 @@ const loadNoteInEditor = async (keepHistory = true) => {
     `
         );
       } else {
-        console.log('opening in editor', content.data);
         post('html', content.data);
       }
       if (id) {

From 73ea2e0a38cfb5e6cf067c4a035bd1ac3c211dea Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 20:43:27 +0500
Subject: [PATCH 23/24] change version to appVersion in announcement

---
 apps/mobile/src/provider/stores.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/src/provider/stores.ts b/apps/mobile/src/provider/stores.ts
index 958a4c824..ea1320f3c 100644
--- a/apps/mobile/src/provider/stores.ts
+++ b/apps/mobile/src/provider/stores.ts
@@ -418,8 +418,8 @@ async function shouldShowAnnouncement(announcement) {
     platform => allowedPlatforms.indexOf(platform) > -1
   );
 
-  if (announcement.version) {
-    return announcement.version === APP_VERSION;
+  if (announcement.appVersion) {
+    return announcement.appVersion === APP_VERSION;
   }
 
   if (!show) return false;

From 377d814a0e74b46a0360a443633a9f3afe9c1647 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Thu, 2 Dec 2021 20:59:00 +0500
Subject: [PATCH 24/24] add release notes

---
 apps/mobile/android/releasenotes/whatsnew-en-US | 12 +++++++-----
 apps/mobile/release_notes.txt                   | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/mobile/android/releasenotes/whatsnew-en-US b/apps/mobile/android/releasenotes/whatsnew-en-US
index 4172b4156..991ab94c4 100644
--- a/apps/mobile/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/android/releasenotes/whatsnew-en-US
@@ -1,7 +1,9 @@
-- Added issue reporting from within the app. Click on "Report an issue" in settings.
-- Fixed undo manager not updated on cut.
-- Fixed note is not saved when content is directly pasted
-- Fixed editor is empty sometimes when note is opened
-- Other minor performance improvements
+- Add new header for notebook screen & topic
+- Ensure that products are loaded before showing pricing
+- Show notebook & topic on note items
+- Fixed sorting on items in groups
+- Fixed editor losing focus in checklists
+- Fixed cursor jump to end of paragraph on removing new line
+- Minor bug fixes and performance improvements.
 
 Thank you for using Notesnook!
\ No newline at end of file
diff --git a/apps/mobile/release_notes.txt b/apps/mobile/release_notes.txt
index 4172b4156..991ab94c4 100644
--- a/apps/mobile/release_notes.txt
+++ b/apps/mobile/release_notes.txt
@@ -1,7 +1,9 @@
-- Added issue reporting from within the app. Click on "Report an issue" in settings.
-- Fixed undo manager not updated on cut.
-- Fixed note is not saved when content is directly pasted
-- Fixed editor is empty sometimes when note is opened
-- Other minor performance improvements
+- Add new header for notebook screen & topic
+- Ensure that products are loaded before showing pricing
+- Show notebook & topic on note items
+- Fixed sorting on items in groups
+- Fixed editor losing focus in checklists
+- Fixed cursor jump to end of paragraph on removing new line
+- Minor bug fixes and performance improvements.
 
 Thank you for using Notesnook!
\ No newline at end of file