...

src/main/kotlin/database/DatabaseFactory.kt

@@ -242,7 +242,7 @@ object DatabaseFactory {
     fun findAllMonitoringTrades(): List<AutoTradeItem> {
         return transaction(mainDb) {
             AutoTradeTable.select {
-                AutoTradeTable.status neq "COMPLETED"
+                AutoTradeTable.status notInList listOf(TradeStatus.COMPLETED, TradeStatus.EXPIRED)
             }.map { mapToAutoTradeItem(it) }
         }
     }