refactor: more cleanup

leather-io · Dec 11, 2024 · b36122e · b36122e
1 parent dbf7a7a
commit b36122e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/src/app/components/sbtc-deposit-status-item/sbtc-deposit-status-item.tsx b/src/app/components/sbtc-deposit-status-item/sbtc-deposit-status-item.tsx
@@ -26,7 +26,6 @@ export function SbtcDepositTransactionItem({ deposit }: SbtcDepositTransactionIt
       openTxLink={openTxLink}
       txCaption={truncateMiddle(deposit.bitcoinTxid, 4)}
       txIcon={
-        // Replace with sBTC avatar icon
         <Avatar.Root>
           <Avatar.Image alt="ST" src={SbtcAvatarIconSrc} />
         </Avatar.Root>

diff --git a/src/app/features/asset-list/stacks/sip10-token-asset-list/sip10-token-asset-item.tsx b/src/app/features/asset-list/stacks/sip10-token-asset-list/sip10-token-asset-item.tsx
@@ -37,6 +37,7 @@ export function Sip10TokenAssetItem({
   const { isTokenEnabled } = useManageTokens();
 
   const { contractId, imageCanonicalUri, name, symbol } = info;
+  // This can be removed once an img is available directly from the sip10 token
   const isSbtc = symbol === 'sBTC';
 
   const icon = (

diff --git a/src/app/pages/swap/components/swap-asset-dialog/components/use-swap-asset-list.tsx b/src/app/pages/swap/components/swap-asset-dialog/components/use-swap-asset-list.tsx
@@ -15,7 +15,6 @@ import {
 import type { SwapFormValues } from '@shared/models/form.model';
 import { RouteUrls } from '@shared/route-urls';
 
-// import { bitflow } from '@shared/utils/bitflow-sdk';
 import { useSwapContext } from '@app/pages/swap/swap.context';
 
 import type { SwapAssetListProps } from './swap-asset-list';
@@ -29,13 +28,6 @@ export function useSwapAssetList({ assets, type }: SwapAssetListProps) {
   const isBaseList = type === 'base';
   const isQuoteList = type === 'quote';
 
-  // async function getBtcToken() {
-  //   // const tokens = await bitflow.getAvailableTokens();
-  //   // console.log(tokens.filter(token => token.tokenId === 'token-xbtc'));
-  //   const result = await bitflow.getQuoteForRoute('token-stx', 'token-xbtc', 1);
-  //   console.log(result);
-  // }
-
   // Filter out selected asset from selectable assets
   const selectableAssets = assets
     .filter(
@@ -77,9 +69,8 @@ export function useSwapAssetList({ assets, type }: SwapAssetListProps) {
 
   const onFetchQuoteAmount = useCallback(
     async (baseAsset: SwapAsset, quoteAsset: SwapAsset) => {
-      // await getBtcToken();
       const quoteAmount = await fetchQuoteAmount(baseAsset, quoteAsset, values.swapAmountBase);
-      // Handle race condition; make sure quote amount is 1:1 for BTC swap
+      // Handle race condition; make sure quote amount is 1:1
       if (baseAsset.name === 'BTC') {
         void setFieldValue('swapAmountQuote', values.swapAmountBase);
         return;

diff --git a/tests/page-object-models/swap.page.ts b/tests/page-object-models/swap.page.ts
@@ -48,11 +48,11 @@ export class SwapPage {
     await this.page.locator('text="BTC"').click();
   }
 
-  async selectSbtcAsQuoteAsset() {
+  async selectQuoteAsset() {
     const swapAssetSelectors = await this.page.locator(this.selectAssetBtn).all();
     await swapAssetSelectors[1].click();
-    await this.page.locator(this.chooseAssetList).waitFor();
-    const quoteAssets = await this.page.locator(this.chooseAssetListItem).all();
-    await quoteAssets[0].click();
+    // await this.page.locator(this.chooseAssetList).waitFor();
+    // const quoteAssets = await this.page.locator(this.chooseAssetListItem).all();
+    // await quoteAssets[0].click();
   }
 }
diff --git a/tests/specs/swap/swap.spec.ts b/tests/specs/swap/swap.spec.ts
@@ -47,16 +47,17 @@ test.describe('Swaps', () => {
     await expect(toast).toBeVisible();
   });
 
-  test('that it preselects cross chain swap assets', async ({ swapPage }) => {
+  test('that it preselects cross chain swap assets and restricts quote list', async ({
+    swapPage,
+  }) => {
     await swapPage.selectBtcAsBaseAsset();
 
     const quoteAsset = await swapPage.page.locator('text="sBTC"').innerText();
     test.expect(quoteAsset).toEqual('sBTC');
 
-    await swapPage.selectAssetToReceive();
-    await swapPage.selectSbtcAsQuoteAsset();
-
-    const baseAsset = await swapPage.page.locator('text="BTC"').innerText();
-    test.expect(baseAsset).toEqual('BTC');
+    await swapPage.selectQuoteAsset();
+    await swapPage.page.locator(swapPage.chooseAssetList).waitFor();
+    const quoteAssets = await swapPage.page.locator(swapPage.chooseAssetListItem).all();
+    test.expect(quoteAssets.length).toEqual(1);
   });
 });