Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
65f9c34
feat: add profile fetching from pubky
ben-kaufman Mar 5, 2026
851c0e0
add core bluetooth framework
ben-kaufman Mar 5, 2026
dd4475d
Fix claude issues
ben-kaufman Mar 11, 2026
4800529
fix comments
ben-kaufman Mar 11, 2026
66134e1
fix
ben-kaufman Mar 11, 2026
b7a9f66
fixes
ben-kaufman Mar 11, 2026
8a27df2
fix
ben-kaufman Mar 11, 2026
00ebf39
fixes
ben-kaufman Mar 11, 2026
813304d
fixes
ben-kaufman Mar 11, 2026
d218db8
fix comments
ben-kaufman Mar 11, 2026
6c1ad2e
fixes
ben-kaufman Mar 11, 2026
1993bc1
refactor: migrate from Paykit to BitkitCore for pubky profile
ben-kaufman Mar 11, 2026
328c9e0
fix comment
ben-kaufman Mar 11, 2026
41073fd
feat: add pubky contacts list and detail views
ben-kaufman Mar 11, 2026
0c59b1e
fixes
ben-kaufman Mar 12, 2026
3d9021b
fixes
ben-kaufman Mar 16, 2026
4932cbf
fixes
ben-kaufman Mar 16, 2026
a0f0de0
fixes
ben-kaufman Mar 16, 2026
b15a5cb
Update ProfileView.swift
ben-kaufman Mar 16, 2026
578f848
fixes
ben-kaufman Mar 17, 2026
71f063f
Add Pubky profile, contacts, and Ring auth import flow
ben-kaufman Mar 31, 2026
3ae9409
chore: bump bitkit-core to v0.1.53
ben-kaufman Mar 31, 2026
8374d94
fix: keep loading spinner visible during post-Ring-auth import
ben-kaufman Mar 31, 2026
2116547
fix: update loading text after Ring approval while fetching data
ben-kaufman Mar 31, 2026
2669a65
fix: pin bitkit-core to v0.1.52 (v0.1.53 tag has broken binary URL)
ben-kaufman Mar 31, 2026
af4bc5c
chore: bump bitkit-core to v0.1.54
ben-kaufman Mar 31, 2026
a44b1ed
fix: adapt PubkyAuthRequest to bitkit-core v0.1.54 API change
ben-kaufman Mar 31, 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
2 changes: 2 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ This project follows **modern SwiftUI patterns** and explicitly **AVOIDS traditi
- Async operations should delegate to `@Observable` business logic objects

4. **Component Design**
- **Always reuse existing components** before creating new ones — check `Components/` for buttons, text styles, layouts, and other shared UI. If identical or near-identical UI exists elsewhere in the codebase, extract it into a shared component rather than duplicating it.
- Use the project's text components (`DisplayText`, `HeadlineText`, `TitleText`, `SubtitleText`, `BodyMText`, `BodyMSBText`, `BodySSBText`, `BodySText`, `CaptionMText`, `CaptionText`) instead of raw `Text().font().foregroundColor()` chains.
- Decompose views into small, focused, single-purpose components
- Use descriptive names (e.g., `UserProfileCard` not `Card`)
- Prefer composition over deep view hierarchies
Expand Down
41 changes: 39 additions & 2 deletions Bitkit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand Down Expand Up @@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand Down Expand Up @@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand Down Expand Up @@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -515,6 +519,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.2;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -543,6 +551,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.2;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -675,6 +687,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 184;
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
Expand Down Expand Up @@ -702,8 +715,13 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.2;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -718,6 +736,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 184;
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
Expand Down Expand Up @@ -745,8 +764,13 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.2;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -893,6 +917,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand Down Expand Up @@ -937,8 +969,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = 6dc2e685d271d78ed18384d713c04081c6b1157c;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All @@ -960,6 +992,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Bitkit/AppScene.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand Down Expand Up @@ -133,6 +135,21 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onChange(of: pubkyProfile.sessionRestorationFailed) { _, failed in
if failed {
pubkyProfile.sessionRestorationFailed = false
app.toast(type: .error, title: t("profile__session_expired_title"), description: t("profile__session_expired_description"))
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand Down Expand Up @@ -390,6 +407,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "contact-card.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
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,15 @@
{
"images" : [
{
"filename" : "ellipse-inner-green.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
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,15 @@
{
"images" : [
{
"filename" : "ellipse-outer-green.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
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" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@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" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@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.
57 changes: 57 additions & 0 deletions Bitkit/Components/Button/GradientCircleButton.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import SwiftUI

/// A circular button with a gradient background, used for action icons (copy, share, edit, delete).
struct GradientCircleButton: View {
let icon: String?
let systemIcon: String?
let accessibilityLabel: String
let action: () -> Void

init(icon: String, accessibilityLabel: String, action: @escaping () -> Void) {
self.icon = icon
systemIcon = nil
self.accessibilityLabel = accessibilityLabel
self.action = action
}

init(systemIcon: String, accessibilityLabel: String, action: @escaping () -> Void) {
icon = nil
self.systemIcon = systemIcon
self.accessibilityLabel = accessibilityLabel
self.action = action
}

var body: some View {
Button(action: action) {
ZStack {
Circle()
.fill(
LinearGradient(
colors: [.gray5, .gray6],
startPoint: .top,
endPoint: .bottom
)
)
.overlay(
Circle()
.stroke(Color.white10, lineWidth: 1)
.padding(0.5)
)

if let icon {
Image(icon)
.resizable()
.scaledToFit()
.foregroundColor(.textPrimary)
.frame(width: 24, height: 24)
} else if let systemIcon {
Image(systemName: systemIcon)
.font(.system(size: 18, weight: .medium))
.foregroundColor(.textPrimary)
}
}
.frame(width: 48, height: 48)
}
.accessibilityLabel(accessibilityLabel)
}
}
Loading
Loading