Merge branch 'master' into mononaut/batch-address-outspend-lookup

frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts

@@ -107,7 +107,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
           this.blocks.unshift(block);
           this.blocks = this.blocks.slice(0, this.dynamicBlocksAmount);
 
-          if (txConfirmed) {
+          if (txConfirmed && this.height === block.height) {
             this.markHeight = block.height;
             this.moveArrowToPosition(true, true);
           } else {

frontend/src/app/components/search-form/search-form.component.scss

@@ -53,3 +53,8 @@ form {
   margin-top: 1px;
   margin-right: 2px;
 }
+
+input:focus {
+  box-shadow: none;
+  border-color: #1b1f2c;
+}

frontend/src/app/components/transaction/transaction.component.ts

@@ -347,7 +347,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.blocksSubscription = this.stateService.blocks$.subscribe(([block, txConfirmed]) => {
       this.latestBlock = block;
 
-      if (txConfirmed && this.tx) {
+      if (txConfirmed && this.tx && !this.tx.status.confirmed) {
         this.tx.status = {
           confirmed: true,
           block_height: block.height,
@@ -496,7 +496,9 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   @HostListener('window:resize', ['$event'])
   setGraphSize(): void {
     if (this.graphContainer) {
-      this.graphWidth = this.graphContainer.nativeElement.clientWidth;
+      setTimeout(() => {
+        this.graphWidth = this.graphContainer.nativeElement.clientWidth;
+      }, 1);
     }
   }