From 0863405671645b005cf74c54455285b76d44f0b8 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sun, 6 Feb 2022 18:06:51 +0400
Subject: [PATCH] Correcting tests. i18n strings and asset links.

---
 frontend/cypress/integration/liquid/liquid.spec.ts          | 6 +++---
 .../cypress/integration/liquidtestnet/liquidtestnet.spec.ts | 6 +++---
 frontend/src/app/components/asset/asset.component.html      | 4 ++--
 .../assets/asset-group/asset-group.component.html           | 2 +-
 .../assets/assets-featured/assets-featured.component.html   | 2 +-
 .../components/assets/assets-nav/assets-nav.component.html  | 4 ++--
 .../src/app/components/search-form/search-form.component.ts | 4 ++--
 .../transactions-list/transactions-list.component.html      | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/cypress/integration/liquid/liquid.spec.ts b/frontend/cypress/integration/liquid/liquid.spec.ts
index af76314a1..877b36dbd 100644
--- a/frontend/cypress/integration/liquid/liquid.spec.ts
+++ b/frontend/cypress/integration/liquid/liquid.spec.ts
@@ -125,7 +125,7 @@ describe('Liquid', () => {
         cy.visit(`${basePath}/assets`);
         cy.waitForSkeletonGone();
         cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => {
-          cy.get('table tr').should('have.length', 1);
+          cy.get('ngb-typeahead-window').should('have.length', 1);
         });
       });
 
@@ -133,7 +133,7 @@ describe('Liquid', () => {
         cy.visit(`${basePath}/assets`);
         cy.waitForSkeletonGone();
         cy.get('.container-xl input').click().type('Liquid AUD').then(() => {
-          cy.get('table tr td:nth-of-type(1) a').click();
+          cy.get('ngb-typeahead-window:nth-of-type(1) button').click();
         });
       });
     });
@@ -197,7 +197,7 @@ describe('Liquid', () => {
       });
 
       it('shows asset peg in/out and burn transactions', () => {
-        cy.visit(`${basePath}/asset/6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d`);
+        cy.visit(`${basePath}/assets/asset/6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d`);
         cy.waitForSkeletonGone();
         cy.get('#table-tx-vout tr').not('.assetBox');
         cy.get('#table-tx-vin tr').not('.assetBox');
diff --git a/frontend/cypress/integration/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/integration/liquidtestnet/liquidtestnet.spec.ts
index eb75be773..79904f784 100644
--- a/frontend/cypress/integration/liquidtestnet/liquidtestnet.spec.ts
+++ b/frontend/cypress/integration/liquidtestnet/liquidtestnet.spec.ts
@@ -83,7 +83,7 @@ describe('Liquid Testnet', () => {
         cy.visit(`${basePath}/assets`);
         cy.waitForSkeletonGone();
         cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => {
-          cy.get('table tr').should('have.length', 1);
+          cy.get('ngb-typeahead-window').should('have.length', 1);
         });
       });
 
@@ -91,7 +91,7 @@ describe('Liquid Testnet', () => {
         cy.visit(`${basePath}/assets`);
         cy.waitForSkeletonGone();
         cy.get('.container-xl input').click().type('Liquid CAD').then(() => {
-          cy.get('table tr td:nth-of-type(1) a').click();
+          cy.get('ngb-typeahead-window:nth-of-type(1) button').click();
         });
       });
     });
@@ -162,7 +162,7 @@ describe('Liquid Testnet', () => {
       });
 
       it('shows asset peg in/out and burn transactions', () => {
-        cy.visit(`${basePath}/asset/ac3e0ff248c5051ffd61e00155b7122e5ebc04fd397a0ecbdd4f4e4a56232926`);
+        cy.visit(`${basePath}/assets/asset/ac3e0ff248c5051ffd61e00155b7122e5ebc04fd397a0ecbdd4f4e4a56232926`);
         cy.waitForSkeletonGone();
         cy.get('#table-tx-vout tr').not('.assetBox');
         cy.get('#table-tx-vin tr').not('.assetBox');
diff --git a/frontend/src/app/components/asset/asset.component.html b/frontend/src/app/components/asset/asset.component.html
index 9723a45e5..b1728a0ff 100644
--- a/frontend/src/app/components/asset/asset.component.html
+++ b/frontend/src/app/components/asset/asset.component.html
@@ -2,7 +2,7 @@
   <div class="title-asset">
     <h1 i18n="asset|Liquid Asset page title">Asset</h1>
     <div class="tx-link">
-      <a [routerLink]="['/asset/' | relativeUrl, assetString]">
+      <a [routerLink]="['/assets/asset/' | relativeUrl, assetString]">
         <span class="d-inline d-lg-none">{{ assetString | shortenString : 24 }}</span>
         <span class="d-none d-lg-inline">{{ assetString }}</span>
       </a>
@@ -20,7 +20,7 @@
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>
-                <td i18n="asset.name|Liquid Asset name">Name</td>
+                <td i18n="Asset name header">Name</td>
                 <td class="assetName">{{ assetContract[2] }} ({{ assetContract[1] }})</td>
               </tr>
               <tr>
diff --git a/frontend/src/app/components/assets/asset-group/asset-group.component.html b/frontend/src/app/components/assets/asset-group/asset-group.component.html
index 64fe182e9..8d476671d 100644
--- a/frontend/src/app/components/assets/asset-group/asset-group.component.html
+++ b/frontend/src/app/components/assets/asset-group/asset-group.component.html
@@ -3,7 +3,7 @@
   <div class="main-title">
     <h2>{{ group.group.name }}</h2>
 
-    <div class="sub-title">Group of {{ group.group.assets.length | number }} assets</div>
+    <div class="sub-title" i18n>Group of {{ group.group.assets.length | number }} assets</div>
   </div>
 
 
diff --git a/frontend/src/app/components/assets/assets-featured/assets-featured.component.html b/frontend/src/app/components/assets/assets-featured/assets-featured.component.html
index f94157766..c5d3d3b6c 100644
--- a/frontend/src/app/components/assets/assets-featured/assets-featured.component.html
+++ b/frontend/src/app/components/assets/assets-featured/assets-featured.component.html
@@ -7,7 +7,7 @@
           <img class="assetIcon" [src]="'https://liquid.network/api/v1/asset/' + group.assets[0] + '/icon'">
         </a>
         <div class="title"><a [routerLink]="['/assets/asset-group', group.id]">{{ group.name }}</a></div>
-        <div class="sub-title">Group of {{ group.assets.length | number }} assets</div>
+        <div class="sub-title" i18n>Group of {{ group.assets.length | number }} assets</div>
       </ng-template>
       <ng-template #singleAsset>
         <a [routerLink]="['/assets/asset/', group.asset]">
diff --git a/frontend/src/app/components/assets/assets-nav/assets-nav.component.html b/frontend/src/app/components/assets/assets-nav/assets-nav.component.html
index c543e1893..8d733d308 100644
--- a/frontend/src/app/components/assets/assets-nav/assets-nav.component.html
+++ b/frontend/src/app/components/assets/assets-nav/assets-nav.component.html
@@ -6,11 +6,11 @@
   <div class="nav-container">
     <ul class="nav nav-pills">
       <li class="nav-item">
-        <a class="nav-link" [routerLink]="['/assets/featured']" routerLinkActive="active">Featured</a>
+        <a class="nav-link" [routerLink]="['/assets/featured']" routerLinkActive="active" i18n>Featured</a>
         
       </li>
       <li class="nav-item">
-        <a class="nav-link" [routerLink]="['/assets/all']" routerLinkActive="active">All</a>
+        <a class="nav-link" [routerLink]="['/assets/all']" routerLinkActive="active" i18n>All</a>
       </li>
     </ul>
 
diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts
index 40f2c1e88..24e8a5b23 100644
--- a/frontend/src/app/components/search-form/search-form.component.ts
+++ b/frontend/src/app/components/search-form/search-form.component.ts
@@ -105,11 +105,11 @@ export class SearchFormComponent implements OnInit {
         const matches = this.regexTransaction.exec(searchText);
         if (this.network === 'liquid' || this.network === 'liquidtestnet') {
           if (this.assets[matches[1]]) {
-            this.navigate('/asset/', matches[1]);
+            this.navigate('/assets/asset/', matches[1]);
           }
           this.electrsApiService.getAsset$(matches[1])
             .subscribe(
-              () => { this.navigate('/asset/', matches[1]); },
+              () => { this.navigate('/assets/asset/', matches[1]); },
               () => {
                 this.electrsApiService.getBlock$(matches[1])
                   .subscribe(
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 91d9feffe..8e81cc3e7 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -274,5 +274,5 @@
   <br />
   {{ assetsMinimal[item.asset][0] }}
   <br />
-  <a [routerLink]="['/asset/' | relativeUrl, item.asset]">{{ item.asset | shortenString : 13 }}</a>
+  <a [routerLink]="['/assets/asset/' | relativeUrl, item.asset]">{{ item.asset | shortenString : 13 }}</a>
 </ng-template>