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
4 changes: 4 additions & 0 deletions BDKSwiftExampleWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
AEE6C74F2ABCBA4600442ADD /* WalletSyncState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6C74E2ABCBA4600442ADD /* WalletSyncState.swift */; };
AEE83A492C07F54B00834468 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AEE83A482C07F54B00834468 /* BitcoinDevKit */; };
AEEA0E402DEF80B600C83255 /* Outpoint+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEEA0E3F2DEF80B600C83255 /* Outpoint+Extensions.swift */; };
AEEC65532E8EC260003B55E8 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = AEEC65522E8EC25F003B55E8 /* AppIcon.icon */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -213,6 +214,7 @@
AEE6C74B2ABCB3E200442ADD /* Transaction+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Transaction+Extensions.swift"; sourceTree = "<group>"; };
AEE6C74E2ABCBA4600442ADD /* WalletSyncState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletSyncState.swift; sourceTree = "<group>"; };
AEEA0E3F2DEF80B600C83255 /* Outpoint+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Outpoint+Extensions.swift"; sourceTree = "<group>"; };
AEEC65522E8EC25F003B55E8 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -267,6 +269,7 @@
A7FBCE392A72944C007C960E /* Resources */ = {
isa = PBXGroup;
children = (
AEEC65522E8EC25F003B55E8 /* AppIcon.icon */,
A733D6CF2A81113000F333B4 /* Localizable.xcstrings */,
);
path = Resources;
Expand Down Expand Up @@ -697,6 +700,7 @@
buildActionMask = 2147483647;
files = (
AE4984A62A1BBCB8009951E2 /* README.md in Resources */,
AEEC65532E8EC260003B55E8 /* AppIcon.icon in Resources */,
A733D6D02A81113000F333B4 /* Localizable.xcstrings in Resources */,
AE4984832A1BBBD7009951E2 /* Preview Assets.xcassets in Resources */,
AE4984802A1BBBD7009951E2 /* Assets.xcassets in Resources */,
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ extension CbfClient {
let info = try await self.nextInfo()
CbfClient.monitoringTasksQueue.sync { Self.lastInfoAt[id] = Date() }
switch info {
case let .progress(progress):
case .progress(let progress):
await MainActor.run {
NotificationCenter.default.post(
name: NSNotification.Name("KyotoProgressUpdate"),
object: nil,
userInfo: ["progress": progress]
)
}
case let .newChainHeight(height):
case .newChainHeight(let height):
await MainActor.run {
NotificationCenter.default.post(
name: NSNotification.Name("KyotoChainHeightUpdate"),
Expand Down
6 changes: 3 additions & 3 deletions BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ enum BalanceDisplayFormat: String, CaseIterable, Codable {
switch self {
case .bitcoinSats, .bitcoin, .bip177: return "₿"
case .fiat: return "$"
default : return ""
default: return ""
}
}

var displayText: String {
switch self {
case .sats, .bitcoinSats: return "sats"
Expand All @@ -31,7 +31,7 @@ enum BalanceDisplayFormat: String, CaseIterable, Codable {
case .fiat: return "USD"
}
}

func formatted(_ btcAmount: UInt64, fiatPrice: Double) -> String {
switch self {
case .sats:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 66 additions & 0 deletions BDKSwiftExampleWallet/Resources/AppIcon.icon/icon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"fill" : "system-light",
"groups" : [
{
"layers" : [
{
"fill" : {
"solid" : "display-p3:0.96409,0.82264,0.51574,1.00000"
},
"glass" : false,
"image-name" : "box-rotated.png",
"name" : "box-rotated",
"position" : {
"scale" : 1.25,
"translation-in-points" : [
-71.375,
-172.71875
]
}
}
],
"shadow" : {
"kind" : "layer-color",
"opacity" : 0.5
},
"translucency" : {
"enabled" : true,
"value" : 0.5
}
},
{
"layers" : [
{
"fill" : {
"solid" : "display-p3:0.96409,0.82264,0.51574,1.00000"
},
"glass" : false,
"hidden" : false,
"image-name" : "box-rotated.png",
"name" : "box-rotated-big",
"position" : {
"scale" : 2.5,
"translation-in-points" : [
4.65625,
86.3046875
]
}
}
],
"shadow" : {
"kind" : "layer-color",
"opacity" : 0.5
},
"translucency" : {
"enabled" : true,
"value" : 0.5
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
6 changes: 5 additions & 1 deletion BDKSwiftExampleWallet/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@
},
"%" : {

},
"%@" : {
"comment" : "A label displaying a transaction ID. The text inside the parentheses is the transaction ID itself.",
"isCommentAutoGenerated" : true
},
"%@ • %@" : {
"localizations" : {
Expand Down Expand Up @@ -1482,5 +1486,5 @@
}
}
},
"version" : "1.0"
"version" : "1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct LocalOutputItemView: View {
.redacted(reason: isRedacted ? .placeholder : [])

Spacer()

Group {
HStack {
Text(balanceFormat.displayPrefix)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct TransactionItemView: View {
let isRedacted: Bool
private let format: BalanceDisplayFormat
private var fiatPrice: Double

init(
txDetails: TxDetails,
isRedacted: Bool,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct TransactionListView: View {
self.format = format
self.fiatPrice = fiatPrice
}

var body: some View {

List {
Expand Down
Loading