Merge pull request #441 from polkawallet-io/develop

release 3611

ios/Runner.xcodeproj/project.pbxproj

@@ -352,7 +352,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3601;
+				CURRENT_PROJECT_VERSION = 3611;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -371,7 +371,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -500,7 +500,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3601;
+				CURRENT_PROJECT_VERSION = 3611;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -519,7 +519,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -541,7 +541,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3601;
+				CURRENT_PROJECT_VERSION = 3611;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -560,7 +560,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

lib/pages/bridge/bridgePage.dart

@@ -189,7 +189,7 @@ class _BridgePageState extends State<BridgePage> {
             ? _token
             : _tokensMap[_chainFrom + _chainTo].first);
     if (address != null) {
-      _updateAccountTo(address);
+      _updateAccountTo(null, address);
     }
 
     setState(() {
@@ -200,9 +200,11 @@ class _BridgePageState extends State<BridgePage> {
     _subscribeBalance();
   }
 
-  Future<void> _updateAccountTo(String address) async {
-    final acc = KeyPairData();
-    acc.address = address;
+  Future<void> _updateAccountTo(KeyPairData account, String address) async {
+    final acc = account ?? KeyPairData();
+    if (address != null) {
+      acc.address = address;
+    }
     setState(() {
       _accountTo = acc;
     });
@@ -212,8 +214,7 @@ class _BridgePageState extends State<BridgePage> {
       _checkAccountTo(acc),
     ]);
     if (res != null && res[0] != null) {
-      final accWithIcon = KeyPairData();
-      accWithIcon.address = address;
+      final accWithIcon = acc;
 
       final List icon = res[0];
       accWithIcon.icon = icon[0][1];
@@ -327,7 +328,7 @@ class _BridgePageState extends State<BridgePage> {
   }
 
   void _changeChain(String from, String to) {
-    _updateAccountTo(widget.service.keyring.current.address);
+    _updateAccountTo(widget.service.keyring.current, null);
 
     if (_chainFrom != from) _fromChange(from);
     if (_chainTo != to) _toChange(to);
@@ -396,7 +397,7 @@ class _BridgePageState extends State<BridgePage> {
       return null;
     }
 
-    if (!acc.address.startsWith('0x')) {
+    if (acc.address?.startsWith('0x') == false) {
       final error =
           I18n.of(context).getDic(i18n_full_dic_ui, 'account')['ss58.mismatch'];
       final res = await widget.service.plugin.sdk.api.bridge

pubspec.lock

@@ -1019,8 +1019,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "5288ed118e845744943494301fa1b25ea24fa891"
-      resolved-ref: "5288ed118e845744943494301fa1b25ea24fa891"
+      ref: "98afd44f9da52ea073edc54cdfdb83396de10ac0"
+      resolved-ref: "98afd44f9da52ea073edc54cdfdb83396de10ac0"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
     source: git
     version: "0.5.6"
@@ -1055,17 +1055,17 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "27b7f26aa0ecacdf18f90b2764fd914e308b4ca6"
-      resolved-ref: "27b7f26aa0ecacdf18f90b2764fd914e308b4ca6"
+      ref: "4fc686f886945491ebdfff77d91992d108537947"
+      resolved-ref: "4fc686f886945491ebdfff77d91992d108537947"
       url: "https://github.com/polkawallet-io/polkawallet_plugin_evm.git"
     source: git
     version: "0.0.1"
   polkawallet_plugin_karura:
     dependency: "direct main"
     description:
       path: "."
-      ref: "51470fd1af4ba3c421a92fa7e2201d32e328ae2e"
-      resolved-ref: "51470fd1af4ba3c421a92fa7e2201d32e328ae2e"
+      ref: "1952901b1e2b3a7f8ac954452be8ea41bb8dabfe"
+      resolved-ref: "1952901b1e2b3a7f8ac954452be8ea41bb8dabfe"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
     source: git
     version: "0.5.6"
@@ -1100,10 +1100,10 @@ packages:
     dependency: "direct main"
     description:
       name: polkawallet_sdk
-      sha256: "1f6ff555636a7d0c29f5d5e9eeac29df340a201d67c4fc391c455feb67f7b928"
+      sha256: ad7482c43c5495f1cedbadea22791e90dd677d1044fd5ad220fb02f2ba7b162b
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.8+4"
+    version: "0.5.8+8"
   polkawallet_ui:
     dependency: "direct main"
     description:

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.0+3601
+version: 3.6.1+3611
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -55,15 +55,15 @@ dependencies:
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: 5288ed118e845744943494301fa1b25ea24fa891
+      ref: 98afd44f9da52ea073edc54cdfdb83396de10ac0
   polkawallet_plugin_karura:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
-      ref: 51470fd1af4ba3c421a92fa7e2201d32e328ae2e
+      ref: 1952901b1e2b3a7f8ac954452be8ea41bb8dabfe
   polkawallet_plugin_evm:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
-      ref: 27b7f26aa0ecacdf18f90b2764fd914e308b4ca6
+      ref: 4fc686f886945491ebdfff77d91992d108537947
   polkawallet_plugin_statemine:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_statemine.git
@@ -112,7 +112,7 @@ dependency_overrides:
 #  polkawallet_plugin_evm:
 #    path: ../../coding/polkawallet/polkawallet_plugin_evm
   polkawallet_ui: ^0.5.5+1
-  polkawallet_sdk: ^0.5.8+4
+  polkawallet_sdk: ^0.5.8+8
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk: