Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Another round of bug fixing #1055

Merged
merged 4 commits into from
Mar 25, 2024
Merged

Another round of bug fixing #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49292f8
wip
GhenadieVP Mar 22, 2024
8a1c1f0
wip
GhenadieVP Mar 25, 2024
c8ef359
Merge branch 'main' into tx_error_kind_titles
GhenadieVP Mar 25, 2024
1419fae
wip
GhenadieVP Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions RadixWallet/Core/FeaturePrelude/Loadable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions RadixWallet/Features/AssetsFeature/AssetsView+Reducer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down
4 changes: 2 additions & 2 deletions ...t/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ extension ResourceBalanceView {
VStack(alignment: .leading, spacing: .zero) {
FungibleView(
thumbnail: .poolUnit(viewState.poolIcon),
caption1: viewState.poolName ?? L10n.TransactionReview.poolUnits,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No fallback for poolUnits name

caption1: viewState.poolName,
caption2: viewState.dAppName.wrappedValue?.flatMap { $0 },
fallback: nil,
amount: viewState.amount,
Expand Down Expand Up @@ -465,7 +465,7 @@ extension ResourceBalanceView {
}

private var useSpacer: Bool {
amount != nil || fallback != nil
amount != nil || fallback != nil || caption1 == nil
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spacer required for the case of missing caption1 and the checkmark selection needs to be disaplyed.

}
}

Expand Down
5 changes: 3 additions & 2 deletions RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 18 additions & 4 deletions RadixWallet/Features/TransactionReviewFeature/SubmitTransaction/SubmitTransaction+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -96,7 +110,7 @@ extension SubmitTransaction {
viewStore.send(.appeared)
}
.alert(store: store.scope(state: \.$dismissTransactionAlert, action: { .view(.dismissTransactionAlert($0)) }))
.interactiveDismissDisabled(true)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably was left in after some local testing

.interactiveDismissDisabled(viewStore.dismissalDisabled)
.presentationDragIndicator(.visible)
.presentationDetents([.fraction(0.66)])
.presentationBackground(.blur)
Expand Down
Loading