Fix payments from HDWallets

This commit is contained in:
poka 2021-12-27 20:15:12 +01:00
parent cd71b0eb3d
commit f05c335073
6 changed files with 108 additions and 89 deletions

View File

@ -79,7 +79,8 @@ class WalletsProfilesProvider with ChangeNotifier {
dewif: dewif, dewif: dewif,
password: pinCode, password: pinCode,
comment: payComment.text, comment: payComment.text,
derivation: derivation); derivation: derivation,
lang: appLang);
return result; return result;
} }

View File

@ -148,6 +148,9 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
await Future.delayed( await Future.delayed(
const Duration(milliseconds: 50)); const Duration(milliseconds: 50));
_myWalletProvider.rebuildWidget(); _myWalletProvider.rebuildWidget();
_generateWalletProvider.pin.text = '';
_generateWalletProvider
.mnemonicController.text = '';
Navigator.pushAndRemoveUntil(context, Navigator.pushAndRemoveUntil(context,
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
return UnlockingWallet( return UnlockingWallet(

View File

@ -34,9 +34,22 @@ class GenerateFastChestScreen extends StatelessWidget {
_generateWalletProvider.pin.text = randomSecretCode(pinLength); _generateWalletProvider.pin.text = randomSecretCode(pinLength);
} }
return Scaffold( return WillPopScope(
onWillPop: () {
_generateWalletProvider.pin.text = '';
_generateWalletProvider.mnemonicController.text = '';
return Future<bool>.value(true);
},
child: Scaffold(
appBar: AppBar( appBar: AppBar(
toolbarHeight: 60 * ratio, toolbarHeight: 60 * ratio,
leading: IconButton(
icon: const Icon(Icons.arrow_back, color: Colors.black),
onPressed: () {
_generateWalletProvider.pin.text = '';
_generateWalletProvider.mnemonicController.text = '';
Navigator.of(context).pop();
}),
title: const SizedBox( title: const SizedBox(
height: 22, height: 22,
child: Text('Générer un trousseau'), child: Text('Générer un trousseau'),
@ -115,10 +128,9 @@ class GenerateFastChestScreen extends StatelessWidget {
? () async { ? () async {
_generateWalletProvider.nbrWord = _generateWalletProvider.nbrWord =
_generateWalletProvider.getRandomInt(); _generateWalletProvider.getRandomInt();
_generateWalletProvider.actualWallet = _generateWalletProvider.actualWallet = await Dewif()
await Dewif().generateDewif( .generateDewif(
_generateWalletProvider _generateWalletProvider.generatedMnemonic!,
.generatedMnemonic!,
_generateWalletProvider.pin.text, _generateWalletProvider.pin.text,
lang: appLang); lang: appLang);
await Navigator.push( await Navigator.push(
@ -126,10 +138,9 @@ class GenerateFastChestScreen extends StatelessWidget {
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
return ConfirmStoreWallet( return ConfirmStoreWallet(
generatedMnemonic: generatedMnemonic:
_generateWalletProvider _generateWalletProvider.generatedMnemonic,
.generatedMnemonic, generatedWallet:
generatedWallet: _generateWalletProvider _generateWalletProvider.actualWallet);
.actualWallet);
}), }),
); );
} }
@ -149,7 +160,10 @@ class GenerateFastChestScreen extends StatelessWidget {
}, },
child: const Icon(Icons.print)) child: const Icon(Icons.print))
]), ]),
))); ),
),
),
);
} }
Widget toolTips(_key, _text, _message) { Widget toolTips(_key, _text, _message) {

View File

@ -192,6 +192,7 @@ class ImportWalletScreen extends StatelessWidget {
}), }),
ModalRoute.withName('/'), ModalRoute.withName('/'),
); );
_generateWalletProvider.resetCesiumImportView();
} }
: null, : null,
child: const Text( child: const Text(

View File

@ -301,7 +301,7 @@ packages:
name: durt name: durt
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.5+2" version: "0.1.5+7"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:

View File

@ -62,7 +62,7 @@ dependencies:
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
dio: ^4.0.4 dio: ^4.0.4
desktop_window: ^0.4.0 desktop_window: ^0.4.0
durt: ^0.1.5+2 durt: ^0.1.5+7
package_info_plus: ^1.3.0 package_info_plus: ^1.3.0
flutter_icons: flutter_icons: