Using different placeholder words in mnemonic

Sources/Core/DesignSystem/Components/AppTextField.swift

@@ -18,7 +18,20 @@ public struct AppTextField<FocusValue: Hashable, Accessory: View, InnerAccessory
 		}
 	}
 
-	let primaryHeading: String?
+	public struct PrimaryHeading: Sendable, Hashable, ExpressibleByStringLiteral {
+		public let text: String
+		public let isProminent: Bool
+		public init(text: String, isProminent: Bool = true) {
+			self.text = text
+			self.isProminent = isProminent
+		}
+
+		public init(stringLiteral value: StringLiteralType) {
+			self.init(text: value)
+		}
+	}
+
+	let primaryHeading: PrimaryHeading?
 	let secondaryHeading: String?
 	let placeholder: String
 	let text: Binding<String>
@@ -29,7 +42,7 @@ public struct AppTextField<FocusValue: Hashable, Accessory: View, InnerAccessory
 	let innerAccesory: InnerAccessory
 
 	public init(
-		primaryHeading: String? = nil,
+		primaryHeading: PrimaryHeading? = nil,
 		secondaryHeading: String? = nil,
 		placeholder: String,
 		text: Binding<String>,
@@ -51,7 +64,7 @@ public struct AppTextField<FocusValue: Hashable, Accessory: View, InnerAccessory
 	}
 
 	public init(
-		primaryHeading: String? = nil,
+		primaryHeading: PrimaryHeading? = nil,
 		secondaryHeading: String? = nil,
 		placeholder: String,
 		text: Binding<String>,
@@ -76,9 +89,9 @@ public struct AppTextField<FocusValue: Hashable, Accessory: View, InnerAccessory
 			VStack(alignment: .leading, spacing: .small3) {
 				HStack(spacing: 0) {
 					if let primaryHeading {
-						Text(primaryHeading)
-							.textStyle(.body1HighImportance)
-							.foregroundColor(accentColor)
+						Text(primaryHeading.text)
+							.textStyle(primaryHeading.isProminent ? .body1HighImportance : .body2Regular)
+							.foregroundColor(primaryHeading.isProminent ? accentColor : .app.gray2)
 							.multilineTextAlignment(.leading)
 					}
 

Sources/Cryptography/Mnemonic/BIP39/BIP39+WordList.swift

@@ -15,8 +15,8 @@ extension BIP39 {
 	public struct WordList: Sendable, Hashable {
 		public typealias Word = BIP39.Word
 		public let language: Language
-		private let indexToWord: [Word.Index: Word]
-		private let wordToIndex: [NonEmptyString: Word.Index]
+		public let indexToWord: [Word.Index: Word]
+		public let wordToIndex: [NonEmptyString: Word.Index]
 
 		public let words: NonEmpty<OrderedSet<Word>>
 

Sources/Features/AppFeature/App+Reducer.swift

@@ -69,6 +69,7 @@ public struct App: Sendable, FeatureReducer {
 		}
 	}
 
+	@Dependency(\.continuousClock) var clock
 	@Dependency(\.errorQueue) var errorQueue
 	@Dependency(\.deviceFactorSourceClient) var deviceFactorSourceClient
 	@Dependency(\.appPreferencesClient) var appPreferencesClient
@@ -114,7 +115,7 @@ public struct App: Sendable, FeatureReducer {
 					if error is Profile.ProfileIsUsedOnAnotherDeviceError {
 						await send(.internal(.toOnboarding))
 						// A slight delay to allow any modal that may be shown to be dismissed.
-						try? await Task.sleep(for: .seconds(0.5))
+						try? await clock.sleep(for: .seconds(0.5))
 					}
 					await send(.internal(.displayErrorAlert(UserFacingError(error))))
 				}

Sources/Features/EditPersonaFeature/EditPersonaField+View.swift

@@ -53,7 +53,7 @@ extension EditPersonaField {
 		public var body: some SwiftUI.View {
 			WithViewStore(store, observe: ViewState.init(state:), send: { .view($0) }) { viewStore in
 				AppTextField(
-					primaryHeading: viewStore.primaryHeading,
+					primaryHeading: .init(text: viewStore.primaryHeading),
 					secondaryHeading: viewStore.secondaryHeading,
 					placeholder: "",
 					text: viewStore.validation(

Sources/Features/ImportMnemonic/ImportMnemonic+View.swift

@@ -10,9 +10,7 @@ extension ImportMnemonic.State {
 			isReadonlyMode: isReadonlyMode,
 			isHidingSecrets: isHidingSecrets,
 			rowCount: rowCount,
-			wordCount: wordCount.rawValue,
-			isAddRowButtonEnabled: isAddRowButtonEnabled,
-			isRemoveRowButtonEnabled: isRemoveRowButtonEnabled,
+			wordCount: wordCount,
 			completedWords: completedWords,
 			mnemonic: mnemonic,
 			bip39Passphrase: bip39Passphrase
@@ -24,20 +22,43 @@ extension ImportMnemonic.State {
 	}
 }
 
-// MARK: - ImportMnemonic.View
+// MARK: - ImportMnemonic.ViewState
 extension ImportMnemonic {
 	public struct ViewState: Equatable {
 		let isReadonlyMode: Bool
 		let isHidingSecrets: Bool
 		let rowCount: Int
-		let wordCount: Int
-		let isAddRowButtonEnabled: Bool
-		let isRemoveRowButtonEnabled: Bool
+		let wordCount: BIP39.WordCount
 		let completedWords: [BIP39.Word]
 		let mnemonic: Mnemonic?
 		let bip39Passphrase: String
 	}
+}
+
+extension ImportMnemonic.ViewState {
+	var isNonChecksummed: Bool {
+		mnemonic == nil && completedWords.count == wordCount.rawValue
+	}
+
+	var isAddRowButtonEnabled: Bool {
+		wordCount != .twentyFour
+	}
+
+	var isRemoveRowButtonEnabled: Bool {
+		wordCount != .twelve
+	}
+
+	var isShowingPassphrase: Bool {
+		!(isReadonlyMode && bip39Passphrase.isEmpty)
+	}
+
+	var isShowingChangeWordCountButtons: Bool {
+		!isReadonlyMode
+	}
+}
 
+// MARK: - ImportMnemonic.View
+extension ImportMnemonic {
 	@MainActor
 	public struct View: SwiftUI.View {
 		@Environment(\.scenePhase) var scenePhase
@@ -51,98 +72,22 @@ extension ImportMnemonic {
 			WithViewStore(store, observe: \.viewState, send: { .view($0) }) { viewStore in
 				ScrollView(showsIndicators: false) {
 					VStack(spacing: .large1) {
-						LazyVGrid(
-							columns: .init(
-								repeating: .init(.flexible()),
-								count: 3
-							)
-						) {
-							ForEachStore(
-								store.scope(state: \.words, action: { .child(.word(id: $0, child: $1)) }),
-								content: { importMnemonicWordStore in
-									VStack(spacing: 0) {
-										ImportMnemonicWord.View(store: importMnemonicWordStore)
-										Spacer(minLength: .medium2)
-									}
-								}
-							)
-						}
+						wordsGrid(with: viewStore)
 
-						if !viewStore.isReadonlyMode {
-							HStack {
-								Button {
-									viewStore.send(.removeRowButtonTapped)
-								} label: {
-									// FIXME: strings
-									HStack {
-										Text("Less words")
-											.foregroundColor(viewStore.isRemoveRowButtonEnabled ? .app.gray1 : .app.white)
-										Image(systemName: "text.badge.plus")
-											.foregroundColor(viewStore.isRemoveRowButtonEnabled ? .app.red1 : .app.white)
-									}
-								}
-								.controlState(viewStore.isRemoveRowButtonEnabled ? .enabled : .disabled)
-
-								Spacer(minLength: 0)
-
-								Button {
-									viewStore.send(.addRowButtonTapped)
-								} label: {
-									// FIXME: strings
-									HStack {
-										Text("More words")
-											.foregroundColor(viewStore.isAddRowButtonEnabled ? .app.gray1 : .app.white)
-										Image(systemName: "text.badge.plus")
-											.foregroundColor(viewStore.isAddRowButtonEnabled ? .app.green1 : .app.white)
-									}
-								}
-								.controlState(viewStore.isAddRowButtonEnabled ? .enabled : .disabled)
-							}
-							.buttonStyle(.secondaryRectangular)
+						if viewStore.isShowingChangeWordCountButtons {
+							changeWordCountButtons(with: viewStore)
 						}
 
-						if !(viewStore.isReadonlyMode && viewStore.bip39Passphrase.isEmpty) {
-							AppTextField(
-								// FIXME: strings
-								primaryHeading: "Passhprase",
-								placeholder: "Passphrase",
-								text: viewStore.binding(
-									get: \.bip39Passphrase,
-									send: { .passphraseChanged($0) }
-								),
-								// FIXME: strings
-								hint: viewStore.isReadonlyMode ? nil : .info("BIP39 Passphrase is often called a '25th word'.")
-							)
-							.disabled(viewStore.isReadonlyMode)
-							.autocorrectionDisabled()
+						if viewStore.isShowingPassphrase {
+							passphrase(with: viewStore)
 						}
 					}
 					.redacted(reason: .privacy, if: viewStore.isHidingSecrets)
 					.onChange(of: scenePhase) { newPhase in
 						viewStore.send(.scenePhase(newPhase))
 					}
 					.footer {
-						WithControlRequirements(
-							viewStore.mnemonic,
-							forAction: { viewStore.send(.continueButtonTapped($0)) }
-						) { action in
-							if !viewStore.isReadonlyMode {
-								if viewStore.mnemonic == nil, viewStore.completedWords.count == viewStore.wordCount {
-									// FIXME: strings
-									Text("Mnemonic not checksummed")
-										.foregroundColor(.app.red1)
-								}
-								// FIXME: strings
-								Button("Import mnemonic", action: action)
-									.buttonStyle(.primaryRectangular)
-							} else {
-								// FIXME: strings
-								Button("Done") {
-									viewStore.send(.doneViewing)
-								}
-								.buttonStyle(.primaryRectangular)
-							}
-						}
+						footer(with: viewStore)
 					}
 				}
 				.animation(.default, value: viewStore.wordCount)
@@ -156,6 +101,104 @@ extension ImportMnemonic {
 	}
 }
 
+extension ImportMnemonic.View {
+	@ViewBuilder
+	private func wordsGrid(with viewStore: ViewStoreOf<ImportMnemonic>) -> some SwiftUI.View {
+		LazyVGrid(
+			columns: .init(
+				repeating: .init(.flexible()),
+				count: 3
+			)
+		) {
+			ForEachStore(
+				store.scope(state: \.words, action: { .child(.word(id: $0, child: $1)) }),
+				content: { importMnemonicWordStore in
+					VStack(spacing: 0) {
+						ImportMnemonicWord.View(store: importMnemonicWordStore)
+						Spacer(minLength: .medium2)
+					}
+				}
+			)
+		}
+	}
+
+	@ViewBuilder
+	private func passphrase(with viewStore: ViewStoreOf<ImportMnemonic>) -> some SwiftUI.View {
+		AppTextField(
+			// FIXME: strings
+			primaryHeading: .init(text: "Passhprase", isProminent: false),
+			placeholder: "Passphrase",
+			text: viewStore.binding(
+				get: \.bip39Passphrase,
+				send: { .passphraseChanged($0) }
+			),
+			// FIXME: strings
+			hint: viewStore.isReadonlyMode ? nil : .info("BIP39 Passphrase is often called a '25th word'.")
+		)
+		.disabled(viewStore.isReadonlyMode)
+		.autocorrectionDisabled()
+	}
+
+	@ViewBuilder
+	private func changeWordCountButtons(with viewStore: ViewStoreOf<ImportMnemonic>) -> some SwiftUI.View {
+		HStack {
+			Button {
+				viewStore.send(.removeRowButtonTapped)
+			} label: {
+				// FIXME: strings
+				HStack {
+					Text("Less words")
+						.foregroundColor(viewStore.isRemoveRowButtonEnabled ? .app.gray1 : .app.white)
+					Image(systemName: "text.badge.plus")
+						.foregroundColor(viewStore.isRemoveRowButtonEnabled ? .app.red1 : .app.white)
+				}
+			}
+			.controlState(viewStore.isRemoveRowButtonEnabled ? .enabled : .disabled)
+
+			Spacer(minLength: 0)
+
+			Button {
+				viewStore.send(.addRowButtonTapped)
+			} label: {
+				// FIXME: strings
+				HStack {
+					Text("More words")
+						.foregroundColor(viewStore.isAddRowButtonEnabled ? .app.gray1 : .app.white)
+					Image(systemName: "text.badge.plus")
+						.foregroundColor(viewStore.isAddRowButtonEnabled ? .app.green1 : .app.white)
+				}
+			}
+			.controlState(viewStore.isAddRowButtonEnabled ? .enabled : .disabled)
+		}
+		.buttonStyle(.secondaryRectangular)
+	}
+
+	@ViewBuilder
+	private func footer(with viewStore: ViewStoreOf<ImportMnemonic>) -> some SwiftUI.View {
+		WithControlRequirements(
+			viewStore.mnemonic,
+			forAction: { viewStore.send(.continueButtonTapped($0)) }
+		) { action in
+			if !viewStore.isReadonlyMode {
+				if viewStore.isNonChecksummed {
+					// FIXME: strings
+					Text("Mnemonic not checksummed")
+						.foregroundColor(.app.red1)
+				}
+				// FIXME: strings
+				Button("Import mnemonic", action: action)
+					.buttonStyle(.primaryRectangular)
+			} else {
+				// FIXME: strings
+				Button("Done") {
+					viewStore.send(.doneViewing)
+				}
+				.buttonStyle(.primaryRectangular)
+			}
+		}
+	}
+}
+
 extension View {
 	/// Conditionally adds a reason to apply a redaction to this view hierarchy.
 	///