dashpay · romchornyi · Jul 29, 2026 · Jul 29, 2026 · Jul 29, 2026 · Jul 29, 2026
diff --git a/Sources/DashUIKit/Button/DashButton.swift b/Sources/DashUIKit/Button/DashButton.swift
@@ -273,7 +273,7 @@ private struct DashButtonStylePreview: View {
             VStack(alignment: .leading, spacing: 12) {
                 VStack(alignment: .leading, spacing: 8) {
                     Text("Enabled")
-                        .font(.subheadline)
+                        .dashFont(.subhead)
                         .foregroundColor(.secondary)
 
                     HStack(alignment: .top, spacing: 12) {
@@ -291,7 +291,7 @@ private struct DashButtonStylePreview: View {
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text("Disabled")
-                        .font(.subheadline)
+                        .dashFont(.subhead)
                         .foregroundColor(.secondary)
 
                     HStack(alignment: .top, spacing: 12) {

diff --git a/Sources/DashUIKit/Components/AddressFieldView.swift b/Sources/DashUIKit/Components/AddressFieldView.swift
@@ -122,12 +122,12 @@ public struct AddressFieldView: View {
                 "",
                 text: $text,
                 prompt: Text(placeholder)
-                    .font(Font.dash.subhead)
+                    .dashFont(.subhead)
                     .foregroundStyle(Color.dash.black1000Alpha30),
                 axis: .vertical
             )
             .lineLimit(1...2)
-            .font(Font.dash.subhead)
+            .dashFont(.subhead)
             .textInputAutocapitalization(.never)
             .disableAutocorrection(true)
             .foregroundStyle(Color.dash.primaryText)
@@ -136,7 +136,7 @@ public struct AddressFieldView: View {
             .disabled(isDisabled)
         } else {
             TextField(placeholder, text: $text)
-                .font(Font.dash.subhead)
+                .dashFont(.subhead)
                 .textInputAutocapitalization(.never)
                 .disableAutocorrection(true)
                 .foregroundStyle(Color.dash.primaryText)
@@ -150,15 +150,15 @@ public struct AddressFieldView: View {
         Group {
             if text.isEmpty {
                 Button(action: { onScanQR?() }) {
-                    Image(dash: .custom("text-field-qr", bundle: .dashUIKit))
+                    DashIcon.Other.textFieldQR.image
                         .resizable()
                         .scaledToFit()
                         .frame(width: Layout.iconSize, height: Layout.iconSize)
                 }
                 .accessibilityLabel(NSLocalizedString("Scan QR code", bundle: .module, comment: "DashUIKit"))
             } else {
                 Button(action: { text = "" }) {
-                    Image(dash: .custom("text-field-clear", bundle: .dashUIKit))
+                    DashIcon.Other.textFieldClear.image
                         .renderingMode(.template)
                         .resizable()
                         .scaledToFit()

diff --git a/Sources/DashUIKit/Components/DashAmount.swift b/Sources/DashUIKit/Components/DashAmount.swift
@@ -88,7 +88,7 @@ public struct DashAmount: View {
                 Text(DashAmountFormat.string(forDuffs: abs(amount)))
                     .font(.system(size: fontSize, weight: weight))
                     .lineLimit(1)
-                Image(dash: .custom("icon_dash_currency", bundle: .dashUIKit))
+                DashIcon.Common.iconDashCurrency.image
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(width: fontSize * dashSymbolFactor,

diff --git a/Sources/DashUIKit/Components/EnterAmount/DashBalanceView.swift b/Sources/DashUIKit/Components/EnterAmount/DashBalanceView.swift
@@ -38,7 +38,7 @@ public struct DashBalanceView: View {
         VStack(alignment: .trailing, spacing: 0) {
             HStack(spacing: 6) {
                 Text(balance)
-                    .font(Font.dash.subhead)
+                    .dashFont(.subhead)
                     .lineLimit(1)
 
                 dashSymbol
@@ -47,14 +47,14 @@ public struct DashBalanceView: View {
 
             if let fiat {
                 Text(fiat)
-                    .font(Font.dash.caption1)
+                    .dashFont(.caption1)
                     .foregroundColor(Color.dash.primaryText)
             }
         }
     }
 
     private var dashSymbol: some View {
-        Image(dash: .custom("icon_dash_currency", bundle: .dashUIKit))
+        DashIcon.Common.iconDashCurrency.image
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: 12, height: 10)

diff --git a/Sources/DashUIKit/Components/EnterAmount/DashPickerView.swift b/Sources/DashUIKit/Components/EnterAmount/DashPickerView.swift
@@ -52,7 +52,7 @@ public struct DashPickerView<Option: Hashable>: View {
 
     private func pickerOption(_ option: Option) -> some View {
         Text(title(option))
-            .font(Font.dash.caption2)
+            .dashFont(.caption2)
             .foregroundColor(selected == option ? Color.dash.primaryText : Color.dash.tertiaryText)
             .padding(.horizontal, Layout.hPadding)
             .padding(.vertical, Layout.vPadding)

diff --git a/Sources/DashUIKit/Components/EnterAmount/DualSwapAmountView.swift b/Sources/DashUIKit/Components/EnterAmount/DualSwapAmountView.swift
@@ -81,7 +81,7 @@ internal struct DualInputTypeSwitcher: View {
                     onSelect(code)
                 } label: {
                     Text(code)
-                        .font(Font.dash.caption2)
+                        .dashFont(.caption2)
                         .foregroundColor(
                             code == selected
                                 ? Color.dash.primaryText

diff --git a/Sources/DashUIKit/Components/EnterAmount/EnterAmountView.swift b/Sources/DashUIKit/Components/EnterAmount/EnterAmountView.swift
@@ -228,7 +228,7 @@ public struct EnterAmountView: View {
                     .frame(width: 40, height: 40)
 
                 Text(NSLocalizedString("Max", bundle: .module, comment: ""))
-                    .font(Font.dash.caption2)
+                    .dashFont(.caption2)
                     .foregroundColor(Color.dash.blue)
             }
         }
@@ -339,7 +339,7 @@ private struct DualSwapPreviewContainer: View {
     var body: some View {
         VStack(spacing: 20) {
             Text(showMax ? "With Max button" : "No Max button — amount stays centered")
-                .font(Font.dash.caption1)
+                .dashFont(.caption1)
                 .foregroundColor(Color.dash.tertiaryText)
 
             EnterAmountView(
@@ -358,7 +358,7 @@ private struct DualSwapPreviewContainer: View {
             .padding(.horizontal, 20)
 
             Button("Tap to swap") { isPrimarySelected.toggle() }
-                .font(Font.dash.footnote)
+                .dashFont(.footnote)
                 .foregroundColor(Color.dash.blue)
         }
         .padding(.vertical, 20)

diff --git a/Sources/DashUIKit/Components/EnterAmount/SwapAmountView.swift b/Sources/DashUIKit/Components/EnterAmount/SwapAmountView.swift
@@ -96,7 +96,7 @@ public struct SwapAmountView: View {
         VStack(spacing: 2) {
             if let top = topText {
                 Text(top)
-                    .font(Font.dash.caption1)
+                    .dashFont(.caption1)
                     .foregroundColor(Color.dash.tertiaryText)
             }
 
@@ -108,7 +108,7 @@ public struct SwapAmountView: View {
 
             if let bottom = bottomText {
                 Text(bottom)
-                    .font(Font.dash.caption1)
+                    .dashFont(.caption1)
                     .foregroundColor(Color.dash.tertiaryText)
             }
         }
@@ -123,7 +123,7 @@ public struct SwapAmountView: View {
 
             if let secondary = secondaryText {
                 Text(secondary)
-                    .font(Font.dash.subhead)
+                    .dashFont(.subhead)
                     .foregroundColor(Color.dash.tertiaryText)
             }
         }
@@ -166,7 +166,7 @@ public struct SwapAmountView: View {
                 Button {
                     onCurrencyTap?()
                 } label: {
-                    Image(dash: .custom("chevron-down-currency-select", bundle: .dashUIKit))
+                    DashIcon.Common.chevronDownCurrencySelect.image
                         .frame(width: 10, height: 5)
                 }
                 .buttonStyle(.plain)
@@ -191,7 +191,7 @@ public struct SwapAmountView: View {
                 .font(font)
 
             if showDashLogo {
-                Image(dash: .custom("enter-amount-dash", bundle: .dashUIKit))
+                DashIcon.Common.enterAmountDash.image
                     .resizable()
                     .scaledToFit()
                     .frame(width: dashSize?.width, height: dashSize?.height)
@@ -210,7 +210,7 @@ public struct SwapAmountView: View {
                 .font(font)
 
             if showSecondaryDashLogo {
-                Image(dash: .custom("enter-amount-dash", bundle: .dashUIKit))
+                DashIcon.Common.enterAmountDash.image
                     .resizable()
                     .scaledToFit()
                     .frame(width: dashSize?.width, height: dashSize?.height)
@@ -365,7 +365,7 @@ private struct AnimatedSwapLayout: View {
 
                 if showSecondaryCurrencyButton {
                     Button { onSecondaryCurrencyTap?() } label: {
-                        Image(dash: .custom("chevron-down-currency-select", bundle: .dashUIKit))
+                        DashIcon.Common.chevronDownCurrencySelect.image
                             .resizable()
                             .scaledToFit()
                             .frame(width: chevronSize.width, height: chevronSize.height)
@@ -436,7 +436,7 @@ private struct AnimatedSwapLayout: View {
             }
             Text(displayText).font(font)
             if showLogo {
-                Image(dash: .custom("enter-amount-dash", bundle: .dashUIKit))
+                DashIcon.Common.enterAmountDash.image
                     .resizable()
                     .scaledToFit()
                     .frame(width: dashSize.width, height: dashSize.height)
@@ -622,7 +622,7 @@ private struct SwapAmountAnimatedPreview: View {
     var body: some View {
         VStack(spacing: 16) {
             Text(isPrimarySelected ? "Dash is primary (large)" : "Fiat is primary (large)")
-                .font(Font.dash.caption1)
+                .dashFont(.caption1)
                 .foregroundColor(Color.dash.tertiaryText)
 
             SwapAmountView(
@@ -640,7 +640,7 @@ private struct SwapAmountAnimatedPreview: View {
             .onTapGesture { isPrimarySelected.toggle() }
 
             Button("Tap to swap") { isPrimarySelected.toggle() }
-                .font(Font.dash.footnote)
+                .dashFont(.footnote)
                 .foregroundColor(Color.dash.blue)
         }
     }

diff --git a/Sources/DashUIKit/Components/Illustrations/ErrorIllustration.swift b/Sources/DashUIKit/Components/Illustrations/ErrorIllustration.swift
@@ -26,7 +26,7 @@ public struct ErrorIllustration: View {
         ZStack {
             Color.dash.red
 
-            Image(dash: .custom("illustration-xmark", bundle: .dashUIKit))
+            DashIcon.Common.illustrationXmark.image
                 .resizable()
                 .scaledToFit()
                 .frame(maxHeight: 29)

diff --git a/Sources/DashUIKit/Components/Illustrations/SuccessIllustration.swift b/Sources/DashUIKit/Components/Illustrations/SuccessIllustration.swift
@@ -26,7 +26,7 @@ public struct SuccessIllustration: View {
         ZStack {
             Color.dash.green
 
-            Image(dash: .custom("checkmark", bundle: .dashUIKit))
+            DashIcon.Common.checkmark.image
                 .resizable()
                 .scaledToFit()
                 .frame(maxHeight: 29)

diff --git a/Sources/DashUIKit/Components/MenuItem.swift b/Sources/DashUIKit/Components/MenuItem.swift
@@ -249,17 +249,17 @@ public struct MenuItem: View {
 #Preview("Enabled vs disabled") {
     VStack(spacing: 0) {
         MenuItem(
-            leadingIcon: .custom("menu-receive", bundle: .dashUIKit),
+            leadingIcon: DashIcon.Menu.receive.source,
             title: "Buy Dash",
             helpText: "From any crypto to your Dash Wallet"
         )
 
         Divider().padding(.leading, 16)
 
         MenuItem(
-            leadingIcon: .custom("menu-receive", bundle: .dashUIKit),
+            leadingIcon: DashIcon.Menu.receive.source,
             isEnabled: false,
-            disabledLeadingIcon: .custom("menu-receive.disabled", bundle: .dashUIKit),
+            disabledLeadingIcon: DashIcon.Menu.receiveDisabled.source,
             title: "Buy Dash",
             helpText: "From any crypto to your Dash Wallet"
         )

diff --git a/Sources/DashUIKit/Components/NumericKeyboardView.swift b/Sources/DashUIKit/Components/NumericKeyboardView.swift
@@ -198,7 +198,7 @@ public struct NumericKeyboardView: View {
     private func helperTextRow(_ text: String?) -> some View {
         if let text, !text.isEmpty {
             Text(text)
-                .font(Font.dash.footnote)
+                .dashFont(.footnote)
                 .foregroundColor(Color.dash.secondaryText)
                 .multilineTextAlignment(.center)
                 .frame(maxWidth: .infinity)

diff --git a/Sources/DashUIKit/Components/SearchBar.swift b/Sources/DashUIKit/Components/SearchBar.swift
@@ -93,7 +93,7 @@ private struct SearchBarFocused: View {
     }
 
     private var magnifyingGlass: some View {
-        Image(dash: .custom("searchbar-magnifyingglass-icon", bundle: .dashUIKit))
+        DashIcon.SearchBar.magnifyingglassIcon.image
             .resizable()
             .scaledToFit()
             .frame(maxHeight: 15)
@@ -105,7 +105,7 @@ private struct SearchBarFocused: View {
             Button(
                 action: { text = "" },
                 label: {
-                    Image(dash: .custom("searchbar-xmark-icon", bundle: .dashUIKit))
+                    DashIcon.SearchBar.xmarkIcon.image
                         .resizable()
                         .scaledToFit()
                         .frame(maxHeight: 15)
@@ -142,7 +142,7 @@ private struct SearchBarFocused: View {
             TextField(
                 text: $text,
                 prompt: Text(placeholder)
-                    .font(Font.dash.subhead)
+                    .dashFont(.subhead)
                     .foregroundStyle(Color.dash.black1000Alpha30)
             ) {
                 EmptyView()
@@ -188,7 +188,7 @@ private struct SearchBarLegacy: View {
     }
 
     private var magnifyingGlass: some View {
-        Image(dash: .custom("searchbar-magnifyingglass-icon", bundle: .dashUIKit))
+        DashIcon.SearchBar.magnifyingglassIcon.image
             .resizable()
             .scaledToFit()
             .frame(maxHeight: 15)
@@ -200,7 +200,7 @@ private struct SearchBarLegacy: View {
             Button(
                 action: { text = "" },
                 label: {
-                    Image(dash: .custom("searchbar-xmark-icon", bundle: .dashUIKit))
+                    DashIcon.SearchBar.xmarkIcon.image
                         .resizable()
                         .scaledToFit()
                         .frame(maxHeight: 15)

diff --git a/Sources/DashUIKit/Components/Switch/Components/ThumbView.swift b/Sources/DashUIKit/Components/Switch/Components/ThumbView.swift
@@ -0,0 +1,37 @@
+//
+//  ThumbView.swift
+//  DashUIKit
+//
+//  Created by Roman Chornyi on 29.07.2026.
+//
+
+import SwiftUI
+
+@available(iOS 14, macOS 11, *)
+struct ThumbView: View {
+
+    private struct Constants {
+        static let switchThumbFill: Color = Color.dash.white
+        static let switchThumbRadius: CGFloat = 1000
+    }
+
+    var body: some View {
+        Rectangle()
+          .foregroundColor(.clear)
+          .frame(width: 39, height: 24)
+          .background(Constants.switchThumbFill)
+          .cornerRadius(Constants.switchThumbRadius)
+          .shadow(color: Color(red: 0.1, green: 0.13, blue: 0.15).opacity(0.06), radius: 1, x: 0, y: 1)
+          .shadow(color: Color(red: 0.1, green: 0.13, blue: 0.15).opacity(0.1), radius: 1.5, x: 0, y: 1)
+    }
+}
+
+#if DEBUG
+
+@available(iOS 17, macOS 14, *)
+#Preview {
+    ThumbView()
+        .padding()
+}
+
+#endif