Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
RomeroYang committed Dec 20, 2022
2 parents 8eb1eb0 + d3c0bd5 commit c7b7d05
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 36 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
10 changes: 5 additions & 5 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
8 changes: 0 additions & 8 deletions lib/pages/stakingNew/overView.dart
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,6 @@ class _OverViewWidgetState extends State<OverViewWidget>
),
],
),
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(
Expand Down
2 changes: 1 addition & 1 deletion lib/polkawallet_plugin_kusama.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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: 33801,
isTestNet: false,
isXCMSupport: name == network_name_kusama,
),
Expand Down
1 change: 0 additions & 1 deletion lib/store/staking/staking.dart
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ abstract class _StakingStore with Store {
'minNominated': data['minNominated'],
'minNominatorBond': data['minNominatorBond'],
'counterForNominators': data['counterForNominators'],
'lastReward': data['lastReward'],
};

// all validators
Expand Down
1 change: 0 additions & 1 deletion lib/utils/i18n/en/staking.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ const Map<String, String> 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',
Expand Down
1 change: 0 additions & 1 deletion lib/utils/i18n/zh/staking.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ const Map<String, String> zhStaking = {
'v3.information': '概览',
'v3.stakedPortion': '总质押占比',
'v3.returns': '回报率',
'v3.lastReward': '最近发放',
'v3.minThreshold': '最低提名',
'v3.unbondingPeriod': '解绑时间',
'v3.activeNominators': '提名人',
Expand Down
24 changes: 12 additions & 12 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
14 changes: 7 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit c7b7d05

Please sign in to comment.