[ABW-3637] Do not preselect account on Transfer + AppTextField fix (#…

…1228)
radixdlt · Jul 22, 2024 · 6416ef6 · 6416ef6
1 parent 41e5c33
commit 6416ef6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/RadixWallet/Core/DesignSystem/Components/AppTextField.swift b/RadixWallet/Core/DesignSystem/Components/AppTextField.swift
@@ -105,7 +105,7 @@ public struct AppTextField<FocusValue: Hashable, Accessory: View, InnerAccessory
 						VStack(alignment: .leading, spacing: 0) {
 							Text(primaryHeading.text)
 								.textStyle(primaryHeading.isProminent ? .body1HighImportance : .body2Regular)
-								.foregroundColor(primaryHeading.isProminent && isEnabled ? accentColor(isFocused: false) : .app.gray2)
+								.foregroundColor(primaryHeading.isProminent && isEnabled ? accentColor(isFocused: true) : .app.gray2)
 								.multilineTextAlignment(.leading)
 							if let subHeading {
 								Text(subHeading)

diff --git a/...res/AssetTransferFeature/Components/TransferAccountList/TransferAccountList+Reducer.swift b/...res/AssetTransferFeature/Components/TransferAccountList/TransferAccountList+Reducer.swift
@@ -234,7 +234,7 @@ extension TransferAccountList {
 		let chooseAccount: ChooseReceivingAccount.State = .init(
 			networkID: state.fromAccount.networkID,
 			chooseAccounts: .init(
-				selectionRequirement: .exactly(1),
+				context: .assetTransfer,
 				filteredAccounts: filteredAccounts,
 				// Create account is very buggy when started from AssetTransfer, disable it for now.
 				canCreateNewAccount: false

diff --git a/RadixWallet/Features/ChooseAccounts/ChooseAccounts+Reducer.swift b/RadixWallet/Features/ChooseAccounts/ChooseAccounts+Reducer.swift
@@ -1,10 +1,10 @@
 import ComposableArchitecture
 import SwiftUI
 
-// MARK: - _ChooseAccounts
+// MARK: - ChooseAccounts
 public struct ChooseAccounts: Sendable, FeatureReducer {
 	public struct State: Sendable, Hashable {
-		public let selectionRequirement: SelectionRequirement
+		public let context: Context
 		public let filteredAccounts: [AccountAddress]
 		public var availableAccounts: IdentifiedArrayOf<Account>
 		public var selectedAccounts: [ChooseAccountsRow.State]?
@@ -13,14 +13,23 @@ public struct ChooseAccounts: Sendable, FeatureReducer {
 		@PresentationState
 		var destination: Destination.State? = nil
 
+		var selectionRequirement: SelectionRequirement {
+			switch context {
+			case .assetTransfer:
+				.exactly(1)
+			case let .permission(selectionRequirement):
+				selectionRequirement
+			}
+		}
+
 		public init(
-			selectionRequirement: SelectionRequirement,
+			context: Context,
 			filteredAccounts: [AccountAddress] = [],
 			availableAccounts: IdentifiedArrayOf<Account> = [],
 			selectedAccounts: [ChooseAccountsRow.State]? = nil,
 			canCreateNewAccount: Bool = true
 		) {
-			self.selectionRequirement = selectionRequirement
+			self.context = context
 			self.filteredAccounts = filteredAccounts
 			self.availableAccounts = availableAccounts
 			self.selectedAccounts = selectedAccounts
@@ -119,3 +128,11 @@ public struct ChooseAccounts: Sendable, FeatureReducer {
 		}
 	}
 }
+
+// MARK: - ChooseAccounts.State.Context
+extension ChooseAccounts.State {
+	public enum Context: Sendable, Hashable {
+		case assetTransfer
+		case permission(SelectionRequirement)
+	}
+}
diff --git a/RadixWallet/Features/ChooseAccounts/ChooseAccounts+View.swift b/RadixWallet/Features/ChooseAccounts/ChooseAccounts+View.swift
@@ -22,9 +22,10 @@ extension ChooseAccounts {
 			self.canCreateNewAccount = state.canCreateNewAccount
 
 			// If the dApp is asking for exactly(1) account and user has only one account, pre-select it
-			if let account = availableAccounts.first,
+			if case .permission = state.context,
+			   selectionRequirement == .exactly(1),
 			   availableAccounts.count == 1,
-			   selectionRequirement == .exactly(1)
+			   let account = availableAccounts.first
 			{
 				self.selectedAccounts = [account]
 			} else {

diff --git a/...re/Children/AccountPermissionChooseAccounts/AccountPermissionChooseAccounts+Reducer.swift b/...re/Children/AccountPermissionChooseAccounts/AccountPermissionChooseAccounts+Reducer.swift
@@ -45,7 +45,7 @@ struct AccountPermissionChooseAccounts: Sendable, FeatureReducer {
 				challenge: challenge,
 				accessKind: accessKind,
 				dappMetadata: dappMetadata,
-				chooseAccounts: .init(selectionRequirement: .init(numberOfAccounts))
+				chooseAccounts: .init(context: .permission(.init(numberOfAccounts)))
 			)
 		}
 	}

diff --git a/...ature/Children/AccountPermissionChooseAccounts/AccountPermissionChooseAccounts+View.swift b/...ature/Children/AccountPermissionChooseAccounts/AccountPermissionChooseAccounts+View.swift
@@ -131,7 +131,7 @@ extension AccountPermissionChooseAccounts.State {
 		accessKind: .ongoing,
 		dappMetadata: .previewValue,
 		chooseAccounts: .init(
-			selectionRequirement: .exactly(1),
+			context: .assetTransfer,
 			availableAccounts: .init(
 				uniqueElements: [
 					.previewValue0,