mobile: disable template when pin note to notifications

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.0.3",
+      "version": "3.0.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",

apps/mobile/app/components/dialogs/vault/index.js

@@ -586,7 +586,7 @@ export class VaultDialog extends Component {
   }
 
   async _copyNote(note) {
-    Clipboard.setString(await convertNoteToText(note));
+    Clipboard.setString((await convertNoteToText(note, true)) || "");
     ToastManager.show({
       heading: "Note copied",
       type: "success",
@@ -602,7 +602,7 @@ export class VaultDialog extends Component {
       await Share.open({
         heading: "Share note",
         failOnCancel: false,
-        message: await convertNoteToText(note)
+        message: (await convertNoteToText(note)) || ""
       });
     } catch (e) {
       console.error(e);

apps/mobile/app/components/sheets/sort/index.js

@@ -86,16 +86,16 @@ const Sort = ({ type, screen }) => {
         <Button
           title={
             groupOptions?.sortDirection === "asc"
-              ? groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              ? groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
                 ? "A - Z"
-                : groupOptions.sortBy === "dueDate"
+                : groupOptions?.sortBy === "dueDate"
                 ? "Earliest first"
                 : "Old - New"
-              : groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              : groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
               ? "Z - A"
-              : groupOptions.sortBy === "dueDate"
+              : groupOptions?.sortBy === "dueDate"
               ? "Latest first"
               : "New - Old"
           }
@@ -134,7 +134,7 @@ const Sort = ({ type, screen }) => {
           alignItems: "center"
         }}
       >
-        {groupOptions.groupBy === "abc" ? (
+        {groupOptions?.groupBy === "abc" ? (
           <Button
             type="secondary"
             title="Title"
@@ -154,18 +154,18 @@ const Sort = ({ type, screen }) => {
               item === "dateEdited") ? null : (
               <Button
                 key={item}
-                type={groupOptions.sortBy === item ? "selected" : "plain"}
+                type={groupOptions?.sortBy === item ? "selected" : "plain"}
                 title={SORT[item]}
                 height={40}
                 iconPosition="left"
-                icon={groupOptions.sortBy === item ? "check" : null}
+                icon={groupOptions?.sortBy === item ? "check" : null}
                 style={{
                   marginRight: 10,
                   paddingHorizontal: 8
                 }}
                 buttonType={{
                   text:
-                    groupOptions.sortBy === item
+                    groupOptions?.sortBy === item
                       ? colors.primary.accent
                       : colors.secondary.paragraph
                 }}
@@ -213,11 +213,11 @@ const Sort = ({ type, screen }) => {
                 key={item}
                 testID={"btn-" + item}
                 type={
-                  groupOptions.groupBy === GROUP[item] ? "selected" : "plain"
+                  groupOptions?.groupBy === GROUP[item] ? "selected" : "plain"
                 }
                 buttonType={{
                   text:
-                    groupOptions.groupBy === GROUP[item]
+                    groupOptions?.groupBy === GROUP[item]
                       ? colors.primary.accent
                       : colors.secondary.paragraph
                 }}
@@ -235,7 +235,7 @@ const Sort = ({ type, screen }) => {
                   updateGroupOptions(_groupOptions);
                 }}
                 height={40}
-                icon={groupOptions.groupBy === GROUP[item] ? "check" : null}
+                icon={groupOptions?.groupBy === GROUP[item] ? "check" : null}
                 title={
                   item.slice(0, 1).toUpperCase() + item.slice(1, item.length)
                 }

apps/mobile/app/hooks/use-actions.tsx

@@ -600,20 +600,11 @@ export const useActions = ({
         });
         return;
       }
-      const text = await convertNoteToText(item as Note, false);
-      if (!text) {
-        ToastManager.error(
-          new Error(Errors.export("text")),
-          undefined,
-          "local"
-        );
-        return;
-      }
-
-      const html = text.replace(/\n/g, "<br />");
+      const text = await convertNoteToText(item as Note, true);
+      const html = (text || "").replace(/\n/g, "<br />");
       await Notifications.displayNotification({
         title: item.title,
-        message: (item as Note).headline || text,
+        message: (item as Note).headline || text || "",
         subtitle: "",
         bigText: html,
         ongoing: true,
@@ -684,15 +675,11 @@ export const useActions = ({
       } else {
         processingId.current = "shareNote";
         const convertedText = await convertNoteToText(item);
-        if (!convertedText) {
-          ToastManager.error(new Error(Errors.export("text")));
-          return;
-        }
         processingId.current = undefined;
         Share.open({
           title: "Share note to",
           failOnCancel: false,
-          message: convertedText
+          message: convertedText || ""
         });
       }
     }
@@ -772,11 +759,7 @@ export const useActions = ({
         } else {
           processingId.current = "copyContent";
           const text = await convertNoteToText(item as Note, true);
-          if (!text) {
-            ToastManager.error(new Error(Errors.export("text")));
-            return;
-          }
-          Clipboard.setString(text);
+          Clipboard.setString(text || "");
           processingId.current = undefined;
           ToastManager.show({
             heading: "Note copied to clipboard",

apps/mobile/app/services/notifications.ts

@@ -952,13 +952,13 @@ async function pinNote(id: string) {
     const note = await db.notes.note(id as string);
     if (!note) return;
 
-    let text = await convertNoteToText(note, false);
+    let text = await convertNoteToText(note, true);
     if (!text) text = "";
     const html = text.replace(/\n/g, "<br />");
     Notifications.displayNotification({
       title: note.title,
       message: note.headline || text,
-      subtitle: note.headline || text,
+      subtitle: "",
       bigText: html,
       ongoing: true,
       actions: ["UNPIN"],

apps/mobile/app/utils/constants.ts

@@ -23,7 +23,7 @@ export const IOS_APPGROUPID = "group.org.streetwriters.notesnook";
 export const FILE_SIZE_LIMIT = 500 * 1024 * 1024;
 export const IMAGE_SIZE_LIMIT = 50 * 1024 * 1024;
 
-export const BETA = true;
+export const BETA = false;
 
 export const STORE_LINK =
   Platform.OS === "ios"

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.0.3",
+      "version": "3.0.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

packages/core/src/api/mfa-manager.ts

@@ -92,7 +92,10 @@ class MFAManager {
   }
 
   async sendCode(method: "sms" | "email") {
-    const token = await this.tokenManager.getAccessToken();
+    const token = await this.tokenManager.getAccessToken([
+      "IdentityServerApi",
+      "auth:grant_types:mfa"
+    ]);
     if (!token) throw new Error("Unauthorized.");
 
     return await http.post(

packages/core/src/api/token-manager.ts

@@ -32,6 +32,15 @@ export type Token = {
   refresh_token: string;
 };
 
+type Scope = (typeof SCOPES)[number];
+
+const SCOPES = [
+  "notesnook.sync",
+  "offline_access",
+  "IdentityServerApi",
+  "auth:grant_types:mfa",
+  "auth:grant_types:mfa_password"
+] as const;
 const ENDPOINTS = {
   token: "/connect/token",
   revoke: "/connect/revocation",
@@ -79,10 +88,14 @@ class TokenManager {
     return scopes.includes("offline_access") && Boolean(refresh_token);
   }
 
-  async getAccessToken(forceRenew = false) {
+  async getAccessToken(
+    scopes: Scope[] = ["notesnook.sync", "IdentityServerApi"],
+    forceRenew = false
+  ) {
     return await getSafeToken(async () => {
       const token = await this.getToken(true, forceRenew);
-      if (!token || token.scope.includes("auth:grant_types")) return;
+      if (!token) return;
+      if (!scopes.some((s) => token.scope.includes(s))) return;
       return token.access_token;
     }, "Error getting access token:");
   }

packages/core/src/api/user-manager.ts

@@ -191,7 +191,7 @@ class UserManager {
         username: email,
         password: hashedPassword,
         grant_type: code ? "mfa" : "password",
-        scope: "notesnook.sync offline_access openid IdentityServerApi",
+        scope: "notesnook.sync offline_access IdentityServerApi",
         client_id: "notesnook",
         "mfa:code": code,
         "mfa:method": method

packages/editor-mobile/src/components/editor.tsx

@@ -478,7 +478,8 @@ const Tiptap = ({
           <p
             style={{
               width: "90%",
-              fontSize: "0.9rem"
+              fontSize: "0.9rem",
+              color: colors.primary.paragraph
             }}
           >
             <ol>