remove redundant var; reset redeemables for all tokens

Signed-off-by: Pranay Valson <pranay.valson@gmail.com>
covalenthq · Dec 3, 2024 · 1241efe · 1241efe
1 parent a57269d
commit 1241efe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/contracts/EwmNftController.sol b/contracts/EwmNftController.sol
@@ -437,15 +437,13 @@ contract EwmNftController is Ownable2StepUpgradeable, ERC721EnumerableUpgradeabl
     uint256[] memory tokenIds = tokenIdsOfOwnerByAmount(msg.sender, totalTokens);
 
     uint256 totalRedeemable = 0;
-    uint256 validTokenCount = 0;
 
     for (uint256 i = 0; i < tokenIds.length; i++) {
       uint256 tokenId = tokenIds[i];
       uint256 redeemable = userReedemable(tokenId);
 
       if (redeemable > 0) {
         totalRedeemable += redeemable;
-        validTokenCount++;
       }
     }
 
@@ -464,10 +462,7 @@ contract EwmNftController is Ownable2StepUpgradeable, ERC721EnumerableUpgradeabl
   ) internal {
     for (uint256 i = 0; i < tokenIds.length; i++) {
       UserInfo storage info = _users[tokenIds[i]];
-      address currentUser = userOf(tokenIds[i]);
-      if (currentUser != address(0)) {
-        info.redeemable = 0; // Reset redeemable amount only for non-expired tokens
-      }
+      info.redeemable = 0; // Reset redeemable amount for all tokens
     }
 
     _transferFromContract(owner, totalRedeemable);

diff --git a/test/unit/controller/rewardRedeem.js b/test/unit/controller/rewardRedeem.js
@@ -242,7 +242,7 @@ describe('EwmNftController - Redeem Rewards', () => {
     // Attempt to redeem rewards
     await expect(controllerContract.connect(holder).redeemRewards())
       .to.emit(controllerContract, 'EventRewardsRedeemed')
-      .withArgs(holder.address, REWARD_REDEEM_THRESHOLD.mul(3));
+      .withArgs(holder.address, REWARD_REDEEM_THRESHOLD.mul(1));
 
     const finalUserInfo = await controllerContract.getUserInfo(9);
     // console.log('Final User Info:', finalUserInfo);