Skip to content
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c95637f
feat: convert Import Private Key to bottom sheet
optimisticcreator Jan 20, 2026
3d4470c
fix: remove stale file references and update build configuration
optimisticcreator Jan 21, 2026
5b8afad
fix: add DAPI-GRPC preparation script for pod installation
optimisticcreator Jan 22, 2026
20cf3f7
fix: update prepare-dapi-grpc.sh for CocoaPods 1.15.2 compatibility
optimisticcreator Jan 22, 2026
98d53b1
fix: update TodayExtension to iOS 14.0 to match DSDynamicOptions libr…
optimisticcreator Jan 22, 2026
72478cd
fix: enable PiggyCards compilation and resolve build errors
optimisticcreator Jan 23, 2026
8a2e3e5
Add and update colors
optimisticcreator Feb 2, 2026
62f99b2
Update colors on "Import Private Key" sheet
optimisticcreator Feb 2, 2026
19d30a3
Add new icons for "Import private key" sheet
optimisticcreator Feb 2, 2026
04890ea
Fix:
ross-dash Feb 2, 2026
10ffd5b
Delete unneeded script
ross-dash Feb 2, 2026
20cf6cc
feat: Update components
ross-dash Feb 20, 2026
2fe58a7
fix: return project file build configs to "master"
HashEngineering Feb 20, 2026
aa9603f
Merge pull request #748 from dashpay/feat/redesign-tools-round-1
HashEngineering Feb 20, 2026
7a7ad35
feat: tools > show MN keys
ross-dash Mar 2, 2026
e0fdcda
Merge pull request #750 from dashpay/feat/redesign-tools-round-2
HashEngineering Mar 4, 2026
364a94c
Updated sheet for the "Extend public key" on the "Tools" page.
ross-dash Mar 9, 2026
0a4647c
Merge pull request #757 from dashpay/feat/redesign-tools-round-3
HashEngineering Mar 10, 2026
5fa314a
Merge branch 'master' into feat/tool-menuitems-and-components
HashEngineering Mar 10, 2026
d591ee2
fix: update localization file and code for "Masternode keys"
HashEngineering Mar 10, 2026
bf3e7aa
fix: remove debug logs from ToolsMenuScreen
HashEngineering Mar 10, 2026
cc610e3
fix: improve call of onScanPrivateKey
HashEngineering Mar 10, 2026
d6d0577
fix: rename Evolution Node ID to HPMN Operator
HashEngineering Mar 10, 2026
c4d28a4
fix: handle number of keys and used keys correctly with Localization
HashEngineering Mar 10, 2026
e8c1213
fix: undo changes to ToolsMenuScreen regarding qrScanModel
HashEngineering Mar 10, 2026
29342ab
fix: Operator Keys -> Operator keys
HashEngineering Mar 10, 2026
28875a3
fix: update localizations for operator keys
HashEngineering Mar 10, 2026
163a318
fix: Localization repair for missing wildcards at end of string
HashEngineering Mar 10, 2026
0336097
fix: improve MerchantListViewControler getting strings
HashEngineering Mar 11, 2026
0d153ab
fix: improve home screen strings with format
HashEngineering Mar 11, 2026
b448e1d
fix: connect Import Private Key flow
HashEngineering Mar 11, 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
784 changes: 391 additions & 393 deletions DashWallet.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "controls-back-dark-mode.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "controls-back-dark-mode@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "controls-back-dark-mode@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "controls-back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "controls-back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "controls-back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions DashWallet/Resources/AppAssets.xcassets/List/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "list-chevron-right.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "list-chevron-right@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "list-chevron-right@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icon-close-sheet-white.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon-close-sheet-white@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon-close-sheet-white@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icon-close-sheet.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon-close-sheet@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon-close-sheet@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "import.private.key.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "import.private.key@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "import.private.key@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "control-back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "control-back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "control-back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"images" : [
{
"filename" : "control-close.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "control-close@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "control-close@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true,
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "control-info.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "control-info@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "control-info@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"images" : [
{
"filename" : "control-plus.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "control-plus@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "control-plus@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true,
"template-rendering-intent" : "template"
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "Icon.png",
"filename" : "icon_copy_outline.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Icon@2x.png",
"filename" : "icon_copy_outline@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Icon@3x.png",
"filename" : "icon_copy_outline@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
11 changes: 11 additions & 0 deletions DashWallet/Sources/Application/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,14 @@ let kOneDash: UInt64 = 100_000_000;
let kDefaultCurrencyCode = "USD"
let kWalletName = "Dash Wallet"
let kDashCurrency = "DASH"

// MARK: - UI Constants

/// Menu radius for all menu containers (from Figma design system)
let kMenuRadius: CGFloat = 20

/// Menu padding (from Figma design system)
let kMenuPadding: CGFloat = 6

/// Menu vertical gap between items in VStack (from Figma design system)
let kMenuVGap: CGFloat = 2
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct CreateUsernameView: View {
VStack(alignment: .leading, spacing: 0) {
Text(NSLocalizedString("Create your username", comment: "Usernames"))
.foregroundColor(.primaryText)
.font(.h5Bold)
.font(.title1)
.padding(.top, 12)
Text(NSLocalizedString("Please note that you will not be able to change it in future", comment: "Usernames"))
.foregroundColor(.primaryText)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ public struct VerifyIdentityScreen: View {
ZStack(alignment: .bottom) {
VStack(alignment: .leading) {
Text(NSLocalizedString("Verify your identity", comment: "Usernames"))
.font(.h5Bold)
.font(.title1)
.multilineTextAlignment(.leading)
.lineSpacing(3)
.foregroundColor(.primaryText)

Text(NSLocalizedString("The link you send will be visible only to the network owners", comment: "Usernames"))
.font(.body2)
.font(.subhead)
.multilineTextAlignment(.leading)
.lineSpacing(3)
.foregroundColor(.secondaryText)
Expand All @@ -52,7 +52,7 @@ public struct VerifyIdentityScreen: View {
.foregroundStyle(Color.secondaryText)

Text(text)
.font(.body2)
.font(.subhead)
.padding(.top, 2)
}
.padding(14)
Expand All @@ -79,14 +79,14 @@ public struct VerifyIdentityScreen: View {
.padding(.vertical, 20)

Text(NSLocalizedString("Prove your identity", comment: "Usernames"))
.font(.subtitle1)
.font(.calloutMedium)
.multilineTextAlignment(.leading)
.lineSpacing(3)
.foregroundColor(.primaryText)
.padding(.top, 8)

Text(NSLocalizedString("Make a post with the text above on a well known social media or messaging platform to verify that you are the original owner of the requested username and paste the link bellow", comment: "Usernames"))
.font(.body2)
.font(.subhead)
.multilineTextAlignment(.leading)
.lineSpacing(3)
.foregroundColor(.secondaryText)
Expand Down
Loading