Skip to content

Commit

Permalink
add reload merge token info
Browse files Browse the repository at this point in the history
  • Loading branch information
MickWang committed Apr 25, 2024
1 parent e778159 commit 45dd3d4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions composables/transaction/useMergeToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default (tokenL2Address: Ref<string | undefined>) => {
inProgress,
error,
execute: getMergeTokenInfo,
reload: reloadMergeTokenInfo,
reset,
} = usePromise(
async () => {
Expand Down Expand Up @@ -59,5 +60,6 @@ export default (tokenL2Address: Ref<string | undefined>) => {
inProgress: computed(() => inProgress.value),
error: computed(() => error.value),
requestMergeTokenInfo,
reloadMergeTokenInfo
};
};
5 changes: 3 additions & 2 deletions views/transactions/Deposit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ const amountInputTokenAddress = computed({
const tokenBalance = computed<BigNumberish | undefined>(() => {
return balance.value?.find((e) => e.address === selectedToken.value?.address)?.amount;
});
const { result: mergeTokenInfo } = useMergeToken(computed(() => selectedToken.value?.l2Address));
const { result: mergeTokenInfo, reloadMergeTokenInfo } = useMergeToken(computed(() => selectedToken.value?.l2Address));

const {
result: allowance,
Expand Down Expand Up @@ -853,6 +853,7 @@ const makeTransaction = async () => {
step.value = "submitted";
previousTransactionAddress.value = transaction.value!.to.address;
recentlyBridged.value = true;
reloadMergeTokenInfo();
}

if (tx) {
Expand Down Expand Up @@ -964,7 +965,7 @@ onMounted(() => {
if (selectedNetworkKey.value === "blast") {
selectedNetworkKey.value = zkSyncNetworks[0].key;
}
})
});
</script>

<style lang="scss" scoped>
Expand Down
7 changes: 6 additions & 1 deletion views/transactions/Withdraw.vue
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,11 @@ const mergeTokenL2Address = computed(() => {
return undefined;
});

const { result: mergeTokenInfo, inProgress: mergeTokenInfoInProgress } = useMergeToken(mergeTokenL2Address);
const {
result: mergeTokenInfo,
reloadMergeTokenInfo,
inProgress: mergeTokenInfoInProgress,
} = useMergeToken(mergeTokenL2Address);

const mergeTokenWithdrawalLimitExceeds = computed(() => {
try {
Expand Down Expand Up @@ -1049,6 +1053,7 @@ const makeTransaction = async () => {
if (transactionStatus.value === "done") {
step.value = "submitted";
previousTransactionAddress.value = transaction.value!.to.address;
reloadMergeTokenInfo();
}

if (tx) {
Expand Down

0 comments on commit 45dd3d4

Please sign in to comment.