Another round of bug fixing (#1055)

radixdlt · Mar 25, 2024 · 94ab677 · 94ab677
1 parent fdf4bf0
commit 94ab677
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/RadixWallet/Core/FeaturePrelude/Loadable.swift b/RadixWallet/Core/FeaturePrelude/Loadable.swift
@@ -292,10 +292,6 @@ extension Loadable {
         concat(other).map(join)
     }
 
-    public func reduce<Element>(_ join: (Element) -> Void) -> Void where Value == Array<Element> {
-
-    }
-
     public mutating func mutateValue(_ mutate: (inout Value) -> Void) {
         switch self {
         case .idle, .loading, .failure:

diff --git a/RadixWallet/Features/AssetsFeature/AssetsView+Reducer.swift b/RadixWallet/Features/AssetsFeature/AssetsView+Reducer.swift
@@ -202,11 +202,11 @@ public struct AssetsView: Sendable, FeatureReducer {
 
 		let poolUnits = portfolio.account.poolUnitResources.poolUnits
 		let poolUnitList: PoolUnitsList.State? = poolUnits.isEmpty ? nil : .init(
-			poolUnits: portfolio.account.poolUnitResources.poolUnits.map { poolUnit in
+			poolUnits: poolUnits.map { poolUnit in
 				PoolUnitsList.State.PoolUnitState(
 					poolUnit: poolUnit,
-					resourceDetails: state.accountPortfolio.poolUnitDetails.flatten().map {
-						$0.first { poolUnit.resourcePoolAddress == $0.address }!
+					resourceDetails: state.accountPortfolio.poolUnitDetails.flatten().flatMap {
+						$0.first { poolUnit.resourcePoolAddress == $0.address }.map(Loadable.success) ?? .loading
 					},
 					isSelected: mode.nonXrdRowSelected(poolUnit.resource.resourceAddress)
 				)

diff --git a/...t/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift b/...t/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift
@@ -259,7 +259,7 @@ extension ResourceBalanceView {
 			VStack(alignment: .leading, spacing: .zero) {
 				FungibleView(
 					thumbnail: .poolUnit(viewState.poolIcon),
-					caption1: viewState.poolName ?? L10n.TransactionReview.poolUnits,
+					caption1: viewState.poolName,
 					caption2: viewState.dAppName.wrappedValue?.flatMap { $0 },
 					fallback: nil,
 					amount: viewState.amount,
@@ -465,7 +465,7 @@ extension ResourceBalanceView {
 		}
 
 		private var useSpacer: Bool {
-			amount != nil || fallback != nil
+			amount != nil || fallback != nil || caption1 == nil
 		}
 	}
 

diff --git a/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion+View.swift b/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion+View.swift
@@ -53,10 +53,11 @@ extension Completion {
 						if let txID = viewStore.txID {
 							HStack {
 								Text(L10n.TransactionReview.SubmitTransaction.txID)
+									.foregroundColor(.app.gray1)
 								AddressView(.identifier(.transaction(txID)))
+									.foregroundColor(.app.blue1)
 							}
-							.foregroundColor(.app.gray1)
-							.textStyle(.body1Regular)
+							.textStyle(.body1Header)
 						}
 					}
 					.padding(.horizontal, .medium2)

diff --git a/RadixWallet/Features/TransactionReviewFeature/SubmitTransaction/SubmitTransaction+View.swift b/RadixWallet/Features/TransactionReviewFeature/SubmitTransaction/SubmitTransaction+View.swift
@@ -29,6 +29,19 @@ extension SubmitTransaction.State.TXStatus {
 			""
 		}
 	}
+
+	var errorTitle: String {
+		switch self {
+		case .notYetSubmitted, .submitting, .submitted, .committedSuccessfully:
+			"" // Not applicable
+		case .temporarilyRejected:
+			L10n.TransactionStatus.Error.title
+		case .permanentlyRejected:
+			L10n.TransactionStatus.Rejected.title
+		case .failed:
+			L10n.TransactionStatus.Failed.title
+		}
+	}
 }
 
 // MARK: - SubmitTransaction.View
@@ -57,7 +70,7 @@ extension SubmitTransaction {
 					VStack(spacing: .medium2) {
 						if viewStore.status.failed {
 							Image(asset: AssetResource.warningError)
-							Text(L10n.TransactionStatus.Failure.title)
+							Text(viewStore.status.errorTitle)
 								.foregroundColor(.app.gray1)
 								.textStyle(.sheetTitle)
 								.multilineTextAlignment(.center)
@@ -84,10 +97,11 @@ extension SubmitTransaction {
 
 						HStack {
 							Text(L10n.TransactionReview.SubmitTransaction.txID)
+								.foregroundColor(.app.gray1)
 							AddressView(.identifier(.transaction(viewStore.txID)))
+								.foregroundColor(.app.blue1)
 						}
-						.foregroundColor(.app.gray1)
-						.textStyle(.body1Regular)
+						.textStyle(.body1Header)
 					}
 					.padding(.horizontal, .medium2)
 					.padding(.bottom, .medium3)
@@ -96,7 +110,7 @@ extension SubmitTransaction {
 					viewStore.send(.appeared)
 				}
 				.alert(store: store.scope(state: \.$dismissTransactionAlert, action: { .view(.dismissTransactionAlert($0)) }))
-				.interactiveDismissDisabled(true)
+				.interactiveDismissDisabled(viewStore.dismissalDisabled)
 				.presentationDragIndicator(.visible)
 				.presentationDetents([.fraction(0.66)])
 				.presentationBackground(.blur)