diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index b48bafbf90d18922f153e9f1542fb8ca05ae6daa..15101a4805026f7a794043e15bd03581aadf6b0b 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -71,13 +71,13 @@ class MyWalletsProvider with ChangeNotifier {
return _targetedWallet;
}
- WalletData? getDefaultWallet([int? chest]) {
+ WalletData getDefaultWallet([int? chest]) {
if (chestBox.isEmpty) {
return WalletData(chest: 0, number: 0);
} else {
chest ??= getCurrentChest();
int? defaultWalletNumber = chestBox.get(chest)!.defaultWallet;
- return getWalletDataById([chest, defaultWalletNumber]);
+ return getWalletDataById([chest, defaultWalletNumber])!;
}
}
@@ -122,7 +122,7 @@ class MyWalletsProvider with ChangeNotifier {
SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
- WalletData defaultWallet = getDefaultWallet()!;
+ WalletData defaultWallet = getDefaultWallet();
final address = await _sub.derive(
context, defaultWallet.address!, _newDerivationNbr, pinCode);
@@ -160,7 +160,7 @@ class MyWalletsProvider with ChangeNotifier {
}
SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
- WalletData defaultWallet = _myWalletProvider.getDefaultWallet()!;
+ WalletData defaultWallet = _myWalletProvider.getDefaultWallet();
final address =
await _sub.generateRootKeypair(defaultWallet.address!, pinCode);
diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart
index 24c0308d0c5070bc89cc9f3eb3e2eced08c31fe5..09170ad066b6506d9ba04f48f59a7ace1e4291c4 100644
--- a/lib/screens/myWallets/change_pin.dart
+++ b/lib/screens/myWallets/change_pin.dart
@@ -105,7 +105,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
),
onPressed: () async {
WalletData defaultWallet =
- _myWalletProvider.getDefaultWallet()!;
+ _myWalletProvider.getDefaultWallet();
String? _pin;
if (_myWalletProvider.pinCode == '') {
diff --git a/lib/screens/myWallets/choose_wallet.dart b/lib/screens/myWallets/choose_wallet.dart
index ab4f790945d55cd7d8a096ff42721f9ead29a722..917f38f3163d4ffcf50eff8857df43e4e1275f2b 100644
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@@ -79,7 +79,7 @@ class ChooseWalletScreen extends StatelessWidget {
final bool isWalletsExists = _myWalletProvider.checkIfWalletExist();
WalletData? defaultWallet = _myWalletProvider.getDefaultWallet();
- selectedWallet ??= defaultWallet!;
+ selectedWallet ??= defaultWallet;
_myWalletProvider.readAllWallets(currentChest);
if (!isWalletsExists) {
diff --git a/lib/screens/myWallets/show_seed.dart b/lib/screens/myWallets/show_seed.dart
index 8d035d817c36bd62369050fd0ea4271bb1a2f909..276caa4bb083eaf33534f2df1012c4ac3d32bfce 100644
--- a/lib/screens/myWallets/show_seed.dart
+++ b/lib/screens/myWallets/show_seed.dart
@@ -23,14 +23,13 @@ class ShowSeed extends StatelessWidget {
@override
Widget build(BuildContext context) {
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
- MyWalletsProvider _myWalletProvider =
+ MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context, listen: false);
CommonElements common = CommonElements();
SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
-WalletData defaultWallet =
- _myWalletProvider.getDefaultWallet()!;
+ WalletData defaultWallet = _myWalletProvider.getDefaultWallet();
return Scaffold(
backgroundColor: backgroundColor,
@@ -44,7 +43,8 @@ WalletData defaultWallet =
child: Column(children: <Widget>[
const Spacer(flex: 1),
FutureBuilder(
- future: _sub.getSeed(defaultWallet.address!, walletProvider.pinCode),
+ future: _sub.getSeed(
+ defaultWallet.address!, walletProvider.pinCode),
builder: (BuildContext context, AsyncSnapshot<String?> _seed) {
if (_seed.connectionState != ConnectionState.done ||
_seed.hasError) {
@@ -122,7 +122,27 @@ WalletData defaultWallet =
]),
]);
}),
- const Spacer(flex: 3),
+ const Spacer(flex: 2),
+ SizedBox(
+ width: 380 * ratio,
+ height: 60 * ratio,
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ elevation: 4,
+ primary: orangeC, // background
+ onPrimary: Colors.white, // foreground
+ ),
+ onPressed: () {
+ Navigator.pop(context);
+ },
+ child: Text(
+ 'Fermer',
+ style: TextStyle(
+ fontSize: 23 * ratio, fontWeight: FontWeight.w600),
+ ),
+ ),
+ ),
+ const Spacer(flex: 2),
]),
));
}
diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart
index 249ce71a13e8505d019a28ba81ffbba2e41e5e66..540325ebef34334123ce977cfd53b290ee544d42 100644
--- a/lib/screens/myWallets/unlocking_wallet.dart
+++ b/lib/screens/myWallets/unlocking_wallet.dart
@@ -219,7 +219,7 @@ class UnlockingWallet extends StatelessWidget {
onCompleted: (_pin) async {
_myWalletProvider.pinCode = _pin.toUpperCase();
final isValid = await _sub.checkPassword(
- defaultWallet!.address!, _pin.toUpperCase());
+ defaultWallet.address!, _pin.toUpperCase());
if (!isValid) {
await Future.delayed(const Duration(milliseconds: 50));
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 8e2f09d8f3167ea42a37ad7d24ebb26227642f49..8a71592df858494fc821cc3c069ac8e5ae9a4e5e 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -354,7 +354,7 @@ class WalletOptions extends StatelessWidget {
MyWalletsProvider _myWalletProvider,
WalletOptionsProvider _walletOptions,
int _currentChest) {
- WalletData defaultWallet = _myWalletProvider.getDefaultWallet()!;
+ WalletData defaultWallet = _myWalletProvider.getDefaultWallet();
_walletOptions.isDefaultWallet = (defaultWallet.number == wallet.id()[1]);
return InkWell(
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index 600da422b29f7816793777cb9ba0a3ba2a99a659..14fbc395a49da867d6ca99e8c0200427b8bfebc7 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -239,7 +239,7 @@ class WalletsHome extends StatelessWidget {
),
)),
balanceBuilder(context, _repository.address!,
- _repository.address == defaultWallet!.address),
+ _repository.address == defaultWallet.address),
ListTile(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index 502610db4ef808d6c8debb27685ea9d51c53fd8d..63bfb45a781d95d289639041648a0127160aadc8 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -30,7 +30,7 @@ class TransactionInProgress extends StatelessWidget {
log.d(_walletViewProvider.address!);
- final from = _myWalletProvider.getDefaultWallet()!.name!;
+ final from = _myWalletProvider.getDefaultWallet().name!;
final to = getShortPubkey(_walletViewProvider.address!);
final amount = _walletViewProvider.payAmount.text;
String _actionName = '';
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index 0218d7b1491269bbdea75098cc67f1cf725f94b2..e665aef47e409cc18b925efd2ca23dbd8e1ad0f9 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -39,7 +39,7 @@ class WalletViewScreen extends StatelessWidget {
MyWalletsProvider _myWalletProvider =
Provider.of<MyWalletsProvider>(context, listen: false);
WalletData? defaultWallet = _myWalletProvider.getDefaultWallet();
- _sub.setCurrentWallet(defaultWallet!);
+ _sub.setCurrentWallet(defaultWallet);
return Scaffold(
backgroundColor: backgroundColor,
@@ -108,7 +108,7 @@ class WalletViewScreen extends StatelessWidget {
WalletData? _defaultWallet =
_myWalletProvider.getDefaultWallet();
return FutureBuilder(
- future: _sub.isMember(_defaultWallet!.address!),
+ future: _sub.isMember(_defaultWallet.address!),
builder: (context, AsyncSnapshot<bool?> snapshot) {
return Visibility(
visible: (snapshot.data ?? false),
@@ -282,7 +282,7 @@ class WalletViewScreen extends StatelessWidget {
const double shapeSize = 20;
WalletData? defaultWallet = _myWalletProvider.getDefaultWallet();
- log.d(defaultWallet!.address);
+ log.d(defaultWallet.address);
bool canValidate = false;