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.

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

fix cancel orders bug when orders cancellations fail #208

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,28 @@ private class dydxCancelPendingIsolatedOrdersViewBuilderPresenter: HostedViewPre
override func start() {
super.start()

let pendingOrdersPublisher = AbacusStateManager.shared.state.selectedSubaccountOrders
.filterMany { [weak self] order in
order.marketId == self?.marketId && order.status == .open
}

Publishers.CombineLatest(
AbacusStateManager.shared.state.configsAndAssetMap,
AbacusStateManager.shared.state.selectedSubaccountOrders
pendingOrdersPublisher
)
.receive(on: RunLoop.main)
.sink { [weak self] configsAndAssetMap, orders in
.sink { [weak self] configsAndAssetMap, pendingOrders in
guard let self = self,
let marketId = self.marketId,
let asset = configsAndAssetMap[marketId]?.asset
else { return }
let pendingOrders = orders.filter { $0.marketId == marketId && $0.status == .open }
self.viewModel?.marketLogoUrl = URL(string: asset.resources?.imageUrl ?? "")
self.viewModel?.marketName = asset.name ?? "--"
self.viewModel?.marketId = asset.id
self.viewModel?.orderCount = pendingOrders.count
self.viewModel?.failureCount = self.viewModel?.failureCount
self.viewModel?.cancelAction = { [weak self] in
self?.tryCancelOrders(orderIds: orders.map(\.id))
self?.tryCancelOrders(orderIds: pendingOrders.map(\.id))
}
}
.store(in: &subscriptions)
Expand Down
Loading