fix Monero polyseed issue (#1474)
Add desktop settings silent payment update versions
Omar Hatem committed
May 31, 2024 at 15:57 UTC
43a4477b3919326d0123a3eb0a92955292267b8d
7 files changed
+24
-17
assets/text/Release_Notes.txt
+1
-2
@@ -1,2 +1 @@
1
-Bitcoin Silent Payments
2
-Bug fixes and generic enhancements
1
+Bug fixes and generic enhancements
\ No newline at end of file
cw_monero/ios/Classes/monero_api.cpp
-1
@@ -399,7 +399,6 @@ extern "C"
399
return false;
400
}
401
402
- wallet->store(std::string(path));
402
change_current_wallet(wallet);
403
return true;
404
}
lib/di.dart
+1
-1
@@ -571,7 +571,7 @@ Future<void> setup({
571
getIt.registerFactory<Modify2FAPage>(
572
() => Modify2FAPage(setup2FAViewModel: getIt.get<Setup2FAViewModel>()));
573
574
- getIt.registerFactory<DesktopSettingsPage>(() => DesktopSettingsPage());
574
+ getIt.registerFactory<DesktopSettingsPage>(() => DesktopSettingsPage(getIt.get<DashboardViewModel>()));
575
576
getIt.registerFactoryParam<ReceiveOptionViewModel, ReceivePageOption?, void>(
577
(pageOption, _) => ReceiveOptionViewModel(getIt.get<AppStore>().wallet!, pageOption));
lib/src/screens/settings/desktop_settings/desktop_settings_page.dart
+10
-1
@@ -3,6 +3,7 @@ import 'package:cake_wallet/routes.dart';
3
import 'package:cake_wallet/src/widgets/setting_action_button.dart';
4
import 'package:cake_wallet/src/widgets/setting_actions.dart';
5
import 'package:cake_wallet/typography.dart';
6
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
7
import 'package:flutter/material.dart';
8
import 'package:cake_wallet/router.dart' as Router;
9
import 'package:cake_wallet/themes/extensions/menu_theme.dart';
@@ -10,7 +11,9 @@ import 'package:cake_wallet/themes/extensions/menu_theme.dart';
11
final _settingsNavigatorKey = GlobalKey<NavigatorState>();
12
13
class DesktopSettingsPage extends StatefulWidget {
13
- const DesktopSettingsPage({super.key});
14
+ const DesktopSettingsPage(this.dashboardViewModel, {super.key});
15
+
16
+ final DashboardViewModel dashboardViewModel;
17
18
@override
19
State<DesktopSettingsPage> createState() => _DesktopSettingsPageState();
@@ -51,6 +54,12 @@ class _DesktopSettingsPageState extends State<DesktopSettingsPage> {
54
padding: EdgeInsets.only(top: 0),
55
itemBuilder: (_, index) {
56
final item = SettingActions.desktopSettings[index];
57
+
58
+ if (!widget.dashboardViewModel.hasSilentPayments &&
59
+ item.name(context) == S.of(context).silent_payments_settings) {
60
+ return Container();
61
+ }
62
+
63
final isLastTile = index == itemCount - 1;
64
return SettingActionButton(
65
isLastTile: isLastTile,
scripts/android/app_env.sh
+4
-4
@@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
15
APP_ANDROID_TYPE=$1
16
17
MONERO_COM_NAME="Monero.com"
18
-MONERO_COM_VERSION="1.15.0"
19
-MONERO_COM_BUILD_NUMBER=90
18
+MONERO_COM_VERSION="1.15.1"
19
+MONERO_COM_BUILD_NUMBER=91
20
MONERO_COM_BUNDLE_ID="com.monero.app"
21
MONERO_COM_PACKAGE="com.monero.app"
22
MONERO_COM_SCHEME="monero.com"
23
24
CAKEWALLET_NAME="Cake Wallet"
25
-CAKEWALLET_VERSION="4.18.0"
26
-CAKEWALLET_BUILD_NUMBER=216
25
+CAKEWALLET_VERSION="4.18.1"
26
+CAKEWALLET_BUILD_NUMBER=217
27
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29
CAKEWALLET_SCHEME="cakewallet"
scripts/ios/app_env.sh
+4
-4
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
13
APP_IOS_TYPE=$1
14
15
MONERO_COM_NAME="Monero.com"
16
-MONERO_COM_VERSION="1.15.0"
17
-MONERO_COM_BUILD_NUMBER=88
16
+MONERO_COM_VERSION="1.15.1"
17
+MONERO_COM_BUILD_NUMBER=89
18
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20
CAKEWALLET_NAME="Cake Wallet"
21
-CAKEWALLET_VERSION="4.18.0"
22
-CAKEWALLET_BUILD_NUMBER=248
21
+CAKEWALLET_VERSION="4.18.1"
22
+CAKEWALLET_BUILD_NUMBER=249
23
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25
HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+4
-4
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
16
fi
17
18
MONERO_COM_NAME="Monero.com"
19
-MONERO_COM_VERSION="1.5.0"
20
-MONERO_COM_BUILD_NUMBER=21
19
+MONERO_COM_VERSION="1.5.1"
20
+MONERO_COM_BUILD_NUMBER=22
21
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
22
23
CAKEWALLET_NAME="Cake Wallet"
24
-CAKEWALLET_VERSION="1.11.0"
25
-CAKEWALLET_BUILD_NUMBER=78
24
+CAKEWALLET_VERSION="1.11.1"
25
+CAKEWALLET_BUILD_NUMBER=79
26
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
27
28
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then