From b2c379fcb7fd158f1fbb9154069597d0fff62b05 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Thu, 8 Jan 2026 23:45:33 +0100
Subject: [PATCH] sanity checks [skip ci]

---
 lib/view_model/backup_view_model.dart               | 9 +++++----
 lib/view_model/edit_backup_password_view_model.dart | 4 ++++
 scripts/macos/app_env.sh                            | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/view_model/backup_view_model.dart b/lib/view_model/backup_view_model.dart
index d9adb1b66..ad066d377 100644
--- a/lib/view_model/backup_view_model.dart
+++ b/lib/view_model/backup_view_model.dart
@@ -1,17 +1,15 @@
 import 'dart:io';
-import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cake_wallet/core/backup_service_v3.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/core/secure_storage.dart';
+import 'package:cake_wallet/entities/default_settings_migration.dart' show generateBackupPassword;
 import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cake_wallet/view_model/edit_backup_password_view_model.dart';
 import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:intl/intl.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:path_provider/path_provider.dart';
 
 part 'backup_view_model.g.dart';
 
@@ -60,7 +58,10 @@ abstract class BackupViewModelBase with Store {
   @action
   Future<void> init() async {
     final key = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
-    backupPassword = (await secureStorage.read(key: key))!;
+    backupPassword = (await secureStorage.read(key: key)) ?? '';
+    if (backupPassword.isEmpty) {
+      generateBackupPassword(secureStorage);
+    }
   }
 
   @action
diff --git a/lib/view_model/edit_backup_password_view_model.dart b/lib/view_model/edit_backup_password_view_model.dart
index 69a3988ff..9c672c61e 100644
--- a/lib/view_model/edit_backup_password_view_model.dart
+++ b/lib/view_model/edit_backup_password_view_model.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/secure_storage.dart';
+import 'package:cake_wallet/entities/default_settings_migration.dart' show generateBackupPassword;
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
 
@@ -28,6 +29,9 @@ abstract class EditBackupPasswordViewModelBase with Store {
   Future<void> init() async {
     final key = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
     final password = (await secureStorage.read(key: key)) ?? '';
+    if (backupPassword.isEmpty) {
+      generateBackupPassword(secureStorage);
+    }
     _originalPassword = password;
     backupPassword = password;
   }
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index e0b43efc6..5916e0606 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="5.6.1"
-MONERO_COM_BUILD_NUMBER=72
+MONERO_COM_VERSION="5.6.5"
+MONERO_COM_BUILD_NUMBER=73
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.6.1"
-CAKEWALLET_BUILD_NUMBER=139
+CAKEWALLET_VERSION="5.6.5"
+CAKEWALLET_BUILD_NUMBER=140
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then