From 0fc6fc7168e1fd71b607cc0f23ce29551226b09f Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 27 Mar 2024 22:19:33 -0400 Subject: [PATCH] withdraw fix --- src/components/Vault.vue | 5 +++-- src/components/Withdraw.vue | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/Vault.vue b/src/components/Vault.vue index 621f1dc..7787031 100644 --- a/src/components/Vault.vue +++ b/src/components/Vault.vue @@ -97,6 +97,7 @@ import {vaultAddress} from "@/blockchain/contract.js"; import {ensureVault} from "@/blockchain/wallet.js"; import CopyButton from "@/components/CopyButton.vue"; import Withdraw from "@/components/Withdraw.vue"; +import {getToken} from "@/blockchain/token.js"; const TokenRow = defineAsyncComponent(()=>import('./TokenRow.vue')) const s = useStore() @@ -113,8 +114,8 @@ const exists = computed(()=>s.vaults.length>0) const withdrawToken = ref(null) const withdrawShow = ref(false) -function onWithdraw(addr) { - const token = s.tokens[addr] +async function onWithdraw(addr) { + const token = await getToken(s.chainId, addr) console.log('withdraw', addr, token) withdrawToken.value = token withdrawShow.value = true diff --git a/src/components/Withdraw.vue b/src/components/Withdraw.vue index 217bb72..9d7d9a2 100644 --- a/src/components/Withdraw.vue +++ b/src/components/Withdraw.vue @@ -2,7 +2,7 @@ -  Withdraw {{ token.symbol }} +  Withdraw {{ token.s }} @@ -45,13 +45,13 @@ const floatAmount = ref(0) function withdraw() { const vaultAddr = props.vault const valueStr = floatAmount.value.toString(); - const amount = FixedNumber.fromString(valueStr,{decimals:props.token.decimals, width:256, signed: false}).value; - console.log('pending withdrawl', valueStr, amount, props.token.symbol) + const amount = FixedNumber.fromString(valueStr,{decimals:props.token.d, width:256, signed: false}).value; + console.log('pending withdrawl', valueStr, amount, props.token.s) if( amount === 0n ) return pendTransaction(async (signer)=>{ const vault = contractOrNull(vaultAddr, vaultAbi, signer) - return await vault['withdraw(address,uint256)'](props.token.address, amount) + return await vault['withdraw(address,uint256)'](props.token.a, amount) }) floatAmount.value = 0 emit('update:modelValue', false)