v4.23.2 Release Candidate (#2039)

* v4.23.2 Release Candidate

* adjust bottom nav bar height

* Adjust gradient and padding

* fix blur

assets/text/Monerocom_Release_Notes.txt

@@ -1,4 +1,3 @@
-Added passphrase support
-Added decentralized cross-chain exchange, Chainflip
+Ledger fixes
 UI enhancements
 Bug fixes

assets/text/Release_Notes.txt

@@ -1,5 +1,5 @@
-Added Zano wallet support
-Added Monero/Wownero passphrase support
-Added decentralized cross-chain exchange, Chainflip
+Zano enhancements
+Ethereum enhancements
+Ledger fixes
 UI enhancements
 Bug fixes

lib/src/screens/dashboard/pages/navigation_dock.dart

@@ -18,176 +18,38 @@ class NavigationDock extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright
-        ? Positioned(
-            child: Observer(
-              builder: (_) {
-                return Container(
-                  alignment: Alignment.bottomCenter,
-                  height: 150,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: <Color>[
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(10),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(75),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(150),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor,
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                      ],
-                    ),
-                  ),
+    return Positioned(
+      child: Observer(
+        builder: (_) {
+          return Container(
+            height: 150,
+            alignment: Alignment.bottomCenter,
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: _getColors(context),
+              ),
+            ),
+            child: Container(
+              margin: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(50),
+                child: BackdropFilter(
+                  filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
                   child: Container(
-                    margin: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
-                    child: ClipRRect(
-                      borderRadius: BorderRadius.circular(50),
-                      child: BackdropFilter(
-                        filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
-                        child: Container(
-                          height: 75,
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(50.0),
-                            border: Border.all(
-                              color:
-                                  Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
-                              width: 1,
-                            ),
-                            color: Theme.of(context)
-                                .extension<SyncIndicatorTheme>()!
-                                .syncedBackgroundColor,
-                          ),
-                          child: Container(
-                            padding: EdgeInsets.symmetric(horizontal: 10),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: MainActions.all
-                                  .where((element) =>
-                                      element.canShow?.call(dashboardViewModel) ?? true)
-                                  .map(
-                                    (action) => Expanded(
-                                      child: Semantics(
-                                        button: true,
-                                        enabled:
-                                            (action.isEnabled?.call(dashboardViewModel) ?? true),
-                                        child: ActionButton(
-                                          key: ValueKey(
-                                              'dashboard_page_${action.name(context)}_action_button_key'),
-                                          image: Image.asset(
-                                            action.image,
-                                            height: 24,
-                                            width: 24,
-                                            color:
-                                                action.isEnabled?.call(dashboardViewModel) ?? true
-                                                    ? Theme.of(context)
-                                                        .extension<DashboardPageTheme>()!
-                                                        .mainActionsIconColor
-                                                    : Theme.of(context)
-                                                        .extension<BalancePageTheme>()!
-                                                        .labelTextColor,
-                                          ),
-                                          title: action.name(context),
-                                          onClick: () async =>
-                                              await action.onTap(context, dashboardViewModel),
-                                          textColor:
-                                              action.isEnabled?.call(dashboardViewModel) ?? true
-                                                  ? null
-                                                  : Theme.of(context)
-                                                      .extension<BalancePageTheme>()!
-                                                      .labelTextColor,
-                                        ),
-                                      ),
-                                    ),
-                                  )
-                                  .toList(),
-                            ),
-                          ),
-                        ),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(50.0),
+                      border: Border.all(
+                        color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+                        width: 1,
                       ),
+                      color:
+                          Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
                     ),
-                  ),
-                );
-              },
-            ),
-          )
-        : Positioned(
-            child: Observer(
-              builder: (_) {
-                  return Container(
-                  alignment: Alignment.bottomCenter,
-                  height: 150,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: <Color>[
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(5),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(50),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(125),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(150),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                            .withAlpha(200),
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor,
-                        Theme.of(context)
-                            .extension<DashboardPageTheme>()!
-                            .thirdGradientBackgroundColor
-                      ],
-                    ),
-                  ),
-                  child: Container(
-                    margin: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
                     child: Container(
-                      height: 75,
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(50.0),
-                        border: Border.all(
-                          color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
-                          width: 1,
-                        ),
-                        color: Theme.of(context)
-                            .extension<SyncIndicatorTheme>()!
-                            .syncedBackgroundColor,
-                        // boxShadow: [
-                        //   BoxShadow(
-                        //       color: Theme.of(context)
-                        //           .extension<BalancePageTheme>()!
-                        //           .cardBorderColor
-                        //           .withAlpha(50),
-                        //       spreadRadius: dashboardViewModel.getShadowSpread(),
-                        //       blurRadius: dashboardViewModel.getShadowBlur())
-                        // ],
-                      ),
-                      child: Container(
-                        padding: EdgeInsets.symmetric(horizontal: 10),
+                      padding: EdgeInsets.symmetric(horizontal: 10),
+                      child: IntrinsicHeight(
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: MainActions.all
@@ -229,9 +91,57 @@ class NavigationDock extends StatelessWidget {
                       ),
                     ),
                   ),
-                );
-              },
+                ),
+              ),
             ),
           );
+        },
+      ),
+    );
+  }
+
+  List<Color> _getColors(BuildContext context) {
+    final isBright = dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright;
+    return isBright
+        ? <Color>[
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(10),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(75),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(150),
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
+          ]
+        : <Color>[
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(5),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(50),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(125),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(150),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(200),
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
+          ];
   }
 }

lib/src/screens/dashboard/widgets/action_button.dart

@@ -31,7 +31,7 @@ class ActionButton extends StatelessWidget {
       },
       child: Container(
         color: Colors.transparent,
-        padding: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0),
+        padding: EdgeInsets.only(top: 5, bottom: 4, left: 0, right: 0),
         alignment: alignment,
         child: Column(
           mainAxisSize: MainAxisSize.max,

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.20.0"
-MONERO_COM_BUILD_NUMBER=113
+MONERO_COM_VERSION="1.20.2"
+MONERO_COM_BUILD_NUMBER=114
 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.23.0"
-CAKEWALLET_BUILD_NUMBER=246
+CAKEWALLET_VERSION="4.23.2"
+CAKEWALLET_BUILD_NUMBER=247
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

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.20.1"
-MONERO_COM_BUILD_NUMBER=111
+MONERO_COM_VERSION="1.20.2"
+MONERO_COM_BUILD_NUMBER=112
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.23.1"
-CAKEWALLET_BUILD_NUMBER=295
+CAKEWALLET_VERSION="4.23.2"
+CAKEWALLET_BUILD_NUMBER=296
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/linux/app_env.sh

@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.13.0"
-CAKEWALLET_BUILD_NUMBER=46
+CAKEWALLET_VERSION="1.13.2"
+CAKEWALLET_BUILD_NUMBER=47
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."

scripts/macos/app_env.sh

@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.10.0"
-MONERO_COM_BUILD_NUMBER=43
+MONERO_COM_VERSION="1.10.2"
+MONERO_COM_BUILD_NUMBER=44
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.16.0"
-CAKEWALLET_BUILD_NUMBER=104
+CAKEWALLET_VERSION="1.16.2"
+CAKEWALLET_BUILD_NUMBER=105
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

scripts/windows/build_exe_installer.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "0.4.0"
+#define MyAppVersion "0.4.2"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"