GITC-665: Ensure that the same token is used in calculations for the …

…items in the checkout cart for ETH network
gitcoinco · Dec 10, 2021 · 84e808b · 84e808b
1 parent 237e890
commit 84e808b
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
@@ -1684,7 +1684,18 @@ Vue.component('grants-cart', {
     // Read array of grants in cart from localStorage
     let grantData = CartData.loadCart();
 
-    this.selectedETHCartToken = grantData.length > 0 && grantData[0].grant_donation_currency;
+    this.selectedETHCartToken = null;
+
+    for (var index = 0; index < grantData.length; index++) {
+      if (grantData[index].grant_donation_currency) {
+        this.selectedETHCartToken = grantData[index].grant_donation_currency;
+        break;
+      }
+    }
+
+    if (!this.selectedETHCartToken) {
+      this.selectedETHCartToken = 'DAI';
+    }
 
     const grantIds = grantData.map(grant => grant.grant_id);
 
@@ -1701,7 +1712,7 @@ Vue.component('grants-cart', {
 
       // Make sure none have empty currencies, and if they do default to 5 DAI. This is done
       // to prevent the cart from getting stuck loading if a currency is empty
-      updatedGrant[grantIndex]['grant_donation_currency'] = grant.grant_donation_currency ? grant.grant_donation_currency : 'DAI';
+      updatedGrant[grantIndex]['grant_donation_currency'] = this.selectedETHCartToken;
       updatedGrant[grantIndex]['grant_donation_amount'] = grant.grant_donation_amount ? grant.grant_donation_amount : '5';
     });