Skip to content

Commit b25598e

Browse files
fix: ensure right donation address is used for gitcoin (#10616)
1 parent b5c09b6 commit b25598e

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

app/assets/v2/js/cart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Vue.component('eth-checkout-button', {
4040
delimiters: [ '[[', ']]' ],
4141
template: '#eth-checkout-template',
4242
props: [
43-
'maxCartItems', 'network', 'isZkSyncDown', 'isPolygonDown', 'onPolygonUpdate', 'onZkSyncUpdate', 'donationInputs',
43+
'maxCartItems', 'network', 'isZkSyncDown', 'isPolygonDown', 'onPolygonUpdate', 'onZkSyncUpdate', 'donationInputs', 'donationInputsPolygon',
4444
'currentTokens', 'grantsByTenant', 'grantsUnderMinimalContribution', 'activeCheckout', 'standardCheckout', 'multisigGrants',
4545
'tabSelected'
4646
]

app/grants/templates/grants/cart-vue.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ <h4 class="font-weight-bold mb-5 my-md-0">Discover Grants</h4>
210210
:is-polygon-down="isPolygonDown"
211211
:current-tokens="currentTokens"
212212
:donation-inputs="donationInputs"
213+
:donation-inputs-polygon="donationInputsPolygon"
213214
:max-cart-items="maxCartItems"
214215
:grants-by-tenant="grantsByTenant"
215216
:grants-under-minimal-contribution="grantsUnderMinimalContribution"

app/grants/templates/grants/cart/eth.html

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,23 @@ <h4 class="col gc-font-base text-dark px-0 pt-2 my-3">Summary</h4>
208208
</div>
209209
<!-- Checkout -->
210210
<div class="text-center mt-3 mb-4 mx-auto">
211-
<eth-checkout-button class="d-none d-md-block" :active-checkout="activeCheckout"
212-
:on-polygon-update="onPolygonUpdate" :on-zk-sync-update="onZkSyncUpdate"
213-
:standard-checkout="standardCheckout" :is-zk-sync-down="isZkSyncDown" :is-polygon-down="isPolygonDown"
214-
:current-tokens="currentTokens" :donation-inputs="donationInputs" :max-cart-items="maxCartItems"
215-
:grants-by-tenant="grantsByTenant" :grants-under-minimal-contribution="grantsUnderMinimalContribution"
216-
:network="network" :multisig-grants="multisigGrants" :tab-selected="tabSelected">
211+
<eth-checkout-button
212+
class="d-none d-md-block"
213+
:active-checkout="activeCheckout"
214+
:on-polygon-update="onPolygonUpdate"
215+
:on-zk-sync-update="onZkSyncUpdate"
216+
:standard-checkout="standardCheckout"
217+
:is-zk-sync-down="isZkSyncDown"
218+
:is-polygon-down="isPolygonDown"
219+
:current-tokens="currentTokens"
220+
:donation-inputs="donationInputs"
221+
:donation-inputs-polygon="donationInputsPolygon"
222+
:max-cart-items="maxCartItems"
223+
:grants-by-tenant="grantsByTenant"
224+
:grants-under-minimal-contribution="grantsUnderMinimalContribution"
225+
:network="network"
226+
:multisig-grants="multisigGrants"
227+
:tab-selected="tabSelected">
217228
</eth-checkout-button>
218229
</div>
219230

app/grants/templates/grants/cart/eth_checkout_button.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
inline-template
7272
@polygon-data-updated="onPolygonUpdate"
7373
:current-tokens="currentTokens"
74-
:donation-inputs="donationInputs"
74+
:donation-inputs="donationInputsPolygon"
7575
:max-cart-items="100"
7676
:grants-by-tenant="grantsByTenant"
7777
:grants-under-minimal-contribution="grantsUnderMinimalContribution"
@@ -143,7 +143,7 @@
143143
inline-template
144144
@polygon-data-updated="onPolygonUpdate"
145145
:current-tokens="currentTokens"
146-
:donation-inputs="donationInputs"
146+
:donation-inputs="donationInputsPolygon"
147147
:max-cart-items="100"
148148
:grants-by-tenant="grantsByTenant"
149149
:grants-under-minimal-contribution="grantsUnderMinimalContribution"

app/grants/templates/grants/cart/eth_polygon.html

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,23 @@ <h4 class="col gc-font-base text-dark px-0 pt-2 my-3">Summary</h4>
209209
</div>
210210
<!-- Checkout -->
211211
<div class="text-center mt-3 mb-4 mx-auto">
212-
<eth-checkout-button class="d-none d-md-block" :active-checkout="activeCheckout"
213-
:on-polygon-update="onPolygonUpdate" :on-zk-sync-update="onZkSyncUpdate"
214-
:standard-checkout="standardCheckout" :is-zk-sync-down="isZkSyncDown" :is-polygon-down="isPolygonDown"
215-
:current-tokens="currentTokens" :donation-inputs="donationInputs" :max-cart-items="maxCartItems"
216-
:grants-by-tenant="grantsByTenant" :grants-under-minimal-contribution="grantsUnderMinimalContribution"
217-
:network="network" :multisig-grants="multisigGrants">
212+
<eth-checkout-button
213+
class="d-none d-md-block"
214+
:active-checkout="activeCheckout"
215+
:on-polygon-update="onPolygonUpdate"
216+
:on-zk-sync-update="onZkSyncUpdate"
217+
:standard-checkout="standardCheckout"
218+
:is-zk-sync-down="isZkSyncDown"
219+
:is-polygon-down="isPolygonDown"
220+
:current-tokens="currentTokens"
221+
:donation-inputs="donationInputs"
222+
:donation-inputs-polygon="donationInputsPolygon"
223+
:max-cart-items="maxCartItems"
224+
:grants-by-tenant="grantsByTenant"
225+
:grants-under-minimal-contribution="grantsUnderMinimalContribution"
226+
:network="network"
227+
:multisig-grants="multisigGrants"
228+
>
218229
</eth-checkout-button>
219230
</div>
220231

0 commit comments

Comments
 (0)