Use the advanced filter for user involved swaps in the swap preview

atomex-protocol · Aug 31, 2022 · b8714dd · b8714dd
1 parent 11e0d33
commit b8714dd
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 7 deletions.
diff --git a/src/atomex/atomexSwapPreviewManager.ts b/src/atomex/atomexSwapPreviewManager.ts
@@ -254,7 +254,23 @@ export class AtomexSwapPreviewManager implements Disposable {
       return swapsInfo;
 
     const swaps = (await this.atomexContext.managers.swapManager.getSwaps(userAddress))
-      .filter(swap => swap.user.status === 'Involved' && swap.from.currencyId === fromCurrencyId);
+      .filter(swap => {
+        if (!(
+          swap.from.currencyId === fromCurrencyId
+          && (swap.user.status === 'Created' || swap.user.status === 'Involved')
+          && (swap.counterParty.status === 'Created' || swap.counterParty.status === 'Involved'
+            || swap.counterParty.status === 'PartiallyInitiated' || swap.counterParty.status === 'Initiated'
+          )
+        )) {
+          return false;
+        }
+
+        const now = Date.now();
+        const swapTimeStamp = swap.timeStamp.getTime();
+
+        return (swapTimeStamp + swap.user.requisites.lockTime * 1000 > now)
+          && (swapTimeStamp + swap.counterParty.requisites.lockTime * 1000 > now);
+      });
     const fromTotalAmount = swaps.reduce(
       (total, swap) => total.plus(swap.from.amount),
       new BigNumber(0)

diff --git a/tests/atomex/testCases/swapPreviewWithAccountAndInvolvedSwapsTestCases.ts b/tests/atomex/testCases/swapPreviewWithAccountAndInvolvedSwapsTestCases.ts
@@ -33,17 +33,33 @@ const swaps: Swap[] = [
       status: 'Involved',
       trades: [],
       transactions: [],
-      requisites: null as any
+      requisites: {
+        lockTime: 18000,
+        baseCurrencyContract: '',
+        quoteCurrencyContract: '',
+        receivingAddress: '',
+        refundAddress: null,
+        secretHash: null,
+        rewardForRedeem: new BigNumber(0)
+      }
     },
     counterParty: {
       status: 'Involved',
       trades: [],
       transactions: [],
-      requisites: null as any
+      requisites: {
+        lockTime: 36000,
+        baseCurrencyContract: '',
+        quoteCurrencyContract: '',
+        receivingAddress: '',
+        refundAddress: null,
+        secretHash: null,
+        rewardForRedeem: new BigNumber(0)
+      }
     },
     secret: null,
     secretHash: '',
-    timeStamp: new Date('2022-08-30T00:25:01Z')
+    timeStamp: new Date()
   },
   {
     id: 89,
@@ -68,17 +84,33 @@ const swaps: Swap[] = [
       status: 'Involved',
       trades: [],
       transactions: [],
-      requisites: null as any
+      requisites: {
+        lockTime: 18000,
+        baseCurrencyContract: '',
+        quoteCurrencyContract: '',
+        receivingAddress: '',
+        refundAddress: null,
+        secretHash: null,
+        rewardForRedeem: new BigNumber(0)
+      }
     },
     counterParty: {
       status: 'Involved',
       trades: [],
       transactions: [],
-      requisites: null as any
+      requisites: {
+        lockTime: 36000,
+        baseCurrencyContract: '',
+        quoteCurrencyContract: '',
+        receivingAddress: '',
+        refundAddress: null,
+        secretHash: null,
+        rewardForRedeem: new BigNumber(0)
+      }
     },
     secret: null,
     secretHash: '',
-    timeStamp: new Date('2022-08-27T14:25:01Z')
+    timeStamp: new Date()
   },
 ];