diff --git a/config/gdev_endpoints.json b/config/gdev_endpoints.json index 1e2f325..90a332f 100644 --- a/config/gdev_endpoints.json +++ b/config/gdev_endpoints.json @@ -1,3 +1,6 @@ [ - "wss://gdev.librelois.fr/ws" + "wss://gdev.librelois.fr/ws", + "wss://gdev.1000i100.fr/ws", + "wss://gdev.komun.org/ws" + ] diff --git a/lib/providers/chest_provider.dart b/lib/providers/chest_provider.dart index 8127581..bc337e2 100644 --- a/lib/providers/chest_provider.dart +++ b/lib/providers/chest_provider.dart @@ -14,7 +14,7 @@ class ChestProvider with ChangeNotifier { Future deleteChest(context, ChestData _chest) async { final bool? _answer = await (_confirmDeletingChest(context, _chest.name)); SubstrateSdk _sub = Provider.of(context, listen: false); - if (_answer!) { + if (_answer ?? false) { await _sub.deleteAccounts(getChestWallets(_chest)); await chestBox.delete(_chest.key); if (chestBox.isEmpty) { diff --git a/lib/providers/home.dart b/lib/providers/home.dart index 75cda4d..1ea7663 100644 --- a/lib/providers/home.dart +++ b/lib/providers/home.dart @@ -61,6 +61,8 @@ class HomeProvider with ChangeNotifier { } Future getValidEndpoints() async { + await configBox.delete('endpoint'); + List _listEndpoints = []; if (!configBox.containsKey('endpoint') || configBox.get('endpoint') == [] || diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart index 7c4d574..14a583a 100644 --- a/lib/providers/substrate_sdk.dart +++ b/lib/providers/substrate_sdk.dart @@ -48,7 +48,6 @@ class SubstrateSdk with ChangeNotifier { List node = []; for (String _endpoint in configBox.get('endpoint')) { - log.d(_endpoint); final n = NetworkParams(); n.name = currencyName; n.endpoint = _endpoint; diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart index fcf51b8..1f038e0 100644 --- a/lib/screens/myWallets/change_pin.dart +++ b/lib/screens/myWallets/change_pin.dart @@ -35,6 +35,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + elevation: 1, toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), diff --git a/lib/screens/myWallets/chest_options.dart b/lib/screens/myWallets/chest_options.dart index 4d462ed..2fa95d7 100644 --- a/lib/screens/myWallets/chest_options.dart +++ b/lib/screens/myWallets/chest_options.dart @@ -26,6 +26,7 @@ class ChestOptions extends StatelessWidget { return Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + elevation: 1, toolbarHeight: 60 * ratio, // leading: IconButton( // icon: const Icon(Icons.arrow_back, color: Colors.black), diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart index 85ac5d1..bc65d66 100644 --- a/lib/screens/myWallets/wallet_options.dart +++ b/lib/screens/myWallets/wallet_options.dart @@ -106,27 +106,34 @@ class WalletOptions extends StatelessWidget { ); }), SizedBox(height: 10 * ratio), - QrImageWidget( - data: _walletOptions.address.text, - version: QrVersions.auto, - size: isTall ? 300 : 270, + Expanded( + child: SingleChildScrollView( + child: Column(children: [ + QrImageWidget( + data: _walletOptions.address.text, + version: QrVersions.auto, + size: isTall ? 300 : 270, + ), + SizedBox(height: 15 * ratio), + Consumer( + builder: (context, walletProvider, _) { + return Column(children: [ + pubkeyWidget(walletProvider, ctx), + SizedBox(height: 10 * ratio), + historyWidget( + context, _historyProvider, walletProvider), + SizedBox(height: 12 * ratio), + setDefaultWallet(context, walletProvider, + _myWalletProvider, _walletOptions, _currentChest), + SizedBox(height: 17 * ratio), + if (!walletProvider.isDefaultWallet) + deleteWallet(context, walletProvider, + _myWalletProvider, _currentChest) + ]); + }), + ]), + ), ), - SizedBox(height: 15 * ratio), - Consumer( - builder: (context, walletProvider, _) { - return Column(children: [ - pubkeyWidget(walletProvider, ctx), - SizedBox(height: 10 * ratio), - historyWidget(context, _historyProvider, walletProvider), - SizedBox(height: 12 * ratio), - setDefaultWallet(context, walletProvider, _myWalletProvider, - _walletOptions, _currentChest), - SizedBox(height: 17 * ratio), - if (!walletProvider.isDefaultWallet) - deleteWallet(context, walletProvider, _myWalletProvider, - _currentChest) - ]); - }), ]), ), ), diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart index ceac16a..f00d707 100644 --- a/lib/screens/myWallets/wallets_home.dart +++ b/lib/screens/myWallets/wallets_home.dart @@ -41,6 +41,7 @@ class WalletsHome extends StatelessWidget { }, child: Scaffold( appBar: AppBar( + elevation: 1, toolbarHeight: 60 * ratio, leading: IconButton( icon: const Icon(Icons.arrow_back, color: Colors.black), diff --git a/lib/screens/search.dart b/lib/screens/search.dart index 026a4df..0538a1c 100644 --- a/lib/screens/search.dart +++ b/lib/screens/search.dart @@ -16,7 +16,6 @@ class SearchScreen extends StatelessWidget { SearchProvider _searchProvider = Provider.of(context); final double screenHeight = MediaQuery.of(context).size.height; - return WillPopScope( onWillPop: () { _searchProvider.searchController.text = ''; @@ -24,6 +23,7 @@ class SearchScreen extends StatelessWidget { }, child: Scaffold( appBar: AppBar( + elevation: 1, toolbarHeight: 60 * ratio, title: const SizedBox( height: 22, diff --git a/pubspec.lock b/pubspec.lock index 4d4c0e2..3a70454 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,7 +112,7 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" build_runner: dependency: "direct dev" description: @@ -983,10 +983,10 @@ packages: description: path: "." ref: fixAndroidActivityVersion - resolved-ref: e33351cde5ea9b55d191772fe3b36f9dbb8277e6 + resolved-ref: "069a9f696ec8d9eacd0a3fdd284116fd2c1faf44" url: "https://github.com/poka-IT/sdk.git" source: git - version: "0.4.5" + version: "0.4.6" pool: dependency: transitive description: @@ -1389,7 +1389,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.8" + version: "2.8.9" webview_flutter_platform_interface: dependency: transitive description: @@ -1403,7 +1403,7 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.7.5" + version: "2.8.0" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index dc90277..8294cd6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.6+7 +version: 0.0.6+8 environment: sdk: '>=2.12.0 <3.0.0'