(ios) Playground: Bolt Card + Phoenix Wallet

buildSrc/src/main/kotlin/Versions.kt

@@ -1,7 +1,6 @@
 object Versions {
     const val lightningKmp = "1.8.4"
     const val secp256k1 = "0.14.0"
-    const val torMobile = "0.2.0"
 
     const val kotlin = "1.9.22"
 

phoenix-ios/phoenix-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,4 +1,5 @@
 {
+  "originHash" : "d649fbe2be50831fdb28cb2641e76bb148d3b4a074f1350225d4c038ab447877",
   "pins" : [
     {
       "identity" : "abseil-cpp-swiftpm",
@@ -126,6 +127,15 @@
         "version" : "2.1.1"
       }
     },
+    {
+      "identity" : "swcrypt",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/soyersoyer/SwCrypt",
+      "state" : {
+        "revision" : "d18cf90973a32dc0d28f94eec91faf14ae8b4443",
+        "version" : "5.1.4"
+      }
+    },
     {
       "identity" : "swift-async-algorithms",
       "kind" : "remoteSourceControl",
@@ -172,5 +182,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

phoenix-ios/phoenix-ios/AppDelegate.swift

@@ -62,9 +62,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
 		UINavigationBar.appearance().compactAppearance = navBarAppearance
 		UINavigationBar.appearance().standardAppearance = navBarAppearance
 
-		#if !targetEnvironment(simulator) // push notifications don't work on iOS simulator
-			UIApplication.shared.registerForRemoteNotifications()
-		#endif
+		// Push notifictions now work on the iOS simulator.
+		// But only for:
+		// - Macs with Apple Silicon processor
+		// - Macs with Intel processor & the T2 security chip
+		//   https://support.apple.com/en-us/103265
+		//
+		UIApplication.shared.registerForRemoteNotifications()
 
 		FirebaseApp.configure()
 		Messaging.messaging().delegate = self
@@ -218,15 +222,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
 		log.trace("application(_:didReceiveRemoteNotification:fetchCompletionHandler:)")
 		log.debug("remote notification: \(userInfo)")
 
-		// If the app is in the foreground:
-		// - we can ignore this notification
-		//
-		// If the app is in the background:
-		// - this notification was delivered to the notifySrvExt, which is in charge of processing it
-
-		DispatchQueue.main.async {
-			completionHandler(.noData)
-		}
+		PushManager.processRemoteNotification(userInfo, completionHandler)
 	}
 
 	func messaging(
@@ -281,7 +277,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
 		business.databaseManager.paymentsDb { paymentsDb, _ in
 
 			let fakePaymentId = WalletPaymentId.IncomingPaymentId(paymentHash: Bitcoin_kmpByteVector32.random())
-			paymentsDb?.deletePayment(paymentId: fakePaymentId) { _ in
+			paymentsDb?.deletePayment(paymentId: fakePaymentId, notify: false) { _ in
 				// Nothing is actually deleted
 			}
 		}

phoenix-ios/phoenix-ios/Assets.xcassets/boltcard.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "boltcard.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

phoenix-ios/phoenix-ios/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
+	<array>
+		<string>D2760000850101</string>
+	</array>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>co.acinq.phoenix.WatchTower</string>
@@ -85,12 +89,16 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
+	<true/>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<false/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NFCReaderUsageDescription</key>
+	<string>The app would like to scan an NFC card.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Phoenix would like to use the camera to scan payment requests.</string>
 	<key>NSFaceIDUsageDescription</key>
@@ -136,7 +144,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
-	<true/>
 </dict>
 </plist>

phoenix-ios/phoenix-ios/InfoPlist.xcstrings

@@ -37,6 +37,18 @@
         }
       }
     },
+    "NFCReaderUsageDescription" : {
+      "comment" : "Privacy - NFC Scan Usage Description",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The app would like to scan an NFC card."
+          }
+        }
+      }
+    },
     "NSCameraUsageDescription" : {
       "comment" : "Privacy - Camera Usage Description",
       "extractionState" : "extracted_with_value",