Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wallets refactor #718

Merged
merged 10 commits into from
Jan 17, 2024
+309 −5,633
Merged

Wallets refactor #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63b76df
exchange flow recipient address from stack selection bugfix
julian-CStack Jan 16, 2024
1f0fc01
send from spark balance for trades instead of lelantus
julian-CStack Jan 16, 2024
8314413
coinlib windows: use find_file to find dll location
sneurlax Jan 16, 2024
e90baa3
clean up unused code
julian-CStack Jan 16, 2024
fb937eb
eth + eth token send fix
julian-CStack Jan 16, 2024
ec52612
xmr/wow address check null error fix
julian-CStack Jan 17, 2024
07b7501
ensure ba/nano height is updated when fetching transactions. Probably…
julian-CStack Jan 17, 2024
33e0059
remove stream watching walletinfo due to flaky updates. Just grab wal…
julian-CStack Jan 17, 2024
c29e1f0
do not put a tempTx for particl due to miss matching txids
julian-CStack Jan 17, 2024
393e27b
possible epiccash duplicate tx in history fix
julian-CStack Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pages/exchange_view/confirm_change_now_send.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class _ConfirmChangeNowSendViewState

try {
if (wallet is FiroWallet && widget.shouldSendPublicFiroFunds == false) {
txidFuture = wallet.confirmSendLelantus(txData: widget.txData);
txidFuture = wallet.confirmSendSpark(txData: widget.txData);
} else {
txidFuture = wallet.confirmSend(txData: widget.txData);
}
Expand Down
6 changes: 4 additions & 2 deletions lib/pages/exchange_view/exchange_step_views/step_2_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,10 @@ class _Step2ViewState extends ConsumerState<Step2View> {

_toController.text = wallet.info.name;
model.recipientAddress = (await wallet
.getCurrentReceivingAddress())!
.value;
.getCurrentReceivingAddress())
?.value ??
wallet
.info.cachedReceivingAddress;

setState(() {
enableNext =
Expand Down
4 changes: 1 addition & 3 deletions lib/pages/exchange_view/exchange_step_views/step_4_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {

Future<TxData> txDataFuture;

// TODO: [prio=high] Firo spark

if (wallet is FiroWallet && !firoPublicSend) {
txDataFuture = wallet.prepareSendLelantus(
txDataFuture = wallet.prepareSendSpark(
txData: TxData(
recipients: [
(
Expand Down
16 changes: 9 additions & 7 deletions lib/pages/exchange_view/send_from_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
recipients: [
(
address: address,
amount: amount, isChange: false,
amount: amount,
isChange: false,
),
],
memo: memo,
Expand All @@ -303,19 +304,21 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
recipients: [
(
address: address,
amount: amount, isChange: false,
amount: amount,
isChange: false,
),
],
feeRateType: FeeRateType.average,
),
);
} else {
txDataFuture = firoWallet.prepareSendLelantus(
txDataFuture = firoWallet.prepareSendSpark(
txData: TxData(
recipients: [
(
address: address,
amount: amount, isChange: false,
amount: amount,
isChange: false,
),
],
// feeRateType: FeeRateType.average,
Expand Down Expand Up @@ -481,7 +484,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
),
Text(
ref.watch(pAmountFormatter(coin)).format(ref
.watch(pWalletBalance(walletId))
.watch(pWalletBalanceTertiary(walletId))
.spendable),
style: STextStyles.itemSubtitle(context),
),
Expand Down Expand Up @@ -543,8 +546,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
Text(
ref.watch(pAmountFormatter(coin)).format(
ref
.watch(
pWalletBalanceSecondary(walletId))
.watch(pWalletBalance(walletId))
.spendable,
),
style: STextStyles.itemSubtitle(context),
Expand Down
5 changes: 4 additions & 1 deletion lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,10 @@ class _DesktopChooseFromStackState
CustomTextButton(
text: "Select wallet",
onTap: () async {
final address = wallet.info.cachedReceivingAddress;
final address =
(await wallet.getCurrentReceivingAddress())
?.value ??
wallet.info.cachedReceivingAddress;

if (mounted) {
Navigator.of(context).pop(
Expand Down
Loading
Loading