Prefer CLAIMED state over EXPIRED when a gift card is less than 24 hours old

Author: jeffyanta

pkg/code/server/account/server.go

@@ -335,17 +335,16 @@ func (s *server) getProtoAccountInfo(ctx context.Context, records *common.Accoun
 		switch err {
 		case nil:
 			if autoReturnActionRecord.State != action.StateUnknown {
-				claimState = accountpb.TokenAccountInfo_CLAIM_STATE_EXPIRED
+				claimState = accountpb.TokenAccountInfo_CLAIM_STATE_CLAIMED
 			}
 		case action.ErrActionNotFound:
 		default:
 			return nil, err
 		}
 
-		// Unclaimed gift cards that are close to the auto-return window are
-		// marked as expired in a consistent manner as SubmitIntent to avoid
-		// race conditions with the auto-return.
-		if claimState == accountpb.TokenAccountInfo_CLAIM_STATE_NOT_CLAIMED && time.Since(records.General.CreatedAt) > async_account.GiftCardExpiry-15*time.Minute {
+		// Gift cards that are close to the auto-return window are marked as expired in
+		// a consistent manner as SubmitIntent to avoid race conditions with the auto-return.
+		if time.Since(records.General.CreatedAt) > async_account.GiftCardExpiry-15*time.Minute {
 			claimState = accountpb.TokenAccountInfo_CLAIM_STATE_EXPIRED
 		}
 

pkg/code/server/account/server_test.go

@@ -340,7 +340,7 @@ func TestGetTokenAccountInfos_RemoteSendGiftCard_HappyPath(t *testing.T) {
 			expectedBalanceSource:    accountpb.TokenAccountInfo_BALANCE_SOURCE_CACHE,
 			expectedBlockchainState:  accountpb.TokenAccountInfo_BLOCKCHAIN_STATE_EXISTS,
 			expectedManagementState:  accountpb.TokenAccountInfo_MANAGEMENT_STATE_LOCKED,
-			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_EXPIRED,
+			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_CLAIMED,
 		},
 		{
 			balance:                  42,
@@ -350,7 +350,7 @@ func TestGetTokenAccountInfos_RemoteSendGiftCard_HappyPath(t *testing.T) {
 			expectedBalanceSource:    accountpb.TokenAccountInfo_BALANCE_SOURCE_CACHE,
 			expectedBlockchainState:  accountpb.TokenAccountInfo_BLOCKCHAIN_STATE_EXISTS,
 			expectedManagementState:  accountpb.TokenAccountInfo_MANAGEMENT_STATE_UNLOCKED,
-			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_EXPIRED,
+			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_CLAIMED,
 		},
 		{
 			balance:                  42,
@@ -360,7 +360,7 @@ func TestGetTokenAccountInfos_RemoteSendGiftCard_HappyPath(t *testing.T) {
 			expectedBalanceSource:    accountpb.TokenAccountInfo_BALANCE_SOURCE_CACHE,
 			expectedBlockchainState:  accountpb.TokenAccountInfo_BLOCKCHAIN_STATE_DOES_NOT_EXIST,
 			expectedManagementState:  accountpb.TokenAccountInfo_MANAGEMENT_STATE_CLOSED,
-			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_EXPIRED,
+			expectedClaimState:       accountpb.TokenAccountInfo_CLAIM_STATE_CLAIMED,
 		},
 	} {
 		ownerAccount := testutil.NewRandomAccount(t)