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

closes #4

Browse Source
This commit is contained in:
Georges KABBOUCHI 2021-08-11 22:40:12 +03:00
parent 063f454713
commit 180b30ac5c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
composables/useAaveV2Position.ts
View File

@ -11,6 +11,7 @@ import { Network } from "./useNetwork";
import { useBigNumber } from "./useBigNumber"; import { useBigNumber } from "./useBigNumber";
import { usePosition } from "./usePosition"; import { usePosition } from "./usePosition";
import { useToken } from "./useToken"; import { useToken } from "./useToken";
import { useSorting } from "./useSorting";
const { const {
times, times,
@ -67,7 +68,8 @@ export function useAaveV2Position(
const { web3, chainId, networkName } = useWeb3(); const { web3, chainId, networkName } = useWeb3();
const { activeAccount } = useDSA(); const { activeAccount } = useDSA();
const { getTokenByKey, allATokensV2 } = useToken(); const { getTokenByKey, allATokensV2 } = useToken();
const { byMaxSupplyOrBorrowDesc } = useSorting()
const resolver = computed(() => const resolver = computed(() =>
chainId.value === 1 chainId.value === 1
? "0xFb3a1D56eD56F046721B9aCa749895100754578b" ? "0xFb3a1D56eD56F046721B9aCa749895100754578b"
@ -204,7 +206,8 @@ export function useAaveV2Position(
max(a.supplyUsd, a.borrowUsd) max(a.supplyUsd, a.borrowUsd)
).toNumber() ).toNumber()
) )
.map(overridePosition); .map(overridePosition)
.sort(byMaxSupplyOrBorrowDesc);
}); });
function getPositionOrDefaultPosition(token, position) { function getPositionOrDefaultPosition(token, position) {

6
composables/useCompoundPosition.ts
View File

@ -13,6 +13,7 @@ import { useToken } from "./useToken";
import addresses from "~/constant/addresses"; import addresses from "~/constant/addresses";
import ctokens from "~/constant/ctokens"; import ctokens from "~/constant/ctokens";
import tokenIdMapping from "~/constant/tokenIdMapping"; import tokenIdMapping from "~/constant/tokenIdMapping";
import { useSorting } from "./useSorting";
const { const {
times, times,
@ -64,7 +65,7 @@ export function useCompoundPosition(
const { web3, networkName } = useWeb3(); const { web3, networkName } = useWeb3();
const { activeAccount } = useDSA(); const { activeAccount } = useDSA();
const { getTokenByKey } = useToken(); const { getTokenByKey } = useToken();
const { byMaxSupplyOrBorrowDesc } = useSorting()
const resolver = computed(() => addresses.mainnet.resolver.compound); const resolver = computed(() => addresses.mainnet.resolver.compound);
const fetchPosition = async () => { const fetchPosition = async () => {
@ -195,7 +196,8 @@ export function useCompoundPosition(
return false; return false;
} }
return true; return true;
}); })
.sort(byMaxSupplyOrBorrowDesc);
}); });
function getPositionOrDefaultPosition(token, pos) { function getPositionOrDefaultPosition(token, pos) {