From f928eaf1a99118f5bfc5a4688d658f90c2d94720 Mon Sep 17 00:00:00 2001 From: shawn Date: Wed, 7 Aug 2024 23:57:07 +0800 Subject: [PATCH 1/2] fix evm account import&delete --- .../account/import/importAccountFromRawSeed.dart | 3 ++- lib/pages/profile/account/accountManagePage.dart | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/pages/account/import/importAccountFromRawSeed.dart b/lib/pages/account/import/importAccountFromRawSeed.dart index 4868bc86..a0e925b3 100644 --- a/lib/pages/account/import/importAccountFromRawSeed.dart +++ b/lib/pages/account/import/importAccountFromRawSeed.dart @@ -150,7 +150,8 @@ class _ImportAccountFromRawSeedState extends State { 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 index c1160f08..8a1f1db6 100644 --- a/lib/pages/profile/account/accountManagePage.dart +++ b/lib/pages/profile/account/accountManagePage.dart @@ -38,10 +38,10 @@ class _AccountManagePageState extends State { BiometricStorageFile _authStorage; Future _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 { 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 { widget.service.keyringEVM.current.toKeyPairData()); }); } - Navigator.of(context).pop(); } + Navigator.of(context).pop(); } Future _updateBiometricAuth(bool enable) async { From 978b58af80e2e246ea0a46489345109eec61d7c4 Mon Sep 17 00:00:00 2001 From: shawn Date: Fri, 9 Aug 2024 11:55:08 +0800 Subject: [PATCH 2/2] release 3681 --- CHANGELOG.md | 4 ++++ ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ pubspec.yaml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60b0d94f..028de63b 100644 --- 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 index 1df75970..10662be4 100644 --- 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/pubspec.yaml b/pubspec.yaml index 7f31d25b..e9d6d2a6 100644 --- 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"