feat: add subscription requests

Bitkit.xcodeproj/project.pbxproj

@@ -1182,7 +1182,7 @@
 			repositoryURL = "https://github.com/pubky/paykit-rs";
 			requirement = {
 				kind = exactVersion;
-				version = "0.1.0-rc51";
+				version = "0.1.0-rc54";
 			};
 		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {

Bitkit/Assets.xcassets/Illustrations/subscription-default-icon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "subscription-default-icon.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/subscription-intro-clock.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "subscription-intro-clock.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/icons/asterisk.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "asterisk.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Assets.xcassets/icons/timer-outline.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "timer-outline.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Components/MoneyCell.swift

@@ -5,13 +5,15 @@ struct MoneyCell: View {
     let sats: Int
     let prefix: String
     var enableHide: Bool = false
+    var symbol: Bool?
 
     var body: some View {
         VStack(alignment: .trailing, spacing: 2) {
             MoneyText(
                 sats: sats,
                 unitType: .primary,
                 size: .bodyMSB,
+                symbol: symbol,
                 enableHide: enableHide,
                 prefix: prefix,
                 color: .textPrimary,

Bitkit/Components/MoneyText.swift

@@ -30,6 +30,7 @@ struct MoneyText: View {
     var color: Color = .textPrimary
     var symbolColor: Color?
     var testIdentifier: String?
+    var fillsWidth: Bool = true
 
     @EnvironmentObject var currency: CurrencyViewModel
     @EnvironmentObject var settings: SettingsViewModel
@@ -105,7 +106,8 @@ extension MoneyText {
         case .display:
             DisplayText(
                 // Cap symbol font weight to ExtraBold
-                text, textColor: color, accentColor: symbolColor ?? .textSecondary, accentFont: size == .display ? Fonts.extraBold : nil
+                text, textColor: color, accentColor: symbolColor ?? .textSecondary,
+                accentFont: Fonts.extraBold, fillsWidth: fillsWidth
             )
         case .title:
             TitleText(text, textColor: color, accentColor: symbolColor ?? .textSecondary)

Bitkit/Components/NoteTextEditor.swift

@@ -5,6 +5,9 @@ struct NoteTextEditor: View {
     let placeholder: String
     let testIdentifier: String
     let isFocused: FocusState<Bool>.Binding
+    var minHeight: CGFloat = 30
+    var maxHeight: CGFloat = 50
+    var backgroundColor: Color = .white06
 
     var body: some View {
         ZStack(alignment: .topLeading) {
@@ -20,13 +23,13 @@ struct NoteTextEditor: View {
                 .submitLabel(.done)
                 .scrollContentBackground(.hidden)
                 .padding(EdgeInsets(top: -8, leading: -5, bottom: -5, trailing: -5))
-                .frame(minHeight: 30, maxHeight: 50)
+                .frame(minHeight: minHeight, maxHeight: maxHeight)
                 .dismissKeyboardOnReturn(text: $text, isFocused: isFocused)
                 .accessibilityValue(text)
                 .accessibilityIdentifier(testIdentifier)
         }
         .padding()
-        .background(Color.white06)
+        .background(backgroundColor)
         .cornerRadius(8)
     }
 }

Bitkit/Components/PubkyContactRow.swift

@@ -15,8 +15,8 @@ struct PubkyContactRow: View {
                 HStack(spacing: 16) {
                     PubkyContactAvatar(contact: contact, size: 48)
 
-                    VStack(alignment: .leading, spacing: 4) {
-                        CaptionText(contact.profile.truncatedPublicKey.localizedUppercase)
+                    VStack(alignment: .leading, spacing: 0) {
+                        CaptionMText(contact.profile.truncatedPublicKey.localizedUppercase, textColor: .white64)
                             .lineLimit(1)
 
                         BodyMSBText(contact.displayName)