diff --git a/apps/simplex-store-service/README.md b/apps/simplex-store-service/README.md
index 65ec1bf5fa..9de4460178 100644
--- a/apps/simplex-store-service/README.md
+++ b/apps/simplex-store-service/README.md
@@ -883,8 +883,8 @@ automatically, and the service never learns where to send money. Support records
    cents.
 
 A balance that an open order holds is never refunded: that order is buying another name with it and
-its invoice is waiting for the difference. The command names the order and its invoice's expiry
-instead:
+its invoice is waiting for the difference. The command names the order instead, with its invoice's
+expiry unless money reached the invoice:
 
 - `its invoice open until <time>`: if the buyer pays it, the balance is spent; if not, it is released
   once the invoice expires and the poller, in service mode, closes the order. Run the command again
@@ -893,9 +893,9 @@ instead:
   after the expiry at the earliest, then stop it and run //refund again`: the poller runs only in
   service mode. Its first pass from 10 minutes after the expiry closes the order and releases the
   hold; a card order closes only once Stripe accepts the cancel.
-- `whose invoice expired at <time> holding money`: a payment reached the invoice; the hold stays
-  until that payment settles, which spends the balance, or the provider closes the invoice, which
-  releases it.
+- `whose invoice holds money`: a payment reached the invoice, before or after its expiry; the hold
+  stays until that payment settles, which spends the balance, or the provider closes the invoice,
+  which releases it.
 
 The command also answers when the reference matches no order, when the order has no balance, and
 when the cents are not the balance. A refunded balance shows `amount` 0 and its `refunded` total in
diff --git a/apps/simplex-store-service/src/StoreService/Service.hs b/apps/simplex-store-service/src/StoreService/Service.hs
index 5e9e3bf702..033f95048c 100644
--- a/apps/simplex-store-service/src/StoreService/Service.hs
+++ b/apps/simplex-store-service/src/StoreService/Service.hs
@@ -290,12 +290,12 @@ showRefund cc ref = do
     Right (Just (RegistrationId rid, Just (balance@Balance {blAmount, blCredited, blRefunded}, chain))) ->
       Right $
         "Order " <> rid <> ": balance " <> dollars blAmount <> " (credited " <> dollars blCredited <> ", refunded " <> dollars blRefunded
-          <> "). Paid by: " <> chainText chain <> ". " <> nextStep now balance
+          <> "). Paid by: " <> chainText chain <> ". " <> nextStep balance
     Left _ -> Left "The balance could not be read."
   where
     withChain db (rid, balance_) = (rid,) <$> mapM (\balance -> (balance,) <$> balanceChain db rid) balance_
-    nextStep now Balance {blAmount, blHold} = case blHold of
-      Just hold -> "It cannot be refunded now: " <> heldText now hold <> "."
+    nextStep Balance {blAmount, blHold} = case blHold of
+      Just hold -> "It cannot be refunded now: " <> heldText hold <> "."
       Nothing
         | blAmount > 0 -> "To record its refund: //refund " <> ref <> " " <> tshow blAmount
         | otherwise -> "Nothing to refund."
@@ -309,19 +309,19 @@ refundBalanceCmd turns ChatController {chatStore} ref cents = do
       -- The registration id, not the reference, since an invoice id is kept out of the logs.
       logInfo $ "names: recorded a refund of " <> tshow rdCents <> " cents for order " <> rid
       pure $ Right $ "Recorded a refund of " <> dollars rdCents <> " for order " <> rid <> ". Refund it now, by: " <> chainText rdChain <> "."
-    Right (Left refusal) -> pure $ Left $ "Nothing recorded: " <> refusalText now refusal <> "."
+    Right (Left refusal) -> pure $ Left $ "Nothing recorded: " <> refusalText refusal <> "."
     Left e -> Left "The refund could not be recorded." <$ logError ("names: recording a refund failed: " <> tshow e)
   where
-    refusalText now = \case
+    refusalText = \case
       RefundNoOrder -> "no order has the reference " <> ref
       RefundNoBalance -> "the order of " <> ref <> " has no balance"
       RefundAmount amount -> "the balance is " <> dollars amount <> " now, not " <> dollars cents
-      RefundHeld hold -> heldText now hold
+      RefundHeld hold -> heldText hold
 
-heldText :: UTCTime -> BalanceHold -> T.Text
-heldText now BalanceHold {bhHolder = RegistrationId holder, bhUntil, bhOverdue}
+heldText :: BalanceHold -> T.Text
+heldText BalanceHold {bhHolder = RegistrationId holder, bhUntil, bhOverdue, bhFunded}
   | bhOverdue = heldBy <> "its invoice expired at " <> fmtTime bhUntil <> "; start the service so the poller closes that order, " <> tshow graceMinutes <> " minutes after the expiry at the earliest, then stop it and run //refund again"
-  | bhUntil < now = heldBy <> "whose invoice expired at " <> fmtTime bhUntil <> " holding money; it holds until that payment settles or the invoice closes; run the command again then"
+  | bhFunded = heldBy <> "whose invoice holds money; it holds until that payment settles or the invoice closes; run the command again then"
   | otherwise = heldBy <> "its invoice open until " <> fmtTime bhUntil <> "; run the command again then"
   where
     heldBy = "held by order " <> holder <> ", "
diff --git a/tests/Bots/StoreService/GroupIntegrationTests.hs b/tests/Bots/StoreService/GroupIntegrationTests.hs
index f52cfec027..bf298ee94b 100644
--- a/tests/Bots/StoreService/GroupIntegrationTests.hs
+++ b/tests/Bots/StoreService/GroupIntegrationTests.hs
@@ -318,7 +318,7 @@ namesRefundChatTests = describe "StoreService names: operator refund" $ do
   it "refuses an unknown reference, an order without a balance and another amount, and answers the usage to a malformed command" testRefundRefusals
   it "refuses a balance held by an open order, naming it and its expiry, and records it once that order's invoice is cancelled" testRefundOpenHolder
   it "refuses a balance held by an overdue order, naming its expiry, and records it once the sweep closed that order" testRefundOverdueHolder
-  it "refuses a balance held by an order whose invoice holds money past its expiry" testRefundFundedHolder
+  it "refuses a balance held by an order whose invoice holds money, before its expiry and past it" testRefundFundedHolder
   it "lists every order of a chain of three that the balance came through" testRefundChain
   it "stops the chain of a late-paid difference order at itself, its cents marked late" testRefundLateChain
   it "is not a group command" $ \_ -> groupCmdAction GROwner "/refund s 10000" `shouldBe` IgnoreMsg
@@ -358,17 +358,17 @@ testRefundRefusals ps = withStoreService ps $ \_ _ cc -> do
     (args,) <$> refundRaw cc args `shouldReturn` (args, Left badgeCmdUsage)
   Balances.figures st "s" t0 `shouldReturn` Just (10000, 10000, 0, Nothing)
 
--- | The source s with a balance of $100.00 and the order h holding it, whose invoice expires at the given time.
-heldSource :: ChatController -> UTCTime -> IO ()
-heldSource cc expiry = do
-  Balances.source (chatStore cc) "s" 10000
-  Balances.holder (chatStore cc) "h" "s" 10000 expiry `shouldReturn` Right ()
+-- | The source with a balance of $100.00 and the holder holding it, whose invoice expires at the given time.
+heldSource :: ChatController -> Text -> Text -> UTCTime -> IO ()
+heldSource cc src holder expiry = do
+  Balances.source (chatStore cc) src 10000
+  Balances.holder (chatStore cc) holder src 10000 expiry `shouldReturn` Right ()
 
-heldRefusals :: HasCallStack => ChatController -> Text -> IO ()
-heldRefusals cc held = do
-  refundRaw cc "s" `shouldReturn` Right ("Order s: balance $100.00 (credited $100.00, refunded $0.00). Paid by: order s: $100.00 by btc on invoice inv-s. It cannot be refunded now: " <> held <> ".")
-  refundRaw cc "inv-s 10000" `shouldReturn` Left ("Nothing recorded: " <> held <> ".")
-  Balances.figures (chatStore cc) "s" t0 >>= (`shouldSatisfy` \case Just (10000, 10000, 0, Just _) -> True; _ -> False)
+heldRefusals :: HasCallStack => ChatController -> Text -> Text -> IO ()
+heldRefusals cc src held = do
+  refundRaw cc src `shouldReturn` Right ("Order " <> src <> ": balance $100.00 (credited $100.00, refunded $0.00). Paid by: order " <> src <> ": $100.00 by btc on invoice inv-" <> src <> ". It cannot be refunded now: " <> held <> ".")
+  refundRaw cc ("inv-" <> src <> " 10000") `shouldReturn` Left ("Nothing recorded: " <> held <> ".")
+  Balances.figures (chatStore cc) src t0 >>= (`shouldSatisfy` \case Just (10000, 10000, 0, Just _) -> True; _ -> False)
 
 recordedS :: Either Text Text
 recordedS = Right "Recorded a refund of $100.00 for order s. Refund it now, by: order s: $100.00 by btc on invoice inv-s."
@@ -377,8 +377,8 @@ testRefundOpenHolder :: HasCallStack => TestParams -> IO ()
 testRefundOpenHolder ps = withStoreService ps $ \_ _ cc -> do
   now <- getCurrentTime
   let expiry = addUTCTime 3600 now
-  heldSource cc expiry
-  heldRefusals cc $ "held by order h, its invoice open until " <> minuteText expiry <> "; run the command again then"
+  heldSource cc "s" "h" expiry
+  heldRefusals cc "s" $ "held by order h, its invoice open until " <> minuteText expiry <> "; run the command again then"
   waiters <- newWaiters
   cancelOpenInvoice (chatStore cc) waiters Nothing (InvoiceId "inv-h") now `shouldReturn` True
   refundRaw cc "s 10000" `shouldReturn` recordedS
@@ -387,8 +387,8 @@ testRefundOverdueHolder :: HasCallStack => TestParams -> IO ()
 testRefundOverdueHolder ps = withStoreService ps $ \_ _ cc -> do
   now <- getCurrentTime
   let expiry = addUTCTime (-120) now
-  heldSource cc expiry
-  heldRefusals cc $ "held by order h, its invoice expired at " <> minuteText expiry <> "; start the service so the poller closes that order, 10 minutes after the expiry at the earliest, then stop it and run //refund again"
+  heldSource cc "s" "h" expiry
+  heldRefusals cc "s" $ "held by order h, its invoice expired at " <> minuteText expiry <> "; start the service so the poller closes that order, 10 minutes after the expiry at the earliest, then stop it and run //refund again"
   waiters <- newWaiters
   expireOverdue (chatStore cc) waiters Nothing now now [InvoiceId "inv-h"] `shouldReturn` [InvoiceId "inv-h"]
   refundRaw cc "s 10000" `shouldReturn` recordedS
@@ -396,10 +396,10 @@ testRefundOverdueHolder ps = withStoreService ps $ \_ _ cc -> do
 testRefundFundedHolder :: HasCallStack => TestParams -> IO ()
 testRefundFundedHolder ps = withStoreService ps $ \_ _ cc -> do
   now <- getCurrentTime
-  let expiry = addUTCTime (-120) now
-  heldSource cc expiry
-  Balances.payment (chatStore cc) "inv-h" (Balances.cardPaid 100 0) now
-  heldRefusals cc $ "held by order h, whose invoice expired at " <> minuteText expiry <> " holding money; it holds until that payment settles or the invoice closes; run the command again then"
+  forM_ [("s", "h", addUTCTime (-120) now), ("t", "g", addUTCTime 3600 now)] $ \(src, holder, expiry) -> do
+    heldSource cc src holder expiry
+    Balances.payment (chatStore cc) ("inv-" <> holder) (Balances.cardPaid 100 0) now
+    heldRefusals cc src $ "held by order " <> holder <> ", whose invoice holds money; it holds until that payment settles or the invoice closes; run the command again then"
 
 testRefundChain :: HasCallStack => TestParams -> IO ()
 testRefundChain ps = withStoreService ps $ \_ _ cc -> do