From 0c901f9917b88372d95dc243e5eae92525fc8760 Mon Sep 17 00:00:00 2001
From: spacedandy-agents-simplex
 <342056592+spacedandy-agents-simplex@users.noreply.github.com>
Date: Wed, 21 Oct 2026 21:37:26 +0000
Subject: [PATCH] review: round 3 fixes

- R3-1: a tier change whose answer says the subscription ended is not credited, as a resume is not, so the credit's clearing of a stored ended never drops the one this answer carries.
- R3-2: the changeTier comment in two lines.

Run: 015-badge-fixes, review round 3
---
 src/Simplex/Chat/Library/Commands.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index 5b4b942b6f..509f29bd3f 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -5781,9 +5781,8 @@ creditStoreReceipt a userId receiptId stash@BadgeStash {masterKey} invoiceId_ pa
                   pure $ SROCredited (Just user')
             -- the service's own check interval
             _ -> notCredited $ failed ri delay BIFServiceError {code = BSEPaymentPending, retryable = True} (Just 3600)
-    -- The record settles with nothing to announce past the window, when the service grants the change at its next renewal
-    -- check; once the purchase's ledger holds the tier charged, when there is nothing to change; or once its badge is no
-    -- longer shown, when the charge's next hand-over resumes the purchase.
+    -- Settles with nothing to announce: past the window the renewal check grants the change, at the tier charged there is
+    -- nothing to change, and a badge no longer shown is resumed by the charge's next hand-over.
     changeTier ri delay purchaseId = do
       user <- withStore $ \db -> getUser db userId
       p_ <- withStore' (`getBadgePurchase` purchaseId)
@@ -5805,10 +5804,10 @@ creditStoreReceipt a userId receiptId stash@BadgeStash {masterKey} invoiceId_ pa
           | storeReceiptRefused code -> SRODeferred <$ withStore' (\db -> refuseStoreReceipt db receiptId $ serviceFailure code retryAfter)
           | otherwise -> failed ri delay (serviceFailure code retryAfter) retryAfter
         Right (Right _) | Just failure <- recorded_ -> failed ri delay failure Nothing
-        Right (Right _) ->
+        Right (Right (_, stored)) ->
           withStore' (`getLatestIssuedCredential` badgePurchaseId) >>= \case
             Just cred@(BadgeCredential _ _ _ info@BadgeInfo {badgeType = issuedType})
-              | issuedType == tier && credentialExpiry cred > answeredAt -> do
+              | issuedType == tier && credentialExpiry cred > answeredAt && stored /= Just SSEnded -> do
                   user' <- withStore $ \db -> do
                     liftIO $ showTierChangedPurchase db user receiptId badgePurchaseId
                     setUserBadge db user (Just $ OwnBadge cred (mkBadgeStatus answeredAt (Just True) info))