add unbonding time left display

& fix acala data bug
polkawallet-io · Sep 11, 2020 · 9102197 · 9102197
1 parent db15d1b
commit 9102197
Show file tree

Hide file tree

Showing 17 changed files with 520 additions and 294 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.1
+- add unbonding time left display
+- fix acala data bug
+
 # 1.0.0
 - rebuild staking module & update nominees list
 - add validator sort type: judgements

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -396,7 +396,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -518,7 +518,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -531,7 +531,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -548,7 +548,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -561,7 +561,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/lib/common/consts/settings.dart b/lib/common/consts/settings.dart
@@ -148,8 +148,8 @@ const String cross_chain_transfer_address_laminar =
     '5CLaminarAUSDCrossChainTransferxxxxxxxxxxxxxwisu';
 
 /// app versions
-const String app_beta_version = 'v1.0.0-beta.5';
-const int app_beta_version_code = 1005;
+const String app_beta_version = 'v1.0.1-beta.1';
+const int app_beta_version_code = 1011;
 
 /// js code versions
 const Map<String, int> js_code_version_map = {

diff --git a/lib/js_service_acala/package.json b/lib/js_service_acala/package.json
@@ -8,9 +8,20 @@
     "build": "webpack -p --mode production",
     "build-dev": "webpack -d --mode development"
   },
+  "resolutions": {
+    "@acala-network/api": "v0.4.0-beta.0",
+    "@acala-network/app-util": "v0.4.0-beta.0",
+    "@acala-network/api-derive": "v0.4.0-beta.0",
+    "@acala-network/types": "v0.4.0-beta.0",
+    "@acala-network/type-definitions": "^0.4.0-beta.0",
+    "@polkadot/api": "1.29.1"
+  },
   "dependencies": {
-    "@acala-network/api": "beta",
-    "@acala-network/app-util": "beta",
+    "@acala-network/api": "v0.4.0-beta.0",
+    "@acala-network/app-util": "v0.4.0-beta.0",
+    "@acala-network/api-derive": "v0.4.0-beta.0",
+    "@acala-network/types": "v0.4.0-beta.0",
+    "@acala-network/type-definitions": "^0.4.0-beta.0",
     "@babel/polyfill": "^7.8.3",
     "@polkadot/api": "^1.18.1",
     "@polkadot/keyring": "^3.1.0-beta.0",