From 643da68048ddb1dab0b6718050fb711ca1757c10 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Wed, 12 May 2021 18:06:39 +0300
Subject: [PATCH] Minor bug fixes. 4.2.1.

---
 ios/Runner.xcodeproj/project.pbxproj                 | 12 ++++++------
 .../bitcoin_mnemonic_is_incorrect_exception.dart     |  2 +-
 lib/bitcoin/electrum_transaction_history.dart        |  2 +-
 lib/entities/wallet_type.dart                        |  2 +-
 pubspec.yaml                                         |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 79c69b9ed..27704e6a2 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -362,7 +362,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -379,7 +379,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -505,7 +505,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -522,7 +522,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -540,7 +540,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -557,7 +557,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/lib/bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart b/lib/bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart
index 5171a4f05..8d0583ce5 100644
--- a/lib/bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart
+++ b/lib/bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart
@@ -1,5 +1,5 @@
 class BitcoinMnemonicIsIncorrectException implements Exception {
   @override
   String toString() =>
-      'Bitcoin mnemonic has incorrect format. Mnemonic should contain 24 words separated by space.';
+      'Bitcoin mnemonic has incorrect format. Mnemonic should contain 12 or 24 words separated by space.';
 }
diff --git a/lib/bitcoin/electrum_transaction_history.dart b/lib/bitcoin/electrum_transaction_history.dart
index 1d5e894c0..2aabf1304 100644
--- a/lib/bitcoin/electrum_transaction_history.dart
+++ b/lib/bitcoin/electrum_transaction_history.dart
@@ -35,7 +35,7 @@ abstract class ElectrumTransactionHistoryBase
 
   @override
   void addMany(Map<String, ElectrumTransactionInfo> transactions) =>
-      this.transactions.addAll(transactions);
+      transactions.forEach((_, tx) => _updateOrInsert(tx));
 
   @override
   Future<void> save() async {
diff --git a/lib/entities/wallet_type.dart b/lib/entities/wallet_type.dart
index d59f336c0..b8a36e709 100644
--- a/lib/entities/wallet_type.dart
+++ b/lib/entities/wallet_type.dart
@@ -71,7 +71,7 @@ String walletTypeToDisplayName(WalletType type) {
     case WalletType.bitcoin:
       return 'Bitcoin (Electrum)';
     case WalletType.litecoin:
-      return 'Litecoin';
+      return 'Litecoin (Electrum)';
     default:
       return '';
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 27fb93b0d..136cf8610 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Cake Wallet.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 4.2.0+49
+version: 4.2.1+50
 
 environment:
   sdk: ">=2.7.0 <3.0.0"