Merge pull request #152 from polkawallet-io/develop

release 3.2.8

CHANGELOG.md

@@ -1,3 +1,16 @@
+# [3.2.8-beta] - 20220602
+- karura new xcm #122
+- acala new xcm #121 #143
+- polkadot/kusama/statemine sdk polkadot.js upgrade ^8.5.1 #128
+- UI details tweaking #132
+- Optimized opening dAPP history refresh logic #139
+- Dot staking 全部解绑提示英文需换行，并限制 #141
+- Tx error message parsing #142
+- Vault adjust tx upgrade #146
+- Restake on STAKING stats panel #135
+- Filter(staked/all)earn-LP staking #81
+- EARN-Sort function #147
+
 # [3.2.7-beta] - 20220525
 - add dapps
 - karura/acala plugin:add cdp multiply

ios/Podfile.lock

@@ -293,4 +293,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 54d14ef5a14a0b3c64cc6d6bfeff28f02dcce905
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.0

ios/Runner.xcodeproj/project.pbxproj

@@ -367,7 +367,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3272;
+				CURRENT_PROJECT_VERSION = 3282;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -385,7 +385,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.2.8;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -514,7 +514,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3272;
+				CURRENT_PROJECT_VERSION = 3282;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -532,7 +532,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -554,7 +554,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3272;
+				CURRENT_PROJECT_VERSION = 3282;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -572,7 +572,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.2.8;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

lib/pages/browser/broswerApi.dart → lib/pages/browser/browserApi.dart

@@ -29,12 +29,13 @@ class BrowserApi {
     return [];
   }
 
-  static openBrowser(BuildContext context, dynamic dapp, AppService service) {
+  static Future openBrowser(
+      BuildContext context, dynamic dapp, AppService service) async {
     var dappLatest = getDappLatestStore(service);
     dappLatest.addAll({dapp["name"]: DateTime.now().toString()});
     service.store.storage.write(_dappLatestKey, dappLatest);
 
-    Navigator.of(context).pushNamed(
+    return await Navigator.of(context).pushNamed(
       DAppWrapperPage.route,
       arguments: {"url": dapp['detailUrl'], "isPlugin": true},
     );

lib/pages/browser/browserPage.dart

@@ -1,4 +1,4 @@
-import 'package:app/pages/browser/broswerApi.dart';
+import 'package:app/pages/browser/browserApi.dart';
 import 'package:app/pages/browser/browserSearch.dart';
 import 'package:app/pages/browser/dappLatestPage.dart';
 import 'package:app/service/index.dart';
@@ -191,8 +191,9 @@ class _BrowserPageState extends State<BrowserPage> {
                                       return GestureDetector(
                                           onTap: () {
                                             BrowserApi.openBrowser(
-                                                context, e, widget.service);
-                                            setState(() {});
+                                                    context, e, widget.service)
+                                                .then(
+                                                    (value) => setState(() {}));
                                           },
                                           child: Container(
                                             child: Column(
@@ -291,8 +292,8 @@ class _BrowserPageState extends State<BrowserPage> {
                             return GestureDetector(
                                 onTap: () {
                                   BrowserApi.openBrowser(
-                                      context, dapp, widget.service);
-                                  setState(() {});
+                                          context, dapp, widget.service)
+                                      .then((value) => setState(() {}));
                                 },
                                 child: Container(
                                   padding: EdgeInsets.all(8),

lib/pages/browser/browserSearch.dart

@@ -1,4 +1,4 @@
-import 'package:app/pages/browser/broswerApi.dart';
+import 'package:app/pages/browser/browserApi.dart';
 import 'package:app/pages/browser/search.dart';
 import 'package:app/service/index.dart';
 import 'package:app/utils/i18n/index.dart';

lib/pages/browser/dappLatestPage.dart

@@ -1,4 +1,4 @@
-import 'package:app/pages/browser/broswerApi.dart';
+import 'package:app/pages/browser/browserApi.dart';
 import 'package:app/service/index.dart';
 import 'package:app/utils/i18n/index.dart';
 import 'package:flutter/cupertino.dart';

lib/pages/ecosystem/converToPage.dart

@@ -443,10 +443,11 @@ class ErrorMessage extends StatelessWidget {
       child: error == null
           ? null
           : Row(children: [
-              Text(
+              Expanded(
+                  child: Text(
                 error,
                 style: TextStyle(fontSize: 12, color: Colors.red),
-              )
+              ))
             ]),
     );
   }

lib/utils/i18n/en/public.dart

@@ -111,7 +111,7 @@ const Map<String, String> enPublic = {
   'event.0515.10': 'Join Collateral Staking',
   'hub.cover.browser':
       'Browsing the website of different network by using your accounts from Polkawallet. You can entry the specific web directly through the feature “lastest”.',
-  'hub.browser': 'Broswer',
+  'hub.browser': 'Browser',
   'hub.browser.welcome':
       'Welcome to Polkawallet browser\nNavigate any network, anywhere, anytime',
   'hub.browser.search': 'Search or enter url....',

pubspec.lock

@@ -551,7 +551,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.23.0+1"
+    version: "1.0.3"
   flutter_swiper:
     dependency: transitive
     description:
@@ -803,12 +803,12 @@ packages:
     source: hosted
     version: "4.1.4"
   liquid_progress_indicator:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: liquid_progress_indicator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.2"
   logging:
     dependency: transitive
     description:
@@ -843,7 +843,7 @@ packages:
       name: mobx
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   mobx_codegen:
     dependency: "direct dev"
     description:
@@ -913,14 +913,14 @@ packages:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.1+1"
+    version: "1.0.0"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "1.0.0"
   path_provider:
     dependency: transitive
     description:
@@ -1015,11 +1015,9 @@ packages:
   polkawallet_plugin_acala:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "812d08edc2af15f1c4907b4bbe6999a20e6b985f"
-      resolved-ref: "812d08edc2af15f1c4907b4bbe6999a20e6b985f"
-      url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
-    source: git
+      path: "../../coding/polkawallet/polkawallet_plugin_acala"
+      relative: true
+    source: path
     version: "0.4.6"
   polkawallet_plugin_bifrost:
     dependency: "direct main"
@@ -1060,20 +1058,16 @@ packages:
   polkawallet_plugin_karura:
     dependency: "direct main"
     description:
-      path: "."
-      ref: cd55c3be640237b6749fda52a88501d8bfac3427
-      resolved-ref: cd55c3be640237b6749fda52a88501d8bfac3427
-      url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
-    source: git
+      path: "../../coding/polkawallet/polkawallet_plugin_karura"
+      relative: true
+    source: path
     version: "0.4.6"
   polkawallet_plugin_kusama:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "0d793bdbd95a76a3088b161d325de87a5db9da1d"
-      resolved-ref: "0d793bdbd95a76a3088b161d325de87a5db9da1d"
-      url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
-    source: git
+      path: "../../coding/polkawallet/polkawallet_plugin_kusama"
+      relative: true
+    source: path
     version: "0.4.6"
   polkawallet_plugin_laminar:
     dependency: "direct main"
@@ -1096,25 +1090,23 @@ packages:
   polkawallet_plugin_statemine:
     dependency: "direct main"
     description:
-      path: "."
-      ref: e2a9fc66914153a24b18a99c99b9895e96837c3f
-      resolved-ref: e2a9fc66914153a24b18a99c99b9895e96837c3f
-      url: "https://github.com/polkawallet-io/polkawallet_plugin_statemine.git"
-    source: git
+      path: "../../coding/polkawallet/polkawallet_plugin_statemine"
+      relative: true
+    source: path
     version: "0.4.6"
   polkawallet_sdk:
     dependency: "direct overridden"
     description:
-      name: polkawallet_sdk
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "../../coding/polkawallet/sdk"
+      relative: true
+    source: path
     version: "0.4.6"
   polkawallet_ui:
     dependency: "direct overridden"
     description:
-      name: polkawallet_ui
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "../../coding/polkawallet/ui"
+      relative: true
+    source: path
     version: "0.4.6"
   pool:
     dependency: transitive
@@ -1570,7 +1562,7 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.4"
   webview_flutter_android:
     dependency: transitive
     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.2.7+3272
+version: 3.2.8+3282
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -49,11 +49,11 @@ dependencies:
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: 812d08edc2af15f1c4907b4bbe6999a20e6b985f
+      ref: 06994d689d8a92e7621b0f89bd0a181024ecb8a1
   polkawallet_plugin_karura:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
-      ref: cd55c3be640237b6749fda52a88501d8bfac3427
+      ref: 03eb437bb059f5bc1e3988df5ac6bbca0e659bf9
   polkawallet_plugin_statemine:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_statemine.git
@@ -92,7 +92,7 @@ dependencies:
   #     url: https://github.com/polkawallet-io/flutter_bugly.git
   #     ref: da653ff78e269d011d1224e368e70703794601a1
   flutter_mobx: ^2.0.0
-  flutter_svg: ^0.23.0+1
+  flutter_svg: ^1.0.3
   card_swiper: ^2.0.3
   simple_shadow: ^0.2.0
   sticky_headers: ^0.2.0
@@ -106,8 +106,8 @@ dependency_overrides:
 #    path: ../../coding/polkawallet/polkawallet_plugin_karura
 #  polkawallet_plugin_statemine:
 #    path: ../../coding/polkawallet/polkawallet_plugin_statemine
-  polkawallet_ui: ^0.4.6
-  polkawallet_sdk: ^0.4.6
+  polkawallet_ui: ^0.4.7
+  polkawallet_sdk: ^0.4.7
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk:
@@ -120,9 +120,8 @@ dependency_overrides:
      git:
        url: https://github.com/google/charts
        path: charts_flutter
-  flutter_svg: ^0.23.0+1
-  liquid_progress_indicator: ^0.4.0
-  webview_flutter: ^3.0.0
+  flutter_svg: ^1.0.3
+  webview_flutter: ^3.0.4
   cached_network_image: ^3.2.0
   flutter_html: ^2.2.1
   flutter_slidable: ^1.2.0