[ABW-3821] Pre Authorization general UI

RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "7d3590b225945abb1bc0ab6c684b005c28c64bdc204afcc2d34c3e379ef8a3c8",
+  "originHash" : "7f25d08c2d5bfce10ead9a90a371e548d360b6e5e8779b8ad654bfac475f1dc8",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -112,10 +112,10 @@
     {
       "identity" : "sargon",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/radixdlt/sargon",
+      "location" : "https://github.com/radixdlt/sargon/",
       "state" : {
-        "revision" : "37a51f2c19e65746e618424499c5e37637648a73",
-        "version" : "1.1.38"
+        "revision" : "83e13eb11037733a9edfe2c2c70d1efeb63e0831",
+        "version" : "1.1.42"
       }
     },
     {

RadixWallet/Clients/OnLedgerEntitiesClient/Helpers/OnLedgerEntitiesClient+ComplexTypes.swift

@@ -21,8 +21,8 @@ extension OnLedgerEntitiesClient {
 		resourceQuantifier: FungibleResourceIndicator,
 		poolContributions: [some TrackedPoolInteraction] = [] as [TrackedPoolContribution],
 		validatorStakes: [TrackedValidatorStake] = [],
-		entities: TransactionReview.ResourcesInfo = [:],
-		resourceAssociatedDapps: TransactionReview.ResourceAssociatedDapps? = nil,
+		entities: InteractionReview.Sections.ResourcesInfo = [:],
+		resourceAssociatedDapps: InteractionReview.Sections.ResourceAssociatedDapps? = nil,
 		networkID: NetworkID,
 		defaultDepositGuarantee: Decimal192 = 1
 	) async throws -> ResourceBalance {
@@ -81,8 +81,8 @@ extension OnLedgerEntitiesClient {
 		_ resource: OnLedgerEntity.Resource,
 		amount: Decimal192,
 		poolContributions: [some TrackedPoolInteraction] = [],
-		entities: TransactionReview.ResourcesInfo = [:],
-		resourceAssociatedDapps: TransactionReview.ResourceAssociatedDapps? = nil,
+		entities: InteractionReview.Sections.ResourcesInfo = [:],
+		resourceAssociatedDapps: InteractionReview.Sections.ResourceAssociatedDapps? = nil,
 		networkID: NetworkID,
 		guarantee: TransactionGuarantee?,
 		hiddenResources: [ResourceIdentifier]
@@ -189,7 +189,7 @@ extension OnLedgerEntitiesClient {
 	// MARK: Non-fungibles
 
 	func nonFungibleResourceBalances(
-		_ resourceInfo: TransactionReview.ResourceInfo,
+		_ resourceInfo: InteractionReview.Sections.ResourceInfo,
 		resourceAddress: ResourceAddress,
 		resourceQuantifier: NonFungibleResourceIndicator,
 		unstakeData: [NonFungibleGlobalId: UnstakeData] = [:],
@@ -321,7 +321,7 @@ extension OnLedgerEntitiesClient {
 	}
 }
 
-extension TransactionReview.ResourceInfo {
+extension InteractionReview.Sections.ResourceInfo {
 	var metadata: OnLedgerEntity.Metadata {
 		switch self {
 		case let .left(resource):

RadixWallet/Clients/PreAuthorizationClient/Models/PreAuthorizationFailure.swift

@@ -0,0 +1,36 @@
+import Foundation
+
+// MARK: - PreAuthorizationFailure
+enum PreAuthorizationFailure: Sendable, LocalizedError, Equatable {
+	case failedToGetPreview(FailedToGetPreview)
+
+	var errorDescription: String? {
+		switch self {
+		case let .failedToGetPreview(error):
+			error.localizedDescription
+		}
+	}
+}
+
+extension PreAuthorizationFailure {
+	var errorKindAndMessage: (errorKind: DappWalletInteractionErrorType, message: String?) {
+		switch self {
+		case .failedToGetPreview:
+			(errorKind: .failedToPrepareTransaction, message: errorDescription)
+		}
+	}
+}
+
+// MARK: PreAuthorizationFailure.FailedToGetPreview
+extension PreAuthorizationFailure {
+	enum FailedToGetPreview: Sendable, LocalizedError, Equatable {
+		case failedToAnalyse(Error)
+
+		var errorDescription: String? {
+			switch self {
+			case let .failedToAnalyse(error):
+				"Failed to analyse PreAuthorization Preview: \(error.localizedDescription)"
+			}
+		}
+	}
+}

RadixWallet/Clients/PreAuthorizationClient/Models/PreAuthorizationModels.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+struct PreAuthorizationPreview: Sendable, Hashable {
+	let kind: PreAuthToReview
+	let networkID: NetworkID
+
+	var manifest: SubintentManifest {
+		switch kind {
+		case let .open(open):
+			open.manifest
+		case let .enclosed(enclosed):
+			enclosed.manifest
+		}
+	}
+}

RadixWallet/Clients/PreAuthorizationClient/PreAuthorizationClient+Interface.swift

@@ -0,0 +1,17 @@
+// MARK: - PreAuthorizationClient
+struct PreAuthorizationClient: Sendable {
+	var getPreview: GetPreview
+}
+
+// MARK: PreAuthorizationClient.GetPreview
+extension PreAuthorizationClient {
+	typealias GetPreview = @Sendable (GetPreviewRequest) async throws -> PreAuthorizationPreview
+}
+
+// MARK: PreAuthorizationClient.GetPreviewRequest
+extension PreAuthorizationClient {
+	struct GetPreviewRequest: Hashable, Sendable {
+		let unvalidatedManifest: UnvalidatedSubintentManifest
+		let nonce: Nonce
+	}
+}

RadixWallet/Clients/PreAuthorizationClient/PreAuthorizationClient+Live.swift

@@ -0,0 +1,32 @@
+extension PreAuthorizationClient: DependencyKey {
+	static var liveValue: Self {
+		@Dependency(\.gatewaysClient) var gatewaysClient
+
+		@Sendable
+		func analysePreview(request: GetPreviewRequest) async throws -> PreAuthToReview {
+			do {
+				return try await SargonOS.shared.analysePreAuthPreview(
+					instructions: request.unvalidatedManifest.subintentManifestString,
+					blobs: request.unvalidatedManifest.blobs,
+					nonce: request.nonce
+				)
+			} catch {
+				throw PreAuthorizationFailure.failedToGetPreview(.failedToAnalyse(error))
+			}
+		}
+
+		let getPreview: GetPreview = { request in
+			let kind = try await analysePreview(request: request)
+			let networkID = await gatewaysClient.getCurrentNetworkID()
+
+			return PreAuthorizationPreview(
+				kind: kind,
+				networkID: networkID
+			)
+		}
+
+		return Self(
+			getPreview: getPreview
+		)
+	}
+}

RadixWallet/Clients/PreAuthorizationClient/PreAuthorizationClient+Test.swift

@@ -0,0 +1,19 @@
+extension DependencyValues {
+	var preAuthorizationClient: PreAuthorizationClient {
+		get { self[PreAuthorizationClient.self] }
+		set { self[PreAuthorizationClient.self] = newValue }
+	}
+}
+
+// MARK: - PreAuthorizationClient + TestDependencyKey
+extension PreAuthorizationClient: TestDependencyKey {
+	static let previewValue = Self.noop
+
+	static let noop = Self(
+		getPreview: { _ in throw NoopError() }
+	)
+
+	static let testValue = Self(
+		getPreview: unimplemented("\(Self.self).getPreview")
+	)
+}

RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Live.swift

@@ -515,8 +515,8 @@ private func key(factorSourceID: FactorSourceIDFromHash) -> KeychainClient.Key {
 
 extension OverlayWindowClient.Item.AlertState {
 	fileprivate static let missingMnemonicAlert = Self(
-		title: { TextState(L10n.TransactionReview.NoMnemonicError.title) },
-		message: { TextState(L10n.TransactionReview.NoMnemonicError.text) }
+		title: { TextState(L10n.Common.NoMnemonicAlert.title) },
+		message: { TextState(L10n.Common.NoMnemonicAlert.text) }
 	)
 }
 

RadixWallet/Clients/TransactionClient/TransactionClient+Live.swift

@@ -161,7 +161,6 @@ extension TransactionClient {
 				return try await SargonOS.shared.analyseTransactionPreview(
 					instructions: request.unvalidatedManifest.transactionManifestString,
 					blobs: request.unvalidatedManifest.blobs,
-					message: request.message,
 					areInstructionsOriginatingFromHost: request.isWalletTransaction,
 					nonce: request.nonce,
 					notaryPublicKey: .ed25519(request.ephemeralNotaryPublicKey.intoSargon())

RadixWallet/Core/FeaturePrelude/AccountCard/AccountCard+DataSource.swift

@@ -48,7 +48,7 @@ extension AccountCard where Trailing == EmptyView, Bottom == EmptyView {
 		)
 	}
 
-	init(kind: Kind = .innerCompact, account: TransactionReview.ReviewAccount) {
+	init(kind: Kind = .innerCompact, account: InteractionReview.ReviewAccount) {
 		switch account {
 		case let .user(account):
 			self.init(kind: kind, account: account)
@@ -98,7 +98,7 @@ private extension AccountForDisplay {
 
 private extension AccountAddress {
 	var asDataSource: AccountCardDataSource {
-		.init(title: L10n.TransactionReview.externalAccountName, ledgerIdentifiable: .address(.account(self)), gradient: .external)
+		.init(title: L10n.InteractionReview.externalAccountName, ledgerIdentifiable: .address(.account(self)), gradient: .external)
 	}
 }
 

RadixWallet/Features/AccountPreferencesFeature/Children/DevAccountPreferences+Reducer.swift

@@ -198,6 +198,7 @@ struct DevAccountPreferences: Sendable, FeatureReducer {
 			} catch: { error, _ in
 				loggerGlobal.warning("Failed to create manifest which turns account into dapp definition account type, error: \(error)")
 			}
+
 		#endif
 		}
 	}

RadixWallet/Features/AppFeature/Overlay/InfoLinkSheet+Reducer.swift

@@ -58,6 +58,8 @@ extension InfoLinkSheet {
 		case dashboard
 		case bridging
 		case payingaccount
+		case preauthorizations
+		case possibledappcalls
 	}
 }
 
@@ -153,6 +155,10 @@ extension InfoLinkSheet.GlossaryItem {
 			L10n.InfoLink.Glossary.bridging
 		case .payingaccount:
 			L10n.InfoLink.Glossary.payingaccount
+		case .preauthorizations:
+			L10n.InfoLink.Glossary.preauthorizations
+		case .possibledappcalls:
+			L10n.InfoLink.Glossary.possibledappcalls
 		}
 	}
 }

RadixWallet/Features/AssetsFeature/Components/FungibleAssetList/Components/Details/FungibleTokenDetails+Reducer.swift

@@ -2,7 +2,9 @@ import ComposableArchitecture
 import SwiftUI
 
 // MARK: - FungibleTokenDetails
+@Reducer
 struct FungibleTokenDetails: Sendable, FeatureReducer {
+	@ObservableState
 	struct State: Sendable, Hashable {
 		let resourceAddress: ResourceAddress
 		var resource: Loadable<OnLedgerEntity.Resource>
@@ -27,6 +29,8 @@ struct FungibleTokenDetails: Sendable, FeatureReducer {
 		}
 	}
 
+	typealias Action = FeatureAction<Self>
+
 	enum ViewAction: Sendable, Equatable {
 		case closeButtonTapped
 		case task

RadixWallet/Features/AssetsFeature/Components/FungibleAssetList/Components/Details/FungibleTokenDetails+View.swift

@@ -2,32 +2,6 @@ import ComposableArchitecture
 import SwiftUI
 
 extension FungibleTokenDetails.State {
-	var viewState: FungibleTokenDetails.ViewState {
-		.init(
-			detailsHeader: detailsHeader,
-			thumbnail: {
-				let iconURL = resource.metadata.get(\.iconURL, prefetched: ownedFungibleResource?.metadata)
-				return isXRD ? .success(.xrd) : iconURL.map { .other($0) }
-			}(),
-			details: .init(
-				description: resource.metadata.get(\.description, prefetched: ownedFungibleResource?.metadata),
-				infoUrl: resource.metadata.infoURL,
-				resourceAddress: resourceAddress,
-				isXRD: isXRD,
-				validatorAddress: nil,
-				resourceName: resource.metadata.name,
-				currentSupply: resource.totalSupply.map { $0?.formatted() ?? L10n.AssetDetails.supplyUnkown },
-				divisibility: resource.divisibility,
-				arbitraryDataFields: resource.metadata.arbitraryItems.asDataFields,
-				behaviors: resource.behaviors,
-				tags: {
-					let tags = resource.metadata.get(\.tags, prefetched: ownedFungibleResource?.metadata)
-					return isXRD ? tags.map { $0 + [.officialRadix] } : tags
-				}()
-			)
-		)
-	}
-
 	var detailsHeader: DetailsContainerWithHeaderViewState {
 		.init(
 			title: resource.metadata.get(\.name, prefetched: ownedFungibleResource?.metadata).map { $0 ?? L10n.Account.PoolUnits.unknownPoolUnitName },
@@ -36,40 +10,53 @@ extension FungibleTokenDetails.State {
 			symbol: resource.metadata.get(\.symbol, prefetched: ownedFungibleResource?.metadata)
 		)
 	}
+
+	var thumbnail: Loadable<Thumbnail.TokenContent> {
+		let iconURL = resource.metadata.get(\.iconURL, prefetched: ownedFungibleResource?.metadata)
+		return isXRD ? .success(.xrd) : iconURL.map { .other($0) }
+	}
+
+	var details: AssetResourceDetailsSection.ViewState {
+		.init(
+			description: resource.metadata.get(\.description, prefetched: ownedFungibleResource?.metadata),
+			infoUrl: resource.metadata.infoURL,
+			resourceAddress: resourceAddress,
+			isXRD: isXRD,
+			validatorAddress: nil,
+			resourceName: resource.metadata.name,
+			currentSupply: resource.totalSupply.map { $0?.formatted() ?? L10n.AssetDetails.supplyUnkown },
+			divisibility: resource.divisibility,
+			arbitraryDataFields: resource.metadata.arbitraryItems.asDataFields,
+			behaviors: resource.behaviors,
+			tags: {
+				let tags = resource.metadata.get(\.tags, prefetched: ownedFungibleResource?.metadata)
+				return isXRD ? tags.map { $0 + [.officialRadix] } : tags
+			}()
+		)
+	}
 }
 
 // MARK: - FungibleTokenDetails.View
 extension FungibleTokenDetails {
-	struct ViewState: Equatable {
-		let detailsHeader: DetailsContainerWithHeaderViewState
-		let thumbnail: Loadable<Thumbnail.TokenContent>
-		let details: AssetResourceDetailsSection.ViewState
-	}
-
-	@MainActor
 	struct View: SwiftUI.View {
-		private let store: StoreOf<FungibleTokenDetails>
-
-		init(store: StoreOf<FungibleTokenDetails>) {
-			self.store = store
-		}
+		let store: StoreOf<FungibleTokenDetails>
 
 		var body: some SwiftUI.View {
-			WithViewStore(store, observe: \.viewState, send: { .view($0) }) { viewStore in
-				DetailsContainerWithHeaderView(viewState: viewStore.detailsHeader) {
-					viewStore.send(.closeButtonTapped)
+			WithPerceptionTracking {
+				DetailsContainerWithHeaderView(viewState: store.detailsHeader) {
+					store.send(.view(.closeButtonTapped))
 				} thumbnailView: {
-					Thumbnail(token: viewStore.thumbnail.wrappedValue ?? .other(nil), size: .veryLarge)
+					Thumbnail(token: store.thumbnail.wrappedValue ?? .other(nil), size: .veryLarge)
 				} detailsView: {
 					VStack(spacing: .medium1) {
-						AssetResourceDetailsSection(viewState: viewStore.details)
+						AssetResourceDetailsSection(viewState: store.details)
 
 						HideResource.View(store: store.hideResource)
 					}
 					.padding(.bottom, .medium1)
 				}
 				.task { @MainActor in
-					await viewStore.send(.task).finish()
+					await store.send(.view(.task)).finish()
 				}
 			}
 		}