diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
index 5eeeb2d22..011435baa 100644
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/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
\ No newline at end of file
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
index 191b24ce3..ca69e0b98 100644
--- a/assets/text/Release_Notes.txt
+++ b/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
\ No newline at end of file
diff --git a/lib/src/screens/dashboard/pages/navigation_dock.dart b/lib/src/screens/dashboard/pages/navigation_dock.dart
index 77f6b7c5b..52b39cdf7 100644
--- a/lib/src/screens/dashboard/pages/navigation_dock.dart
+++ b/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
- ],
- ),
- ),
- 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(),
- ),
- ),
- ),
- ),
- ),
- ),
- );
- },
+ 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),
+ ),
),
- )
- : 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: 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: 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())
- // ],
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(50.0),
+ border: Border.all(
+ color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+ width: 1,
),
- child: Container(
- padding: EdgeInsets.symmetric(horizontal: 10),
+ color:
+ Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+ ),
+ child: Container(
+ 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
+ ];
}
}
diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart
index b762b65c7..786c56658 100644
--- a/lib/src/screens/dashboard/widgets/action_button.dart
+++ b/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,
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 6b34a9bb1..8b1d46264 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.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"
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 304b95b5b..29599ede3 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.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"
diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh
index f049933bf..325d2b335 100755
--- 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.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."
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index e54a7bfe0..f554d4d01 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.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
diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss
index 40c2a8af5..b2dd60130 100644
--- a/scripts/windows/build_exe_installer.iss
+++ b/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"