-
Notifications
You must be signed in to change notification settings - Fork 24
feat(ui): group Masternodes and Voting under a Governance menu #924
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
DashWallet/Sources/UI/Menu/Governance/GovernanceMenuScreen.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| // | ||
| // Copyright © 2026 Dash Core Group. All rights reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import DashUIKit | ||
| import SwiftUI | ||
| import UIKit | ||
|
|
||
| /// Governance submenu: the wallet's masternode-facing surfaces, reached from | ||
| /// the main menu's "Governance" row. Groups Masternodes (moved here from | ||
| /// Tools) with username Voting (moved here from the main menu). | ||
| struct GovernanceMenuScreen: View { | ||
| private let vc: UINavigationController | ||
|
|
||
| @StateObject private var viewModel = GovernanceMenuViewModel() | ||
|
|
||
| init(vc: UINavigationController) { | ||
| self.vc = vc | ||
| } | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 0) { | ||
| NavBarBack { | ||
| vc.popViewController(animated: true) | ||
| } | ||
|
|
||
| TopIntro(title: NSLocalizedString("Governance", comment: "Governance")) | ||
| .padding(.leading, 20) | ||
| .padding(.trailing, 60) | ||
| .padding(.top, 10) | ||
| .padding(.bottom, 20) | ||
|
|
||
| VStack(spacing: 2) { | ||
| ForEach(viewModel.items) { item in | ||
| MenuItem( | ||
| title: item.title, | ||
| subtitle: item.subtitle, | ||
| details: item.details, | ||
| icon: item.icon, | ||
| showInfo: item.showInfo, | ||
| showChevron: false, | ||
| isToggled: item.isToggled, | ||
| action: item.action | ||
| ) | ||
| .frame(minHeight: 56) | ||
| } | ||
| } | ||
| .padding(6) | ||
| .background(Color.dash.secondaryBackground) | ||
| .clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous)) | ||
| .shadow(color: Color.dash.shadow, radius: 20, x: 0, y: 5) | ||
| .padding(.horizontal, 20) | ||
|
|
||
| Spacer() | ||
| } | ||
| .background(Color.dash.primaryBackground) | ||
| .navigationBarHidden(true) | ||
| .onReceive(viewModel.$navigationDestination) { destination in | ||
| handleNavigation(destination) | ||
| } | ||
| } | ||
|
|
||
| private func handleNavigation(_ destination: GovernanceMenuNavigationDestination?) { | ||
| switch destination { | ||
| case .masternodes: | ||
| showMasternodes() | ||
| #if DASHPAY | ||
| case .voting: | ||
| showVoting() | ||
| #endif | ||
| case .none: | ||
| break | ||
| } | ||
|
|
||
| if destination != nil { | ||
| viewModel.resetNavigation() | ||
| } | ||
| } | ||
|
|
||
| /// Same hosting wrapper Tools used when this screen lived there: the | ||
| /// SwiftUI list needs its own `NavigationStack` for row drill-downs, so | ||
| /// the back button is wired explicitly to pop the UIKit stack. | ||
| private func showMasternodes() { | ||
| let navController = vc | ||
| let popRoot: () -> Void = { [weak navController] in | ||
| _ = navController?.popViewController(animated: true) | ||
| } | ||
|
|
||
| let hosting = UIHostingController( | ||
| rootView: AnyView( | ||
| NavigationStack { | ||
| MasternodesScreen() | ||
| .navigationTitle(NSLocalizedString("Masternodes", comment: "Masternodes")) | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| .toolbar { | ||
| ToolbarItem(placement: .navigationBarLeading) { | ||
| Button(action: popRoot) { | ||
| Image(systemName: "chevron.left") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ) | ||
| ) | ||
| hosting.hidesBottomBarWhenPushed = true | ||
| vc.pushViewController(hosting, animated: true) | ||
| } | ||
|
|
||
| #if DASHPAY | ||
| private func showVoting() { | ||
| let controller = UsernameVotingViewController.controller() | ||
| controller.hidesBottomBarWhenPushed = true | ||
| vc.pushViewController(controller, animated: true) | ||
| } | ||
| #endif | ||
| } |
74 changes: 74 additions & 0 deletions
74
DashWallet/Sources/UI/Menu/Governance/GovernanceMenuViewModel.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // | ||
| // Copyright © 2026 Dash Core Group. All rights reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Combine | ||
| import Foundation | ||
|
|
||
| enum GovernanceMenuNavigationDestination { | ||
| case masternodes | ||
| #if DASHPAY | ||
| case voting | ||
| #endif | ||
| } | ||
|
|
||
| @MainActor | ||
| final class GovernanceMenuViewModel: ObservableObject { | ||
| @Published var items: [MenuItemModel] = [] | ||
| @Published var navigationDestination: GovernanceMenuNavigationDestination? | ||
|
|
||
| init() { | ||
| setupMenuItems() | ||
| } | ||
|
|
||
| private func setupMenuItems() { | ||
| var allItems: [MenuItemModel] = [] | ||
|
|
||
| // Masternodes — not DashPay-gated: masternode ownership is a Core | ||
| // concern and this screen is reachable in every build configuration | ||
| // (it previously lived under Tools with no gate). | ||
| allItems.append(MenuItemModel( | ||
| title: NSLocalizedString("Masternodes", comment: "Masternodes"), | ||
| subtitle: NSLocalizedString( | ||
| "Masternodes and evonodes using this wallet's keys", comment: "Masternodes"), | ||
| icon: .system("server.rack"), | ||
| action: { [weak self] in | ||
| self?.navigationDestination = .masternodes | ||
| } | ||
| )) | ||
|
|
||
| #if DASHPAY | ||
| // Username voting, behind the same preference that gated it on the | ||
| // main menu (Settings → "Username voting"). | ||
| if VotingPrefs.shared.votingEnabled { | ||
| allItems.append(MenuItemModel( | ||
| title: NSLocalizedString("Voting", comment: ""), | ||
| subtitle: NSLocalizedString( | ||
| "Vote on contested usernames", comment: "Voting"), | ||
| icon: .custom("menu_voting", maxHeight: 30), | ||
| action: { [weak self] in | ||
| self?.navigationDestination = .voting | ||
| } | ||
| )) | ||
| } | ||
| #endif | ||
|
|
||
| items = allItems | ||
| } | ||
|
|
||
| func resetNavigation() { | ||
| navigationDestination = nil | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.