Skip to content

Commit

Permalink
Merge pull request #9 from polkawallet-io/develop
Browse files Browse the repository at this point in the history
release 0.4.7
  • Loading branch information
RomeroYang authored Jun 6, 2022
2 parents ede8911 + 7b9925b commit 0f34019
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 28 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [0.4.7] - 20220606.

* bump polkawallet_sdk: 0.4.7.
* dependencies upgrade.

## [0.4.6] - 20220526.

* bump polkawallet_sdk: 0.4.6.
Expand Down
18 changes: 5 additions & 13 deletions lib/components/v3/plugin/pluginScaffold.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,11 @@ class PluginScaffold extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
stops: [0.0, 1.0],
colors: [Color(0xFF27292F), Color(0xFF202020)])),
child: Scaffold(
backgroundColor: Colors.transparent,
extendBodyBehindAppBar: extendBodyBehindAppBar,
appBar: appBar,
body: body,
),
return Scaffold(
backgroundColor: Color(0xFF212224),
extendBodyBehindAppBar: extendBodyBehindAppBar,
appBar: appBar,
body: body,
);
}
}
7 changes: 4 additions & 3 deletions lib/pages/v3/xcmTxConfirmPage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:polkawallet_sdk/api/types/txInfoData.dart';
import 'package:polkawallet_sdk/plugin/index.dart';
import 'package:polkawallet_sdk/plugin/store/balances.dart';
import 'package:polkawallet_sdk/storage/keyring.dart';
import 'package:polkawallet_sdk/storage/types/keyPairData.dart';
import 'package:polkawallet_sdk/utils/i18n.dart';
Expand Down Expand Up @@ -308,8 +309,8 @@ class _XcmTxConfirmPageState extends State<XcmTxConfirmPage> {
final isNetworkMatch = widget.plugin.networkState.genesisHash ==
widget.plugin.basic.genesisHash;

final symbol = args.feeToken;
final int decimals = (widget.plugin.networkState.tokenDecimals ?? [12])[0];
final symbol = args.feeToken.symbol;
final decimals = args.feeToken.decimals!;

final bool isObservation = widget.keyring.current.observation ?? false;

Expand Down Expand Up @@ -996,6 +997,6 @@ class XcmTxConfirmParams {
final bool isPlugin;
final String chainFrom;
final Widget? chainFromIcon;
final String feeToken;
final TokenBalanceData feeToken;
final Widget? waitingWidget;
}
16 changes: 8 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ packages:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "0.23.0+1"
version: "1.0.3"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down Expand Up @@ -309,14 +309,14 @@ packages:
name: path_drawing
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.1"
version: "1.0.0"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.1"
version: "1.0.0"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -404,10 +404,10 @@ packages:
polkawallet_sdk:
dependency: "direct main"
description:
path: "../sdk"
relative: true
source: path
version: "0.4.5"
name: polkawallet_sdk
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.6"
process:
dependency: transitive
description:
Expand Down Expand Up @@ -601,7 +601,7 @@ packages:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
version: "3.0.4"
webview_flutter_android:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: polkawallet_ui
description: Common used Widgets for polkawallet app.
version: 0.4.6
version: 0.4.7
homepage: https://polkawallet.io

environment:
Expand All @@ -10,15 +10,15 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_svg: ^0.23.0+1
flutter_svg: ^1.0.3
permission_handler: ^7.2.0
dropdown_search: ^0.6.3
url_launcher: ^6.0.4
intl: ^0.17.0
qr_flutter_fork: ^4.0.0
flutter_qr_scan: ^1.0.7
polkawallet_sdk: ^0.4.6
webview_flutter: ^3.0.0
polkawallet_sdk: ^0.4.7
webview_flutter: ^3.0.4
skeleton_loader: ^2.0.0+4
flutter_screenutil: ^5.0.0+2
scrollable_positioned_list: ^0.2.3
Expand Down

0 comments on commit 0f34019

Please sign in to comment.