diff --git a/CHANGELOG.md b/CHANGELOG.md index 630224a3..ff01ff27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [3.6.5-beta] +20240521 +1. acala EVM address binding page fix. + # [3.6.4-beta] 20240516 1. acala EVM address binding fix. diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8cc59b02..272ca8be 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 = 3641; + CURRENT_PROJECT_VERSION = 3651; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -373,7 +373,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.6.4; + MARKETING_VERSION = 3.6.5; 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 = 3641; + CURRENT_PROJECT_VERSION = 3651; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -521,7 +521,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.6.4; + MARKETING_VERSION = 3.6.5; 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 = 3641; + CURRENT_PROJECT_VERSION = 3651; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -562,7 +562,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.6.4; + MARKETING_VERSION = 3.6.5; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/pages/account/bind/accountBindStep2.dart b/lib/pages/account/bind/accountBindStep2.dart index a15d951e..b4b2f15f 100644 --- a/lib/pages/account/bind/accountBindStep2.dart +++ b/lib/pages/account/bind/accountBindStep2.dart @@ -3,15 +3,15 @@ import 'package:app/service/index.dart'; import 'package:app/utils/i18n/index.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:polkawallet_plugin_evm/polkawallet_plugin_evm.dart'; import 'package:polkawallet_sdk/storage/types/ethWalletData.dart'; import 'package:polkawallet_sdk/storage/types/keyPairData.dart'; import 'package:polkawallet_sdk/utils/i18n.dart'; -import 'package:polkawallet_ui/utils/i18n.dart'; -import 'package:polkawallet_ui/utils/index.dart'; import 'package:polkawallet_ui/components/v3/button.dart'; import 'package:polkawallet_ui/components/v3/dialog.dart'; import 'package:polkawallet_ui/utils/format.dart'; -import 'package:polkawallet_plugin_evm/polkawallet_plugin_evm.dart'; +import 'package:polkawallet_ui/utils/i18n.dart'; +import 'package:polkawallet_ui/utils/index.dart'; class AccountBindStep2 extends StatefulWidget { const AccountBindStep2( @@ -44,14 +44,8 @@ class _AccountBindStep2State extends State { _submitting = true; }); - // todo: remove testnet before release Map res = await widget.service.account.evmSignMessage( - // isAcala - // ? metamask_acala_params - // : metamask_karura_params, - isAcala - ? metamask_acala_testnet_params - : metamask_karura_testnet_params, + isAcala ? metamask_acala_params : metamask_karura_params, widget.keyPairData.pubKey, widget.ethWalletData.address, password); diff --git a/pubspec.yaml b/pubspec.yaml index 20f7b8cb..6be183e1 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.4+3641 +version: 3.6.5+3651 environment: sdk: ">=2.10.0 <3.0.0"