chore: unify menu item model in all setting screens

Author: Syn-McJ

DashWallet/Sources/UI/Menu/Main/MainMenuViewController.swift

@@ -25,7 +25,7 @@ class MainMenuViewController: UIViewController {
 
     weak var delegate: DWWipeDelegate?
 
-    private var hostingController: UIHostingController<MianMenuScreen>!
+    private var hostingController: UIHostingController<MainMenuScreen>!
 
     #if DASHPAY
     private let receiveModel: DWReceiveModelProtocol?
@@ -85,7 +85,7 @@ class MainMenuViewController: UIViewController {
 
     private func setupSwiftUIView() {
         #if DASHPAY
-        let swiftUIView = MianMenuScreen(
+        let swiftUIView = MainMenuScreen(
             vc: navigationController!,
             delegate: delegate as? MainMenuViewControllerDelegate,
             wipeDelegate: delegate,
@@ -130,7 +130,7 @@ extension MainMenuViewController: MFMailComposeViewControllerDelegate {
     }
 }
 
-struct MianMenuScreen: View {
+struct MainMenuScreen: View {
     private let vc: UINavigationController
     private let delegateInternal: DelegateInternal
     private let onContactSupport: () -> ()
@@ -224,12 +224,49 @@ struct MianMenuScreen: View {
                 }
                 #endif
 
-                // Menu sections
-                ForEach(Array(viewModel.menuSections.enumerated()), id: \.offset) { index, section in
-                    MenuSectionView(section: section) { menuItem in
-                        viewModel.handleMenuAction(menuItem)
+                // Menu items grouped in sections
+                VStack(spacing: 16) {
+                    // First group - main services (first 2 items)
+                    if viewModel.items.count >= 2 {
+                        VStack(spacing: 0) {
+                            ForEach(viewModel.items.prefix(2)) { item in
+                                MenuItem(
+                                    title: item.title,
+                                    subtitle: item.subtitle,
+                                    icon: item.icon,
+                                    showChevron: false,
+                                    action: item.action
+                                )
+                                .frame(minHeight: 60)
+                            }
+                        }
+                        .padding(.vertical, 5)
+                        .background(Color.secondaryBackground)
+                        .cornerRadius(12)
+                        .shadow(color: Color.shadow, radius: 20, x: 0, y: 5)
+                    }
+                    
+                    // Second group - settings items (remaining items)
+                    if viewModel.items.count > 2 {
+                        VStack(spacing: 0) {
+                            ForEach(viewModel.items.dropFirst(2)) { item in
+                                MenuItem(
+                                    title: item.title,
+                                    subtitle: item.subtitle,
+                                    icon: item.icon,
+                                    showChevron: false,
+                                    action: item.action
+                                )
+                                .frame(minHeight: 60)
+                            }
+                        }
+                        .padding(.vertical, 5)
+                        .background(Color.secondaryBackground)
+                        .cornerRadius(12)
+                        .shadow(color: Color.shadow, radius: 20, x: 0, y: 5)
                     }
                 }
+                .padding(.horizontal, 20)
 
                 Spacer(minLength: 60)
             }
@@ -471,42 +508,8 @@ struct MianMenuScreen: View {
     #endif
 }
 
-struct MenuSectionView: View {
-    let section: MenuSection
-    let onMenuItemTap: (MenuItemType) -> Void
-    
-    var body: some View {
-        VStack(spacing: 0) {
-            ForEach(section.items, id: \.self) { item in
-                MenuItemView(item: item) {
-                    onMenuItemTap(item)
-                }
-            }
-        }
-        .padding(.vertical, 5)
-        .background(Color.secondaryBackground)
-        .cornerRadius(12)
-        .shadow(color: Color.shadow, radius: 20, x: 0, y: 5)
-        .padding(.horizontal, 20)
-    }
-}
-
-struct MenuItemView: View {
-    let item: MenuItemType
-    let action: () -> Void
-    
-    var body: some View {
-        MenuItem(
-            title: item.title,
-            subtitle: nil,
-            icon: item.iconName,
-            showChevron: false,
-            action: action
-        )
-    }
-}
 
-extension MianMenuScreen {
+extension MainMenuScreen {
     class DelegateInternal: NSObject, RootEditProfileViewControllerDelegate, ExploreViewControllerDelegate {
         private weak var delegate: MainMenuViewControllerDelegate?
         private weak var wipeDelegate: DWWipeDelegate?

DashWallet/Sources/UI/Menu/Main/MainMenuViewModel.swift

@@ -41,7 +41,7 @@ protocol MainMenuViewModelDelegate: AnyObject {
 @MainActor
 class MainMenuViewModel: ObservableObject {
 
-    @Published var menuSections: [MenuSection] = []
+    @Published var items: [MenuItemModel] = []
     @Published var navigationDestination: MainMenuNavigationDestination?
     @Published var showCreditsWarning: Bool = false
     @Published var creditsWarningHeading: String = ""
@@ -73,57 +73,79 @@ class MainMenuViewModel: ObservableObject {
     // MARK: - Menu Building
 
     func buildMenuSections() {
-        var sections: [MenuSection] = []
+        var allItems: [MenuItemModel] = []
 
-        // Main services section
-        sections.append(MenuSection(items: [
-            .buySellDash,
-            .explore
-        ]))
+        // Buy & Sell Dash
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Buy & sell Dash", comment: ""),
+            icon: .custom("image.buy.and.sell", maxHeight: 22),
+            action: { [weak self] in
+                self?.handleBuySellDash()
+            }
+        ))
+        
+        // Explore
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Explore", comment: ""),
+            icon: .custom("image.explore", maxHeight: 22),
+            action: { [weak self] in
+                self?.navigationDestination = .explore
+            }
+        ))
 
-        // Settings section
-        var settingsItems: [MenuItemType] = [
-            .security,
-            .settings,
-            .tools,
-            .support
-        ]
+        // Security
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Security", comment: ""),
+            icon: .custom("image.security", maxHeight: 22),
+            action: { [weak self] in
+                self?.navigationDestination = .security
+            }
+        ))
+        
+        // Settings
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Settings", comment: ""),
+            icon: .custom("image.settings", maxHeight: 22),
+            action: { [weak self] in
+                self?.navigationDestination = .settings
+            }
+        ))
+        
+        // Tools
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Tools", comment: ""),
+            icon: .custom("image.tools", maxHeight: 22),
+            action: { [weak self] in
+                self?.navigationDestination = .tools
+            }
+        ))
+        
+        // Support
+        allItems.append(MenuItemModel(
+            title: NSLocalizedString("Support", comment: ""),
+            icon: .custom("image.support", maxHeight: 22),
+            action: { [weak self] in
+                self?.navigationDestination = .support
+            }
+        ))
 
         #if DASHPAY
+        // Voting
         if VotingPrefs.shared.votingEnabled {
-            settingsItems.append(.voting)
+            allItems.append(MenuItemModel(
+                title: NSLocalizedString("Voting", comment: ""),
+                icon: .custom("menu_voting", maxHeight: 22),
+                action: { [weak self] in
+                    self?.navigationDestination = .voting
+                }
+            ))
         }
         #endif
 
-        sections.append(MenuSection(items: settingsItems))
-        
-        self.menuSections = sections
+        self.items = allItems
     }
 
     // MARK: - Actions
-    
-    func handleMenuAction(_ item: MenuItemType) {
-        switch item {
-        case .buySellDash:
-            handleBuySellDash()
-        case .explore:
-            navigationDestination = .explore
-        case .security:
-            navigationDestination = .security
-        case .settings:
-            navigationDestination = .settings
-        case .tools:
-            navigationDestination = .tools
-        case .support:
-            navigationDestination = .support
-        #if DASHPAY
-        case .invite:
-            navigationDestination = .invite
-        case .voting:
-            navigationDestination = .voting
-        #endif
-        }
-    }
 
     private func handleBuySellDash() {
         DSAuthenticationManager.sharedInstance().authenticate(
@@ -147,69 +169,3 @@ class MainMenuViewModel: ObservableObject {
         showCreditsWarning = true
     }
 }
-
-// MARK: - Data Models
-
-struct MenuSection {
-    let items: [MenuItemType]
-}
-
-enum MenuItemType: CaseIterable {
-    case buySellDash
-    case explore
-    case security
-    case settings
-    case tools
-    case support
-    #if DASHPAY
-    case invite
-    case voting
-    #endif
-    
-    var title: String {
-        switch self {
-        case .buySellDash:
-            return NSLocalizedString("Buy & sell Dash", comment: "")
-        case .explore:
-            return NSLocalizedString("Explore", comment: "")
-        case .security:
-            return NSLocalizedString("Security", comment: "")
-        case .settings:
-            return NSLocalizedString("Settings", comment: "")
-        case .tools:
-            return NSLocalizedString("Tools", comment: "")
-        case .support:
-            return NSLocalizedString("Support", comment: "")
-        #if DASHPAY
-        case .invite:
-            return NSLocalizedString("Invite", comment: "")
-        case .voting:
-            return NSLocalizedString("Voting", comment: "")
-        #endif
-        }
-    }
-    
-    var iconName: IconName {
-        switch self {
-        case .buySellDash:
-            return .custom("image.buy.and.sell", maxHeight: 22)
-        case .explore:
-            return .custom("image.explore", maxHeight: 22)
-        case .security:
-            return .custom("image.security", maxHeight: 22)
-        case .settings:
-            return .custom("image.settings", maxHeight: 22)
-        case .tools:
-            return .custom("image.tools", maxHeight: 22)
-        case .support:
-            return .custom("image.support", maxHeight: 22)
-        #if DASHPAY
-        case .invite:
-            return .custom("menu_invite", maxHeight: 22)
-        case .voting:
-            return .custom("menu_voting", maxHeight: 22)
-        #endif
-        }
-    }
-}
-

DashWallet/ar.lproj/Localizable.strings

@@ -592,9 +592,6 @@
 /* Usernames */
 "Create a username" = "Create a username";
 
-/* No comment provided by engineer. */
-"Create a username and say goodbye to numerical addresses" = "Create a username and say goodbye to numerical addresses";
-
 /* CrowdNode */
 "Create Account" = "إنشاء حساب";
 
@@ -2371,6 +2368,9 @@
 /* Voting */
 "Submit" = "Submit";
 
+/* No comment provided by engineer. */
+"Successful purchase" = "Successful purchase";
+
 /* No comment provided by engineer. */
 "Support" = "Support";
 

DashWallet/bg.lproj/Localizable.strings

@@ -592,9 +592,6 @@
 /* Usernames */
 "Create a username" = "Create a username";
 
-/* No comment provided by engineer. */
-"Create a username and say goodbye to numerical addresses" = "Create a username and say goodbye to numerical addresses";
-
 /* CrowdNode */
 "Create Account" = "Create Account";
 
@@ -2371,6 +2368,9 @@
 /* Voting */
 "Submit" = "Submit";
 
+/* No comment provided by engineer. */
+"Successful purchase" = "Successful purchase";
+
 /* No comment provided by engineer. */
 "Support" = "Support";
 

DashWallet/ca.lproj/Localizable.strings

@@ -592,9 +592,6 @@
 /* Usernames */
 "Create a username" = "Create a username";
 
-/* No comment provided by engineer. */
-"Create a username and say goodbye to numerical addresses" = "Create a username and say goodbye to numerical addresses";
-
 /* CrowdNode */
 "Create Account" = "Create Account";
 
@@ -2371,6 +2368,9 @@
 /* Voting */
 "Submit" = "Submit";
 
+/* No comment provided by engineer. */
+"Successful purchase" = "Successful purchase";
+
 /* No comment provided by engineer. */
 "Support" = "Support";