From a0ddd502a906c73fff59651fecc28a4684445c3f Mon Sep 17 00:00:00 2001 From: shawn Date: Thu, 1 Dec 2022 16:16:08 +0800 Subject: [PATCH 1/3] bump jsCodeVersion for 33502 update --- lib/polkawallet_plugin_kusama.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/polkawallet_plugin_kusama.dart b/lib/polkawallet_plugin_kusama.dart index 84add8516..30a007c92 100644 --- a/lib/polkawallet_plugin_kusama.dart +++ b/lib/polkawallet_plugin_kusama.dart @@ -65,7 +65,7 @@ class PluginKusama extends PolkawalletPlugin { 'packages/polkawallet_plugin_kusama/assets/images/public/$name.png'), iconDisabled: Image.asset( 'packages/polkawallet_plugin_kusama/assets/images/public/${name}_gray.png'), - jsCodeVersion: 33501, + jsCodeVersion: 33701, isTestNet: false, isXCMSupport: name == network_name_kusama, ), From 76492f52052d714c5020c2672beecc1d8db36020 Mon Sep 17 00:00:00 2001 From: shawn Date: Tue, 20 Dec 2022 16:04:25 +0800 Subject: [PATCH 2/3] update for sdk 0.5.1 --- CHANGELOG.md | 5 +++++ lib/pages/stakingNew/overView.dart | 8 -------- lib/polkawallet_plugin_kusama.dart | 2 +- lib/store/staking/staking.dart | 1 - lib/utils/i18n/en/staking.dart | 1 - lib/utils/i18n/zh/staking.dart | 1 - pubspec.yaml | 6 +++--- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ec900ae..35d417703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [0.5.1] - 20221220. + +* bump polkawallet_sdk: 0.5.1. +* ui update & bug fix. + ## [0.4.9] - 20220808. * bump polkawallet_sdk: 0.4.9. diff --git a/lib/pages/stakingNew/overView.dart b/lib/pages/stakingNew/overView.dart index 3756ebc1f..70c171d8e 100644 --- a/lib/pages/stakingNew/overView.dart +++ b/lib/pages/stakingNew/overView.dart @@ -225,14 +225,6 @@ class _OverViewWidgetState extends State ), ], ), - Padding( - padding: EdgeInsets.only(bottom: 8), - child: InfoItemRow( - dicStaking['v3.lastReward']!, - "${Fmt.balance((overview['lastReward'] ?? 0).toString(), decimals)} $symbol", - labelStyle: labelStyle, - contentStyle: labelStyle, - )), Padding( padding: EdgeInsets.only(bottom: 8), child: InfoItemRow( diff --git a/lib/polkawallet_plugin_kusama.dart b/lib/polkawallet_plugin_kusama.dart index 30a007c92..eab9f940e 100644 --- a/lib/polkawallet_plugin_kusama.dart +++ b/lib/polkawallet_plugin_kusama.dart @@ -65,7 +65,7 @@ class PluginKusama extends PolkawalletPlugin { 'packages/polkawallet_plugin_kusama/assets/images/public/$name.png'), iconDisabled: Image.asset( 'packages/polkawallet_plugin_kusama/assets/images/public/${name}_gray.png'), - jsCodeVersion: 33701, + jsCodeVersion: 33801, isTestNet: false, isXCMSupport: name == network_name_kusama, ), diff --git a/lib/store/staking/staking.dart b/lib/store/staking/staking.dart index 95450c49a..cc111f338 100644 --- a/lib/store/staking/staking.dart +++ b/lib/store/staking/staking.dart @@ -102,7 +102,6 @@ abstract class _StakingStore with Store { 'minNominated': data['minNominated'], 'minNominatorBond': data['minNominatorBond'], 'counterForNominators': data['counterForNominators'], - 'lastReward': data['lastReward'], }; // all validators diff --git a/lib/utils/i18n/en/staking.dart b/lib/utils/i18n/en/staking.dart index 71d2a1c2e..36fc1506a 100644 --- a/lib/utils/i18n/en/staking.dart +++ b/lib/utils/i18n/en/staking.dart @@ -99,7 +99,6 @@ const Map enStaking = { 'v3.information': 'Information', 'v3.stakedPortion': 'Staked portion', 'v3.returns': 'Returns', - 'v3.lastReward': 'Last Reward', 'v3.minThreshold': 'Min Threshold', 'v3.unbondingPeriod': 'Unbonding Period', 'v3.activeNominators': 'Nominators', diff --git a/lib/utils/i18n/zh/staking.dart b/lib/utils/i18n/zh/staking.dart index 887321998..6b2d7c644 100644 --- a/lib/utils/i18n/zh/staking.dart +++ b/lib/utils/i18n/zh/staking.dart @@ -92,7 +92,6 @@ const Map zhStaking = { 'v3.information': '概览', 'v3.stakedPortion': '总质押占比', 'v3.returns': '回报率', - 'v3.lastReward': '最近发放', 'v3.minThreshold': '最低提名', 'v3.unbondingPeriod': '解绑时间', 'v3.activeNominators': '提名人', diff --git a/pubspec.yaml b/pubspec.yaml index 188f676a7..a79b39e98 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: polkawallet_plugin_kusama description: The kusama/polkadot network flutter plugin for polkawallet app. -version: 0.4.9 +version: 0.5.1 homepage: environment: @@ -17,8 +17,8 @@ dependencies: flutter_svg: ^1.0.3 get_storage: ^2.0.3 json_annotation: ^4.0.1 - polkawallet_sdk: ^0.4.9 - polkawallet_ui: ^0.4.9 + polkawallet_sdk: ^0.5.1 + polkawallet_ui: ^0.5.1 fl_chart: ^0.40.2 sticky_headers: ^0.2.0 flutter_swiper: ^1.1.6 From d3c0bd5a20e9b4a0e8024c560d05bdeb9515db34 Mon Sep 17 00:00:00 2001 From: shawn Date: Tue, 20 Dec 2022 16:07:19 +0800 Subject: [PATCH 3/3] update --- example/pubspec.lock | 10 +++++----- pubspec.lock | 24 ++++++++++++------------ pubspec.yaml | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 584e475dd..82e15d624 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -236,7 +236,7 @@ packages: name: flutter_inappwebview url: "https://pub.dartlang.org" source: hosted - version: "5.3.2" + version: "5.7.2+3" flutter_localizations: dependency: "direct main" description: flutter @@ -547,21 +547,21 @@ packages: path: ".." relative: true source: path - version: "0.4.8" + version: "0.5.1" polkawallet_sdk: dependency: transitive description: name: polkawallet_sdk url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.5.1" polkawallet_ui: dependency: "direct main" description: path: "../../ui" relative: true source: path - version: "0.4.9" + version: "0.5.1" process: dependency: transitive description: @@ -912,4 +912,4 @@ packages: version: "3.1.1" sdks: dart: ">=2.17.0 <3.0.0" - flutter: ">=2.11.0-0.1.pre" + flutter: ">=3.0.0" diff --git a/pubspec.lock b/pubspec.lock index f839e2fff..f4dbebae9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -285,7 +285,7 @@ packages: name: flutter_inappwebview url: "https://pub.dartlang.org" source: hosted - version: "5.3.2" + version: "5.7.2+3" flutter_mobx: dependency: "direct main" description: @@ -484,7 +484,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: @@ -635,17 +635,17 @@ packages: polkawallet_sdk: dependency: "direct main" description: - path: "../sdk" - relative: true - source: path - version: "0.4.8" + name: polkawallet_sdk + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.1" polkawallet_ui: dependency: "direct main" description: - path: "../ui" - relative: true - source: path - version: "0.4.9" + name: polkawallet_ui + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.1" pool: dependency: transitive description: @@ -888,7 +888,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" timing: dependency: transitive description: @@ -1045,4 +1045,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.17.0 <3.0.0" - flutter: ">=2.11.0-0.1.pre" + flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index a79b39e98..a9dee8486 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,10 +31,10 @@ dev_dependencies: sdk: flutter dependency_overrides: - polkawallet_ui: - path: ../ui - polkawallet_sdk: - path: ../sdk +# polkawallet_ui: +# path: ../ui +# polkawallet_sdk: +# path: ../sdk # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec