Merge branch 'master' into mainnet

evansmj · Jul 10, 2024 · f811e43 · f811e43
2 parents fab1fb6 + a27c845
commit f811e43
Show file tree

Hide file tree

Showing 24 changed files with 1,387 additions and 851 deletions.
diff --git a/phoenix-android/build.gradle.kts b/phoenix-android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 34
-        versionCode = 83
-        versionName = "2.3.2"
+        versionCode = 84
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations.addAll(listOf("en", "fr", "de", "es", "b+es+419", "cs", "pt-rBR", "sk", "vi"))
     }

diff --git a/phoenix-android/src/main/res/values-b+es+419/important_strings.xml b/phoenix-android/src/main/res/values-b+es+419/important_strings.xml
@@ -449,6 +449,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Esta es una dirección humanamente legible para su solicitud de pago Bolt12.</string>
-    <string name="bip353_subtitle2">¿Quieres una dirección más bonita? Utilice servicios de terceros como twelve.cash o aloje usted mismo la dirección.</string>
+    <string name="bip353_subtitle2">¿Quieres una dirección más bonita? Utilice servicios de terceros o aloje usted mismo la dirección.</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-cs/important_strings.xml b/phoenix-android/src/main/res/values-cs/important_strings.xml
@@ -460,6 +460,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Toto je lidsky čitelná adresa pro vaši žádost o platbu Bolt12.</string>
-    <string name="bip353_subtitle2">Chcete hezčí adresu? Použijte služby třetích stran, jako je twelve.cash, nebo si adresu hostujte sami!</string>
+    <string name="bip353_subtitle2">Chcete hezčí adresu? Použijte služby třetích stran, nebo si adresu hostujte sami!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-de/important_strings.xml b/phoenix-android/src/main/res/values-de/important_strings.xml
@@ -458,6 +458,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Dies ist eine von Menschen lesbare Adresse für Ihre Bolt12-Zahlungsanfrage.</string>
-    <string name="bip353_subtitle2">Wollen Sie eine hübschere Adresse? Verwenden Sie Dienste von Drittanbietern wie twelve.cash, oder hosten Sie die Adresse selbst!</string>
+    <string name="bip353_subtitle2">Wollen Sie eine hübschere Adresse? Verwenden Sie Dienste von Drittanbietern, oder hosten Sie die Adresse selbst!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-es/important_strings.xml b/phoenix-android/src/main/res/values-es/important_strings.xml
@@ -461,6 +461,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Esta es una dirección humanamente legible para su solicitud de pago Bolt12.</string>
-    <string name="bip353_subtitle2">¿Quieres una dirección más bonita? Utilice servicios de terceros como twelve.cash o aloje usted mismo la dirección.</string>
+    <string name="bip353_subtitle2">¿Quieres una dirección más bonita? Utilice servicios de terceros o aloje usted mismo la dirección.</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-fr/important_strings.xml b/phoenix-android/src/main/res/values-fr/important_strings.xml
@@ -461,6 +461,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Il s\'agit d\'une adresse humainement compréhensible pour votre requête de paiement Bolt12.</string>
-    <string name="bip353_subtitle2">Vous voulez une adresse plus jolie ? Utilisez des services tiers comme twelve.cash, ou hébergez vous-même l\'adresse!</string>
+    <string name="bip353_subtitle2">Vous voulez une adresse plus jolie ? Utilisez des services tiers, ou hébergez vous-même l\'adresse!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-pt-rBR/important_strings.xml b/phoenix-android/src/main/res/values-pt-rBR/important_strings.xml
@@ -456,6 +456,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Este é um endereço legível por humanos para sua solicitação de pagamento do Bolt12.</string>
-    <string name="bip353_subtitle2">Quer um endereço mais bonito? Use serviços de terceiros, como twelve.cash, ou hospede o endereço por conta própria!</string>
+    <string name="bip353_subtitle2">Quer um endereço mais bonito? Use serviços de terceiros, ou hospede o endereço por conta própria!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-sk/important_strings.xml b/phoenix-android/src/main/res/values-sk/important_strings.xml
@@ -461,6 +461,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Toto je ľudsky čitateľná adresa pre vašu žiadosť o platbu Bolt12.</string>
-    <string name="bip353_subtitle2">Chcete krajšiu adresu? Použite služby tretích strán, ako je twelve.cash, alebo si adresu vytvorte sami!</string>
+    <string name="bip353_subtitle2">Chcete krajšiu adresu? Použite služby tretích strán, alebo si adresu vytvorte sami!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values-vi/important_strings.xml b/phoenix-android/src/main/res/values-vi/important_strings.xml
@@ -468,6 +468,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">Đây là địa chỉ mà con người có thể đọc được cho yêu cầu thanh toán Bolt12 của bạn.</string>
-    <string name="bip353_subtitle2">Bạn muốn một địa chỉ đẹp hơn? Sử dụng các dịch vụ của bên thứ ba như Twelve.cash hoặc tự lưu trữ địa chỉ!</string>
+    <string name="bip353_subtitle2">Bạn muốn một địa chỉ đẹp hơn? Sử dụng dịch vụ của bên thứ ba hoặc tự lưu trữ địa chỉ!</string>
 
 </resources>
diff --git a/phoenix-android/src/main/res/values/important_strings.xml b/phoenix-android/src/main/res/values/important_strings.xml
@@ -463,6 +463,6 @@
     <!-- experimental features -->
 
     <string name="bip353_subtitle">This is a human-readable address for your Bolt12 payment request.</string>
-    <string name="bip353_subtitle2">Want a prettier address? Use third-party services like twelve.cash, or self-host the address!</string>
+    <string name="bip353_subtitle2">Want a prettier address? Use third-party services, or self-host the address!</string>
 
 </resources>
diff --git a/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj b/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj
@@ -185,6 +185,7 @@
 		DC6D68252AC1DD5C0099929F /* Currencies.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = DC6D68242AC1DD5C0099929F /* Currencies.xcstrings */; };
 		DC6D68272AC1DD5C0099929F /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = DC6D68262AC1DD5C0099929F /* Localizable.xcstrings */; };
 		DC6D68292AC1DD5C0099929F /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = DC6D68282AC1DD5C0099929F /* InfoPlist.xcstrings */; };
+		DC6F04232C35EB9900627B4F /* SummaryInfoGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC6F04222C35EB9900627B4F /* SummaryInfoGrid.swift */; };
 		DC70A99C2BBB6093002DBFF8 /* InboundFeeWarning.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC70A99B2BBB6093002DBFF8 /* InboundFeeWarning.swift */; };
 		DC71E7302723240E0063613D /* KotlinObservables.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC71E72F2723240E0063613D /* KotlinObservables.swift */; };
 		DC71E7332728645B0063613D /* CurrencyConverterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC71E7322728645B0063613D /* CurrencyConverterView.swift */; };
@@ -574,6 +575,7 @@
 		DC6D68242AC1DD5C0099929F /* Currencies.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Currencies.xcstrings; sourceTree = "<group>"; };
 		DC6D68262AC1DD5C0099929F /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
 		DC6D68282AC1DD5C0099929F /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
+		DC6F04222C35EB9900627B4F /* SummaryInfoGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryInfoGrid.swift; sourceTree = "<group>"; };
 		DC70A99B2BBB6093002DBFF8 /* InboundFeeWarning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboundFeeWarning.swift; sourceTree = "<group>"; };
 		DC71E72F2723240E0063613D /* KotlinObservables.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KotlinObservables.swift; sourceTree = "<group>"; };
 		DC71E7322728645B0063613D /* CurrencyConverterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyConverterView.swift; sourceTree = "<group>"; };
@@ -1375,6 +1377,7 @@
 			children = (
 				53BEF4DAE061532668494988 /* PaymentView.swift */,
 				DCCD045E27EE0301007D57A5 /* SummaryView.swift */,
+				DC6F04222C35EB9900627B4F /* SummaryInfoGrid.swift */,
 				DCCD046027EE045C007D57A5 /* DetailsView.swift */,
 				DCCD045C27EE0173007D57A5 /* EditInfoView.swift */,
 				DCCD046227EE04E1007D57A5 /* WalletPaymentExtensions.swift */,
@@ -1603,8 +1606,9 @@
 		7555FF73242A565900829871 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = Acinq;
 				TargetAttributes = {
 					7555FF7A242A565900829871 = {
@@ -1984,6 +1988,7 @@
 				DC65D86428E2F7D700686355 /* ResetWalletView_Action.swift in Sources */,
 				DC71E7332728645B0063613D /* CurrencyConverterView.swift in Sources */,
 				DCA3B41F2A5471C900E6B231 /* MinerFeeInfo.swift in Sources */,
+				DC6F04232C35EB9900627B4F /* SummaryInfoGrid.swift in Sources */,
 				DCACF6F02566D0A60009B01E /* Data+Hexadecimal.swift in Sources */,
 				DCE3C7AB2A6AD3CC00F4D385 /* MempoolMonitor.swift in Sources */,
 				DC3780392C04D60400937C8E /* KotlinEnums.swift in Sources */,
@@ -2277,7 +2282,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2306,7 +2311,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2410,8 +2415,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -2439,8 +2445,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -2470,7 +2477,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
@@ -2497,7 +2504,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";

diff --git a/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-ios-framework.xcscheme b/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-ios-framework.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-ios.xcscheme b/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-ios.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-notifySrvExt.xcscheme b/phoenix-ios/phoenix-ios.xcodeproj/xcshareddata/xcschemes/phoenix-notifySrvExt.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1540"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/phoenix-ios/phoenix-ios/Localizable.xcstrings b/phoenix-ios/phoenix-ios/Localizable.xcstrings
@@ -21340,6 +21340,17 @@
         }
       }
     },
+    "Invalid BIP353 DNS address" : {
+      "comment" : "Error message - dns record contains an invalid offer",
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Adresse DNS BIP353 invalide"
+          }
+        }
+      }
+    },
     "Invalid bitcoin address" : {
       "comment" : "Error message - parsing bitcoin address",
       "localizations" : {

diff --git a/phoenix-ios/phoenix-ios/kotlin/KotlinTypes.swift b/phoenix-ios/phoenix-ios/kotlin/KotlinTypes.swift
@@ -22,6 +22,7 @@ extension Scan {
 	typealias Model_OnChainFlow = ModelOnchainFlow
 
 	typealias Model_LnurlServiceFetch = ModelLnurlServiceFetch
+	typealias Model_ResolvingBip353 = ModelResolvingBip353
 
 	typealias Model_LnurlPayFlow = ModelLnurlPayFlow
 	typealias Model_LnurlPayFlow_LnurlPayRequest = ModelLnurlPayFlowLnurlPayRequest
@@ -68,6 +69,7 @@ extension Scan {
 	typealias BadRequestReason_ServiceError = BadRequestReasonServiceError
 	typealias BadRequestReason_UnknownFormat = BadRequestReasonUnknownFormat
 	typealias BadRequestReason_UnsupportedLnurl = BadRequestReasonUnsupportedLnurl
+	typealias BadRequestReason_InvalidBip353 = BadRequestReasonInvalidBip353
 
 	typealias ClipboardContent_Bolt11InvoiceRequest = ClipboardContentBolt11InvoiceRequest
 	typealias ClipboardContent_BitcoinRequest = ClipboardContentBitcoinRequest

diff --git a/phoenix-ios/phoenix-ios/views/configuration/advanced/wallet/SpendExpiredSwapIns.swift b/phoenix-ios/phoenix-ios/views/configuration/advanced/wallet/SpendExpiredSwapIns.swift
@@ -427,7 +427,6 @@ struct SpendExpiredSwapIns: View {
 
 		guard
 			let minerFeeInfo,
-			let peer = Biz.business.peerManager.peerStateValue(),
 			let keyManager = Biz.business.walletManager.keyManagerValue()
 		else {
 			return

diff --git a/phoenix-ios/phoenix-ios/views/configuration/fees/liquidity management/LiquidityAdsView.swift b/phoenix-ios/phoenix-ios/views/configuration/fees/liquidity management/LiquidityAdsView.swift
@@ -918,9 +918,8 @@ struct LiquidityAdsView: View {
 // MARK: -
 // --------------------------------------------------
 
-/**
- * Workaround for iOS 15, where `Grid` isn't available.
- */
+/// Workaround for iOS 15, where `Grid` isn't available.
+///
 fileprivate struct FeeInfo_Grid: InfoGridView {
 
 	let feeInfo: LiquidityFeeInfo
-Original file line number
+Diff line change
@@ Expand Up / @@ -427,7 +427,6 @@ struct SpendExpiredSwapIns: View { @@
     		guard
     			let minerFeeInfo,
-    			let peer = Biz.business.peerManager.peerStateValue(),
     			let keyManager = Biz.business.walletManager.keyManagerValue()
     		else {
     			return
@@ Expand Down @@