Merge pull request #449 from polkawallet-io/develop

release 0661
polkawallet-io · Jul 8, 2024 · 9a2da41 · 9a2da41
2 parents 0e17d68 + e1f3772
commit 9a2da41
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [3.6.6-beta]
+20240708
+1. bridge module update.
+2. acala/karura NFT display fix.
+3. DOT transfer history fix.
+
 # [3.6.5-beta]
 20240521
 1. acala EVM address binding page fix.

diff --git a/lib/pages/bridge/bridgePage.dart b/lib/pages/bridge/bridgePage.dart
@@ -392,7 +392,7 @@ class _BridgePageState extends State<BridgePage> {
   }
 
   Future<String> _checkAccountTo(KeyPairData acc) async {
-    if (_props == null) return null;
+    if (_props == null || _useAnyAccount()) return null;
 
     final error =
         I18n.of(context).getDic(i18n_full_dic_ui, 'account')['ss58.mismatch'];
@@ -551,10 +551,12 @@ class _BridgePageState extends State<BridgePage> {
   }
 
   bool _useEVMAccount() {
-    return _chainTo == 'moonriver' ||
-        _chainTo == 'moonbeam' ||
-        ((_chainTo == 'acala' || _chainTo == 'karura') &&
-            _acalaEVMTokens.contains(_token));
+    return _chainTo == 'moonriver' || _chainTo == 'moonbeam';
+  }
+
+  bool _useAnyAccount() {
+    return (_chainTo == 'acala' || _chainTo == 'karura') &&
+        _acalaEVMTokens.contains(_token);
   }
 
   @override
@@ -656,11 +658,12 @@ class _BridgePageState extends State<BridgePage> {
                                         widget.service.plugin.sdk.api,
                                         widget.service.keyring.allWithContacts
                                             .toList(),
-                                        localEthAccounts: _useEVMAccount()
-                                            ? widget.service.keyringEVM
-                                                .allWithContacts
-                                                .toList()
-                                            : null,
+                                        localEthAccounts:
+                                            _useEVMAccount() || _useAnyAccount()
+                                                ? widget.service.keyringEVM
+                                                    .allWithContacts
+                                                    .toList()
+                                                : null,
                                         sdk: widget.service.plugin.sdk,
                                         labelText: dic['hub.to.address'],
                                         labelStyle: Theme.of(context)

diff --git a/pubspec.lock b/pubspec.lock
@@ -1019,8 +1019,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "92b2fd8cfc0a60695faa3377ad62b23536d35e3a"
-      resolved-ref: "92b2fd8cfc0a60695faa3377ad62b23536d35e3a"
+      ref: "9d8651921a3268bd1c5b40d55ab8e27eab90a6c3"
+      resolved-ref: "9d8651921a3268bd1c5b40d55ab8e27eab90a6c3"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
     source: git
     version: "0.5.6"
@@ -1064,17 +1064,17 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: a61773da1e19c0a83cbc3ba8d2d3058fb589e6a0
-      resolved-ref: a61773da1e19c0a83cbc3ba8d2d3058fb589e6a0
+      ref: "4d4400f5742cc8514392267c245d19c529a1ccba"
+      resolved-ref: "4d4400f5742cc8514392267c245d19c529a1ccba"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
     source: git
     version: "0.5.6"
   polkawallet_plugin_kusama:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6693774b1c30731c2e09d77707a74edca3c6d0de"
-      resolved-ref: "6693774b1c30731c2e09d77707a74edca3c6d0de"
+      ref: "056acdb6ca84846eedae14d18eddd0062e667057"
+      resolved-ref: "056acdb6ca84846eedae14d18eddd0062e667057"
       url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
     source: git
     version: "0.5.2"
@@ -1100,10 +1100,10 @@ packages:
     dependency: "direct main"
     description:
       name: polkawallet_sdk
-      sha256: c53cd369adf81b12f03dd42df4174da63d77436c107bf262011f9b5e7b2dcd6d
+      sha256: fab475543adcd772977970ba857ad9adc426afec52f2900ca453d8f3f5122486
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0+1"
+    version: "0.6.1"
   polkawallet_ui:
     dependency: "direct main"
     description:

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.5+3651
+version: 3.6.6+3661
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -51,15 +51,15 @@ dependencies:
   polkawallet_plugin_kusama:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
-      ref: 6693774b1c30731c2e09d77707a74edca3c6d0de
+      ref: 056acdb6ca84846eedae14d18eddd0062e667057
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: 92b2fd8cfc0a60695faa3377ad62b23536d35e3a
+      ref: 9d8651921a3268bd1c5b40d55ab8e27eab90a6c3
   polkawallet_plugin_karura:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
-      ref: a61773da1e19c0a83cbc3ba8d2d3058fb589e6a0
+      ref: 4d4400f5742cc8514392267c245d19c529a1ccba
   polkawallet_plugin_evm:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
@@ -112,7 +112,7 @@ dependency_overrides:
 #  polkawallet_plugin_evm:
 #    path: ../../coding/polkawallet/polkawallet_plugin_evm
   polkawallet_ui: ^0.5.5+2
-  polkawallet_sdk: ^0.6.0+1
+  polkawallet_sdk: ^0.6.1
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk: