Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import { Routes } from '@shared/enums/routes.enum';
export class AppComponent extends StoreDispatcher implements OnInit {

protected readonly menu$: Observable<AppMenu> = this.select$(AppSelectors.menu);
protected readonly showLandingPage$: Observable<boolean> = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/'));
protected readonly showLoadingWebNodePage$: Observable<boolean> = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === `/${Routes.LOADING_WEB_NODE}`));
protected readonly showLandingPage$: Observable<boolean> = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/' || route.url.startsWith('/?')));
protected readonly showLoadingWebNodePage$: Observable<boolean> = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url.startsWith(`/${Routes.LOADING_WEB_NODE}`)));
subMenusLength: number = 0;
hideToolbar: boolean = CONFIG.hideToolbar;
loaded: boolean;
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ export class AppGlobalErrorhandler implements ErrorHandler {
constructor(private errorHandlerService: GlobalErrorHandlerService) {}

handleError(error: any): void {
console.log(123123123);
Sentry.captureException(error);
this.errorHandlerService.handleError(error);
console.error(error);
}
Expand Down Expand Up @@ -90,9 +88,9 @@ export class AppGlobalErrorhandler implements ErrorHandler {
],
providers: [
THEME_PROVIDER,
{ provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] },
{ provide: LOCALE_ID, useValue: 'en' },
{ provide: ErrorHandler, useValue: Sentry.createErrorHandler() },
{ provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] },
{ provide: Sentry.TraceService, deps: [Router] },
{
provide: APP_INITIALIZER,
Expand Down
18 changes: 9 additions & 9 deletions frontend/src/app/core/services/web-node.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class WebNodeService {
return from(wasm.run(this.webNodeKeyPair.privateKey));
}),
tap((webnode: any) => {
(window as any)['webnode'] = webnode;
any(window)['webnode'] = webnode;
this.webnode$.next(webnode);
this.webnodeProgress$.next('Started');
}),
Expand All @@ -108,14 +108,14 @@ export class WebNodeService {
get status$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).status())),
switchMap(handle => from(any(handle).status())),
);
}

get blockProducerStats$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).stats().block_producer())),
switchMap(handle => from(any(handle).stats().block_producer())),
);
}

Expand Down Expand Up @@ -144,42 +144,42 @@ export class WebNodeService {
get messageProgress$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).state().message_progress())),
switchMap(handle => from(any(handle).state().message_progress())),
);
}

get sync$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).stats().sync())),
switchMap(handle => from(any(handle).stats().sync())),
);
}

get accounts$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).ledger().latest().accounts().all())),
switchMap(handle => from(any(handle).ledger().latest().accounts().all())),
);
}

get bestChainUserCommands$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).transition_frontier().best_chain().user_commands())),
switchMap(handle => from(any(handle).transition_frontier().best_chain().user_commands())),
);
}

sendPayment$(payment: any): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).transaction_pool().inject().payment(payment))),
switchMap(handle => from(any(handle).transaction_pool().inject().payment(payment))),
);
}

get transactionPool$(): Observable<any> {
return this.webnode$.asObservable().pipe(
filter(Boolean),
switchMap(handle => from((handle as any).transaction_pool().get())),
switchMap(handle => from(any(handle).transaction_pool().get())),
);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="logo-header w-100 border-bottom fx-row-full-cent">
<img ngSrc="assets/images/logo/logo-text.svg" height="40" width="136"/>
</div>
<div class="data-wrapper flex-column w-100 overflow-auto align-center">
<div class="data-wrapper border-bottom flex-column w-100 overflow-auto align-center">
<div class="loading-content h-100 flex-column flex-around align-center">
<div class="header flex-column align-center pl-10 pr-10 text-center mb-16">
<div class="loading-webnode f-500 mb-8">
Expand Down Expand Up @@ -32,7 +32,7 @@
</div>

@if (!loading[loading.length - 1].loaded && errors.length) {
<div class="flex-column w-100 pl-10 pr-10 mt-10">
<div class="errors flex-column w-100 pl-10 pr-10 mt-10">
<div class="flex-column w-100 bg-surface p-12 border-rad-6">
<div class="w-100 font-16 flex-row flex-column-md flex-between align-center flex-start-md"
[ngClass]="errors.length ? 'warn-primary' : 'aware-primary'">
Expand All @@ -47,7 +47,7 @@
</div>
}
</div>
<div class="footer border-top fx-row-vert-cent flex-between w-100 pl-10 pr-10">
<div class="footer fx-row-vert-cent flex-between w-100 pl-10 pr-10">
<div class="fx-row-vert-cent mr-10">
<span class="mina-icon icon-300 selected-primary mr-5">lightbulb</span>
<div class="selected-primary f-big f-500">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ $white: #000000;
}
}

.errors {
max-width: 568px;
}

.footer {
height: 72px;
max-width: 568px;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.