Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ TODO.md
*/Topper-Info.plist
*/Coinbase-Info.plist
*/ZenLedger-Info.plist
CLAUDE.md
78 changes: 54 additions & 24 deletions DashWallet.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "icon_dropDown.png",
"filename" : "GiftCard.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_dropDown@2x.png",
"filename" : "GiftCard@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_dropDown@3x.png",
"filename" : "GiftCard@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images" : [
{
"filename" : "all trans.png",
"idiom" : "universal",
"filename" : "icon_pay_small.png",
"scale" : "1x"
},
{
"filename" : "all trans@2x.png",
"idiom" : "universal",
"filename" : "icon_pay_small@2x.png",
"scale" : "2x"
},
{
"filename" : "all trans@3x.png",
"idiom" : "universal",
"filename" : "icon_pay_small@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"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.
2 changes: 1 addition & 1 deletion DashWallet/Sources/Application/App.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ final class App {
static let shared = App()

func cleanUp() {
TxUserInfoDAOImpl.shared.deleteAll()
TransactionMetadataDAOImpl.shared.deleteAll()
AddressUserInfoDAOImpl.shared.deleteAll()
#if DASHPAY
UsernameRequestsDAOImpl.shared.deleteAll()
Expand Down
17 changes: 17 additions & 0 deletions DashWallet/Sources/Categories/Foundation+Bitcoin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,23 @@ extension Data {
let rawValue: Int
static let upperCase = HexEncodingOptions(rawValue: 1 << 0)
}

init?(hex: String) {
let len = hex.count / 2
var data = Data(capacity: len)
var i = hex.startIndex
for _ in 0..<len {
let j = hex.index(i, offsetBy: 2)
let bytes = hex[i..<j]
if var num = UInt8(bytes, radix: 16) {
data.append(&num, count: 1)
} else {
return nil
}
i = j
}
self = data
}

func hexEncodedString(options: HexEncodingOptions = []) -> String {
let format = options.contains(.upperCase) ? "%02hhX" : "%02hhx"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ extension DatabaseConnection {
}

static func migrations() -> [Migration] {
[SeedDB(), AddGiftCardsTable()]
[SeedDB(), AddGiftCardsTable(), AddIconBitmapsTable()]
}

static func migrationsBundle() -> Bundle {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Adding metadata fields to tx_userinfo table
ALTER TABLE tx_userinfo ADD timestamp BIGINT NULL;
ALTER TABLE tx_userinfo ADD memo TEXT NULL;
ALTER TABLE tx_userinfo ADD service TEXT NULL;
ALTER TABLE tx_userinfo ADD customIconId BLOB NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//
// Created by Andrei Ashikhmin
// Copyright © 2025 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 Foundation
import SQLite
import SQLiteMigrationManager

struct AddIconBitmapsTable: Migration {
var version: Int64 = 20250114130000

func migrateDatabase(_ db: Connection) throws {
try db.run(IconBitmap.table.create(ifNotExists: true) { t in
t.column(IconBitmap.id, primaryKey: true)
t.column(IconBitmap.imageData)
t.column(IconBitmap.originalUrl)
t.column(IconBitmap.height)
t.column(IconBitmap.width)
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import SQLite
import SQLiteMigrationManager

struct SeedDB: Migration {
var version: Int64 = 20241130210940
var version: Int64 = 20250418145536

func migrateDatabase(_ db: Connection) throws { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ExploreDatabaseConnection {
guard let dbPath = dbPath() else { throw ExploreDatabaseConnectionError.fileNotFound }

do {
db = try Connection(nil ?? dbPath)
db = try Connection(dbPath)
} catch {
print(error)
}
Expand Down
Loading
Loading