chore: merge merkle conflicts

the-standard · Nov 12, 2024 · 3c2cfa0 · 3c2cfa0
2 parents 7dfb18b + ac2dd52
commit 3c2cfa0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/components/vault/merkl/ClaimModal.jsx b/src/components/vault/merkl/ClaimModal.jsx
@@ -104,6 +104,7 @@ const ClaimModal = (props) => {
       // 
     } else if (isSuccess) {
       toast.success("Claim Successful");
+      closeModal();
     } else if (isError) {
       console.error(error)
       toast.error('There was an error');

diff --git a/src/components/vault/merkl/RewardList.jsx b/src/components/vault/merkl/RewardList.jsx
@@ -69,7 +69,7 @@ const RewardList = ({
     if (merklBalances) {
       if (merklBalances[index]) {
         if (merklBalances[index].result) {
-          useBalance = rewardDecimals[index].result;
+          useBalance = merklBalances[index].result;
         }
         return {
           ...merklRewards[index],