From 180b30ac5ced0b1c0312c62b7537e8199dc15b06 Mon Sep 17 00:00:00 2001
From: Georges KABBOUCHI <georges.kabbouchi@gmail.com>
Date: Wed, 11 Aug 2021 22:40:12 +0300
Subject: [PATCH] closes #4

---
 composables/useAaveV2Position.ts   | 7 +++++--
 composables/useCompoundPosition.ts | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/composables/useAaveV2Position.ts b/composables/useAaveV2Position.ts
index f24a540..eff3b46 100644
--- a/composables/useAaveV2Position.ts
+++ b/composables/useAaveV2Position.ts
@@ -11,6 +11,7 @@ import { Network } from "./useNetwork";
 import { useBigNumber } from "./useBigNumber";
 import { usePosition } from "./usePosition";
 import { useToken } from "./useToken";
+import { useSorting } from "./useSorting";
 
 const {
   times,
@@ -67,7 +68,8 @@ export function useAaveV2Position(
   const { web3, chainId, networkName } = useWeb3();
   const { activeAccount } = useDSA();
   const { getTokenByKey, allATokensV2 } = useToken();
-
+  const { byMaxSupplyOrBorrowDesc } = useSorting()
+  
   const resolver = computed(() =>
     chainId.value === 1
       ? "0xFb3a1D56eD56F046721B9aCa749895100754578b"
@@ -204,7 +206,8 @@ export function useAaveV2Position(
           max(a.supplyUsd, a.borrowUsd)
         ).toNumber()
       )
-      .map(overridePosition);
+      .map(overridePosition)
+      .sort(byMaxSupplyOrBorrowDesc);
   });
 
   function getPositionOrDefaultPosition(token, position) {
diff --git a/composables/useCompoundPosition.ts b/composables/useCompoundPosition.ts
index 7fa6eb5..d7f896a 100644
--- a/composables/useCompoundPosition.ts
+++ b/composables/useCompoundPosition.ts
@@ -13,6 +13,7 @@ import { useToken } from "./useToken";
 import addresses from "~/constant/addresses";
 import ctokens from "~/constant/ctokens";
 import tokenIdMapping from "~/constant/tokenIdMapping";
+import { useSorting } from "./useSorting";
 
 const {
   times,
@@ -64,7 +65,7 @@ export function useCompoundPosition(
   const { web3, networkName } = useWeb3();
   const { activeAccount } = useDSA();
   const { getTokenByKey } = useToken();
-
+  const { byMaxSupplyOrBorrowDesc } = useSorting()
   const resolver = computed(() => addresses.mainnet.resolver.compound);
 
   const fetchPosition = async () => {
@@ -195,7 +196,8 @@ export function useCompoundPosition(
           return false;
         }
         return true;
-      });
+      })
+      .sort(byMaxSupplyOrBorrowDesc);
   });
 
   function getPositionOrDefaultPosition(token, pos) {