diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 557dd8b265..faad677774 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,2 +1 @@ -Bitcoin Silent Payments -Bug fixes and generic enhancements +Bug fixes and generic enhancements \ No newline at end of file diff --git a/cw_monero/ios/Classes/monero_api.cpp b/cw_monero/ios/Classes/monero_api.cpp index 01a8d9a51c..a2a17bd5ea 100644 --- a/cw_monero/ios/Classes/monero_api.cpp +++ b/cw_monero/ios/Classes/monero_api.cpp @@ -399,7 +399,6 @@ extern "C" return false; } - wallet->store(std::string(path)); change_current_wallet(wallet); return true; } diff --git a/lib/di.dart b/lib/di.dart index bbad4a636a..31655b402d 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -571,7 +571,7 @@ Future setup({ getIt.registerFactory( () => Modify2FAPage(setup2FAViewModel: getIt.get())); - getIt.registerFactory(() => DesktopSettingsPage()); + getIt.registerFactory(() => DesktopSettingsPage(getIt.get())); getIt.registerFactoryParam( (pageOption, _) => ReceiveOptionViewModel(getIt.get().wallet!, pageOption)); diff --git a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart index 5355b7bb8d..611b2acb75 100644 --- a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart +++ b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart @@ -3,6 +3,7 @@ import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/widgets/setting_action_button.dart'; import 'package:cake_wallet/src/widgets/setting_actions.dart'; import 'package:cake_wallet/typography.dart'; +import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:flutter/material.dart'; import 'package:cake_wallet/router.dart' as Router; import 'package:cake_wallet/themes/extensions/menu_theme.dart'; @@ -10,7 +11,9 @@ import 'package:cake_wallet/themes/extensions/menu_theme.dart'; final _settingsNavigatorKey = GlobalKey(); class DesktopSettingsPage extends StatefulWidget { - const DesktopSettingsPage({super.key}); + const DesktopSettingsPage(this.dashboardViewModel, {super.key}); + + final DashboardViewModel dashboardViewModel; @override State createState() => _DesktopSettingsPageState(); @@ -51,6 +54,12 @@ class _DesktopSettingsPageState extends State { padding: EdgeInsets.only(top: 0), itemBuilder: (_, index) { final item = SettingActions.desktopSettings[index]; + + if (!widget.dashboardViewModel.hasSilentPayments && + item.name(context) == S.of(context).silent_payments_settings) { + return Container(); + } + final isLastTile = index == itemCount - 1; return SettingActionButton( isLastTile: isLastTile, diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 4578fd3d39..deceec53e4 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.15.0" -MONERO_COM_BUILD_NUMBER=90 +MONERO_COM_VERSION="1.15.1" +MONERO_COM_BUILD_NUMBER=91 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.18.0" -CAKEWALLET_BUILD_NUMBER=216 +CAKEWALLET_VERSION="4.18.1" +CAKEWALLET_BUILD_NUMBER=217 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index ef038b6c75..8893d48422 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.15.0" -MONERO_COM_BUILD_NUMBER=88 +MONERO_COM_VERSION="1.15.1" +MONERO_COM_BUILD_NUMBER=89 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.18.0" -CAKEWALLET_BUILD_NUMBER=248 +CAKEWALLET_VERSION="4.18.1" +CAKEWALLET_BUILD_NUMBER=249 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index a046605143..e648f1aa06 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -16,13 +16,13 @@ if [ -n "$1" ]; then fi MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.5.0" -MONERO_COM_BUILD_NUMBER=21 +MONERO_COM_VERSION="1.5.1" +MONERO_COM_BUILD_NUMBER=22 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.11.0" -CAKEWALLET_BUILD_NUMBER=78 +CAKEWALLET_VERSION="1.11.1" +CAKEWALLET_BUILD_NUMBER=79 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then