Merge branch 'develop'

polkawallet-io · Mar 31, 2021 · 864ce4c · 864ce4c
2 parents 2b44b48 + 3c717f3
commit 864ce4c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 34 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -493,7 +493,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -526,7 +526,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/lib/common/consts.dart b/lib/common/consts.dart
@@ -14,8 +14,8 @@ const prefixList = [
 ];
 
 /// app versions
-const String app_beta_version = 'v2.0.1-beta.1';
-const int app_beta_version_code = 2011;
+const String app_beta_version = 'v2.0.1-beta.2';
+const int app_beta_version_code = 2012;
 
 const show_guide_status_key = 'show_guide_status';
 const show_banner_status_key = 'show_banner_status';
diff --git a/lib/pages/assets/transfer/transferPage.dart b/lib/pages/assets/transfer/transferPage.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:app/service/index.dart';
 import 'package:app/utils/i18n/index.dart';
 import 'package:flutter/cupertino.dart';

diff --git a/lib/pages/profile/account/signPage.dart b/lib/pages/profile/account/signPage.dart
@@ -13,7 +13,6 @@ import 'package:polkawallet_ui/components/infoItemRow.dart';
 import 'package:polkawallet_ui/components/roundedButton.dart';
 import 'package:polkawallet_ui/utils/i18n.dart';
 import 'package:polkawallet_ui/utils/index.dart';
-import 'package:polkawallet_ui/utils/regInputFormatter.dart';
 
 class SignMessagePage extends StatefulWidget {
   const SignMessagePage(this.service);
@@ -146,9 +145,6 @@ class _SignMessagePageState extends State<SignMessagePage>
                           labelText: dic['sign.data'],
                         ),
                         controller: _messageCtrl,
-                        inputFormatters: [
-                          RegExInputFormatter.withRegex(r'^(.*)$')
-                        ],
                         minLines: 1,
                         maxLines: 3,
                         validator: (v) {
@@ -211,9 +207,6 @@ class _SignMessagePageState extends State<SignMessagePage>
                           labelText: dic['sign.data'],
                         ),
                         controller: _messageVerifyCtrl,
-                        inputFormatters: [
-                          RegExInputFormatter.withRegex(r'^(.*)$')
-                        ],
                         minLines: 1,
                         maxLines: 3,
                         validator: (v) {
@@ -229,9 +222,6 @@ class _SignMessagePageState extends State<SignMessagePage>
                           labelText: dic['sign.verify'],
                         ),
                         controller: _signatureCtrl,
-                        inputFormatters: [
-                          RegExInputFormatter.withRegex(r'^(\w*)$')
-                        ],
                         minLines: 1,
                         maxLines: 3,
                         validator: (v) {

diff --git a/lib/pages/profile/recovery/createRecoveryPage.dart b/lib/pages/profile/recovery/createRecoveryPage.dart
@@ -15,7 +15,7 @@ import 'package:polkawallet_ui/components/txButton.dart';
 import 'package:polkawallet_ui/pages/txConfirmPage.dart';
 import 'package:polkawallet_ui/utils/format.dart';
 import 'package:polkawallet_ui/utils/i18n.dart';
-import 'package:polkawallet_ui/utils/regInputFormatter.dart';
+import 'package:polkawallet_ui/utils/index.dart';
 
 class CreateRecoveryPage extends StatefulWidget {
   CreateRecoveryPage(this.service);
@@ -265,8 +265,7 @@ ${dic['recovery.deposit.factor']} = ${Fmt.doubleFormat(_friendDepositFactor)} $s
                                   padding: EdgeInsets.fromLTRB(12, 3, 12, 3),
                                   placeholder: dic['recovery.custom'],
                                   inputFormatters: [
-                                    RegExInputFormatter.withRegex(
-                                        '^[0-9]{0,6}(\\.[0-9]{0,2})?\$')
+                                    UI.decimalInputFormatter(6)
                                   ],
                                   keyboardType: TextInputType.numberWithOptions(
                                     decimal: true,

diff --git a/pubspec.lock b/pubspec.lock
@@ -671,26 +671,26 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "9da6a0b31330bde27fb29084c8ec553890e6f53d"
-      resolved-ref: "9da6a0b31330bde27fb29084c8ec553890e6f53d"
+      ref: "5da386794c2e85e0ea55e0ea09b25d57446668aa"
+      resolved-ref: "5da386794c2e85e0ea55e0ea09b25d57446668aa"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
     source: git
     version: "0.1.3"
   polkawallet_plugin_kusama:
     dependency: "direct main"
     description:
       path: "."
-      ref: e864b0f5b253ec02efc080484c785adf904ba714
-      resolved-ref: e864b0f5b253ec02efc080484c785adf904ba714
+      ref: "3f2a1119b7408a5166c8d92ba57e93938331aeda"
+      resolved-ref: "3f2a1119b7408a5166c8d92ba57e93938331aeda"
       url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
     source: git
-    version: "0.1.3"
+    version: "0.1.4"
   polkawallet_plugin_laminar:
     dependency: "direct main"
     description:
       path: "."
-      ref: "614e42d5eba0c8cfb6b6263c31a3adac01694e72"
-      resolved-ref: "614e42d5eba0c8cfb6b6263c31a3adac01694e72"
+      ref: b115aa0ab5b341bcfa3b7f5e239ed22f2026f82b
+      resolved-ref: b115aa0ab5b341bcfa3b7f5e239ed22f2026f82b
       url: "https://github.com/polkawallet-io/polkawallet_plugin_laminar.git"
     source: git
     version: "0.1.5"
@@ -705,8 +705,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: c73a6905201b9899522e99e01260d0a4919c177e
-      resolved-ref: c73a6905201b9899522e99e01260d0a4919c177e
+      ref: c4346ecf37f277d6b61480f4782a9e78c99c68e2
+      resolved-ref: c4346ecf37f277d6b61480f4782a9e78c99c68e2
       url: "https://github.com/polkawallet-io/ui.git"
     source: git
     version: "0.1.4"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,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: 2.0.1+2011
+version: 2.0.1+2012
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -35,22 +35,22 @@ dependencies:
   polkawallet_ui:
     git:
       url: https://github.com/polkawallet-io/ui.git
-      ref: c73a6905201b9899522e99e01260d0a4919c177e
+      ref: c4346ecf37f277d6b61480f4782a9e78c99c68e2
 #    path: ../../coding/polkawallet/ui
   polkawallet_plugin_kusama:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
-      ref: e864b0f5b253ec02efc080484c785adf904ba714
+      ref: 3f2a1119b7408a5166c8d92ba57e93938331aeda
 #    path: ../../coding/polkawallet/polkawallet_plugin_kusama
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: 9da6a0b31330bde27fb29084c8ec553890e6f53d
+      ref: 5da386794c2e85e0ea55e0ea09b25d57446668aa
 #    path: ../../coding/polkawallet/polkawallet_plugin_acala
   polkawallet_plugin_laminar:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_laminar.git
-      ref: 614e42d5eba0c8cfb6b6263c31a3adac01694e72
+      ref: b115aa0ab5b341bcfa3b7f5e239ed22f2026f82b
 #    path: ../../coding/polkawallet/polkawallet_plugin_laminar
 #  polkawallet_plugin_chainx:
 ##    git: