Merge branch 'main' into ledger-monero-fix

cake-tech · Dec 6, 2024 · 35c2408 · 35c2408
2 parents 1978501 + 9fcbc4d
commit 35c2408
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
         disable 'InvalidPackage'
     }
 
-    namespace com.cakewallet.cake_wallet
+    namespace "com.cakewallet.cake_wallet"
 
     defaultConfig {
         applicationId appProperties['id']

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cakewallet.cake_wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cakewallet.cake_wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/cw_core/lib/monero_balance.dart b/cw_core/lib/monero_balance.dart
@@ -3,8 +3,8 @@ import 'package:cw_core/monero_amount_format.dart';
 
 class MoneroBalance extends Balance {
   MoneroBalance({required this.fullBalance, required this.unlockedBalance, this.frozenBalance = 0})
-      : formattedFullBalance = moneroAmountToString(amount: fullBalance),
-        formattedUnlockedBalance = moneroAmountToString(amount: unlockedBalance - frozenBalance),
+      : formattedFullBalance = moneroAmountToString(amount: frozenBalance + fullBalance),
+        formattedUnlockedBalance = moneroAmountToString(amount: unlockedBalance),
         formattedLockedBalance =
             moneroAmountToString(amount: frozenBalance + fullBalance - unlockedBalance),
         super(unlockedBalance, fullBalance);

diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
@@ -725,8 +725,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
   void _askForUpdateBalance() {
     final unlockedBalance = _getUnlockedBalance();
-    final fullBalance = _getUnlockedBalance() + _getFrozenBalance();
-    final frozenBalance = 0; // this is calculated on the monero side now
+    final fullBalance = monero_wallet.getFullBalance(
+      accountIndex: walletAddresses.account!.id);
+    final frozenBalance = _getFrozenBalance();
     if (balance[currency]!.fullBalance != fullBalance ||
         balance[currency]!.unlockedBalance != unlockedBalance ||
         balance[currency]!.frozenBalance != frozenBalance) {

diff --git a/lib/src/screens/dashboard/pages/cake_features_page.dart b/lib/src/screens/dashboard/pages/cake_features_page.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
@@ -40,7 +42,13 @@ class CakeFeaturesPage extends StatelessWidget {
                 children: <Widget>[
                   SizedBox(height: 20),
                   DashBoardRoundedCardWidget(
-                    onTap: () => _navigatorToGiftCardsPage(context),
+                    onTap: () {
+                      if (Platform.isMacOS) {
+                        _launchUrl("buy.cakepay.com");
+                      } else {
+                        _navigatorToGiftCardsPage(context);
+                      }
+                    },
                     title: 'Cake Pay',
                     subTitle: S.of(context).cake_pay_subtitle,
                     image: Image.asset(
@@ -75,7 +83,7 @@ class CakeFeaturesPage extends StatelessWidget {
                         icon: Icon(
                           Icons.speaker_notes_rounded,
                           color:
-                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                              Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                           size: 75,
                         ),
                       );

diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh
@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.11.1"
-CAKEWALLET_BUILD_NUMBER=39
+CAKEWALLET_VERSION="1.11.2"
+CAKEWALLET_BUILD_NUMBER=40
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."

diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
@@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=37
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.14.1"
-CAKEWALLET_BUILD_NUMBER=97
+CAKEWALLET_VERSION="1.14.2"
+CAKEWALLET_BUILD_NUMBER=98
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then