diff --git a/frontend/cypress/integration/bisq/bisq.spec.ts b/frontend/cypress/integration/bisq/bisq.spec.ts
index 3cea27781..bafca218a 100644
--- a/frontend/cypress/integration/bisq/bisq.spec.ts
+++ b/frontend/cypress/integration/bisq/bisq.spec.ts
@@ -1,6 +1,6 @@
describe('Bisq', () => {
const baseModule = Cypress.env("BASE_MODULE");
- const basePath = (baseModule === 'bisq') ? '' : '/bisq';
+ const basePath = '';
beforeEach(() => {
cy.intercept('/sockjs-node/info*').as('socket');
@@ -23,7 +23,7 @@ describe('Bisq', () => {
});
});
- if (baseModule === 'mempool' || baseModule === 'bisq') {
+ if (baseModule === 'bisq') {
it('loads the dashboard', () => {
cy.visit(`${basePath}`);
diff --git a/frontend/cypress/integration/liquid/liquid.spec.ts b/frontend/cypress/integration/liquid/liquid.spec.ts
index 26885330b..5661340f4 100644
--- a/frontend/cypress/integration/liquid/liquid.spec.ts
+++ b/frontend/cypress/integration/liquid/liquid.spec.ts
@@ -1,6 +1,6 @@
describe('Liquid', () => {
const baseModule = Cypress.env("BASE_MODULE");
- const basePath = (baseModule === 'liquid') ? '' : '/liquid';
+ const basePath = '';
beforeEach(() => {
cy.intercept('/liquid/api/block/**').as('block');
@@ -16,7 +16,7 @@ describe('Liquid', () => {
});
});
- if (baseModule === 'mempool' || baseModule === 'liquid') {
+ if (baseModule === 'liquid') {
it('check first mempool block after skeleton loads', () => {
cy.visit(`${basePath}`);
diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts
index 461f5c0a8..77095781a 100644
--- a/frontend/cypress/integration/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts
@@ -296,9 +296,7 @@ describe('Mainnet', () => {
cy.changeNetwork("testnet");
cy.changeNetwork("signet");
- cy.changeNetwork("liquid");
cy.changeNetwork("mainnet");
- cy.changeNetwork("bisq");
});
it.skip('loads the dashboard with the skeleton blocks', () => {
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 2e367d78c..52e98362e 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -105,176 +105,6 @@ let routes: Routes = [
},
],
},
- {
- path: 'liquidtestnet',
- children: [
- {
- path: '',
- component: MasterPageComponent,
- children: [
- {
- path: 'tx/push',
- component: PushTransactionComponent,
- },
- {
- path: '',
- component: StartComponent,
- children: [
- {
- path: '',
- component: DashboardComponent
- },
- {
- path: 'tx/:id',
- component: TransactionComponent
- },
- {
- path: 'block/:id',
- component: BlockComponent
- },
- {
- path: 'mempool-block/:id',
- component: MempoolBlockComponent
- },
- ],
- },
- {
- path: 'blocks',
- component: LatestBlocksComponent,
- },
- {
- path: 'graphs',
- component: StatisticsComponent,
- },
- {
- path: 'address/:id',
- component: AddressComponent
- },
- {
- path: 'asset/:id',
- component: AssetComponent
- },
- {
- path: 'assets',
- component: AssetsComponent,
- },
- {
- path: 'docs/api/:type',
- component: DocsComponent
- },
- {
- path: 'docs/api',
- redirectTo: 'docs/api/rest'
- },
- {
- path: 'docs',
- redirectTo: 'docs/api/rest'
- },
- {
- path: 'api',
- redirectTo: 'docs/api/rest'
- },
- ],
- },
- {
- path: 'tv',
- component: TelevisionComponent
- },
- {
- path: 'status',
- component: StatusViewComponent
- },
- {
- path: '**',
- redirectTo: ''
- },
- ]
- },
- {
- path: 'liquid',
- children: [
- {
- path: '',
- component: MasterPageComponent,
- children: [
- {
- path: 'tx/push',
- component: PushTransactionComponent,
- },
- {
- path: '',
- component: StartComponent,
- children: [
- {
- path: '',
- component: DashboardComponent
- },
- {
- path: 'tx/:id',
- component: TransactionComponent
- },
- {
- path: 'block/:id',
- component: BlockComponent
- },
- {
- path: 'mempool-block/:id',
- component: MempoolBlockComponent
- },
- ],
- },
- {
- path: 'blocks',
- component: LatestBlocksComponent,
- },
- {
- path: 'graphs',
- component: StatisticsComponent,
- },
- {
- path: 'address/:id',
- component: AddressComponent
- },
- {
- path: 'asset/:id',
- component: AssetComponent
- },
- {
- path: 'assets',
- component: AssetsComponent,
- },
- {
- path: 'docs/api/:type',
- component: DocsComponent
- },
- {
- path: 'docs/api',
- redirectTo: 'docs/api/rest'
- },
- {
- path: 'docs',
- redirectTo: 'docs/api/rest'
- },
- {
- path: 'api',
- redirectTo: 'docs/api/rest'
- },
- ],
- },
- {
- path: 'tv',
- component: TelevisionComponent
- },
- {
- path: 'status',
- component: StatusViewComponent
- },
- {
- path: '**',
- redirectTo: ''
- },
- ]
- },
{
path: 'testnet',
children: [
@@ -431,11 +261,6 @@ let routes: Routes = [
},
]
},
- {
- path: 'bisq',
- component: MasterPageComponent,
- loadChildren: () => import('./bisq/bisq.module').then(m => m.BisqModule)
- },
{
path: 'tv',
component: TelevisionComponent,
diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index faa2c7ddd..85b8d250f 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -20,12 +20,9 @@
- 
Bisq
-
- 
Liquid
-
- 
Liquid Testnet
-
+ Bisq
+ Liquid
+ Liquid Testnet