diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 34f805b90..551d775ef 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,2 +1,2 @@ -In-app Cake Pay is Back -Bug fixes and generic enhancements \ No newline at end of file +Monero enhancements +Bug fixes \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index dcaf59665..551d775ef 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,3 +1,2 @@ -In-app Cake Pay is Back -Bitcoin nodes stability enhancements -Bug fixes and generic enhancements \ No newline at end of file +Monero enhancements +Bug fixes \ No newline at end of file diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index d31888987..1ca7fc85b 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -438,9 +438,9 @@ packages: dependency: "direct main" description: path: "." - ref: "200ad221441c6481439c966288b6e8834769ed21" - resolved-ref: "200ad221441c6481439c966288b6e8834769ed21" - url: "https://git.mrcyjanek.net/mrcyjanek/monero.dart" + ref: d46753eca865e9e56c2f0ef6fe485c42e11982c5 + resolved-ref: d46753eca865e9e56c2f0ef6fe485c42e11982c5 + url: "https://github.com/mrcyjanek/monero.dart" source: git version: "0.0.0" mutex: diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart index 288862ce7..8b4074d08 100644 --- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart @@ -194,10 +194,11 @@ class WalletRestoreFromSeedFormState extends State { ), if (!isPolyseed && widget.displayBlockHeightSelector) BlockchainHeightWidget( - focusNode: widget.blockHeightFocusNode, - key: blockchainHeightKey, - onHeightOrDateEntered: widget.onHeightOrDateEntered, - hasDatePicker: widget.type == WalletType.monero), + focusNode: widget.blockHeightFocusNode, + key: blockchainHeightKey, + onHeightOrDateEntered: widget.onHeightOrDateEntered, + hasDatePicker: widget.type == WalletType.monero || widget.type == WalletType.wownero, + ), if (widget.displayPassphrase) ...[ const SizedBox(height: 10), BaseTextFormField( @@ -209,7 +210,9 @@ class WalletRestoreFromSeedFormState extends State { ])); } - bool get isPolyseed => widget.seedTypeViewModel.moneroSeedType == SeedType.polyseed; + bool get isPolyseed => + widget.seedTypeViewModel.moneroSeedType == SeedType.polyseed && + widget.type == WalletType.monero; Widget get expandIcon => Container( padding: EdgeInsets.all(18), diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 974e44bc4..7d52d42bb 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.15.2" -MONERO_COM_BUILD_NUMBER=90 +MONERO_COM_VERSION="1.16.0" +MONERO_COM_BUILD_NUMBER=91 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.18.2" -CAKEWALLET_BUILD_NUMBER=250 +CAKEWALLET_VERSION="4.19.0" +CAKEWALLET_BUILD_NUMBER=251 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven"