Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix small zkSync bugs, run linter #7412

Merged
merged 1 commit into from
Sep 15, 2020
Merged

Fix small zkSync bugs, run linter #7412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/assets/v2/js/cart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,8 +1800,9 @@ Vue.component('grants-cart', {
// signing key is set

// +1 for each additional token in their cart
Object.keys(this.donationsTotal).forEach((token) => {
if (token !== 'ETH') {
selectedTokens.forEach((token, index) => {
if (index !== 0) {
// SKip first one since we already expect at least one token transfer
this.maxPossibleSignatures += 1;
}
});
Expand Down Expand Up @@ -2002,7 +2003,9 @@ Vue.component('grants-cart', {
const tx = await this.nominalSyncWallet.syncTransfer({
to: transferInfo.dest,
token: transferInfo.name,
amount,
// totalRequiredAmount amount includes fee of this transfer, so subtract that now because
// otherwise we'd be transferring one additional fee
amount: zksync.utils.closestPackableTransactionAmount(amount.sub(fee)),
fee
});

Expand Down
6 changes: 3 additions & 3 deletions app/assets/v2/js/grants/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ Vue.component('grant-sidebar', {
isMobileDevice: function() {
return window.innerWidth < 576;
},
filterLink: function(params){
filterLink: function(params) {
if (params.type === this.type) {
this.filter_grants(params)
this.filter_grants(params);
} else {
document.location.href = `/grants/${params.type}`
document.location.href = `/grants/${params.type}`;
}
},
searchKeyword: function() {
Expand Down