fix comments

Author: OBorce

CHANGELOG.md

@@ -22,6 +22,10 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
     - `wallet-create`/`wallet-recover`/`wallet-open` support the `ledger` subcommand, in addition to the existing
       `software` and `trezor`, which specifies the type of the wallet to operate on.
 
+### Fixed
+  - Wallet:
+    - Fixed handling of confirmed and unconfirmed conflicting order transactions in the wallet.
+
 ## [1.3.0] - 2026-04-09
 
 ### Added

wallet/src/account/output_cache/mod.rs

@@ -2103,8 +2103,8 @@ fn uses_conflicting_nonce(
 
 fn uses_conflicting_order_command(
     unconfirmed_tx: &WalletTx,
-    cmd_tag: OrderAccountCommandTag,
-    order_id: OrderId,
+    confirmed_cmd_tag: OrderAccountCommandTag,
+    confirmed_order_id: OrderId,
 ) -> bool {
     unconfirmed_tx.inputs().iter().any(|input| match input {
         TxInput::OrderAccountCommand(cmd) => {
@@ -2114,12 +2114,12 @@ fn uses_conflicting_order_command(
                 | OrderAccountCommand::ConcludeOrder(id) => *id,
             };
             // It is only a conflict if it is the same order id
-            if unconfirmed_order_id != order_id {
+            if unconfirmed_order_id != confirmed_order_id {
                 return false;
             }
 
             let unconfirmed_cmd_tag: OrderAccountCommandTag = cmd.into();
-            match cmd_tag {
+            match confirmed_cmd_tag {
                 // Confirmed fill orders do not conflict with anything
                 OrderAccountCommandTag::FillOrder => false,
                 // Confirmed conclude order conflict with any other unconfirmed operation on the

wallet/src/account/output_cache/tests.rs

@@ -1379,7 +1379,7 @@ fn update_conflicting_txs_order_v1_conclude(#[case] seed: Seed) {
     assert!(output_cache.orders[&order_id].is_concluded);
 
     // A *different* confirmed conclude tx for the same order arrives.
-    // update_conflicting_txs must mark the unconfirmed one as Conflicted.
+    // update_conflicting_txs must mark the unconfirmed ones as Conflicted.
     let confirmed_conclude_tx = TransactionBuilder::new()
         .add_input(
             TxInput::OrderAccountCommand(OrderAccountCommand::ConcludeOrder(order_id)),
@@ -1446,6 +1446,7 @@ fn update_conflicting_txs_order_v1_conclude(#[case] seed: Seed) {
         .unwrap();
 
     assert!(output_cache.orders[&order_id].is_concluded);
+    assert!(!output_cache.orders[&order_id].is_frozen);
 }
 
 // Regression test: same as above but for FreezeOrder.
@@ -1531,6 +1532,8 @@ fn update_conflicting_txs_order_v1_freeze(#[case] seed: Seed) {
         .unwrap();
 
     assert!(output_cache.orders[&order_id].is_frozen);
+    // concluded is still false
+    assert!(!output_cache.orders[&order_id].is_concluded);
 
     // A *different* confirmed freeze tx for the same order arrives.
     // update_conflicting_txs must mark the unconfirmed one as Conflicted.
@@ -1577,6 +1580,7 @@ fn update_conflicting_txs_order_v1_freeze(#[case] seed: Seed) {
 
     // is_frozen must be rolled back after the conflict.
     assert!(!output_cache.orders[&order_id].is_frozen);
+    assert!(!output_cache.orders[&order_id].is_concluded);
 
     // The confirmed freeze tx must now be addable without error.
     output_cache
@@ -1592,6 +1596,7 @@ fn update_conflicting_txs_order_v1_freeze(#[case] seed: Seed) {
         .unwrap();
 
     assert!(output_cache.orders[&order_id].is_frozen);
+    assert!(!output_cache.orders[&order_id].is_concluded);
 }
 
 fn add_random_transfer_tx(