Instadapp/assembly
1
0
Fork 0
mirror of https://github.com/Instadapp/assembly.git synced 2024-07-29 22:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Georges KABBOUCHI 2021-08-16 21:33:56 +03:00
parent e1fbd73e8b
commit 1179aeb007
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/swap/SwapCard.vue
View File

@ -347,7 +347,7 @@
</template>
<script>
import { computed, defineComponent, reactive, ref, watch, watchEffect } from '@nuxtjs/composition-api'
import { computed, defineComponent, onMounted, reactive, ref, watch, watchEffect } from '@nuxtjs/composition-api'
import { useNetwork } from '~/composables/useNetwork'
import tokens from '~/constant/tokens'
import Button from '../Button.vue'
@ -389,7 +389,7 @@ export default defineComponent({
address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
symbol: 'ETH',
amount: '0',
amountUSD: computed(() => prices[activeNetworkId.value][token0.address] * token0.amount),
amountUSD: computed(() => (prices[activeNetworkId.value][token0.address] * token0.amount) || '0'),
balance: computed(() => getBalanceByKey(token0.symbol)),
decimals: 18,
@ -399,7 +399,7 @@ export default defineComponent({
address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
symbol: 'DAI',
amount: props.token1Amount,
amountUSD: computed(() => prices[activeNetworkId.value][token1.address] * token1.amount),
amountUSD: computed(() => (prices[activeNetworkId.value][token1.address] * token1.amount) || '0'),
balance: computed(() => getBalanceByKey(token1.symbol)),
decimals: 18,
})
@ -443,7 +443,6 @@ export default defineComponent({
}
const selectToken1 = (token) => {
console.log(token);
token1.symbol = token.symbol
token1.address = token.address
token1.decimals = token.decimals
@ -453,6 +452,10 @@ export default defineComponent({
watch(token0, () => emit('token0', { ...token0 }), { immediate: true })
watch(token1, () => emit('token1', { ...token1 }), { immediate: true })
watch([slippage, customSlippage, customSlippageValue], () => emit('slippage', customSlippage.value ? customSlippageValue.value : slippage.value), { immediate: true })
watch(activeNetworkId, () => {
selectToken0(allTokens.value.find(token => token.symbol === 'ETH'))
selectToken1(allTokens.value.find(token => token.symbol === 'DAI'))
}, { immediate: true })
const swapping = ref(false)

2
composables/useNetwork.ts
View File

@ -14,7 +14,7 @@ export enum Network {
export const networks = [
{ id: "mainnet", chainId: 1, name: "Mainnet", icon: MainnetSVG },
{ id: "polygon", chainId: 136, name: "Polygon", icon: PolygonSVG }
{ id: "polygon", chainId: 137, name: "Polygon", icon: PolygonSVG }
];
export const activeNetworkId = ref<Network>();