Better checks the swap status

Author: thewhaleking

bittensor_cli/src/commands/wallets.py

@@ -2002,9 +2002,9 @@ async def check_swap_status(
         origin_ss58: The SS58 address of the original coldkey
         block_number: Optional block number where the swap was scheduled
     """
-    scheduled_swaps = await subtensor.get_scheduled_coldkey_swap()
 
     if not origin_ss58:
+        scheduled_swaps = await subtensor.get_scheduled_coldkey_swap()
         if not scheduled_swaps:
             console.print("[yellow]No pending coldkey swaps found.[/yellow]")
             return
@@ -2036,8 +2036,16 @@ async def check_swap_status(
             "\n[dim]Tip: Check specific swap details by providing the original coldkey SS58 address and the block number.[/dim]"
         )
         return
-
-    is_pending = origin_ss58 in scheduled_swaps
+    chain_reported_completion_block, destination_address = await subtensor.query(
+        "SubtensorModule", "ColdkeySwapScheduled", [origin_ss58]
+    )
+    if (
+        chain_reported_completion_block != 0
+        and destination_address != "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
+    ):
+        is_pending = True
+    else:
+        is_pending = False
 
     if not is_pending:
         console.print(
@@ -2050,7 +2058,7 @@ async def check_swap_status(
     )
 
     if expected_block_number is None:
-        return
+        expected_block_number = chain_reported_completion_block
 
     swap_info = await find_coldkey_swap_extrinsic(
         subtensor=subtensor,