Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password

assets/text/Monerocom_Release_Notes.txt

@@ -1,2 +1,5 @@
-Bug fixes
+Ability to Auto generate new Monero subaddress when used
-Fiat Onramp improvements
+Coin Control for Monero
+In-app Live Chat support
+Additional themes
+Bug Fixes and performance enhancements

assets/text/Release_Notes.txt

@@ -1,2 +1,6 @@
-Bug fixes
+Restore Ethereum from private key and QR
-Fiat Onramp improvements
+Ability to Auto generate new Monero subaddress when used
+Coin Control for Monero
+In-app Live Chat support
+Additional themes
+Bug Fixes and performance enhancements

ios/Podfile.lock

@@ -8,25 +8,6 @@ PODS:
     - Flutter
     - ReachabilitySwift
   - CryptoSwift (1.7.1)
-  - cw_haven (0.0.1):
-    - cw_haven/Boost (= 0.0.1)
-    - cw_haven/Haven (= 0.0.1)
-    - cw_haven/OpenSSL (= 0.0.1)
-    - cw_haven/Sodium (= 0.0.1)
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Boost (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Haven (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/OpenSSL (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Sodium (0.0.1):
-    - cw_shared_external
-    - Flutter
   - cw_monero (0.0.2):
     - cw_monero/Boost (= 0.0.2)
     - cw_monero/Monero (= 0.0.2)
@@ -159,7 +140,6 @@ DEPENDENCIES:
   - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - CryptoSwift
-  - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
   - cw_monero (from `.symlinks/plugins/cw_monero/ios`)
   - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
   - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
@@ -205,8 +185,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/barcode_scan2/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  cw_haven:
-    :path: ".symlinks/plugins/cw_haven/ios"
   cw_monero:
     :path: ".symlinks/plugins/cw_monero/ios"
   cw_shared_external:
@@ -261,7 +239,6 @@ SPEC CHECKSUMS:
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
   connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
   CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
-  cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
   cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
   cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
   device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7

ios/Runner.xcodeproj/project.pbxproj

@@ -227,6 +227,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

lib/src/screens/settings/display_settings_page.dart

@@ -21,7 +21,8 @@ class DisplaySettingsPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    return Observer(builder: (_) {
+    return SingleChildScrollView(
+      child: Observer(builder: (_) {
         return Container(
           padding: EdgeInsets.only(top: 10),
           child: Column(
@@ -79,6 +80,7 @@ class DisplaySettingsPage extends BasePage {
             ],
           ),
         );
-    });
+      }),
+    );
   }
 }

lib/src/screens/support/widgets/support_tiles.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:flutter/material.dart';
 
@@ -44,7 +45,7 @@ class SupportTile extends StatelessWidget {
                       style: TextStyle(
                         fontSize: 20,
                         fontWeight: FontWeight.w500,
-                        color: Theme.of(context).dialogTheme.backgroundColor,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       ),
                     ),
                     Padding(

lib/src/widgets/search_bar_widget.dart

@@ -17,7 +17,7 @@ class SearchBarWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return TextFormField(
       controller: searchController,
-      style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchTextColor),
+      style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
       decoration: InputDecoration(
         hintText: hintText ?? S.of(context).search_currency,
         hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),

lib/view_model/unspent_coins/unspent_coins_list_view_model.dart

@@ -3,11 +3,9 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/entities/unspent_transaction_output.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_item.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
-import 'package:cw_monero/monero_wallet.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 

scripts/android/app_env.sh

@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.5.1"
+MONERO_COM_VERSION="1.6.0"
-MONERO_COM_BUILD_NUMBER=55
+MONERO_COM_BUILD_NUMBER=56
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.8.1"
+CAKEWALLET_VERSION="4.9.0"
-CAKEWALLET_BUILD_NUMBER=168
+CAKEWALLET_BUILD_NUMBER=169
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 

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.5.1"
+MONERO_COM_VERSION="1.6.0"
-MONERO_COM_BUILD_NUMBER=53
+MONERO_COM_BUILD_NUMBER=54
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.8.1"
+CAKEWALLET_VERSION="4.9.0"
-CAKEWALLET_BUILD_NUMBER=176
+CAKEWALLET_BUILD_NUMBER=178
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/macos/app_env.sh

@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.1.1"
+CAKEWALLET_VERSION="1.2.0"
-CAKEWALLET_BUILD_NUMBER=30
+CAKEWALLET_BUILD_NUMBER=31
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then