diff --git a/apps/mobile/app/services/notifications.ts b/apps/mobile/app/services/notifications.ts index 09c7c8d58..c0ecbaf6d 100644 --- a/apps/mobile/app/services/notifications.ts +++ b/apps/mobile/app/services/notifications.ts @@ -99,7 +99,6 @@ const onEvent = async ({ type, detail }: Event) => { if (type === EventType.PRESS) { notifee.decrementBadgeCount(); if (notification?.data?.type === "quickNote") return; - editorState().movedAway = false; MMKV.removeItem("appState"); await db.init(); await db.notes?.init(); @@ -109,8 +108,9 @@ const onEvent = async ({ type, detail }: Event) => { const ReminderNotify = require("../components/sheets/reminder-notify").default; ReminderNotify.present(reminder); + return; } - + editorState().movedAway = false; const noteId = notification?.id; if (useNoteStore?.getState()?.loading === false) { loadNote(noteId as string, false); diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/native/android/app/build.gradle index 233dcd17f..390e41901 100644 --- a/apps/mobile/native/android/app/build.gradle +++ b/apps/mobile/native/android/app/build.gradle @@ -164,7 +164,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true - versionCode 2036 + versionCode 2037 versionName getNpmVersion() testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj index 96d466241..f1f052af1 100644 --- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj +++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj @@ -1083,7 +1083,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEVELOPMENT_TEAM = 53CWBG3QUC; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1157,7 +1157,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1187,7 +1187,7 @@ CODE_SIGN_ENTITLEMENTS = Notesnook/Notesnook.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1260,7 +1260,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -1418,7 +1418,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1430,7 +1430,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; @@ -1460,7 +1460,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1472,7 +1472,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1501,7 +1501,7 @@ CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1575,7 +1575,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; @@ -1605,7 +1605,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2028; + CURRENT_PROJECT_VERSION = 2029; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1679,7 +1679,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.5; + MARKETING_VERSION = 2.4.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/apps/mobile/native/package.json b/apps/mobile/native/package.json index 5753d4dfd..f5363989c 100644 --- a/apps/mobile/native/package.json +++ b/apps/mobile/native/package.json @@ -52,7 +52,7 @@ "rn-fetch-blob": "^0.12.0", "react-native-gzip":"1.0.0", "@shopify/flash-list":"1.4.0", - "@ammarahmed/notifee-react-native": "7.4.3", + "@ammarahmed/notifee-react-native": "7.4.4", "react-native-modal-datetime-picker":"14.0.0", "@react-native-community/datetimepicker":"6.6.0", "react-native-date-picker": "4.2.6", diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json index 1a0976eb0..e07e510ce 100644 --- a/apps/mobile/package-lock.json +++ b/apps/mobile/package-lock.json @@ -1,12 +1,12 @@ { "name": "@notesnook/mobile", - "version": "2.4.4", + "version": "2.4.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@notesnook/mobile", - "version": "2.4.4", + "version": "2.4.5", "license": "GPL-3.0-or-later", "workspaces": [ "native/", @@ -60,7 +60,7 @@ "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { - "@ammarahmed/notifee-react-native": "7.4.3", + "@ammarahmed/notifee-react-native": "7.4.4", "@ammarahmed/react-native-sodium": "1.3.0", "@bam.tech/react-native-image-resizer": "3.0.5", "@callstack/repack": "^3.0.0", @@ -155,9 +155,9 @@ } }, "node_modules/@ammarahmed/notifee-react-native": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.3.tgz", - "integrity": "sha512-7jz91BZLxsz3v2nOPSnUf0ULa/k+KtkyX8zN2ijeluLHSQ5fjSd5jQ+u+4+Rcja0g0xQze7fpg26q6lA6F2j1g==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.4.tgz", + "integrity": "sha512-soiJp11voU1MvwmzN66vlbq+NHW7nG3OlKtMPVzJ2O4Q44LP+yrm5u+N8kohMd7jGW14s3E+d27rT7NTzeK+ww==", "peerDependencies": { "react-native": "*" } @@ -21520,9 +21520,9 @@ }, "dependencies": { "@ammarahmed/notifee-react-native": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.3.tgz", - "integrity": "sha512-7jz91BZLxsz3v2nOPSnUf0ULa/k+KtkyX8zN2ijeluLHSQ5fjSd5jQ+u+4+Rcja0g0xQze7fpg26q6lA6F2j1g==" + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.4.tgz", + "integrity": "sha512-soiJp11voU1MvwmzN66vlbq+NHW7nG3OlKtMPVzJ2O4Q44LP+yrm5u+N8kohMd7jGW14s3E+d27rT7NTzeK+ww==" }, "@ammarahmed/react-native-sodium": { "version": "1.3.0", @@ -24325,7 +24325,7 @@ "@notesnook/mobile-native": { "version": "file:native", "requires": { - "@ammarahmed/notifee-react-native": "7.4.3", + "@ammarahmed/notifee-react-native": "7.4.4", "@ammarahmed/react-native-sodium": "1.3.0", "@babel/core": "^7.12.9", "@babel/eslint-parser": "^7.16.5", diff --git a/apps/mobile/package.json b/apps/mobile/package.json index eccc52fb0..1469f38bd 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@notesnook/mobile", - "version": "2.4.5", + "version": "2.4.6", "private": true, "license": "GPL-3.0-or-later", "workspaces": [