Fix merge conflicts

2023-07-13 11:03:44 +09:00
parent 28ead0bed5
commit ce8630d747
3 changed files with 9 additions and 16 deletions
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -201,7 +201,7 @@ export class StateService {

    this.networkChanged$.subscribe((network) => {
      this.transactions$ = new ReplaySubject<TransactionStripped>(6);
-      this.blocksSubject$ = new BehaviorSubject<BlockExtended[]>([]);
+      this.blocksSubject$.next([]);
    });

    this.blockVSize = this.env.BLOCK_WEIGHT_UNITS / 4;