From 19cbc40e81dc13fc88667949c7d187300ec5ffd1 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Fri, 26 May 2023 21:13:22 +0300 Subject: [PATCH] New versions 4.6.6 and 1.3.7 (#949) Disable 'prevent screenshots' option from Desktop since it's not supported yet --- assets/text/Monerocom_Release_Notes.txt | 9 ++++++--- assets/text/Release_Notes.txt | 9 ++++++--- lib/src/screens/settings/privacy_page.dart | 14 ++++++++------ lib/store/settings_store.dart | 11 +++++++---- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- scripts/android/app_env.sh | 8 ++++---- scripts/ios/app_env.sh | 8 ++++---- scripts/macos/app_env.sh | 4 ++-- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 56fb3deb79..178fa45eaf 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,3 +1,6 @@ -Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes -Show amount received by each Monero account in account overview -Other bugfixes \ No newline at end of file +Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa +Auto generate restore height for Monero restore QR codes +Hausa and Yoruba languages +Additional privacy settings +Update Monero to 0.18.2.2 +Refactoring and bug fixes \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 56fb3deb79..178fa45eaf 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,3 +1,6 @@ -Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes -Show amount received by each Monero account in account overview -Other bugfixes \ No newline at end of file +Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa +Auto generate restore height for Monero restore QR codes +Hausa and Yoruba languages +Additional privacy settings +Update Monero to 0.18.2.2 +Refactoring and bug fixes \ No newline at end of file diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart index c84bdc8e90..186e19d37b 100644 --- a/lib/src/screens/settings/privacy_page.dart +++ b/lib/src/screens/settings/privacy_page.dart @@ -4,6 +4,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart'; import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/view_model/settings/choices_list_item.dart'; import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart'; import 'package:flutter/material.dart'; @@ -48,12 +49,13 @@ class PrivacyPage extends BasePage { onValueChange: (BuildContext _, bool value) { _privacySettingsViewModel.setShouldSaveRecipientAddress(value); }), - SettingsSwitcherCell( - title: S.current.prevent_screenshots, - value: _privacySettingsViewModel.isAppSecure, - onValueChange: (BuildContext _, bool value) { - _privacySettingsViewModel.setIsAppSecure(value); - }), + if (DeviceInfo.instance.isMobile) + SettingsSwitcherCell( + title: S.current.prevent_screenshots, + value: _privacySettingsViewModel.isAppSecure, + onValueChange: (BuildContext _, bool value) { + _privacySettingsViewModel.setIsAppSecure(value); + }), SettingsSwitcherCell( title: S.current.disable_buy, value: _privacySettingsViewModel.disableBuy, diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index 01723fc6e0..9dfdacd395 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -4,6 +4,7 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart'; import 'package:cake_wallet/entities/exchange_api_mode.dart'; import 'package:cake_wallet/entities/pin_code_required_duration.dart'; import 'package:cake_wallet/entities/preferences_key.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cw_core/transaction_priority.dart'; import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/themes/theme_list.dart'; @@ -135,12 +136,14 @@ abstract class SettingsStoreBase with Store { (bool shouldSaveRecipientAddress) => sharedPreferences.setBool( PreferencesKey.shouldSaveRecipientAddressKey, shouldSaveRecipientAddress)); - setIsAppSecureNative(isAppSecure); + if (DeviceInfo.instance.isMobile) { + setIsAppSecureNative(isAppSecure); - reaction((_) => isAppSecure, (bool isAppSecure) { - sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure); + reaction((_) => isAppSecure, (bool isAppSecure) { + sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure); setIsAppSecureNative(isAppSecure); - }); + }); + } reaction( (_) => disableBuy, diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 437237153c..c7f78b30fc 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -25,7 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { CwMoneroPlugin.register(with: registry.registrar(forPlugin: "CwMoneroPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin")) - FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 98e5762f25..119ddb56c8 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.3.6" -MONERO_COM_BUILD_NUMBER=49 +MONERO_COM_VERSION="1.3.7" +MONERO_COM_BUILD_NUMBER=50 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.6.5" -CAKEWALLET_BUILD_NUMBER=159 +CAKEWALLET_VERSION="4.6.6" +CAKEWALLET_BUILD_NUMBER=160 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 0ee76e82db..360b647709 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.3.6" -MONERO_COM_BUILD_NUMBER=47 +MONERO_COM_VERSION="1.3.7" +MONERO_COM_BUILD_NUMBER=48 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.6.5" -CAKEWALLET_BUILD_NUMBER=154 +CAKEWALLET_VERSION="4.6.6" +CAKEWALLET_BUILD_NUMBER=155 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 09a0773034..8f328465ea 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -15,8 +15,8 @@ if [ -n "$1" ]; then fi CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.0.4" -CAKEWALLET_BUILD_NUMBER=22 +CAKEWALLET_VERSION="1.0.5" +CAKEWALLET_BUILD_NUMBER=24 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then