librelois
/
gecko
forked from axiom-team/gecko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

payment inter wallets is working; bug with feedback position

This commit is contained in:
poka 2022-09-12 04:52:34 +02:00
parent edbe1d8b5c
commit 8b32bb8e26
9 changed files with 385 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/providers/duniter_indexer.dart
View File

@ -339,7 +339,7 @@ class DuniterIndexer with ChangeNotifier {
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
walletsProfiles.address = profile['id']; walletsProfiles.address = profile['id'];
return WalletViewScreen( return WalletViewScreen(
pubkey: profile['id'], address: profile['id'],
username: g1WalletsBox username: g1WalletsBox
.get(profile['id']) .get(profile['id'])
?.id ?.id

2
lib/providers/wallets_profiles.dart
View File

@ -44,7 +44,7 @@ class WalletsProfilesProvider with ChangeNotifier {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
return WalletViewScreen(pubkey: barcode!.rawContent); return WalletViewScreen(address: barcode!.rawContent);
}), }),
); );
} else { } else {

2
lib/screens/activity.dart
View File

@ -354,7 +354,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
return WalletViewScreen(pubkey: repository[1]); return WalletViewScreen(address: repository[1]);
}), }),
); );
// Navigator.pop(context); // Navigator.pop(context);

2
lib/screens/myWallets/choose_wallet.dart
View File

@ -53,8 +53,6 @@ class ChooseWalletScreen extends StatelessWidget {
), ),
onPressed: () async { onPressed: () async {
await sub.setCurrentWallet(selectedWallet!); await sub.setCurrentWallet(selectedWallet!);
// _walletViewProvider.reload();
sub.reload(); sub.reload();
// Navigator.pop(context); // Navigator.pop(context);

176
lib/screens/myWallets/wallets_home.dart
View File

@ -18,6 +18,7 @@ import 'package:gecko/screens/myWallets/choose_chest.dart';
import 'package:gecko/screens/myWallets/import_g1_v1.dart'; import 'package:gecko/screens/myWallets/import_g1_v1.dart';
import 'package:gecko/screens/myWallets/unlocking_wallet.dart'; import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
import 'package:gecko/screens/myWallets/wallet_options.dart'; import 'package:gecko/screens/myWallets/wallet_options.dart';
import 'package:gecko/screens/wallet_view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class WalletsHome extends StatelessWidget { class WalletsHome extends StatelessWidget {
@ -159,6 +160,7 @@ class WalletsHome extends StatelessWidget {
WalletOptionsProvider walletOptions = WalletOptionsProvider walletOptions =
Provider.of<WalletOptionsProvider>(context, listen: false); Provider.of<WalletOptionsProvider>(context, listen: false);
final bool isWalletsExists = myWalletProvider.checkIfWalletExist(); final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
if (!isWalletsExists) { if (!isWalletsExists) {
return const Text(''); return const Text('');
@ -196,78 +198,114 @@ class WalletsHome extends StatelessWidget {
mainAxisSpacing: 0, mainAxisSpacing: 0,
children: <Widget>[ children: <Widget>[
for (WalletData repository in listWallets as Iterable<WalletData>) for (WalletData repository in listWallets as Iterable<WalletData>)
Padding( LongPressDraggable<String>(
padding: const EdgeInsets.all(16), data: repository.address!,
child: GestureDetector( dragAnchorStrategy:
key: keyOpenWallet(repository.address!), (Draggable<Object> _, BuildContext __, Offset ___) =>
onTap: () { const Offset(0, 0),
walletOptions.getAddress( feedback: ElevatedButton(
currentChestNumber, repository.derivation!); onPressed: () {},
Navigator.push( style: ElevatedButton.styleFrom(
context, backgroundColor: orangeC,
SmoothTransition( shape: const CircleBorder(),
page: WalletOptions( padding: const EdgeInsets.all(15),
wallet: repository, ),
child: const SizedBox(
height: 35,
child: Image(image: AssetImage('assets/vector_white.png')),
),
),
child: DragTarget<String>(onAccept: (senderAddress) async {
log.d(
'INTERPAY: sender: $senderAddress --- receiver: ${repository.address!}');
final walletData =
myWalletProvider.getWalletDataByAddress(senderAddress);
await sub.setCurrentWallet(walletData!);
sub.reload();
paymentPopup(context, repository.address!);
}, builder: (
BuildContext context,
List<dynamic> accepted,
List<dynamic> rejected,
) {
return Padding(
padding: const EdgeInsets.all(16),
child: GestureDetector(
key: keyOpenWallet(repository.address!),
onTap: () {
walletOptions.getAddress(
currentChestNumber, repository.derivation!);
Navigator.push(
context,
SmoothTransition(
page: WalletOptions(
wallet: repository,
),
),
);
},
child: ClipOvalShadow(
shadow: const Shadow(
color: Colors.transparent,
offset: Offset(0, 0),
blurRadius: 5,
), ),
), clipper: CustomClipperOval(),
); child: ClipRRect(
}, borderRadius:
child: ClipOvalShadow( const BorderRadius.all(Radius.circular(12)),
shadow: const Shadow( child: Column(children: <Widget>[
color: Colors.transparent, Expanded(
offset: Offset(0, 0), child: Container(
blurRadius: 5, width: double.infinity,
), height: double.infinity,
clipper: CustomClipperOval(), decoration: BoxDecoration(
child: ClipRRect( gradient: RadialGradient(
borderRadius: radius: 0.6,
const BorderRadius.all(Radius.circular(12)), colors: [
child: Column(children: <Widget>[ Colors.green[400]!,
Expanded( const Color(0xFFE7E7A6),
child: Container( ],
width: double.infinity, )),
height: double.infinity, child:
decoration: BoxDecoration( // SvgPicture.asset('assets/chopp-gecko2.png',
gradient: RadialGradient( // semanticsLabel: 'Gecko', height: 48),
radius: 0.6, repository.imageCustomPath == null ||
colors: [ repository.imageCustomPath == ''
Colors.green[400]!, ? Image.asset(
const Color(0xFFE7E7A6), 'assets/avatars/${repository.imageDefaultPath}',
], alignment: Alignment.bottomCenter,
)), scale: 0.5,
child: )
// SvgPicture.asset('assets/chopp-gecko2.png', : Container(
// semanticsLabel: 'Gecko', height: 48), decoration: BoxDecoration(
repository.imageCustomPath == null || shape: BoxShape.circle,
repository.imageCustomPath == '' color: Colors.transparent,
? Image.asset( image: DecorationImage(
'assets/avatars/${repository.imageDefaultPath}', fit: BoxFit.fitHeight,
alignment: Alignment.bottomCenter, image: FileImage(
scale: 0.5, File(repository
) .imageCustomPath!),
: Container( ),
decoration: BoxDecoration( ),
shape: BoxShape.circle,
color: Colors.transparent,
image: DecorationImage(
fit: BoxFit.fitHeight,
image: FileImage(
File(repository.imageCustomPath!),
), ),
), ),
), )),
), Stack(children: <Widget>[
)), balanceBuilder(
Stack(children: <Widget>[ context,
balanceBuilder(context, repository.address!, repository.address!,
repository.address == defaultWallet.address), repository.address ==
nameBuilder(context, repository, defaultWallet, defaultWallet.address),
currentChestNumber), nameBuilder(context, repository, defaultWallet,
]), currentChestNumber),
]), ]),
), ]),
), ),
)), ),
));
}),
),
Consumer<SubstrateSdk>(builder: (context, sub, _) { Consumer<SubstrateSdk>(builder: (context, sub, _) {
return sub.nodeConnected return sub.nodeConnected
? addNewDerivation(context) ? addNewDerivation(context)

2
lib/screens/my_contacts.dart
View File

@ -116,7 +116,7 @@ class ContactsScreen extends StatelessWidget {
walletsProfilesClass.address = walletsProfilesClass.address =
g1Wallet.pubkey; g1Wallet.pubkey;
return WalletViewScreen( return WalletViewScreen(
pubkey: g1Wallet.pubkey, address: g1Wallet.pubkey,
username: g1WalletsBox username: g1WalletsBox
.get(g1Wallet.pubkey) .get(g1Wallet.pubkey)
?.id ?.id

2
lib/screens/search_result.dart
View File

@ -143,7 +143,7 @@ class SearchResultScreen extends StatelessWidget {
walletsProfilesClass.address = walletsProfilesClass.address =
g1Wallet.pubkey; g1Wallet.pubkey;
return WalletViewScreen( return WalletViewScreen(
pubkey: g1Wallet.pubkey, address: g1Wallet.pubkey,
username: g1WalletsBox username: g1WalletsBox
.get(g1Wallet.pubkey) .get(g1Wallet.pubkey)
?.id ?.id

537
lib/screens/wallet_view.dart
View File

@ -24,9 +24,9 @@ import 'package:qr_flutter/qr_flutter.dart';
class WalletViewScreen extends StatelessWidget { class WalletViewScreen extends StatelessWidget {
const WalletViewScreen( const WalletViewScreen(
{required this.pubkey, this.username, this.avatar, Key? key}) {required this.address, this.username, this.avatar, Key? key})
: super(key: key); : super(key: key);
final String? pubkey; final String? address;
final String? username; final String? username;
final Image? avatar; final Image? avatar;
final double buttonSize = 100; final double buttonSize = 100;
@ -39,7 +39,7 @@ class WalletViewScreen extends StatelessWidget {
Provider.of<WalletsProfilesProvider>(context, listen: false); Provider.of<WalletsProfilesProvider>(context, listen: false);
CesiumPlusProvider cesiumPlusProvider = CesiumPlusProvider cesiumPlusProvider =
Provider.of<CesiumPlusProvider>(context, listen: false); Provider.of<CesiumPlusProvider>(context, listen: false);
walletProfile.address = pubkey!; walletProfile.address = address!;
SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false); SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
HomeProvider homeProvider = HomeProvider homeProvider =
Provider.of<HomeProvider>(context, listen: false); Provider.of<HomeProvider>(context, listen: false);
@ -67,14 +67,14 @@ class WalletViewScreen extends StatelessWidget {
onPressed: () async { onPressed: () async {
G1WalletsList? newContact; G1WalletsList? newContact;
g1WalletsBox.toMap().forEach((key, value) { g1WalletsBox.toMap().forEach((key, value) {
if (key == pubkey) newContact = value; if (key == address) newContact = value;
}); });
// G1WalletsList(pubkey: pubkey!, username: username); // G1WalletsList(pubkey: pubkey!, username: username);
await walletProfile.addContact( await walletProfile.addContact(
newContact ?? G1WalletsList(pubkey: pubkey!)); newContact ?? G1WalletsList(pubkey: address!));
}, },
icon: Icon( icon: Icon(
walletProfile.isContact(pubkey!) walletProfile.isContact(address!)
? Icons.add_reaction_rounded ? Icons.add_reaction_rounded
: Icons.add_reaction_outlined, : Icons.add_reaction_outlined,
size: 35, size: 35,
@ -110,7 +110,7 @@ class WalletViewScreen extends StatelessWidget {
bottomNavigationBar: homeProvider.bottomAppBar(context), bottomNavigationBar: homeProvider.bottomAppBar(context),
body: SafeArea( body: SafeArea(
child: Column(children: <Widget>[ child: Column(children: <Widget>[
walletProfile.headerProfileView(context, pubkey!, username), walletProfile.headerProfileView(context, address!, username),
SizedBox(height: isTall ? 10 : 0), SizedBox(height: isTall ? 10 : 0),
Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
Column(children: <Widget>[ Column(children: <Widget>[
@ -134,7 +134,7 @@ class WalletViewScreen extends StatelessWidget {
context, context,
MaterialPageRoute(builder: (context) { MaterialPageRoute(builder: (context) {
return ActivityScreen( return ActivityScreen(
address: pubkey, address: address,
avatar: avatar:
cesiumPlusProvider.defaultAvatar(50)); cesiumPlusProvider.defaultAvatar(50));
}), }),
@ -155,7 +155,7 @@ class WalletViewScreen extends StatelessWidget {
WalletData? defaultWallet = myWalletProvider.getDefaultWallet(); WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
return FutureBuilder( return FutureBuilder(
future: sub.certState(defaultWallet.address!, future: sub.certState(defaultWallet.address!,
pubkey!), // .canCertify(_defaultWallet.address!, pubkey!), address!), // .canCertify(_defaultWallet.address!, pubkey!),
builder: (context, AsyncSnapshot<Map<String, int>> snapshot) { builder: (context, AsyncSnapshot<Map<String, int>> snapshot) {
if (snapshot.data == null) return const SizedBox(); if (snapshot.data == null) return const SizedBox();
String duration = ''; String duration = '';
@ -223,7 +223,7 @@ class WalletViewScreen extends StatelessWidget {
context, context,
"areYouSureYouWantToCertify".tr( "areYouSureYouWantToCertify".tr(
args: [ args: [
getShortPubkey(pubkey!) getShortPubkey(address!)
])); ]));
if (result ?? false) { if (result ?? false) {
@ -303,7 +303,7 @@ class WalletViewScreen extends StatelessWidget {
image: AssetImage('assets/copy_key.png'), image: AssetImage('assets/copy_key.png'),
height: 90)), height: 90)),
onTap: () { onTap: () {
Clipboard.setData(ClipboardData(text: pubkey)); Clipboard.setData(ClipboardData(text: address));
snackCopyKey(context); snackCopyKey(context);
}), }),
), ),
@ -340,14 +340,14 @@ class WalletViewScreen extends StatelessWidget {
splashColor: yellowC, splashColor: yellowC,
onTap: sub.nodeConnected onTap: sub.nodeConnected
? () { ? () {
paymentPopup(context, walletProfile); paymentPopup(context, address!);
} }
: null, // inkwell color : null, // inkwell color
child: const Padding( child: const Padding(
padding: EdgeInsets.all(14), padding: EdgeInsets.all(14),
child: Image( child: Image(
image: AssetImage('assets/vector_white.png'), image: AssetImage('assets/vector_white.png')),
))), )),
), ),
), ),
), ),
@ -397,270 +397,267 @@ class WalletViewScreen extends StatelessWidget {
), ),
]); ]);
} }
}
void paymentPopup( void paymentPopup(BuildContext context, String toAddress) {
BuildContext context, WalletsProfilesProvider walletViewProvider) { // WalletsProfilesProvider _walletViewProvider =
// WalletsProfilesProvider _walletViewProvider = // Provider.of<WalletsProfilesProvider>(context, listen: false);
// Provider.of<WalletsProfilesProvider>(context, listen: false); final walletViewProvider =
Provider.of<WalletsProfilesProvider>(context, listen: false);
final myWalletProvider = final myWalletProvider =
Provider.of<MyWalletsProvider>(context, listen: false); Provider.of<MyWalletsProvider>(context, listen: false);
final sub = Provider.of<SubstrateSdk>(context, listen: false); final sub = Provider.of<SubstrateSdk>(context, listen: false);
const double shapeSize = 20; const double shapeSize = 20;
WalletData? defaultWallet = myWalletProvider.getDefaultWallet(); WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
log.d(defaultWallet.address); log.d(defaultWallet.address);
bool canValidate = false; bool canValidate = false;
final bool isUdUnit = configBox.get('isUdUnit') ?? false; final bool isUdUnit = configBox.get('isUdUnit') ?? false;
final udValue = sub.udValue; final udValue = sub.udValue;
final double balanceRatio = isUdUnit ? round(udValue / 100, 6) : 1; final double balanceRatio = isUdUnit ? round(udValue / 100, 6) : 1;
showModalBottomSheet<void>( showModalBottomSheet<void>(
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topRight: Radius.circular(shapeSize), topRight: Radius.circular(shapeSize),
topLeft: Radius.circular(shapeSize), topLeft: Radius.circular(shapeSize),
),
), ),
isScrollControlled: true, ),
context: context, isScrollControlled: true,
builder: (BuildContext context) { context: context,
return StatefulBuilder( builder: (BuildContext context) {
builder: (BuildContext context, StateSetter setState) { return StatefulBuilder(
if (walletViewProvider.payAmount.text != '' && builder: (BuildContext context, StateSetter setState) {
(double.parse(walletViewProvider.payAmount.text) + if (walletViewProvider.payAmount.text != '' &&
2 / balanceRatio) <= (double.parse(walletViewProvider.payAmount.text) +
(balanceCache[defaultWallet.address] ?? 0) && 2 / balanceRatio) <=
walletViewProvider.address != defaultWallet.address) { (balanceCache[defaultWallet.address] ?? 0) &&
if ((balanceCache[pubkey] == 0 || balanceCache[pubkey] == null) && toAddress != defaultWallet.address) {
double.parse(walletViewProvider.payAmount.text) < if ((balanceCache[toAddress] == 0 ||
5 / balanceRatio) { balanceCache[toAddress] == null) &&
canValidate = false; double.parse(walletViewProvider.payAmount.text) <
} else { 5 / balanceRatio) {
canValidate = true;
}
} else {
canValidate = false; canValidate = false;
} else {
canValidate = true;
} }
final bool isUdUnit = configBox.get('isUdUnit') ?? false; } else {
return Padding( canValidate = false;
padding: EdgeInsets.only( }
bottom: MediaQuery.of(context).viewInsets.bottom), final bool isUdUnit = configBox.get('isUdUnit') ?? false;
child: Container( return Padding(
height: 400, padding: EdgeInsets.only(
decoration: const ShapeDecoration( bottom: MediaQuery.of(context).viewInsets.bottom),
color: Color(0xffffeed1), child: Container(
shape: RoundedRectangleBorder( height: 400,
borderRadius: BorderRadius.only( decoration: const ShapeDecoration(
topRight: Radius.circular(shapeSize), color: Color(0xffffeed1),
topLeft: Radius.circular(shapeSize), shape: RoundedRectangleBorder(
), borderRadius: BorderRadius.only(
topRight: Radius.circular(shapeSize),
topLeft: Radius.circular(shapeSize),
), ),
), ),
child: Padding(
padding: const EdgeInsets.only(
top: 24, bottom: 0, left: 24, right: 24),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'executeATransfer'.tr(),
style: const TextStyle(
fontSize: 26, fontWeight: FontWeight.w700),
),
IconButton(
iconSize: 40,
icon: const Icon(Icons.cancel_outlined),
onPressed: () {
Navigator.pop(context);
},
),
]),
const SizedBox(height: 20),
Text(
'from'.tr(),
style: TextStyle(
fontSize: 19,
fontWeight: FontWeight.w500,
color: Colors.grey[600]),
),
const SizedBox(height: 10),
Consumer<SubstrateSdk>(builder: (context, sub, _) {
return InkWell(
key: keyChangeChest,
onTap: () async {
String? pin;
if (myWalletProvider.pinCode == '') {
pin = await Navigator.push(
context,
MaterialPageRoute(
builder: (homeContext) {
return UnlockingWallet(
wallet: defaultWallet);
},
),
);
}
if (pin != null ||
myWalletProvider.pinCode != '') {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return ChooseWalletScreen(
pin: pin ?? myWalletProvider.pinCode);
}),
);
}
},
child: Container(
width: double.infinity,
decoration: BoxDecoration(
border: Border.all(
color: Colors.blueAccent.shade200,
width: 2),
borderRadius: const BorderRadius.all(
Radius.circular(10.0)),
),
padding: const EdgeInsets.all(10),
child: Row(children: [
Text(defaultWallet.name!),
const Spacer(),
balance(context, defaultWallet.address!, 20)
]),
),
);
}),
const Spacer(),
// const SizedBox(height: 10),
Text(
'amount'.tr(),
style: TextStyle(
fontSize: 19,
fontWeight: FontWeight.w500,
color: Colors.grey[600]),
),
const SizedBox(height: 10),
TextField(
key: keyAmountField,
controller: walletViewProvider.payAmount,
autofocus: true,
maxLines: 1,
textAlign: TextAlign.center,
keyboardType: TextInputType.number,
onChanged: (_) => setState(() {
// _walletViewProvider.reload();
}),
inputFormatters: <TextInputFormatter>[
// FilteringTextInputFormatter.digitsOnly,
FilteringTextInputFormatter.deny(',',
replacementString: '.'),
FilteringTextInputFormatter.allow(
RegExp(r'(^\d+\.?\d{0,2})')),
],
// onChanged: (v) => _searchProvider.reload(),
decoration: InputDecoration(
hintText: '0.00',
suffix: Text(isUdUnit
? 'ud'.tr(args: [''])
: currencyName), // udUnitDisplay(40),
filled: true,
fillColor: Colors.transparent,
// border: OutlineInputBorder(
// borderSide:
// BorderSide(color: Colors.grey[500], width: 2),
// borderRadius: BorderRadius.circular(8)),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.grey[500]!, width: 2),
borderRadius: BorderRadius.circular(8),
),
contentPadding: const EdgeInsets.all(20),
),
style: const TextStyle(
fontSize: 40,
color: Colors.black,
fontWeight: FontWeight.w600,
),
),
// const SizedBox(height: 40),
const Spacer(),
SizedBox(
width: double.infinity,
height: 60,
child: ElevatedButton(
key: keyConfirmPayment,
style: ElevatedButton.styleFrom(
foregroundColor: Colors.white, elevation: 4,
backgroundColor: orangeC, // foreground
),
onPressed: canValidate
? () async {
String? pin;
if (myWalletProvider.pinCode == '') {
pin = await Navigator.push(
context,
MaterialPageRoute(
builder: (homeContext) {
return UnlockingWallet(
wallet: defaultWallet);
},
),
);
}
log.d(pin);
if (pin != null ||
myWalletProvider.pinCode != '') {
// Payment workflow !
WalletsProfilesProvider
walletViewProvider =
Provider.of<WalletsProfilesProvider>(
context,
listen: false);
SubstrateSdk sub =
Provider.of<SubstrateSdk>(context,
listen: false);
final acc = sub.getCurrentWallet();
log.d(
"fromAddress: ${acc.address!},destAddress: ${walletViewProvider.address!}, amount: ${double.parse(walletViewProvider.payAmount.text)}, password: $pin");
sub.pay(
fromAddress: acc.address!,
destAddress:
walletViewProvider.address!,
amount: double.parse(
walletViewProvider
.payAmount.text),
password:
pin ?? myWalletProvider.pinCode);
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return const TransactionInProgress();
}),
);
}
}
: null,
child: Text(
'executeTheTransfer'.tr(),
style: const TextStyle(
fontSize: 20, fontWeight: FontWeight.w600),
),
),
),
const Spacer(),
]),
),
), ),
); child: Padding(
}); padding: const EdgeInsets.only(
}).then((value) => walletViewProvider.payAmount.text = ''); top: 24, bottom: 0, left: 24, right: 24),
} child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'executeATransfer'.tr(),
style: const TextStyle(
fontSize: 26, fontWeight: FontWeight.w700),
),
IconButton(
iconSize: 40,
icon: const Icon(Icons.cancel_outlined),
onPressed: () {
Navigator.pop(context);
},
),
]),
const SizedBox(height: 20),
Text(
'from'.tr(),
style: TextStyle(
fontSize: 19,
fontWeight: FontWeight.w500,
color: Colors.grey[600]),
),
const SizedBox(height: 10),
Consumer<SubstrateSdk>(builder: (context, sub, _) {
return InkWell(
key: keyChangeChest,
onTap: () async {
String? pin;
if (myWalletProvider.pinCode == '') {
pin = await Navigator.push(
context,
MaterialPageRoute(
builder: (homeContext) {
return UnlockingWallet(
wallet: defaultWallet);
},
),
);
}
if (pin != null || myWalletProvider.pinCode != '') {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return ChooseWalletScreen(
pin: pin ?? myWalletProvider.pinCode);
}),
);
}
},
child: Container(
width: double.infinity,
decoration: BoxDecoration(
border: Border.all(
color: Colors.blueAccent.shade200, width: 2),
borderRadius:
const BorderRadius.all(Radius.circular(10.0)),
),
padding: const EdgeInsets.all(10),
child: Row(children: [
Text(defaultWallet.name!),
const Spacer(),
balance(context, defaultWallet.address!, 20)
]),
),
);
}),
const Spacer(),
// const SizedBox(height: 10),
Text(
'amount'.tr(),
style: TextStyle(
fontSize: 19,
fontWeight: FontWeight.w500,
color: Colors.grey[600]),
),
const SizedBox(height: 10),
TextField(
key: keyAmountField,
controller: walletViewProvider.payAmount,
autofocus: true,
maxLines: 1,
textAlign: TextAlign.center,
keyboardType: TextInputType.number,
onChanged: (_) => setState(() {
// _walletViewProvider.reload();
}),
inputFormatters: <TextInputFormatter>[
// FilteringTextInputFormatter.digitsOnly,
FilteringTextInputFormatter.deny(',',
replacementString: '.'),
FilteringTextInputFormatter.allow(
RegExp(r'(^\d+\.?\d{0,2})')),
],
// onChanged: (v) => _searchProvider.reload(),
decoration: InputDecoration(
hintText: '0.00',
suffix: Text(isUdUnit
? 'ud'.tr(args: [''])
: currencyName), // udUnitDisplay(40),
filled: true,
fillColor: Colors.transparent,
// border: OutlineInputBorder(
// borderSide:
// BorderSide(color: Colors.grey[500], width: 2),
// borderRadius: BorderRadius.circular(8)),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey[500]!, width: 2),
borderRadius: BorderRadius.circular(8),
),
contentPadding: const EdgeInsets.all(20),
),
style: const TextStyle(
fontSize: 40,
color: Colors.black,
fontWeight: FontWeight.w600,
),
),
// const SizedBox(height: 40),
const Spacer(),
SizedBox(
width: double.infinity,
height: 60,
child: ElevatedButton(
key: keyConfirmPayment,
style: ElevatedButton.styleFrom(
foregroundColor: Colors.white, elevation: 4,
backgroundColor: orangeC, // foreground
),
onPressed: canValidate
? () async {
String? pin;
if (myWalletProvider.pinCode == '') {
pin = await Navigator.push(
context,
MaterialPageRoute(
builder: (homeContext) {
return UnlockingWallet(
wallet: defaultWallet);
},
),
);
}
log.d(pin);
if (pin != null ||
myWalletProvider.pinCode != '') {
// Payment workflow !
WalletsProfilesProvider walletViewProvider =
Provider.of<WalletsProfilesProvider>(
context,
listen: false);
SubstrateSdk sub =
Provider.of<SubstrateSdk>(context,
listen: false);
final acc = sub.getCurrentWallet();
log.d(
"fromAddress: ${acc.address!},destAddress: $toAddress, amount: ${double.parse(walletViewProvider.payAmount.text)}, password: $pin");
sub.pay(
fromAddress: acc.address!,
destAddress: toAddress,
amount: double.parse(
walletViewProvider.payAmount.text),
password:
pin ?? myWalletProvider.pinCode);
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return const TransactionInProgress();
}),
);
}
}
: null,
child: Text(
'executeTheTransfer'.tr(),
style: const TextStyle(
fontSize: 20, fontWeight: FontWeight.w600),
),
),
),
const Spacer(),
]),
),
),
);
});
}).then((value) => walletViewProvider.payAmount.text = '');
} }

12
pubspec.lock
View File

@ -611,7 +611,7 @@ packages:
name: image_picker_android name: image_picker_android
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.8.5+2" version: "0.8.5+3"
image_picker_for_web: image_picker_for_web:
dependency: transitive dependency: transitive
description: description:
@ -826,7 +826,7 @@ packages:
name: package_info_plus_windows name: package_info_plus_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.1.0"
path: path:
dependency: transitive dependency: transitive
description: description:
@ -980,7 +980,7 @@ packages:
name: pointycastle name: pointycastle
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.6.1" version: "3.6.2"
polkawallet_sdk: polkawallet_sdk:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1003,7 +1003,7 @@ packages:
name: printing name: printing
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.9.2" version: "5.9.3"
process: process:
dependency: transitive dependency: transitive
description: description:
@ -1096,7 +1096,7 @@ packages:
name: shared_preferences_android name: shared_preferences_android
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.12" version: "2.0.13"
shared_preferences_ios: shared_preferences_ios:
dependency: transitive dependency: transitive
description: description:
@ -1325,7 +1325,7 @@ packages:
name: win32 name: win32
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.7.0" version: "3.0.0"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description: