diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 00cb2fcb1..aa441ad9a 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -41,7 +41,7 @@ Timestamp - + diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index 0c22cf391..f630ab3c5 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -53,7 +53,7 @@ {{ i }} transactions
-
+
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 2b4dd470e..5f09e0267 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -29,10 +29,10 @@
- + - +
diff --git a/frontend/src/app/components/time/time.component.ts b/frontend/src/app/components/time/time.component.ts index f2b220d39..2febf6238 100644 --- a/frontend/src/app/components/time/time.component.ts +++ b/frontend/src/app/components/time/time.component.ts @@ -29,6 +29,7 @@ export class TimeComponent implements OnInit, OnChanges, OnDestroy { @Input() fixedRender = false; @Input() relative = false; @Input() precision: number = 0; + @Input() minUnit: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second' = 'second'; @Input() fractionDigits: number = 0; constructor( @@ -96,10 +97,13 @@ export class TimeComponent implements OnInit, OnChanges, OnDestroy { for (const [index, unit] of this.units.entries()) { let precisionUnit = this.units[Math.min(this.units.length - 1, index + this.precision)]; counter = Math.floor(seconds / this.intervals[unit]); - const precisionCounter = Math.floor(seconds / this.intervals[precisionUnit]); + const precisionCounter = Math.round(seconds / this.intervals[precisionUnit]); if (precisionCounter > this.precisionThresholds[precisionUnit]) { precisionUnit = unit; } + if (this.units.indexOf(precisionUnit) === this.units.indexOf(this.minUnit)) { + counter = Math.max(1, counter); + } if (counter > 0) { let rounded = Math.round(seconds / this.intervals[precisionUnit]); if (this.fractionDigits) { diff --git a/frontend/src/app/shared/components/timestamp/timestamp.component.html b/frontend/src/app/shared/components/timestamp/timestamp.component.html index f84c60b78..7b77cb1a3 100644 --- a/frontend/src/app/shared/components/timestamp/timestamp.component.html +++ b/frontend/src/app/shared/components/timestamp/timestamp.component.html @@ -2,6 +2,6 @@ ‎{{ seconds * 1000 | date: customFormat ?? 'yyyy-MM-dd HH:mm' }}
- () + ()
diff --git a/frontend/src/app/shared/components/timestamp/timestamp.component.ts b/frontend/src/app/shared/components/timestamp/timestamp.component.ts index e3b96c376..aace6efbf 100644 --- a/frontend/src/app/shared/components/timestamp/timestamp.component.ts +++ b/frontend/src/app/shared/components/timestamp/timestamp.component.ts @@ -11,6 +11,8 @@ export class TimestampComponent implements OnChanges { @Input() dateString: string; @Input() customFormat: string; @Input() hideTimeSince: boolean = false; + @Input() precision: number = 0; + @Input() minUnit: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second' = 'second'; seconds: number | undefined = undefined;