From 9025d4dd546bc90e31b3767dbcdda96efabb8590 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 14 Apr 2020 15:35:20 +0700 Subject: [PATCH] - Switched the arrow colors for spent/unspent utxos - Collapse dropdown on search (mobile) --- .../app/components/master-page/master-page.component.html | 2 +- .../src/app/components/search-form/search-form.component.ts | 6 +++++- .../transactions-list/transactions-list.component.html | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index b650fa4d4..11e2915fb 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -25,7 +25,7 @@ Contributors - + diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index 7b372b5e5..da07ddad7 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ChangeDetectionStrategy } from '@angular/core'; +import { Component, OnInit, ChangeDetectionStrategy, EventEmitter, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; @@ -10,6 +10,7 @@ import { Router } from '@angular/router'; }) export class SearchFormComponent implements OnInit { searchForm: FormGroup; + @Output() searchTriggered = new EventEmitter(); regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/; regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/; @@ -31,10 +32,13 @@ export class SearchFormComponent implements OnInit { if (searchText) { if (this.regexAddress.test(searchText)) { this.router.navigate(['/address/', searchText]); + this.searchTriggered.emit(); } else if (this.regexBlockhash.test(searchText)) { this.router.navigate(['/block/', searchText]); + this.searchTriggered.emit(); } else if (this.regexTransaction.test(searchText)) { this.router.navigate(['/tx/', searchText]); + this.searchTriggered.emit(); } else { return; } diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index f45a88fc2..487c716e4 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -23,7 +23,7 @@ - + @@ -75,9 +75,9 @@ - + - +