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-08 13:17:46 +03:00
parent a9878a1baa
commit 0f64299179
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/sidebar/context/compound/SidebarCompoundBorrow.vue
View File

@ -109,7 +109,7 @@ export default defineComponent({
const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') 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) => { overridePosition: (position) => {
if (tokenId.value !== position.cTokenId) return position if (tokenId.value !== position.cTokenId) return position
@ -130,7 +130,7 @@ export default defineComponent({
const amountParsed = computed(() => parseSafeFloat(amount.value)) const amountParsed = computed(() => parseSafeFloat(amount.value))
const currentPosition = computed(() => 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)) const token = computed(() => getTokenByKey(rootTokenKey.value))

16
components/sidebar/context/compound/SidebarCompoundSupply.vue
View File

@ -38,7 +38,7 @@
<SidebarSectionStatus <SidebarSectionStatus
class="mt-8" class="mt-8"
:liquidation="maxLiquidation" :liquidation="liquidation"
:status="status" :status="status"
/> />
@ -110,7 +110,7 @@ export default defineComponent({
const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') 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) => { overridePosition: (position) => {
if (tokenId.value !== position.cTokenId) return position if (tokenId.value !== position.cTokenId) return position
@ -131,8 +131,12 @@ export default defineComponent({
const balance = computed(() => getBalanceByKey(rootTokenKey.value)) const balance = computed(() => getBalanceByKey(rootTokenKey.value))
const address = computed(() => token.value?.address) const address = computed(() => token.value?.address)
const factor = computed( const currentPosition = computed(() =>
() => displayPositions.value?.find((position) => position.cTokenId === tokenId.value)?.factor position.value?.data.find((position) => position.cTokenId === tokenId.value)
)
const factor = computed(
() => currentPosition.value?.factor || "0"
) )
const { toggle, isMaxAmount } = useMaxAmountActive(amount, balance) const { toggle, isMaxAmount } = useMaxAmountActive(amount, balance)
@ -140,7 +144,7 @@ export default defineComponent({
const { validateAmount, validateLiquidation, validateIsLoggedIn } = useValidators() const { validateAmount, validateLiquidation, validateIsLoggedIn } = useValidators()
const errors = computed(() => { const errors = computed(() => {
const hasAmountValue = !isZero(amount.value) 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 { return {
amount: { message: validateAmount(amountParsed.value, balance.value), show: hasAmountValue }, amount: { message: validateAmount(amountParsed.value, balance.value), show: hasAmountValue },
@ -192,7 +196,7 @@ export default defineComponent({
formatUsd, formatUsd,
toggle, toggle,
isMaxAmount, isMaxAmount,
maxLiquidation, liquidation,
liquidationPrice, liquidationPrice,
liquidationMaxPrice, liquidationMaxPrice,
errorMessages, errorMessages,

10
components/sidebar/context/compound/SidebarCompoundWithdraw.vue
View File

@ -40,7 +40,7 @@
<SidebarSectionStatus <SidebarSectionStatus
class="mt-8" class="mt-8"
:liquidation="maxLiquidation" :liquidation="liquidation"
:status="status" :status="status"
/> />
@ -111,7 +111,7 @@ export default defineComponent({
const rootTokenKey = computed(() => ctokens[networkName.value].rootTokens.includes(tokenKey.value) ? tokenKey.value : 'eth') 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) => { overridePosition: (position) => {
if (tokenId.value !== position.cTokenId) return position if (tokenId.value !== position.cTokenId) return position
originalBalance.value = position.supply originalBalance.value = position.supply
@ -124,7 +124,7 @@ export default defineComponent({
}) })
const balance = computed( 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('') const amount = ref('')
@ -146,7 +146,7 @@ export default defineComponent({
const errors = computed(() => { const errors = computed(() => {
const hasAmountValue = !isZero(amount.value) const hasAmountValue = !isZero(amount.value)
const liqValid = gt(factor.value, '0') 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 : null
return { return {
@ -200,7 +200,7 @@ export default defineComponent({
formatUsd, formatUsd,
toggle, toggle,
isMaxAmount, isMaxAmount,
maxLiquidation, liquidation,
liquidationPrice, liquidationPrice,
liquidationMaxPrice, liquidationMaxPrice,
errorMessages, errorMessages,