diff --git a/src/app/pages/network/network.component.scss b/src/app/pages/network/network.component.scss
index 0d7dfa5a..9b43c91c 100644
--- a/src/app/pages/network/network.component.scss
+++ b/src/app/pages/network/network.component.scss
@@ -16,8 +16,18 @@
* along with this program. If not, see
.
*/
+.network-page {
+ min-height: 100%;
+ background: var(--ps-top-bar-bg-color);
+ color: #fff;
+}
+
.network-explorer-container {
+ padding-top: 1px;
padding-bottom: 120px;
+ background: var(--ps-explorer-container, #fff);
+ border-radius: 4px;
+ color: #222;
}
.network-explorer-bottom-bar {
@@ -30,7 +40,7 @@
justify-content: space-between;
align-items: center;
column-gap: 16px;
- background: var(--ps-top-bar-bg-color);
- color: var(--ps-top-bar-text-color);
+ background: var(--ps-bottom-bar-bg-color, #333);
+ color: var(--ps-bottom-bar-text-color, #fff);
padding: 0 8px;
}
diff --git a/src/app/pages/network/network.component.ts b/src/app/pages/network/network.component.ts
index 92f249b9..bf844f0a 100644
--- a/src/app/pages/network/network.component.ts
+++ b/src/app/pages/network/network.component.ts
@@ -26,7 +26,6 @@ import { PolkadaptService } from '../../services/polkadapt.service';
import { AppConfig } from '../../app-config';
@Component({
- selector: 'app-network',
templateUrl: './network.component.html',
styleUrls: ['./network.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
@@ -51,9 +50,9 @@ export class NetworkComponent implements OnInit, OnDestroy {
// Change network when param changes in route.
this.route.params
.pipe(
- takeUntil(this.destroyer),
map((p) => p['network']),
- distinctUntilChanged()
+ distinctUntilChanged(),
+ takeUntil(this.destroyer)
)
.subscribe({
next: (network: string) => {
@@ -69,18 +68,17 @@ export class NetworkComponent implements OnInit, OnDestroy {
// Pass the last loaded number to the variables service, so other parts of the application can pick it up.
this.ns.currentNetwork.pipe(
- // Keep it running until this component is destroyed.
- takeUntil(this.destroyer),
// Only continue if a network is set.
filter(network => !!network),
// Only continue if the network value has changed.
distinctUntilChanged(),
// Watch for new loaded block numbers from the Substrate node.
switchMap(() => this.ns.blockHarvester.loadedNumber.pipe(
- takeUntil(this.destroyer),
// Only continue if new block number is larger than 0.
filter(nr => nr > 0)
- ))
+ )),
+ // Keep it running until this component is destroyed.
+ takeUntil(this.destroyer)
).subscribe({
next: (nr) => {
this.vars.blockNumber.next(nr);
diff --git a/src/app/pages/network/network.module.ts b/src/app/pages/network/network.module.ts
index 65d64814..5cd111f0 100644
--- a/src/app/pages/network/network.module.ts
+++ b/src/app/pages/network/network.module.ts
@@ -33,6 +33,7 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatOptionModule } from '@angular/material/core';
import { MatDialogModule } from '@angular/material/dialog';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
@NgModule({
@@ -42,20 +43,21 @@ import { MatDialogModule } from '@angular/material/dialog';
PsTopBarComponent,
PsConnectionDialogComponent
],
- imports: [
- CommonModule,
- ReactiveFormsModule,
- NetworkRoutingModule,
- MatMenuModule,
- MatButtonModule,
- MatSelectModule,
- MatFormFieldModule,
- MatAutocompleteModule,
- MatOptionModule,
- MatInputModule,
- MatIconModule,
- MatDialogModule
- ]
+ imports: [
+ CommonModule,
+ ReactiveFormsModule,
+ NetworkRoutingModule,
+ MatMenuModule,
+ MatButtonModule,
+ MatSelectModule,
+ MatFormFieldModule,
+ MatAutocompleteModule,
+ MatOptionModule,
+ MatInputModule,
+ MatIconModule,
+ MatDialogModule,
+ MatProgressSpinnerModule
+ ]
})
export class NetworkModule {
}
diff --git a/src/app/services/network.service.ts b/src/app/services/network.service.ts
index f8ba7270..95d6902d 100644
--- a/src/app/services/network.service.ts
+++ b/src/app/services/network.service.ts
@@ -108,10 +108,10 @@ export class NetworkService {
this.pa.run({observableResults: false}).getChainProperties()
.pipe(
- filter((properties) => Boolean((properties.name || properties.systemName) && properties.specName))
+ filter((properties) => Boolean((properties.systemName) && properties.specName))
).subscribe({
next: (properties: types.ChainProperties) => {
- const name: string = (properties.name ? properties.name : properties.systemName) as string;
+ const name: string = properties.systemName as string;
const ss58Format: number = properties.chainSS58 ?? this.defaultSS58;
const tokenSymbol: string = (properties.chainTokens && properties.chainTokens[0]) ?? this.defaultSymbol;
const tokenDecimals: number = (properties.chainDecimals && properties.chainDecimals[0]) ?? this.defaultDecimals;
diff --git a/src/app/services/polkadapt.service.ts b/src/app/services/polkadapt.service.ts
index 1ea6f333..4ea39d98 100644
--- a/src/app/services/polkadapt.service.ts
+++ b/src/app/services/polkadapt.service.ts
@@ -109,10 +109,10 @@ export class PolkadaptService {
if (config.subsquid && Object.keys(config.subsquid).length) {
aa.subsquid = new subsquid.Adapter({
chain: network,
- archiveUrl: this.config.networks[network].subsquid?.archiveUrl,
- explorerUrl: this.config.networks[network].subsquid?.explorerUrl,
giantSquidExplorerUrl: this.config.networks[network].subsquid?.giantSquidExplorerUrl,
- giantSquidMainUrl: this.config.networks[network].subsquid?.giantSquidMainUrl
+ giantSquidMainUrl: this.config.networks[network].subsquid?.giantSquidMainUrl,
+ giantSquidStatsUrl: this.config.networks[network].subsquid?.giantSquidStatsUrl,
+ metaDataUrl: this.config.networks[network].subsquid?.metaDataUrl
});
}
if (config.coingecko && config.coingecko.coinId) {
diff --git a/src/app/services/runtime/runtime.service.ts b/src/app/services/runtime/runtime.service.ts
index a99560f5..e081594e 100644
--- a/src/app/services/runtime/runtime.service.ts
+++ b/src/app/services/runtime/runtime.service.ts
@@ -166,7 +166,10 @@ export class RuntimeService {
combineLatest(items.map(
runtime => this.pa.run().getRuntime(runtime.specName, runtime.specVersion)
)).pipe(
- switchMap(runtimes => merge(...runtimes.map(r => r.pipe(last())))),
+ switchMap(runtimes => merge(...runtimes.map(r => r.pipe(
+ filter((runtime) => runtime.countPallets !== undefined),
+ take(1)
+ )))),
).subscribe((runtime: types.Runtime) => {
bs.getValue().forEach(r => {
if (r.specName === runtime.specName && r.specVersion === runtime.specVersion) {
diff --git a/src/assets/polkadot-icons/batch-transaction.svg b/src/assets/polkadot-icons/batch-transaction.svg
new file mode 100644
index 00000000..1cc0a6ea
--- /dev/null
+++ b/src/assets/polkadot-icons/batch-transaction.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/block-number.svg b/src/assets/polkadot-icons/block-number.svg
new file mode 100644
index 00000000..bbed9592
--- /dev/null
+++ b/src/assets/polkadot-icons/block-number.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/blockchain.svg b/src/assets/polkadot-icons/blockchain.svg
new file mode 100644
index 00000000..7ccb5aba
--- /dev/null
+++ b/src/assets/polkadot-icons/blockchain.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/events.svg b/src/assets/polkadot-icons/events.svg
new file mode 100644
index 00000000..e315be6e
--- /dev/null
+++ b/src/assets/polkadot-icons/events.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/gift.svg b/src/assets/polkadot-icons/gift.svg
new file mode 100644
index 00000000..c8d1dda2
--- /dev/null
+++ b/src/assets/polkadot-icons/gift.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/investors.svg b/src/assets/polkadot-icons/investors.svg
new file mode 100644
index 00000000..598d6eb5
--- /dev/null
+++ b/src/assets/polkadot-icons/investors.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/nominators.svg b/src/assets/polkadot-icons/nominators.svg
new file mode 100644
index 00000000..fad4bf93
--- /dev/null
+++ b/src/assets/polkadot-icons/nominators.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/proof-of-stake.svg b/src/assets/polkadot-icons/proof-of-stake.svg
new file mode 100644
index 00000000..e390632b
--- /dev/null
+++ b/src/assets/polkadot-icons/proof-of-stake.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/starting-period.svg b/src/assets/polkadot-icons/starting-period.svg
new file mode 100644
index 00000000..18e5e00f
--- /dev/null
+++ b/src/assets/polkadot-icons/starting-period.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/transaction.svg b/src/assets/polkadot-icons/transaction.svg
new file mode 100644
index 00000000..050b25cc
--- /dev/null
+++ b/src/assets/polkadot-icons/transaction.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/validators.svg b/src/assets/polkadot-icons/validators.svg
new file mode 100644
index 00000000..0818a8e4
--- /dev/null
+++ b/src/assets/polkadot-icons/validators.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/verified-signed.svg b/src/assets/polkadot-icons/verified-signed.svg
new file mode 100644
index 00000000..b52e8cff
--- /dev/null
+++ b/src/assets/polkadot-icons/verified-signed.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/wallet.svg b/src/assets/polkadot-icons/wallet.svg
new file mode 100644
index 00000000..cf21c1a0
--- /dev/null
+++ b/src/assets/polkadot-icons/wallet.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/polkadot-icons/wallets.svg b/src/assets/polkadot-icons/wallets.svg
new file mode 100644
index 00000000..2b0446de
--- /dev/null
+++ b/src/assets/polkadot-icons/wallets.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/common/account-id/account-id.common.component.ts b/src/common/account-id/account-id.common.component.ts
index 83c1ed39..1298bb56 100644
--- a/src/common/account-id/account-id.common.component.ts
+++ b/src/common/account-id/account-id.common.component.ts
@@ -182,11 +182,9 @@ export class AccountIdCommonComponent implements OnInit, OnChanges, OnDestroy {
}
const apiPromise = this.pa.availableAdapters[network as string].substrateRpc!.apiPromise;
return from(apiPromise).pipe(
- takeUntil(this.destroyer),
- switchMap((api) => api.derive.accounts.info(address).pipe(
- takeUntil(this.destroyer)
- ) as Observable
- ));
+ switchMap((api) => api.derive.accounts.info(address) as Observable),
+ takeUntil(this.destroyer)
+ );
})
);
diff --git a/src/common/attributes/attributes.component.html b/src/common/attributes/attributes.component.html
index ddc42cb0..59c04bcd 100644
--- a/src/common/attributes/attributes.component.html
+++ b/src/common/attributes/attributes.component.html
@@ -21,7 +21,8 @@
-
+
+ {{attribute.type}} ({{attribute.composition}})
@@ -43,7 +44,6 @@
-
diff --git a/src/common/attributes/attributes.component.ts b/src/common/attributes/attributes.component.ts
index 0f32798b..c7546ec8 100644
--- a/src/common/attributes/attributes.component.ts
+++ b/src/common/attributes/attributes.component.ts
@@ -17,107 +17,146 @@
*/
import {
- ChangeDetectionStrategy,
- Component,
- Input,
- OnChanges,
- SimpleChanges,
- ViewEncapsulation
+ ChangeDetectionStrategy,
+ Component,
+ Input,
+ OnChanges,
+ SimpleChanges,
+ ViewEncapsulation
} from '@angular/core';
import { IconTheme } from '../identicon/identicon.types';
import { Prefix } from '@polkadot/util-crypto/address/types';
import { types as pst } from '@polkadapt/core';
-import { attributesConfig as attrConfig} from './attributes.config';
+import { attributesConfig as attrConfig } from './attributes.config';
import { BehaviorSubject } from 'rxjs';
@Component({
- selector: 'attributes',
- templateUrl: 'attributes.component.html',
- encapsulation: ViewEncapsulation.None,
- changeDetection: ChangeDetectionStrategy.OnPush
+ selector: 'attributes',
+ templateUrl: 'attributes.component.html',
+ encapsulation: ViewEncapsulation.None,
+ changeDetection: ChangeDetectionStrategy.OnPush
})
export class AttributesComponent implements OnChanges {
- @Input() attributes: any[] | string;
- @Input() iconTheme: IconTheme;
- @Input() iconSize: number;
- @Input() tokenDecimals: number;
- @Input() tokenSymbol: string;
- @Input() ss58Prefix: Prefix;
- @Input() runtimeEventAttributes: pst.RuntimeEventAttribute[] | null | undefined;
+ @Input() attributes: any[] | string;
+ @Input() iconTheme: IconTheme;
+ @Input() iconSize: number;
+ @Input() tokenDecimals: number;
+ @Input() tokenSymbol: string;
+ @Input() ss58Prefix: Prefix;
+ @Input() runtimeEventAttributes: pst.RuntimeEventAttribute[] | null | undefined;
+ @Input() runtimeCallArguments: pst.RuntimeCallArgument[] | null | undefined;
- isArray = new BehaviorSubject(false);
+ isArray = new BehaviorSubject(false);
- parsedAttributes: any[] = [];
- attributesConfig = attrConfig;
+ parsedAttributes: any[] = [];
+ attributesConfig = attrConfig;
- constructor() {
- }
+ constructor() {
+ }
- ngOnChanges(changes: SimpleChanges): void {
- if (changes['attributes'] || changes['runtimeEventAttributes']) {
- let attrs = [];
- const currentValue = this.attributes;
+ ngOnChanges(changes: SimpleChanges): void {
+ if (changes['attributes'] || changes['runtimeEventAttributes'] || changes['runtimeCallArguments']) {
+ let attrs = [];
+ const currentValue = this.attributes;
- if (currentValue) {
- if (typeof currentValue === 'string') {
- try {
- const parsed = JSON.parse(currentValue);
- if (Array.isArray(parsed)) {
- attrs = parsed;
- this.isArray.next(true);
- } else if (typeof parsed === 'object' && Object.keys(parsed).length) {
- attrs = [parsed];
- }
- } catch (e) {
- // Do nothing
- }
- } else if (Array.isArray(currentValue)) {
- this.isArray.next(true);
- attrs = currentValue;
- } else if (typeof currentValue === 'object') {
- attrs = [currentValue];
- }
+ if (currentValue) {
+ if (typeof currentValue === 'string') {
+ try {
+ const parsed = JSON.parse(currentValue);
+ if (Array.isArray(parsed)) {
+ attrs = parsed;
+ this.isArray.next(true);
+ } else if (typeof parsed === 'object' && Object.keys(parsed).length) {
+ attrs = [parsed];
+ }
+ } catch (e) {
+ // Do nothing
+ }
+ } else if (Array.isArray(currentValue)) {
+ this.isArray.next(true);
+ attrs = currentValue;
+ } else if (typeof currentValue === 'object') {
+ attrs = [currentValue];
+ }
+
+ if (Array.isArray(this.runtimeEventAttributes) || Array.isArray(this.runtimeCallArguments)) {
+ attrs = attrs.map((value, i) => {
+ if (value.type) {
+ return value;
+ }
+
+ if (typeof value === 'object' && !Array.isArray(value)) {
+ // This is an Object with (sub)attribute names and values.
+ value = Object.entries(value).map(([subName, subValue]) => {
+ const camelCase = subName.replace(/_([a-z])/g, (m, p1) => p1.toUpperCase());
+ const snakeCase = subName.replace(/[A-Z]/g, (m) => '_' + m.toLowerCase());
+
+ let eventAttribute: pst.RuntimeEventAttribute | undefined;
+ if (this.runtimeEventAttributes) {
+ eventAttribute = (this.runtimeEventAttributes as pst.RuntimeEventAttribute[]).find(
+ (ea) => ea.eventAttributeName === subName
+ || ea.eventAttributeName === camelCase
+ || ea.eventAttributeName === snakeCase
+ );
+ }
+
+ let callArgument: pst.RuntimeCallArgument | undefined;
+ if (this.runtimeCallArguments) {
+ callArgument = (this.runtimeCallArguments as pst.RuntimeCallArgument[]).find(
+ (ea) => ea.callName === subName
+ || ea.callName === camelCase
+ || ea.callName === snakeCase
+ );
+ }
+
+ if (eventAttribute && eventAttribute.scaleType) {
+ return {
+ name: subName,
+ type: eventAttribute.scaleType,
+ composition: eventAttribute.scaleTypeComposition,
+ value: subValue
+ };
+ } else if (callArgument && callArgument.scaleType) {
+ return {
+ name: subName,
+ type: callArgument.scaleType,
+ composition: callArgument.scaleTypeComposition,
+ value: subValue
+ };
+ } else {
+ if (subName) {
+ return {name: subName, value: subValue};
+ } else {
+ return subValue;
+ }
+ }
+ });
+ }
- if (Array.isArray(this.runtimeEventAttributes)) {
- attrs = attrs.map(value => {
- if (value.type) {
- return value;
- }
- if (typeof value === 'object' && !Array.isArray(value)) {
- // This is an Object with (sub)attribute names and values.
- value = Object.entries(value).map(([subName, subValue]) => {
- const camelCase = subName.replace(/_([a-z])/g, (m, p1) => p1.toUpperCase());
- const snakeCase = subName.replace(/[A-Z]/g, (m) => '_' + m.toLowerCase());
- const eventAttribute = (this.runtimeEventAttributes as pst.RuntimeEventAttribute[]).find(
- (ea) => ea.eventAttributeName === subName
- || ea.eventAttributeName === camelCase
- || ea.eventAttributeName === snakeCase
- );
+ if (this.runtimeEventAttributes) {
+ return {
+ name: (this.runtimeEventAttributes as pst.RuntimeEventAttribute[])[i].eventAttributeName,
+ type: (this.runtimeEventAttributes as pst.RuntimeEventAttribute[])[i].scaleType,
+ composition: (this.runtimeEventAttributes as pst.RuntimeEventAttribute[])[i].scaleTypeComposition,
+ value: value
+ }
- if (eventAttribute && eventAttribute.scaleType) {
- return {
- name: subName,
- type: eventAttribute.scaleType,
- value: subValue
- };
- } else {
- if (subName) {
- return {name: subName, value: subValue};
- } else {
- return subValue;
- }
+ } else if (this.runtimeCallArguments) {
+ return {
+ name: (this.runtimeCallArguments as pst.RuntimeCallArgument[])[i].name,
+ type: (this.runtimeCallArguments as pst.RuntimeCallArgument[])[i].scaleType,
+ composition: (this.runtimeCallArguments as pst.RuntimeCallArgument[])[i].scaleTypeComposition,
+ value: value
+ }
+ }
+ });
+ if (attrs.length === 1 && Array.isArray(attrs[0])) {
+ attrs = attrs[0];
+ }
}
- });
}
- return value;
- });
- if (attrs.length === 1 && Array.isArray(attrs[0])) {
- attrs = attrs[0];
- }
+ this.parsedAttributes = attrs;
}
- }
- this.parsedAttributes = attrs;
}
- }
}
diff --git a/src/common/attributes/attributes/attribute-address.component.ts b/src/common/attributes/attributes/attribute-address.component.ts
index 68f5b450..680056fa 100644
--- a/src/common/attributes/attributes/attribute-address.component.ts
+++ b/src/common/attributes/attributes/attribute-address.component.ts
@@ -45,7 +45,7 @@ import { TooltipsService } from '../../../app/services/tooltips.service';
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AttributeAddressComponent implements OnChanges {
- @Input() attribute: { type: string, value: HexString | Uint8Array | string };
+ @Input() attribute: { type: string, composition: string, value: HexString | Uint8Array | string };
@Input() iconTheme: IconTheme;
@Input() iconSize: number;
@Input() tokenDecimals: number;
@@ -59,9 +59,17 @@ export class AttributeAddressComponent implements OnChanges {
ngOnChanges(changes: SimpleChanges): void {
if (changes['attribute']) {
- const value = changes['attribute'].currentValue && changes['attribute'].currentValue.value;
+ let value = changes['attribute'].currentValue && changes['attribute'].currentValue.value;
let address = '';
+ if (this.attribute.composition === 'MultiAddress') {
+ if (Array.isArray(value) && value.length) {
+ if (value[0]?.value) {
+ value = value[0].value;
+ }
+ }
+ }
+
if (value) {
try {
address = isU8a(value) || isHex(value)
diff --git a/src/common/balance/balance.common.component.ts b/src/common/balance/balance.common.component.ts
index 9f08cbed..2ce37b3e 100644
--- a/src/common/balance/balance.common.component.ts
+++ b/src/common/balance/balance.common.component.ts
@@ -46,7 +46,7 @@ import { BN } from '@polkadot/util';
changeDetection: ChangeDetectionStrategy.OnPush
})
export class BalanceCommonComponent implements OnChanges {
- @Input() value: number | BN;
+ @Input() value: number | string | BN;
@Input() tokenDecimals: number;
@Input() tokenSymbol: string;
@Input() maxDecimals: number;
@@ -69,7 +69,7 @@ export class BalanceCommonComponent implements OnChanges {
let val: BN | undefined;
if (BN.isBN(this.value)) {
val = this.value;
- } else if (Number.isInteger(this.value)) {
+ } else {
try {
val = new BN(this.value as number);
} catch (e) {
diff --git a/src/common/list-base/paginated-list-component-base.directive.ts b/src/common/list-base/paginated-list-component-base.directive.ts
index 50e9c00f..5f628a08 100644
--- a/src/common/list-base/paginated-list-component-base.directive.ts
+++ b/src/common/list-base/paginated-list-component-base.directive.ts
@@ -83,10 +83,12 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
readonly reset: Subject = new Subject();
protected constructor(private _ns: NetworkService) {
- this.loadingObservable = this.loadingCounterObservable.pipe(takeUntil(this.destroyer), map((c) => !!c));
+ this.loadingObservable = this.loadingCounterObservable.pipe(
+ map((c) => !!c),
+ takeUntil(this.destroyer),
+ );
this.lowestBlockNumber = this.itemsObservable.pipe(
- takeUntil(this.destroyer),
map((items) => {
if (items.length > 0) {
const itemWithLowestBlockNumber: T =
@@ -101,7 +103,12 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
}
return null;
}),
- shareReplay(1)
+ takeUntil(this.destroyer), // refcount is false, destroy manually.
+ shareReplay({
+ bufferSize: 1,
+ refCount: false
+ }),
+ takeUntil(this.destroyer)
);
}
@@ -110,8 +117,8 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
this._ns.currentNetwork
.pipe(
debounceTime(100),
- takeUntil(this.destroyer),
- filter((n) => !!n)
+ filter((n) => !!n),
+ takeUntil(this.destroyer)
)
.subscribe((network: string) => {
if (this.network !== network) {
@@ -124,9 +131,9 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
this.latestItemObservable
.pipe(
- takeUntil(this.destroyer),
filter(() => this.pageLive),
- switchMap | T, Observable>((item) => isObservable(item) ? item.pipe(takeUntil(this.destroyer)) : of(item))
+ switchMap | T, Observable>((item) => isObservable(item) ? item : of(item)),
+ takeUntil(this.destroyer)
).subscribe((item: T) => {
const itemObservables = this.itemsObservable.value;
// Add the latest item to the list.
@@ -210,8 +217,6 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
// Merge list with current list, sort the list.
itemsSubscription = itemsObservable.pipe(
- takeUntil(this.destroyer),
- takeUntil(this.reset),
tap({
subscribe: () => {
this.loading++;
@@ -234,7 +239,9 @@ export abstract class PaginatedListComponentBase implements OnInit, OnDestroy
}
) === -1
)),
- map((items) => items.sort(this.sortCompareFn))
+ map((items) => items.sort(this.sortCompareFn)),
+ takeUntil(this.destroyer),
+ takeUntil(this.reset),
).subscribe({
next: (items) => {
if (items.length >= this.listSize) {
diff --git a/src/mat-styles.scss b/src/mat-styles.scss
index 89c02182..a06eda2f 100644
--- a/src/mat-styles.scss
+++ b/src/mat-styles.scss
@@ -45,7 +45,8 @@ $explorer-ui-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
$explorer-ui-warn: mat.define-palette(mat.$red-palette);
$explorer-ui-typography: mat.define-typography-config(
- $font-family: 'Lexend, sans-serif'
+ $font-family: 'Lexend, sans-serif',
+ $body-1: mat.define-typography-level($font-size: 1rem)
);
// Create the theme object. A theme consists of configurations for individual
@@ -65,4 +66,9 @@ $explorer-ui-theme: mat.define-light-theme((
body {
@include mat.all-component-themes($explorer-ui-theme);
@include mat.all-component-typographies($explorer-ui-typography);
+ @include mat.private-form-field-density(-1);
+}
+
+.cdk-overlay-container {
+ background: rgba(0,0,0,.15);
}
diff --git a/src/styles.scss b/src/styles.scss
index c0835cb8..0e6979f3 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-:root {
+body {
--ps-top-bar-bg-color: #350659;
--ps-top-bar-text-color: #FFF;
--ps-top-bar-logo-text-color: #FFF;
@@ -34,13 +34,18 @@ button, html, input, select, textarea {
}
body, html {
- font-size: 16px;
+ font-size: 15px;
line-height: 1.5;
padding: 0;
margin: 0;
height: 100%;
}
+body {
+ display: flex;
+ flex-flow: column nowrap;
+}
+
a {
color: inherit;
}
@@ -203,9 +208,10 @@ mat-divider.mat-divider {
}
.width-container {
+ display: block;
margin: 0 auto;
width: 100%;
max-width: 1260px;
box-sizing: border-box;
- padding: 0 20px;
+ padding: 0 16px;
}