Skip to content

Update Masternode UI for Firo #1333

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

Open
levoncrypto wants to merge 6 commits into
base: staging
Choose a base branch
from
Open

Update Masternode UI for Firo #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cedfec
update Masternode UI for Firo
levoncrypto May 9, 2026
4438aab
support private (Spark) balance for masternode collateral
May 11, 2026
7fd62d6
Masternode collateral fee check and send cancel black screen
levoncrypto May 15, 2026
595b41c
dart format
levoncrypto May 15, 2026
7b427dc
Offer Spark unshield for masternode consolidation fee
levoncrypto May 15, 2026
1d877fd
Merge branch 'staging' into masternode-dialog-update
levoncrypto May 15, 2026
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
22 changes: 17 additions & 5 deletions 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 @@ -83,10 +83,24 @@ class _ConfirmChangeNowSendViewState
final coin = wallet.info.coin;

final sendProgressController = ProgressAndSuccessController();
var isSendingDialogOpen = false;

void closeSendingDialog() {
if (!context.mounted || !isSendingDialogOpen) {
return;
}
final rootNavigator = Navigator.of(context, rootNavigator: true);
if (rootNavigator.canPop()) {
rootNavigator.pop();
}
isSendingDialogOpen = false;
}

isSendingDialogOpen = true;
unawaited(
showDialog<void>(
context: context,
useRootNavigator: true,
useSafeArea: false,
barrierDismissible: false,
builder: (context) {
Expand All @@ -95,7 +109,7 @@ class _ConfirmChangeNowSendViewState
controller: sendProgressController,
);
},
),
).whenComplete(() => isSendingDialogOpen = false),
);

final time = Future<dynamic>.delayed(const Duration(milliseconds: 2500));
Expand Down Expand Up @@ -141,10 +155,8 @@ class _ConfirmChangeNowSendViewState

// pop back to wallet
if (context.mounted) {
closeSendingDialog();
if (Util.isDesktop) {
// pop sending dialog
Navigator.of(context, rootNavigator: true).pop();

// one day we'll do routing right
Navigator.of(context, rootNavigator: true).pop();
if (widget.fromDesktopStep4) {
Expand All @@ -162,7 +174,7 @@ class _ConfirmChangeNowSendViewState
);

// pop sending dialog
Navigator.of(context).pop();
closeSendingDialog();

await showDialog<dynamic>(
context: context,
Expand Down
6 changes: 5 additions & 1 deletion lib/pages/masternodes/create_masternode_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ class _CreateMasternodeDialogState extends ConsumerState<CreateMasternodeView> {
style: STextStyles.desktopH3(context),
),
),
const DesktopDialogCloseButton(),
DesktopDialogCloseButton(
onPressedOverride: () {
Navigator.of(context, rootNavigator: true).pop();
},
),
],
),
Flexible(
Expand Down
Loading
Loading