Merge pull request #451 from polkawallet-io/develop

release 3681
polkawallet-io · Aug 9, 2024 · 8d1fade · 8d1fade
2 parents 111956a + 978b58a
commit 8d1fade
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# [3.6.8-beta]
+20240809
+1. evm account import/delete fix.
+
 # [3.6.7-beta]
 20240708
 1. polkadot/kusama staking reward display fix.

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -354,7 +354,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3671;
+				CURRENT_PROJECT_VERSION = 3681;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -373,7 +373,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.7;
+				MARKETING_VERSION = 3.6.8;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -502,7 +502,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3671;
+				CURRENT_PROJECT_VERSION = 3681;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -521,7 +521,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.7;
+				MARKETING_VERSION = 3.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -543,7 +543,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3671;
+				CURRENT_PROJECT_VERSION = 3681;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -562,7 +562,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.7;
+				MARKETING_VERSION = 3.6.8;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/lib/pages/account/import/importAccountFromRawSeed.dart b/lib/pages/account/import/importAccountFromRawSeed.dart
@@ -150,7 +150,8 @@ class _ImportAccountFromRawSeedState extends State<ImportAccountFromRawSeed> {
         passed = true;
       }
     } else {
-      if (input.startsWith('0x') && input.length == 66) {
+      if ((input.startsWith('0x') && input.length == 66) ||
+          (!input.startsWith('0x') && input.length == 64)) {
         passed = true;
       }
     }

diff --git a/lib/pages/profile/account/accountManagePage.dart b/lib/pages/profile/account/accountManagePage.dart
@@ -38,10 +38,10 @@ class _AccountManagePageState extends State<AccountManagePage> {
   BiometricStorageFile _authStorage;
 
   Future<void> _onDeleteAccount(BuildContext context) async {
-    final password = await widget.service.account
-        .getPassword(context, widget.service.keyring.current);
-    if (password != null) {
-      if (widget.service.store.account.accountType == AccountType.Substrate) {
+    if (widget.service.store.account.accountType == AccountType.Substrate) {
+      final password = await widget.service.account
+          .getPassword(context, widget.service.keyring.current);
+      if (password != null) {
         widget.service.plugin.sdk.api.keyring
             .deleteAccount(
                 widget.service.keyring, widget.service.keyring.current)
@@ -50,7 +50,11 @@ class _AccountManagePageState extends State<AccountManagePage> {
           widget.service.account
               .handleAccountChanged(widget.service.keyring.current);
         });
-      } else {
+      }
+    } else {
+      final password = await widget.service.account
+          .getEvmPassword(context, widget.service.keyringEVM.current);
+      if (password != null) {
         widget.service.plugin.sdk.api.eth.keyring
             .deleteAccount(
                 widget.service.keyringEVM, widget.service.keyringEVM.current)
@@ -59,8 +63,8 @@ class _AccountManagePageState extends State<AccountManagePage> {
               widget.service.keyringEVM.current.toKeyPairData());
         });
       }
-      Navigator.of(context).pop();
     }
+    Navigator.of(context).pop();
   }
 
   Future<void> _updateBiometricAuth(bool enable) async {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 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: 3.6.7+3671
+version: 3.6.8+3681
 
 environment:
   sdk: ">=2.10.0 <3.0.0"