[ABW-3976] Shield Setup - Recovery & Confirmation

RadixWallet.xcodeproj/project.pbxproj

@@ -1279,6 +1279,9 @@
 		E791F2A32D2EDFDE001A007B /* SelectNumberOfFactorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2A22D2EDFDE001A007B /* SelectNumberOfFactorsView.swift */; };
 		E791F2A52D2FED42001A007B /* RolesSetupCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2A42D2FED42001A007B /* RolesSetupCoordinator.swift */; };
 		E791F2A72D2FED51001A007B /* RolesSetupCoordinator+View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2A62D2FED51001A007B /* RolesSetupCoordinator+View.swift */; };
+		E791F2AA2D3151E7001A007B /* RecoveryRoleSetup+Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2A92D3151E7001A007B /* RecoveryRoleSetup+Reducer.swift */; };
+		E791F2AC2D3151ED001A007B /* RecoveryRoleSetup+View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2AB2D3151ED001A007B /* RecoveryRoleSetup+View.swift */; };
+		E791F2AE2D365A76001A007B /* SelectEmergencyFallbackPeriodView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E791F2AD2D365A76001A007B /* SelectEmergencyFallbackPeriodView.swift */; };
 		E79DD1B12CE365CF00B1EB86 /* ChooseReceivingAccountOnDelete+Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E79DD1B02CE365CF00B1EB86 /* ChooseReceivingAccountOnDelete+Reducer.swift */; };
 		E79DD1B32CE365D600B1EB86 /* ChooseReceivingAccountOnDelete+View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E79DD1B22CE365D600B1EB86 /* ChooseReceivingAccountOnDelete+View.swift */; };
 		E79DD1B62CE4933100B1EB86 /* DeleteAccountConfirmation+Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E79DD1B52CE4933100B1EB86 /* DeleteAccountConfirmation+Reducer.swift */; };
@@ -2566,6 +2569,9 @@
 		E791F2A22D2EDFDE001A007B /* SelectNumberOfFactorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectNumberOfFactorsView.swift; sourceTree = "<group>"; };
 		E791F2A42D2FED42001A007B /* RolesSetupCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RolesSetupCoordinator.swift; sourceTree = "<group>"; };
 		E791F2A62D2FED51001A007B /* RolesSetupCoordinator+View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RolesSetupCoordinator+View.swift"; sourceTree = "<group>"; };
+		E791F2A92D3151E7001A007B /* RecoveryRoleSetup+Reducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RecoveryRoleSetup+Reducer.swift"; sourceTree = "<group>"; };
+		E791F2AB2D3151ED001A007B /* RecoveryRoleSetup+View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RecoveryRoleSetup+View.swift"; sourceTree = "<group>"; };
+		E791F2AD2D365A76001A007B /* SelectEmergencyFallbackPeriodView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectEmergencyFallbackPeriodView.swift; sourceTree = "<group>"; };
 		E79DD1B02CE365CF00B1EB86 /* ChooseReceivingAccountOnDelete+Reducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChooseReceivingAccountOnDelete+Reducer.swift"; sourceTree = "<group>"; };
 		E79DD1B22CE365D600B1EB86 /* ChooseReceivingAccountOnDelete+View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChooseReceivingAccountOnDelete+View.swift"; sourceTree = "<group>"; };
 		E79DD1B52CE4933100B1EB86 /* DeleteAccountConfirmation+Reducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DeleteAccountConfirmation+Reducer.swift"; sourceTree = "<group>"; };
@@ -7113,10 +7119,21 @@
 			isa = PBXGroup;
 			children = (
 				E791F2992D2BEF1A001A007B /* PrimaryRoleSetup */,
+				E791F2A82D300E3B001A007B /* RecoveryRoleSetup */,
 			);
 			path = Children;
 			sourceTree = "<group>";
 		};
+		E791F2A82D300E3B001A007B /* RecoveryRoleSetup */ = {
+			isa = PBXGroup;
+			children = (
+				E791F2A92D3151E7001A007B /* RecoveryRoleSetup+Reducer.swift */,
+				E791F2AB2D3151ED001A007B /* RecoveryRoleSetup+View.swift */,
+				E791F2AD2D365A76001A007B /* SelectEmergencyFallbackPeriodView.swift */,
+			);
+			path = RecoveryRoleSetup;
+			sourceTree = "<group>";
+		};
 		E79DD1B42CE492E800B1EB86 /* DeleteAccount */ = {
 			isa = PBXGroup;
 			children = (
@@ -7655,6 +7672,7 @@
 				A41557532B7645E70040AD4E /* TransactionHistory+Reducer.swift in Sources */,
 				A408165B2C7E0D08005E65B9 /* ValidatorCollectionItem.swift in Sources */,
 				E6A2D9E72AFA7132001857EC /* Mnemonics+Utils.swift in Sources */,
+				E791F2AA2D3151E7001A007B /* RecoveryRoleSetup+Reducer.swift in Sources */,
 				48CFC28A2ADC10D900E77A5C /* TransactionReviewGuarantees.swift in Sources */,
 				48CFC5772ADC10DA00E77A5C /* MetadataTypedValue.swift in Sources */,
 				48CFC44B2ADC10DA00E77A5C /* MnemonicClient+Interface.swift in Sources */,
@@ -7670,6 +7688,7 @@
 				48CFC4772ADC10DA00E77A5C /* GatewaysClient+Interface.swift in Sources */,
 				A408161E2C7E0D08005E65B9 /* StateEntityNonFungiblesPageResponse.swift in Sources */,
 				A40816432C7E0D08005E65B9 /* TransactionFungibleFeeBalanceChangeType.swift in Sources */,
+				E791F2AE2D365A76001A007B /* SelectEmergencyFallbackPeriodView.swift in Sources */,
 				A40815862C7E0D08005E65B9 /* LedgerStateMixin.swift in Sources */,
 				48CFC59D2ADC10DA00E77A5C /* UIKeyboardType+Extra.swift in Sources */,
 				48CFC5E12ADC10DA00E77A5C /* Validation+Extra.swift in Sources */,
@@ -7866,6 +7885,7 @@
 				48CFC26A2ADC10D900E77A5C /* Signing+View.swift in Sources */,
 				48CFC3262ADC10D900E77A5C /* LocalNetworkPermission+Reducer.swift in Sources */,
 				E657773D2B0BAB35002DB237 /* RecoverWalletControlWithBDFSOnly.swift in Sources */,
+				E791F2AC2D3151ED001A007B /* RecoveryRoleSetup+View.swift in Sources */,
 				48CFC4482ADC10DA00E77A5C /* AccountsClient+Test.swift in Sources */,
 				A408158C2C7E0D08005E65B9 /* MetadataDecimalValue.swift in Sources */,
 				48CFC42D2ADC10DA00E77A5C /* AsyncExtension+Sendable.swift in Sources */,
@@ -9382,7 +9402,7 @@
 			repositoryURL = "https://github.com/radixdlt/sargon";
 			requirement = {
 				kind = exactVersion;
-				version = 1.1.106;
+				version = 1.1.107;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

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

@@ -105,8 +105,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/radixdlt/sargon",
       "state" : {
-        "revision" : "dc3ecf6bcfc260846e661e7b85fa9a60315385e9",
-        "version" : "1.1.106"
+        "revision" : "84acb9525993de833fc16cfddfb2ccb12706efbf",
+        "version" : "1.1.107"
       }
     },
     {

RadixWallet/Core/DesignSystem/Colors.swift

@@ -89,6 +89,7 @@ extension Color.App {
 	var alert: Color { .init(hex: .alert) }
 	var lightAlert: Color { .init(hex: .lightAlert) }
 	var error: Color { .init(hex: .error) }
+	var lightError: Color { .init(hex: .lightError) }
 	var notification: Color { .init(hex: .notification) }
 
 	var background: Color { .dynamic(light: .white, dark: .black) }
@@ -165,6 +166,8 @@ extension Color {
 
 		case error = 0xC82020
 
+		case lightError = 0xFCEBEB
+
 		case notification = 0xF81B1B
 
 		// gradient

RadixWallet/Core/Resources/Generated/AssetResource.generated.swift

@@ -143,6 +143,7 @@ internal enum AssetResource {
   internal static let prepareFactorSourcesAdd = ImageAsset(name: "prepareFactorSourcesAdd")
   internal static let prepareFactorSourcesCompletion = ImageAsset(name: "prepareFactorSourcesCompletion")
   internal static let prepareFactorSourcesIntro = ImageAsset(name: "prepareFactorSourcesIntro")
+  internal static let emergencyFallbackCalendar = ImageAsset(name: "emergencyFallbackCalendar")
   internal static let recoverySetup = ImageAsset(name: "recoverySetup")
   internal static let regularAccessSetup = ImageAsset(name: "regularAccessSetup")
   internal static let selectFactorSources = ImageAsset(name: "selectFactorSources")

RadixWallet/Core/Resources/Resources/Assets.xcassets/ShieldSetup/RolesSetup/emergencyFallbackCalendar.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "emergencyFallbackCalendar.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -67,6 +67,7 @@ extension InfoLinkSheet {
 		case passwords
 		case securityshields
 		case buildingshield
+		case emergencyfallback
 	}
 }
 
@@ -180,6 +181,8 @@ extension InfoLinkSheet.GlossaryItem {
 			L10n.InfoLink.Glossary.securityshields
 		case .buildingshield:
 			L10n.InfoLink.Glossary.buildingshield
+		case .emergencyfallback:
+			"TODO"
 		}
 	}
 }

RadixWallet/Features/ShieldSetup/RolesSetup/Children/PrimaryRoleSetup/PrimaryRoleSetup+Reducer.swift

@@ -84,15 +84,13 @@ struct PrimaryRoleSetup: FeatureReducer, Sendable {
 
 		case let .removeThresholdFactorTapped(id):
 			state.$shieldBuilder.withLock { builder in
-				// TODO: use removeFactorFromPrimaryThreshold
-				builder = builder.removeFactorFromPrimary(factorSourceId: id)
+				builder = builder.removeFactorFromPrimary(factorSourceId: id, factorListKind: .threshold)
 			}
 			return .none
 
 		case let .removeOverrideFactorTapped(id):
 			state.$shieldBuilder.withLock { builder in
-				// TODO: use removeFactorFromPrimaryOverride
-				builder = builder.removeFactorFromPrimary(factorSourceId: id)
+				builder = builder.removeFactorFromPrimary(factorSourceId: id, factorListKind: .override)
 			}
 			return .none
 
@@ -111,7 +109,7 @@ struct PrimaryRoleSetup: FeatureReducer, Sendable {
 			state.$shieldBuilder.withLock { builder in
 				// TODO: use removeAllFactorsFromPrimaryOverride
 				for overrideFactor in state.overrideFactors {
-					builder = builder.removeFactorFromPrimary(factorSourceId: overrideFactor.factorSourceID)
+					builder = builder.removeFactorFromPrimary(factorSourceId: overrideFactor.factorSourceID, factorListKind: .override)
 				}
 			}
 			return .none
@@ -141,15 +139,10 @@ struct PrimaryRoleSetup: FeatureReducer, Sendable {
 		case .selectNumberOfFactorsView(.close):
 			state.destination = nil
 			return .none
-		case let .selectNumberOfFactorsView(.set(value)):
+		case let .selectNumberOfFactorsView(.set(threshold)):
 			state.destination = nil
 			state.$shieldBuilder.withLock { builder in
-				switch value {
-				case .all:
-					builder = builder.setThreshold(threshold: UInt8(builder.primaryRoleThresholdFactors.count))
-				case let .specific(numberOfFactors):
-					builder = builder.setThreshold(threshold: UInt8(numberOfFactors))
-				}
+				builder = builder.setThreshold(threshold: threshold)
 			}
 			return .none
 		}

RadixWallet/Features/ShieldSetup/RolesSetup/Children/PrimaryRoleSetup/PrimaryRoleSetup+View.swift

@@ -37,7 +37,7 @@ extension PrimaryRoleSetup.State {
 		if threshold == shieldBuilder.primaryRoleThresholdFactors.count {
 			return .all
 		} else {
-			return .specific(threshold)
+			return .specific(UInt8(threshold))
 		}
 	}
 }
@@ -181,10 +181,10 @@ extension PrimaryRoleSetup {
 
 		private var thresholdSelectorView: some SwiftUI.View {
 			HStack(spacing: .zero) {
-				// TODO: Add a new key for "**%@**"
 				let thresholdTitle = store.threshold.titleShort
-				let title = L10n.ShieldWizardRegularAccess.ThresholdDescription.title(thresholdTitle)
-				let parts = title.components(separatedBy: "**\(thresholdTitle)**")
+				let separator = L10n.ShieldWizardRegularAccess.ThresholdDescription.selection(thresholdTitle)
+				let title = L10n.ShieldWizardRegularAccess.ThresholdDescription.title(separator)
+				let parts = title.components(separatedBy: separator)
 
 				if parts.count == 2 {
 					Text(parts[0])

RadixWallet/Features/ShieldSetup/RolesSetup/Children/PrimaryRoleSetup/SelectNumberOfFactorsView.swift

@@ -32,6 +32,8 @@ struct SelectNumberOfFactorsView: View {
 				ForEach(pickerItems, id: \.self) { threshold in
 					Text(threshold.title)
 						.tag(threshold)
+						.foregroundStyle(.app.gray1)
+						.textStyle(.body1Regular)
 				}
 			}
 			.pickerStyle(.wheel)
@@ -45,7 +47,7 @@ struct SelectNumberOfFactorsView: View {
 		var values: [Threshold] = []
 
 		for i in 1 ..< maxAvailableFactors {
-			values.insert(.specific(i), at: 0)
+			values.insert(.specific(UInt8(i)), at: 0)
 		}
 
 		values.insert(.all, at: 0)
@@ -62,13 +64,6 @@ extension SelectNumberOfFactorsView {
 	}
 }
 
-// MARK: - Threshold
-// TODO: Move to Sargon - https://radixdlt.atlassian.net/browse/ABW-4047
-enum Threshold: Hashable {
-	case all
-	case specific(Int)
-}
-
 private extension Threshold {
 	var title: String {
 		switch self {

RadixWallet/Features/ShieldSetup/RolesSetup/Children/RecoveryRoleSetup/RecoveryRoleSetup+Reducer.swift

@@ -0,0 +1,132 @@
+import ComposableArchitecture
+
+// MARK: - RecoveryRoleSetup
+@Reducer
+struct RecoveryRoleSetup: FeatureReducer, Sendable {
+	@ObservableState
+	struct State: Hashable, Sendable {
+		@Shared(.shieldBuilder) var shieldBuilder
+
+		var factorSourcesFromProfile: [FactorSource] = []
+
+		@Presents
+		var destination: Destination.State? = nil
+	}
+
+	typealias Action = FeatureAction<Self>
+
+	@CasePathable
+	enum ViewAction: Equatable, Sendable {
+		case task
+		case continueButtonTapped
+		case addFactorSourceButtonTapped(ChooseFactorSourceContext)
+		case removeRecoveryFactorTapped(FactorSourceID)
+		case removeConfirmationFactorTapped(FactorSourceID)
+		case invalidCombinationReadMoreTapped
+		case selectFallbackButtonTapped
+		case fallbackInfoButtonTapped
+	}
+
+	enum InternalAction: Equatable, Sendable {
+		case setFactorSources([FactorSource])
+	}
+
+	enum DelegateAction: Equatable, Sendable {
+		case chooseFactorSource(ChooseFactorSourceContext)
+		case finished
+	}
+
+	struct Destination: DestinationReducer {
+		@CasePathable
+		enum State: Sendable, Hashable {
+			case selectEmergencyFallbackPeriod
+		}
+
+		@CasePathable
+		enum Action: Sendable, Equatable {
+			case selectEmergencyFallbackPeriod(SelectEmergencyFallbackPeriodView.Action)
+		}
+
+		var body: some ReducerOf<Self> {
+			EmptyReducer()
+		}
+	}
+
+	var body: some ReducerOf<Self> {
+		Reduce(core)
+			.ifLet(destinationPath, action: \.destination) {
+				Destination()
+			}
+	}
+
+	private let destinationPath: WritableKeyPath<State, PresentationState<Destination.State>> = \.$destination
+
+	@Dependency(\.factorSourcesClient) var factorSourcesClient
+	@Dependency(\.overlayWindowClient) var overlayWindowClient
+	@Dependency(\.errorQueue) var errorQueue
+
+	func reduce(into state: inout State, viewAction: ViewAction) -> Effect<Action> {
+		switch viewAction {
+		case .task:
+			return .run { send in
+				let factorSources = try await factorSourcesClient.getFactorSources().elements
+				await send(.internal(.setFactorSources(factorSources)))
+			} catch: { error, _ in
+				errorQueue.schedule(error)
+			}
+
+		case .invalidCombinationReadMoreTapped:
+			overlayWindowClient.showInfoLink(.init(glossaryItem: .buildingshield))
+			return .none
+
+		case let .removeRecoveryFactorTapped(id):
+			state.$shieldBuilder.withLock { builder in
+				builder = builder.removeFactorFromRecovery(factorSourceId: id)
+			}
+			return .none
+
+		case let .removeConfirmationFactorTapped(id):
+			state.$shieldBuilder.withLock { builder in
+				builder = builder.removeFactorFromConfirmation(factorSourceId: id)
+			}
+			return .none
+
+		case let .addFactorSourceButtonTapped(context):
+			return .send(.delegate(.chooseFactorSource(context)))
+
+		case .selectFallbackButtonTapped:
+			state.destination = .selectEmergencyFallbackPeriod
+			return .none
+
+		case .fallbackInfoButtonTapped:
+			overlayWindowClient.showInfoLink(.init(glossaryItem: .emergencyfallback))
+			return .none
+
+		case .continueButtonTapped:
+			return .send(.delegate(.finished))
+		}
+	}
+
+	func reduce(into state: inout State, internalAction: InternalAction) -> Effect<Action> {
+		switch internalAction {
+		case let .setFactorSources(factorSources):
+			state.factorSourcesFromProfile = factorSources
+			return .none
+		}
+	}
+
+	func reduce(into state: inout State, presentedAction: Destination.Action) -> Effect<Action> {
+		switch presentedAction {
+		case .selectEmergencyFallbackPeriod(.close):
+			state.destination = nil
+			return .none
+		case let .selectEmergencyFallbackPeriod(.set(period)):
+			state.destination = nil
+			state.$shieldBuilder.withLock { builder in
+				// TODO: use `builder.setPeriodUntilAutoConfirm(..)`
+				builder = builder.setNumberOfDaysUntilAutoConfirm(numberOfDays: UInt16(period.days))
+			}
+			return .none
+		}
+	}
+}