From ee380324031d141025a4a1a1c080818d464221f7 Mon Sep 17 00:00:00 2001 From: Ammar Ahmed Date: Wed, 22 Nov 2023 14:45:16 +0500 Subject: [PATCH] mobile: release v2.6.11 --- .../mobile/app/components/premium/expiring.js | 28 +++++++++---------- apps/mobile/native/android/app/build.gradle | 2 +- .../android/releasenotes/whatsnew-en-US | 4 --- .../ios/Notesnook.xcodeproj/project.pbxproj | 24 ++++++++-------- apps/mobile/package.json | 2 +- .../android/en-US/changelogs/10359.txt | 3 ++ 6 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/10359.txt diff --git a/apps/mobile/app/components/premium/expiring.js b/apps/mobile/app/components/premium/expiring.js index ea27621dba..af99e2d083 100644 --- a/apps/mobile/app/components/premium/expiring.js +++ b/apps/mobile/app/components/premium/expiring.js @@ -48,23 +48,23 @@ export const Expiring = () => { const [visible, setVisible] = useState(false); const [status, setStatus] = useState({ title: "Your trial is ending soon", - offer: null, + offer: "Get 30% off", extend: true }); const pricing = usePricing("yearly"); - - const promo = status.offer - ? { - promoCode: - pricing?.info?.discount > 30 - ? pricing.info.sku - : "com.streetwriters.notesnook.sub.yr.trialoffer", - text: `GET ${ - pricing?.info?.discount > 30 ? pricing?.info?.discount : 30 - }% OFF on yearly`, - discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30 - } - : null; + const promo = + status.offer && pricing?.info + ? { + promoCode: + pricing?.info?.discount > 30 + ? pricing.info.sku + : "com.streetwriters.notesnook.sub.yr.trialoffer", + text: `GET ${ + pricing?.info?.discount > 30 ? pricing?.info?.discount : 30 + }% OFF on yearly`, + discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30 + } + : null; useEffect(() => { eSubscribeEvent(eOpenTrialEndingDialog, open); diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/native/android/app/build.gradle index 6446d0e5f0..ee11039551 100644 --- a/apps/mobile/native/android/app/build.gradle +++ b/apps/mobile/native/android/app/build.gradle @@ -111,7 +111,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true - versionCode 2070 + versionCode 2071 versionName getNpmVersion() testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/apps/mobile/native/android/releasenotes/whatsnew-en-US b/apps/mobile/native/android/releasenotes/whatsnew-en-US index 6494a6b262..8c32701e4d 100644 --- a/apps/mobile/native/android/releasenotes/whatsnew-en-US +++ b/apps/mobile/native/android/releasenotes/whatsnew-en-US @@ -1,7 +1,3 @@ -- Fixed HTML & PDF exports -- Improved task lists in editor -- Improved loading images -- Allow restoring backups when logged out - Bug fixes and performance improvements Thank you for using Notesnook! \ No newline at end of file diff --git a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj index 551b1f1719..3652ac6125 100644 --- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj +++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj @@ -997,7 +997,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEVELOPMENT_TEAM = 53CWBG3QUC; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1071,7 +1071,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1102,7 +1102,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1176,7 +1176,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -1335,7 +1335,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1347,7 +1347,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; @@ -1378,7 +1378,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC; @@ -1391,7 +1391,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1421,7 +1421,7 @@ CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1495,7 +1495,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; @@ -1526,7 +1526,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2061; + CURRENT_PROJECT_VERSION = 2062; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC; @@ -1601,7 +1601,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.10; + MARKETING_VERSION = 2.6.11; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/apps/mobile/package.json b/apps/mobile/package.json index d80cd3e936..e41f1478b2 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@notesnook/mobile", - "version": "2.6.10", + "version": "2.6.11", "private": true, "license": "GPL-3.0-or-later", "workspaces": [ diff --git a/fastlane/metadata/android/en-US/changelogs/10359.txt b/fastlane/metadata/android/en-US/changelogs/10359.txt new file mode 100644 index 0000000000..8c32701e4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/10359.txt @@ -0,0 +1,3 @@ +- Bug fixes and performance improvements + +Thank you for using Notesnook! \ No newline at end of file