merge branch develop

polkawallet-io · Jun 4, 2021 · 680a023 · 680a023
2 parents 8b168dc + 24e0388
commit 680a023
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,4 +41,14 @@
 - Remove Kusama council module.
 - Update Edgeware Update.
 - Update ChainX plugin.
+- Fix known Bugs.
+
+# 2.0.6-beta
+- Update kar crowd loan flow.
+
+# 2.0.7-beta
+- Add Acala loan incentives.
+- Update Kusama/Polkadot plugin.
+- Edgeware plugin update.
+- Update kar crowdloan flow.
 - Fix known Bugs.
diff --git a/assets/images/public/github_logo.svg b/assets/images/public/github_logo.svg
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 = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				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 = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				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 = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/lib/common/consts.dart b/lib/common/consts.dart
@@ -20,6 +20,16 @@ const local_tx_store_key = 'local_tx_store';
 enum BuildTargets { apk, playStore, dev }
 const String app_beta_version = 'v2.0.7-beta.5';
 const int app_beta_version_code = 2075;
+const plugin_github_links = {
+  'kusama': 'https://github.com/polkawallet-io/app/issues',
+  'polkadot': 'https://github.com/polkawallet-io/app/issues',
+  'acala-tc6':
+      'https://github.com/AcalaNetwork/polkawallet_plugin_acala/issues',
+  'laminar-tc3':
+      'https://github.com/polkawallet-io/polkawallet_plugin_laminar/issues',
+  'chainx': 'https://github.com/true-eye/polkawallet_plugin_chainx/issues',
+  'edgeware': 'https://github.com/remzrn/polkawallet_plugin_edgeware/issues',
+};
 
 const show_guide_status_key = 'show_guide_status';
 const show_banner_status_key = 'show_banner_status';
diff --git a/lib/main-google.dart b/lib/main-google.dart
@@ -1,13 +1,12 @@
 import 'package:app/app.dart';
 import 'package:app/common/consts.dart';
 import 'package:flutter/material.dart';
-import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:polkawallet_plugin_acala/polkawallet_plugin_acala.dart';
-// import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
 // import 'package:polkawallet_plugin_chainx/polkawallet_plugin_chainx.dart';
-// import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
-
-import 'package:get_storage/get_storage.dart';
+import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
+import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
+import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
 
 void main() async {
   await GetStorage.init(get_storage_container);
@@ -16,9 +15,9 @@ void main() async {
     PluginKusama(name: 'polkadot'),
     PluginKusama(),
     PluginAcala(),
-    // PluginLaminar(),
+    PluginLaminar(),
     // PluginChainX(),
-    // PluginEdgeware(),
+    PluginEdgeware(),
   ];
 
   runApp(WalletApp(_plugins, BuildTargets.playStore));

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,13 +1,12 @@
 import 'package:app/app.dart';
 import 'package:app/common/consts.dart';
 import 'package:flutter/material.dart';
-import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:polkawallet_plugin_acala/polkawallet_plugin_acala.dart';
-import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
 // import 'package:polkawallet_plugin_chainx/polkawallet_plugin_chainx.dart';
-// import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
-
-import 'package:get_storage/get_storage.dart';
+import 'package:polkawallet_plugin_edgeware/polkawallet_plugin_edgeware.dart';
+import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
+import 'package:polkawallet_plugin_laminar/polkawallet_plugin_laminar.dart';
 
 void main() async {
   await GetStorage.init(get_storage_container);
@@ -18,7 +17,7 @@ void main() async {
     PluginAcala(),
     PluginLaminar(),
     // PluginChainX(),
-    // PluginEdgeware(),
+    PluginEdgeware(),
   ];
 
   runApp(WalletApp(_plugins, BuildTargets.apk));

diff --git a/lib/pages/profile/aboutPage.dart b/lib/pages/profile/aboutPage.dart
@@ -5,9 +5,11 @@ import 'package:app/utils/UI.dart';
 import 'package:app/utils/i18n/index.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:polkawallet_sdk/utils/i18n.dart';
 import 'package:polkawallet_ui/components/jumpToBrowserLink.dart';
 import 'package:polkawallet_ui/components/roundedButton.dart';
+import 'package:polkawallet_ui/utils/format.dart';
 
 class AboutPage extends StatefulWidget {
   AboutPage(this.service);
@@ -41,6 +43,7 @@ class _AboutPage extends State<AboutPage> {
         widget.service.store.storage,
         widget.service.plugin.basic.name,
         widget.service.plugin.basic.jsCodeVersion);
+    final githubLink = plugin_github_links[widget.service.plugin.basic.name];
     return Scaffold(
       backgroundColor: Theme.of(context).cardColor,
       appBar: AppBar(
@@ -71,6 +74,20 @@ class _AboutPage extends State<AboutPage> {
                 child: JumpToBrowserLink('https://polkawallet.io'),
               ),
             ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Container(
+                  margin: EdgeInsets.only(right: 4),
+                  child:
+                      SvgPicture.asset('assets/images/public/github_logo.svg'),
+                ),
+                JumpToBrowserLink(
+                  githubLink,
+                  text: Fmt.address(githubLink, pad: 16),
+                ),
+              ],
+            ),
             Padding(
               padding: EdgeInsets.all(8),
               child: Text('${dic['about.version']}: $app_beta_version'),