diff --git a/components/sidebar/context/compound/SidebarCompoundBorrow.vue b/components/sidebar/context/compound/SidebarCompoundBorrow.vue index f7edfbf..ab7f40f 100644 --- a/components/sidebar/context/compound/SidebarCompoundBorrow.vue +++ b/components/sidebar/context/compound/SidebarCompoundBorrow.vue @@ -109,7 +109,7 @@ export default defineComponent({ const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') - const { stats, status: initialStatus, displayPositions, liquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ + const { stats, status: initialStatus,position, displayPositions, liquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ overridePosition: (position) => { if (tokenId.value !== position.cTokenId) return position @@ -130,7 +130,7 @@ export default defineComponent({ const amountParsed = computed(() => parseSafeFloat(amount.value)) const currentPosition = computed(() => - displayPositions.value.find((position) => position.cTokenId === tokenId.value) + position.value?.data.find((position) => position.cTokenId === tokenId.value) ) const token = computed(() => getTokenByKey(rootTokenKey.value)) diff --git a/components/sidebar/context/compound/SidebarCompoundSupply.vue b/components/sidebar/context/compound/SidebarCompoundSupply.vue index 13a9e73..f197c9d 100644 --- a/components/sidebar/context/compound/SidebarCompoundSupply.vue +++ b/components/sidebar/context/compound/SidebarCompoundSupply.vue @@ -38,7 +38,7 @@ @@ -110,7 +110,7 @@ export default defineComponent({ const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') - const { status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ + const { status, position, displayPositions, liquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ overridePosition: (position) => { if (tokenId.value !== position.cTokenId) return position @@ -131,8 +131,12 @@ export default defineComponent({ const balance = computed(() => getBalanceByKey(rootTokenKey.value)) const address = computed(() => token.value?.address) - const factor = computed( - () => displayPositions.value?.find((position) => position.cTokenId === tokenId.value)?.factor + const currentPosition = computed(() => + position.value?.data.find((position) => position.cTokenId === tokenId.value) + ) + + const factor = computed( + () => currentPosition.value?.factor || "0" ) const { toggle, isMaxAmount } = useMaxAmountActive(amount, balance) @@ -140,7 +144,7 @@ export default defineComponent({ const { validateAmount, validateLiquidation, validateIsLoggedIn } = useValidators() const errors = computed(() => { const hasAmountValue = !isZero(amount.value) - const liqValid = gt(factor.value, '0') ? validateLiquidation(status.value, maxLiquidation.value) : null + const liqValid = gt(factor.value, '0') ? validateLiquidation(status.value, liquidation.value) : null return { amount: { message: validateAmount(amountParsed.value, balance.value), show: hasAmountValue }, @@ -192,7 +196,7 @@ export default defineComponent({ formatUsd, toggle, isMaxAmount, - maxLiquidation, + liquidation, liquidationPrice, liquidationMaxPrice, errorMessages, diff --git a/components/sidebar/context/compound/SidebarCompoundWithdraw.vue b/components/sidebar/context/compound/SidebarCompoundWithdraw.vue index 239ea3b..53d893f 100644 --- a/components/sidebar/context/compound/SidebarCompoundWithdraw.vue +++ b/components/sidebar/context/compound/SidebarCompoundWithdraw.vue @@ -40,7 +40,7 @@ @@ -111,7 +111,7 @@ export default defineComponent({ const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') - const { stats, status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ + const { stats, status,position, displayPositions, liquidation, liquidationPrice, liquidationMaxPrice } = useCompoundPosition({ overridePosition: (position) => { if (tokenId.value !== position.cTokenId) return position originalBalance.value = position.supply @@ -124,7 +124,7 @@ export default defineComponent({ }) const balance = computed( - () => displayPositions.value.find((position) => position.cTokenId === tokenId.value)?.supply || '0' + () => position.value.data.find((position) => position.cTokenId === tokenId.value)?.supply || '0' ) const amount = ref('') @@ -146,7 +146,7 @@ export default defineComponent({ const errors = computed(() => { const hasAmountValue = !isZero(amount.value) const liqValid = gt(factor.value, '0') - ? validateLiquidation(status.value, maxLiquidation.value, isZero(stats.value.totalBorrowInEth)) + ? validateLiquidation(status.value, liquidation.value, isZero(stats.value.totalBorrowInEth)) : null return { @@ -200,7 +200,7 @@ export default defineComponent({ formatUsd, toggle, isMaxAmount, - maxLiquidation, + liquidation, liquidationPrice, liquidationMaxPrice, errorMessages,