Fixes round 3 (#1063)

radixdlt · Mar 26, 2024 · 693eafb · 693eafb
1 parent 0f43cc6
commit 693eafb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/RadixWallet/Features/AssetsFeature/AssetsView+Reducer.swift b/RadixWallet/Features/AssetsFeature/AssetsView+Reducer.swift
@@ -476,3 +476,9 @@ extension NonFungibleTokensPerResourceProvider {
 		)
 	}
 }
+
+extension SpecificAddress {
+	var isOnMainnet: Bool {
+		networkID == NetworkID.mainnet
+	}
+}
diff --git a/RadixWallet/Features/AssetsFeature/AssetsView+View.swift b/RadixWallet/Features/AssetsFeature/AssetsView+View.swift
@@ -68,6 +68,9 @@ extension AssetsView {
 						}
 					}
 				}
+				#if !DEBUG
+				.environment(\.resourceBalanceHideFiatValue, !viewStore.account.address.isOnMainnet)
+				#endif
 				.buttonStyle(.plain)
 				.scrollContentBackground(.hidden)
 				.listStyle(.insetGrouped)

diff --git a/RadixWallet/Features/AssetsFeature/Components/DetailsContainerWithHeaderView.swift b/RadixWallet/Features/AssetsFeature/Components/DetailsContainerWithHeaderView.swift
@@ -22,6 +22,7 @@ extension DetailsContainerWithHeaderViewState {
 
 // MARK: - DetailsContainerWithHeaderView
 struct DetailsContainerWithHeaderView<ThumbnailView: View, DetailsView: View>: View {
+	@Environment(\.resourceBalanceHideFiatValue) var resourceBalanceHideFiatValue
 	let viewState: DetailsContainerWithHeaderViewState
 	let closeButtonAction: () -> Void
 
@@ -70,7 +71,7 @@ struct DetailsContainerWithHeaderView<ThumbnailView: View, DetailsView: View>: V
 				}
 			}
 
-			if let currencyWorth = viewState.currencyWorth {
+			if !resourceBalanceHideFiatValue, let currencyWorth = viewState.currencyWorth {
 				Text(currencyWorth)
 					.textStyle(.body2HighImportance)
 					.foregroundStyle(.app.gray2)

diff --git a/...es/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView+Helpers.swift b/...es/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView+Helpers.swift
@@ -73,3 +73,15 @@ extension EnvironmentValues {
 private struct ResourceBalanceHideDetailsKey: EnvironmentKey {
 	static let defaultValue: Bool = false
 }
+
+extension EnvironmentValues {
+	var resourceBalanceHideFiatValue: Bool {
+		get { self[ResourceBalanceHideFiatValue.self] }
+		set { self[ResourceBalanceHideFiatValue.self] = newValue }
+	}
+}
+
+// MARK: - ResourceBalanceHideFiatValue
+private struct ResourceBalanceHideFiatValue: EnvironmentKey {
+	static let defaultValue: Bool = false
+}
diff --git a/...t/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift b/...t/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift
@@ -451,6 +451,9 @@ extension ResourceBalanceView {
 					.padding(.leading, isSelected != nil ? .small2 : 0)
 
 				if let isSelected {
+					if !useSpacer, caption1 == nil {
+						Spacer(minLength: .small2)
+					}
 					CheckmarkView(appearance: .dark, isChecked: isSelected)
 				}
 			}
@@ -465,7 +468,7 @@ extension ResourceBalanceView {
 		}
 
 		private var useSpacer: Bool {
-			amount != nil || fallback != nil || caption1 == nil
+			amount != nil || fallback != nil
 		}
 	}
 
@@ -527,6 +530,7 @@ extension ResourceBalanceView {
 	}
 
 	struct AmountView: View {
+		@Environment(\.resourceBalanceHideFiatValue) var resourceBalanceHideFiatValue
 		let amount: ResourceBalance.Amount?
 		let fallback: String?
 		let compact: Bool
@@ -554,7 +558,7 @@ extension ResourceBalanceView {
 					Text(amount.amount.nominalAmount.formatted())
 						.textStyle(amountTextStyle)
 						.foregroundColor(.app.gray1)
-					if let fiatWorth = amount.amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
+					if !resourceBalanceHideFiatValue, let fiatWorth = amount.amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
 						Text(fiatWorth)
 							.textStyle(.body2HighImportance)
 							.foregroundStyle(.app.gray2)
@@ -575,7 +579,7 @@ extension ResourceBalanceView {
 						.textStyle(.secondaryHeader)
 						.foregroundColor(.app.gray1)
 
-					if let fiatWorth = amount.amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
+					if !resourceBalanceHideFiatValue, let fiatWorth = amount.amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
 						Text(fiatWorth)
 							.textStyle(.body2HighImportance)
 							.foregroundStyle(.app.gray2)

diff --git a/...xWallet/Features/AssetsFeature/Components/StakeUnitList/Components/StakeSummaryView.swift b/...xWallet/Features/AssetsFeature/Components/StakeUnitList/Components/StakeSummaryView.swift
@@ -15,6 +15,7 @@ public struct StakeSummaryView: View {
 		}
 	}
 
+	@Environment(\.resourceBalanceHideFiatValue) var resourceBalanceHideFiatValue
 	public let viewState: ViewState
 	public let onReadyToClaimTapped: () -> Void
 
@@ -77,7 +78,7 @@ extension StakeSummaryView {
 					Text("\(amount.nominalAmount.formatted()) XRD")
 						.textStyle(.body2HighImportance)
 						.foregroundColor(amountTextColor)
-					if let fiatWorth = amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
+					if !resourceBalanceHideFiatValue, let fiatWorth = amount.fiatWorth?.currencyFormatted(applyCustomFont: false) {
 						Text(fiatWorth)
 							.textStyle(.body2HighImportance)
 							.foregroundStyle(.app.gray2)