resolve merge conflicts

resolve merge conflcts adjust for breaking abacus changes
dydxprotocol · Jun 18, 2024 · ef26f2b · ef26f2b
1 parent 2ff862f
commit ef26f2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Model+Ext.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Model+Ext.swift
@@ -13,7 +13,7 @@ extension OrderStatusModel {
 
     convenience init(order: Abacus.SubaccountOrder) {
         switch order.status {
-        case .cancelled, .canceling:
+        case .canceled, .canceling:
             self.init(status: .red)
         case .filled:
             self.init(status: .green)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift
@@ -282,7 +282,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
 private extension OrderStatus {
     var statusIcon: dydxTradeStatusLogoViewModel.StatusIcon? {
         switch self {
-        case .cancelled: return .failed
+        case .canceled: return .failed
         case .canceling, .pending, .partiallyfilled: return .pending
         case .filled: return .filled
         case .open, .untriggered: return .open
@@ -292,7 +292,7 @@ private extension OrderStatus {
 
     var detailKey: String? {
         switch self {
-        case .cancelled: return "APP.TRADE.ORDER_CANCELED_DESC"
+        case .canceled: return "APP.TRADE.ORDER_CANCELED_DESC"
         case .canceling, .pending, .partiallyfilled: return "APP.TRADE.ORDER_PENDING_DESC"
         case .filled: return "APP.TRADE.ORDER_FILLED_DESC"
         case .open: return "APP.TRADE.ORDER_PLACED_DESC"