diff --git a/lib/globals.dart b/lib/globals.dart
index e500877bf0e1dd4c4b6856f39aacaf361332fc35..097630559e80a306bb0444b93e581f738b8136dc 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -13,6 +13,8 @@ SharedPreferences prefs;
String endPointGVA;
int ramSys;
+String cesiumPod = "https://g1.data.le-sou.org";
+
// Responsive ratios
bool isTall;
double ratio;
diff --git a/lib/models/cesiumPlus.dart b/lib/models/cesiumPlus.dart
index 7cbe5e4fcbf93bc4622a31df048a421060978bcf..d0ebf059c5d5ef2d6dcaa12a60269b267a8eecce 100644
--- a/lib/models/cesiumPlus.dart
+++ b/lib/models/cesiumPlus.dart
@@ -51,7 +51,6 @@ class CesiumPlusProvider with ChangeNotifier {
"indices_boost": {"user": 100, "page": 1, "group": 0.01}
});
- String cesiumPod = "https://g1.data.le-sou.org";
String requestUrl = "/user,page,group/profile,record/_search";
String podRequest = cesiumPod + requestUrl;
diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart
index ed89498d11b4fb51f2e960da9a4c2c990247ca41..832c91780630d5ed3af3864ce7d6641e14f41680 100644
--- a/lib/models/myWallets.dart
+++ b/lib/models/myWallets.dart
@@ -9,7 +9,7 @@ class MyWalletsProvider with ChangeNotifier {
String listWallets;
Future initWalletFolder() async {
- await getDefaultWallet();
+ getDefaultWallet();
final bool isWalletFolderExist = await walletsDirectory.exists();
if (!isWalletFolderExist) {
@@ -84,17 +84,17 @@ class MyWalletsProvider with ChangeNotifier {
return listWallets;
}
- Future getDefaultWallet() async {
+ void getDefaultWallet() {
defaultWalletFile = File('${appPath.path}/defaultWallet');
- bool isdefaultWalletFile = await defaultWalletFile.exists();
+ bool isdefaultWalletFile = defaultWalletFile.existsSync();
if (!isdefaultWalletFile) {
- await File(defaultWalletFile.path).create();
+ File(defaultWalletFile.path).createSync();
}
try {
- defaultWallet = await defaultWalletFile.readAsString();
+ defaultWallet = defaultWalletFile.readAsStringSync();
} catch (e) {
defaultWallet = '0:0';
}
diff --git a/lib/models/walletOptions.dart b/lib/models/walletOptions.dart
index 31dfb81ec863ef14793e06e24c1d603fdecc0fc9..6c4a1b2c5bfe30b360c4ac007f188c7e9b741cbd 100644
--- a/lib/models/walletOptions.dart
+++ b/lib/models/walletOptions.dart
@@ -22,6 +22,7 @@ class WalletOptionsProvider with ChangeNotifier {
FocusNode walletNameFocus = FocusNode();
TextEditingController nameController = TextEditingController();
String walletID;
+ bool isDefaultWallet;
Future<NewWallet> get badWallet => null;
@@ -356,12 +357,11 @@ class WalletOptionsProvider with ChangeNotifier {
return await scanner.generateBarCode(_pubkey);
}
- Future defAsDefaultWallet(String _id) async {
- await defaultWalletFile.delete();
- await defaultWalletFile.create();
- await defaultWalletFile
- .writeAsString(_id)
- .then((value) => notifyListeners());
+ void defAsDefaultWallet(String _id) {
+ defaultWalletFile.deleteSync();
+ defaultWalletFile.createSync();
+ defaultWalletFile.writeAsStringSync(_id);
+ notifyListeners();
}
Future changeAvatar() async {
diff --git a/lib/screens/myWallets/unlockingWallet.dart b/lib/screens/myWallets/unlockingWallet.dart
index eb70588eb679f96fa072f6cba7b0221c81bc360d..c52fe4522f0c293d9262e9411f9058c77775a270 100644
--- a/lib/screens/myWallets/unlockingWallet.dart
+++ b/lib/screens/myWallets/unlockingWallet.dart
@@ -144,7 +144,7 @@ class UnlockingWallet extends StatelessWidget {
pinColor = Colors.green[400];
// await Future.delayed(Duration(milliseconds: 50));
Navigator.push(
- context,
+ formKey.currentContext,
SmoothTransition(
page: WalletOptions(
walletNbr: walletNbr,
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index 82d96f299a4a059d57654cc91432eb68de4472f6..88d731daca2611edd8e2f3ee95c1a0ee7bdb1273 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -12,7 +12,7 @@ import 'package:provider/provider.dart';
import 'package:flutter/services.dart';
// ignore: must_be_immutable
-class WalletOptions extends StatelessWidget with ChangeNotifier {
+class WalletOptions extends StatelessWidget {
WalletOptions(
{Key keyMyWallets,
@required this.walletNbr,
@@ -24,7 +24,6 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
int derivation;
int _nbrLinesName = 1;
bool _isNewNameValid = false;
- bool isDefaultWallet;
@override
Widget build(BuildContext context) {
@@ -46,7 +45,6 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
} else {
walletName = _walletOptions.nameController.text;
}
- _walletOptions.walletID = '0:$walletNbr';
_walletOptions.nameController.text.length >= 15
? _nbrLinesName = 2
@@ -54,9 +52,13 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
if (_walletOptions.nameController.text.length >= 26 && isTall)
_nbrLinesName = 3;
+ _walletOptions.walletID = '0:$walletNbr';
+
+ _myWalletProvider.getDefaultWallet();
+
defaultWallet == _walletOptions.walletID
- ? isDefaultWallet = true
- : isDefaultWallet = false;
+ ? _walletOptions.isDefaultWallet = true
+ : _walletOptions.isDefaultWallet = false;
// print(_walletOptions.generateQRcode(_walletOptions.pubkey.text));
@@ -160,7 +162,7 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
variables: {
'pubkey': _walletOptions.pubkey.text,
},
- pollInterval: Duration(seconds: 1),
+ // pollInterval: Duration(seconds: 1),
),
builder: (QueryResult result,
{VoidCallback refetch, FetchMore fetchMore}) {
@@ -171,6 +173,9 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
if (result.isLoading) {
return Text('Loading');
}
+
+ print(result);
+
// List repositories = result.data['viewer']['repositories']['nodes'];
String wBalanceUD;
if (result.data['balance'] == null) {
@@ -362,15 +367,12 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
]))),
SizedBox(height: 12 * ratio),
InkWell(
- onTap: !isDefaultWallet
- ? () async {
- await _walletOptions
- .defAsDefaultWallet(_walletOptions.walletID)
- .then((value) => {
- _myWalletProvider
- .getAllWalletsNames(_currentChest),
- _myWalletProvider.rebuildWidget()
- });
+ onTap: !_walletOptions.isDefaultWallet
+ ? () {
+ defaultWallet = '0:$walletNbr';
+ _walletOptions
+ .defAsDefaultWallet(_walletOptions.walletID);
+ _myWalletProvider.getAllWalletsNames(_currentChest);
}
: null,
child: SizedBox(
@@ -378,19 +380,19 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
child: Row(children: <Widget>[
SizedBox(width: 31),
CircleAvatar(
- backgroundColor:
- Colors.grey[isDefaultWallet ? 300 : 500],
+ backgroundColor: Colors.grey[
+ _walletOptions.isDefaultWallet ? 300 : 500],
child: Image.asset(
'assets/walletOptions/android-checkmark.png',
)),
SizedBox(width: 12),
Text(
- isDefaultWallet
+ _walletOptions.isDefaultWallet
? 'Ce portefeuille est celui par defaut'
: 'Définir comme portefeuille par défaut',
style: TextStyle(
fontSize: 20,
- color: isDefaultWallet
+ color: _walletOptions.isDefaultWallet
? Colors.grey[500]
: Colors.black)),
]))),