Merge branch 'master' into simon/dropdown-button-links-fix

2022-05-31 23:15:25 +09:00
parent a9a2545859 3d34016181
commit fea8784fe5
18 changed files with 672 additions and 845 deletions
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -22,7 +22,7 @@
      <tbody *ngIf="blocks$ | async as blocks; else skeleton" [style]="isLoading ? 'opacity: 0.75' : ''">
        <tr *ngFor="let block of blocks; let i= index; trackBy: trackByBlock">
          <td class="text-left" [class]="widget ? 'widget' : ''">
-            <a [routerLink]="['/block' | relativeUrl, block.height]">{{ block.height }}</a>
+            <a [routerLink]="['/block' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height }}</a>
          </td>
          <td  *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
            <div class="tooltip-custom">
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -221,8 +221,7 @@
      <tbody [style]="isLoading ? 'opacity: 0.75' : ''">
        <tr *ngFor="let block of blocks; let i= index; trackBy: trackByBlock">
          <td class="height">
-            <a [routerLink]="['/block' | relativeUrl, block.height]">{{ block.height
-              }}</a>
+            <a [routerLink]="['/block' | relativeUrl, block.id]">{{ block.height }}</a>
          </td>
          <td class="timestamp">
            &lrm;{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -30,7 +30,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {

  latestBlock$: Observable<BlockExtended>;
  outspendsSubscription: Subscription;
-  refreshOutspends$: ReplaySubject<object> = new ReplaySubject();
+  refreshOutspends$: ReplaySubject<{ [str: string]: Observable<Outspend[]>}> = new ReplaySubject();
  showDetails$ = new BehaviorSubject<boolean>(false);
  outspends: Outspend[][] = [];
  assetsMinimal: any;
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -4470,6 +4470,7 @@ export const restApiDocsData = [
  fastestFee: 1,
  halfHourFee: 1,
  hourFee: 1,
+  economyFee: 1,
  minimumFee: 1
 }`
        },
@@ -4481,6 +4482,7 @@ export const restApiDocsData = [
  fastestFee: 1,
  halfHourFee: 1,
  hourFee: 1,
+  economyFee: 1,
  minimumFee: 1
 }`
        },
@@ -4492,6 +4494,7 @@ export const restApiDocsData = [
  fastestFee: 1,
  halfHourFee: 1,
  hourFee: 1,
+  economyFee: 1,
  minimumFee: 1
 }`
        },
@@ -4503,7 +4506,8 @@ export const restApiDocsData = [
  fastestFee: 0.1,
  halfHourFee: 0.1,
  hourFee: 0.1,
-  minimumFee: 1
+  economyFee: 0.1,
+  minimumFee: 0.1
 }`
        },
        codeSampleLiquidTestnet: {
@@ -4514,7 +4518,8 @@ export const restApiDocsData = [
  fastestFee: 0.1,
  halfHourFee: 0.1,
  hourFee: 0.1,
-  minimumFee: 1
+  economyFee: 0.1,
+  minimumFee: 0.1
 }`
        },
        codeSampleBisq: emptyCodeSample,
--- a/frontend/src/app/docs/api-docs/api-docs.component.ts
+++ b/frontend/src/app/docs/api-docs/api-docs.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable, merge, of } from 'rxjs';
-import { SeoService } from '../../services/seo.service';
 import { tap } from 'rxjs/operators';
 import { ActivatedRoute } from "@angular/router";
 import { faqData, restApiDocsData, wsApiDocsData } from './api-docs-data';
@@ -27,7 +26,6 @@ export class ApiDocsComponent implements OnInit {

  constructor(
    private stateService: StateService,
-    private seoService: SeoService,
    private route: ActivatedRoute,
  ) { }

@@ -45,7 +43,6 @@ export class ApiDocsComponent implements OnInit {

  ngOnInit(): void {
    this.env = this.stateService.env;
-    this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
    this.network$ = merge(of(''), this.stateService.networkChanged$).pipe(
      tap((network: string) => {
        if (this.env.BASE_MODULE === 'mempool' && network !== '') {
--- a/frontend/src/app/docs/docs/docs.component.ts
+++ b/frontend/src/app/docs/docs/docs.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, HostBinding } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Env, StateService } from '../../services/state.service';
 import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from '../../services/seo.service';

@Component({
  selector: 'app-docs',
@@ -21,6 +22,7 @@ export class DocsComponent implements OnInit {
    private route: ActivatedRoute,
    private stateService: StateService,
    private websocket: WebsocketService,
+    private seoService: SeoService,
  ) { }

  ngOnInit(): void {
@@ -28,10 +30,13 @@ export class DocsComponent implements OnInit {
    const url = this.route.snapshot.url;
    if (url[0].path === "faq" ) {
        this.activeTab = 0;
+        this.seoService.setTitle($localize`:@@docs.faq.button-title:FAQ`);
    } else if( url[1].path === "rest" ) {
        this.activeTab = 1;
+        this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
    } else {
        this.activeTab = 2;
+        this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
    }

    this.env = this.stateService.env;
--- a/frontend/src/locale/messages.xlf
+++ b/frontend/src/locale/messages.xlf
@@ -3934,13 +3934,6 @@
        </context-group>
        <note priority="1" from="description">api-docs.websocket.websocket</note>
      </trans-unit>
-      <trans-unit id="e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4" datatype="html">
-        <source>API</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/docs/api-docs/api-docs.component.ts</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="0a668c1c2a17e557a18fc06619998e002f50df1e" datatype="html">
        <source>Code Example</source>
        <context-group purpose="location">
@@ -3973,6 +3966,24 @@
        </context-group>
        <note priority="1" from="description">API Docs API response</note>
      </trans-unit>
+      <trans-unit id="docs.faq.button-title" datatype="html">
+        <source>FAQ</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4" datatype="html">
+        <source>API</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="date-base.year" datatype="html">
        <source><x id="DATE" equiv-text="counter"/> year</source>
        <context-group purpose="location">