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

Avoid opening claim page if claiming has been started #1709

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Avoid opening claim page if claiming has been started #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
269c39e
feat(wormhole): ensure disabling
TrGiLong Feb 19, 2024
dc08f23
feat: change default endpoint
TrGiLong Feb 20, 2024
565a40c
fix(wormhole): wrong screen
TrGiLong Feb 20, 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
2 changes: 1 addition & 1 deletion p2p_wallet/Common/Services/GlobalAppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class GlobalAppState: ObservableObject {

@Published var bridgeEndpoint: String = (Environment.current == .release) ?
String.secretConfig("BRIDGE_PROD")! :
String.secretConfig("BRIDGE_DEV")!
String.secretConfig("BRIDGE_PROD")!

@Published var tokenEndpoint: String = (Environment.current == .release) ?
String.secretConfig("TOKEN_SERVICE_PROD")! :
Expand Down
4 changes: 2 additions & 2 deletions p2p_wallet/Scenes/Main/Crypto/Container/CryptoCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ final class CryptoCoordinator: Coordinator<CryptoResult> {
.map { _ in () }
.eraseToAnyPublisher()
case let .claim(account, userAction):
if let userAction, userAction.status == .processing {
if let userAction, userAction.status != .ready {
return coordinate(to: TransactionDetailCoordinator(
viewModel: .init(userAction: userAction),
presentingViewController: navigationController
Expand All @@ -169,7 +169,7 @@ final class CryptoCoordinator: Coordinator<CryptoResult> {
)
)
.handleEvents(receiveOutput: { [weak self] result in
guard let self = self else { return }
guard let self else { return }
switch result {
case let .claiming(pendingTrx):
self.coordinate(
Expand Down
Loading