Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-29 21:55:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable fee preview calculation for desktop send form

Browse source
This commit is contained in:
julian 2022-10-27 08:31:25 -06:00
parent 89e301df45
commit 49c3c15a7d
2 changed files with 120 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

242
lib/pages_desktop_specific/home/my_stack_view/wallet_view/send/desktop_send.dart
View file

@ -7,6 +7,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:stackwallet/models/send_view_auto_fill_data.dart';
import 'package:stackwallet/pages/address_book_views/address_book_view.dart';
import 'package:stackwallet/pages/send_view/confirm_transaction_view.dart';
import 'package:stackwallet/pages/send_view/sub_widgets/building_transaction_dialog.dart';
import 'package:stackwallet/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart';
import 'package:stackwallet/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart';
import 'package:stackwallet/providers/providers.dart';
@ -22,7 +24,6 @@ import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
import 'package:stackwallet/utilities/clipboard_interface.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/fee_rate_type_enum.dart';
import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/prefs.dart';
@ -40,9 +41,6 @@ import 'package:stackwallet/widgets/stack_dialog.dart';
import 'package:stackwallet/widgets/stack_text_field.dart';
import 'package:stackwallet/widgets/textfield_icon_button.dart';
import '../../../../../pages/send_view/confirm_transaction_view.dart';
import '../../../../../pages/send_view/sub_widgets/building_transaction_dialog.dart';
class DesktopSend extends ConsumerStatefulWidget {
const DesktopSend({
Key? key,
@ -71,7 +69,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
late TextEditingController cryptoAmountController;
late TextEditingController baseAmountController;
late TextEditingController noteController;
late TextEditingController feeController;
// late TextEditingController feeController;
late final SendViewAutoFillData? _data;
@ -92,8 +90,6 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
bool _cryptoAmountChangeLock = false;
late VoidCallback onCryptoAmountChanged;
Decimal? _cachedBalance;
Future<void> previewSend() async {
// wait for keyboard to disappear
FocusScope.of(context).unfocus();
@ -346,78 +342,78 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
(isValidAddress && amount != null && amount > Decimal.zero);
}
late Future<String> _calculateFeesFuture;
// late Future<String> _calculateFeesFuture;
Map<int, String> cachedFees = {};
Map<int, String> cachedFiroPrivateFees = {};
Map<int, String> cachedFiroPublicFees = {};
// Map<int, String> cachedFees = {};
// Map<int, String> cachedFiroPrivateFees = {};
// Map<int, String> cachedFiroPublicFees = {};
Future<String> calculateFees(int amount) async {
if (amount <= 0) {
return "0";
}
if (coin == Coin.firo || coin == Coin.firoTestNet) {
if (ref.read(publicPrivateBalanceStateProvider.state).state ==
"Private") {
if (cachedFiroPrivateFees[amount] != null) {
return cachedFiroPrivateFees[amount]!;
}
} else {
if (cachedFiroPublicFees[amount] != null) {
return cachedFiroPublicFees[amount]!;
}
}
} else if (cachedFees[amount] != null) {
return cachedFees[amount]!;
}
final manager =
ref.read(walletsChangeNotifierProvider).getManager(walletId);
final feeObject = await manager.fees;
late final int feeRate;
switch (ref.read(feeRateTypeStateProvider.state).state) {
case FeeRateType.fast:
feeRate = feeObject.fast;
break;
case FeeRateType.average:
feeRate = feeObject.medium;
break;
case FeeRateType.slow:
feeRate = feeObject.slow;
break;
}
int fee;
if (coin == Coin.firo || coin == Coin.firoTestNet) {
if (ref.read(publicPrivateBalanceStateProvider.state).state ==
"Private") {
fee = await manager.estimateFeeFor(amount, feeRate);
cachedFiroPrivateFees[amount] = Format.satoshisToAmount(fee)
.toStringAsFixed(Constants.decimalPlaces);
return cachedFiroPrivateFees[amount]!;
} else {
fee = await (manager.wallet as FiroWallet)
.estimateFeeForPublic(amount, feeRate);
cachedFiroPublicFees[amount] = Format.satoshisToAmount(fee)
.toStringAsFixed(Constants.decimalPlaces);
return cachedFiroPublicFees[amount]!;
}
} else {
fee = await manager.estimateFeeFor(amount, feeRate);
cachedFees[amount] =
Format.satoshisToAmount(fee).toStringAsFixed(Constants.decimalPlaces);
return cachedFees[amount]!;
}
}
// Future<String> calculateFees(int amount) async {
// if (amount <= 0) {
// return "0";
// }
//
// if (coin == Coin.firo || coin == Coin.firoTestNet) {
// if (ref.read(publicPrivateBalanceStateProvider.state).state ==
// "Private") {
// if (cachedFiroPrivateFees[amount] != null) {
// return cachedFiroPrivateFees[amount]!;
// }
// } else {
// if (cachedFiroPublicFees[amount] != null) {
// return cachedFiroPublicFees[amount]!;
// }
// }
// } else if (cachedFees[amount] != null) {
// return cachedFees[amount]!;
// }
//
// final manager =
// ref.read(walletsChangeNotifierProvider).getManager(walletId);
// final feeObject = await manager.fees;
//
// late final int feeRate;
//
// switch (ref.read(feeRateTypeStateProvider.state).state) {
// case FeeRateType.fast:
// feeRate = feeObject.fast;
// break;
// case FeeRateType.average:
// feeRate = feeObject.medium;
// break;
// case FeeRateType.slow:
// feeRate = feeObject.slow;
// break;
// }
//
// int fee;
//
// if (coin == Coin.firo || coin == Coin.firoTestNet) {
// if (ref.read(publicPrivateBalanceStateProvider.state).state ==
// "Private") {
// fee = await manager.estimateFeeFor(amount, feeRate);
//
// cachedFiroPrivateFees[amount] = Format.satoshisToAmount(fee)
// .toStringAsFixed(Constants.decimalPlaces);
//
// return cachedFiroPrivateFees[amount]!;
// } else {
// fee = await (manager.wallet as FiroWallet)
// .estimateFeeForPublic(amount, feeRate);
//
// cachedFiroPublicFees[amount] = Format.satoshisToAmount(fee)
// .toStringAsFixed(Constants.decimalPlaces);
//
// return cachedFiroPublicFees[amount]!;
// }
// } else {
// fee = await manager.estimateFeeFor(amount, feeRate);
// cachedFees[amount] =
// Format.satoshisToAmount(fee).toStringAsFixed(Constants.decimalPlaces);
//
// return cachedFees[amount]!;
// }
// }
Future<String?> _firoBalanceFuture(
ChangeNotifierProvider<Manager> provider, String locale) async {
@ -443,7 +439,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
void initState() {
ref.refresh(feeSheetSessionCacheProvider);
_calculateFeesFuture = calculateFees(0);
// _calculateFeesFuture = calculateFees(0);
_data = widget.autoFillData;
walletId = widget.walletId;
coin = ref.read(walletsChangeNotifierProvider).getManager(walletId).coin;
@ -454,7 +450,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
cryptoAmountController = TextEditingController();
baseAmountController = TextEditingController();
noteController = TextEditingController();
feeController = TextEditingController();
// feeController = TextEditingController();
onCryptoAmountChanged = _cryptoAmountChanged;
cryptoAmountController.addListener(onCryptoAmountChanged);
@ -468,35 +464,35 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
_addressToggleFlag = true;
}
_cryptoFocus.addListener(() {
if (!_cryptoFocus.hasFocus && !_baseFocus.hasFocus) {
if (_amountToSend == null) {
setState(() {
_calculateFeesFuture = calculateFees(0);
});
} else {
setState(() {
_calculateFeesFuture =
calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
});
}
}
});
_baseFocus.addListener(() {
if (!_cryptoFocus.hasFocus && !_baseFocus.hasFocus) {
if (_amountToSend == null) {
setState(() {
_calculateFeesFuture = calculateFees(0);
});
} else {
setState(() {
_calculateFeesFuture =
calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
});
}
}
});
// _cryptoFocus.addListener(() {
// if (!_cryptoFocus.hasFocus && !_baseFocus.hasFocus) {
// if (_amountToSend == null) {
// setState(() {
// _calculateFeesFuture = calculateFees(0);
// });
// } else {
// setState(() {
// _calculateFeesFuture =
// calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
// });
// }
// }
// });
//
// _baseFocus.addListener(() {
// if (!_cryptoFocus.hasFocus && !_baseFocus.hasFocus) {
// if (_amountToSend == null) {
// setState(() {
// _calculateFeesFuture = calculateFees(0);
// });
// } else {
// setState(() {
// _calculateFeesFuture =
// calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
// });
// }
// }
// });
super.initState();
}
@ -509,7 +505,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
cryptoAmountController.dispose();
baseAmountController.dispose();
noteController.dispose();
feeController.dispose();
// feeController.dispose();
_noteFocusNode.dispose();
_addressFocusNode.dispose();
@ -526,20 +522,20 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
final String locale = ref.watch(
localeServiceChangeNotifierProvider.select((value) => value.locale));
if (coin == Coin.firo || coin == Coin.firoTestNet) {
ref.listen(publicPrivateBalanceStateProvider, (previous, next) {
if (_amountToSend == null) {
setState(() {
_calculateFeesFuture = calculateFees(0);
});
} else {
setState(() {
_calculateFeesFuture =
calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
});
}
});
}
// if (coin == Coin.firo || coin == Coin.firoTestNet) {
// ref.listen(publicPrivateBalanceStateProvider, (previous, next) {
// if (_amountToSend == null) {
// setState(() {
// _calculateFeesFuture = calculateFees(0);
// });
// } else {
// setState(() {
// _calculateFeesFuture =
// calculateFees(Format.decimalAmountToSatoshis(_amountToSend!));
// });
// }
// });
// }
return Column(
crossAxisAlignment: CrossAxisAlignment.start,

2
pubspec.lock
View file

@ -1410,7 +1410,7 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "1.1.0"
string_validator:
dependency: "direct main"
description: