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 deposit merge #91

Merged
merged 1 commit into from
Apr 9, 2024
Merged

fix deposit merge #91

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
2 changes: 1 addition & 1 deletion views/transactions/Deposit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
(e) => e.networkKey === eraNetwork.value.key || e.address === ETH_TOKEN.l1Address
);
return filterL1tokens;
// return Object.values(l1Tokens.value ?? []);

Check failure on line 474 in views/transactions/Deposit.vue

View workflow job for this annotation

GitHub Actions / Build 

'ETH_TOKEN' is not defined

Check failure on line 474 in views/transactions/Deposit.vue

View workflow job for this annotation

GitHub Actions / Build 

'ETH_TOKEN' is not defined
});
const availableBalances = computed<TokenAmount[]>(() => {
return balance.value ?? [];
Expand Down Expand Up @@ -784,7 +784,7 @@
to: transaction.value!.to.address,
tokenAddress: transaction.value!.token.address,
amount: transaction.value!.token.amount,
toMerge: transaction.value!.toMerge,
toMerge: mergeSupported.value && transaction.value!.toMerge,
},
feeValues.value!
);
Expand Down
Loading