diff --git a/config/gdev_endpoints.json b/config/gdev_endpoints.json
index 1e2f325ee9ab25d85bbadd6fe36bf858dc78995a..90a332fafd821235eb2b7f49858b7cfed6e4e0f6 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 812758181d998e95be00882161eb5abc109a1d3c..bc337e2368753db9749fc6305392cdd830efb665 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<SubstrateSdk>(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 75cda4de716ce183af25ba4c6af4bfe3ce40b1e9..1ea76638d74f9cea390d82fb445812d6b4b1029d 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -61,6 +61,8 @@ class HomeProvider with ChangeNotifier {
}
Future<List?> 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 7c4d5747c862ec33cb38de0513fbaefae8fe65c4..14a583ad23bc4b20133649e7ef304536aec2580f 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -48,7 +48,6 @@ class SubstrateSdk with ChangeNotifier {
List<NetworkParams> 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 fcf51b8b9bc6c7e1b2a5ade19ce6625577e0857e..1f038e096c756c70152fd2fee8ff03877b607207 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 4d462ed782d968ce4c98bb631ae43b3e1282d723..2fa95d7e3dc00dfaa9d1f901c39b3864147235cc 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 85ac5d1a2e72613dcec93881dadb833ccd2b5021..bc65d661bd600e22dc50ac02df2709a04e9cf646 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: <Widget>[
+ QrImageWidget(
+ data: _walletOptions.address.text,
+ version: QrVersions.auto,
+ size: isTall ? 300 : 270,
+ ),
+ SizedBox(height: 15 * ratio),
+ Consumer<WalletOptionsProvider>(
+ 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<WalletOptionsProvider>(
- 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 ceac16ae24e378685d572c9137a1b353c80e851c..f00d707fe651b3a26e4ec64553539a743aff2e57 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 026a4df8d63a8b1a3ee2c62abaf51b98b1dd62a6..0538a1c4fcc99e051ff281e6e09494eef174275a 100644
--- a/lib/screens/search.dart
+++ b/lib/screens/search.dart
@@ -16,7 +16,6 @@ class SearchScreen extends StatelessWidget {
SearchProvider _searchProvider = Provider.of<SearchProvider>(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 4d4c0e28da9dcc11f06a4af33be4094863f5b9cf..3a70454c36b2a404e1979c0d98d8deea91b646f2 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 dc902772a4f18efdd3842c07e2daa41937652a29..8294cd6794c1c08cf4ea9715d0939dddb0c99dab 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'