2
0
mirror of https://github.com/Ride-The-Lightning/RTL synced 2024-11-03 23:15:24 +00:00
Fix issue #118
This commit is contained in:
ShahanaFarooqui 2019-04-14 18:02:52 -04:00
parent c55e9e2a6f
commit f7f14f25bc
7 changed files with 14 additions and 13 deletions

View File

@ -8,5 +8,5 @@
<link rel="stylesheet" href="styles.c7b8be38c41a5a330ca0.css"></head>
<body>
<rtl-app></rtl-app>
<script type="text/javascript" src="runtime.26209474bfa8dc87a77c.js"></script><script type="text/javascript" src="polyfills.181b5a67c421a167a96a.js"></script><script type="text/javascript" src="main.716bab8a5dfa8a85abfa.js"></script></body>
<script type="text/javascript" src="runtime.26209474bfa8dc87a77c.js"></script><script type="text/javascript" src="polyfills.181b5a67c421a167a96a.js"></script><script type="text/javascript" src="main.7b000723c8806c9e2653.js"></script></body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -121,7 +121,7 @@ export class InvoicesComponent implements OnInit, OnDestroy {
invoice.settle_date_str = (invoice.settle_date_str === '') ? '' : formatDate(invoice.settle_date_str, 'MMM/dd/yy HH:mm:ss', 'en-US');
}
});
setTimeout(() => { this.flgAnimate = false; }, 5000);
setTimeout(() => { this.flgAnimate = false; }, 3000);
this.logger.info(this.invoices);
}

View File

@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
import { formatDate } from '@angular/common';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { takeUntil, take } from 'rxjs/operators';
import { Store } from '@ngrx/store';
import { MatTableDataSource, MatSort } from '@angular/material';
@ -76,7 +76,7 @@ export class PaymentsComponent implements OnInit, OnDestroy {
this.payments.data.forEach(payment => {
payment.creation_date_str = (payment.creation_date_str === '') ? '' : formatDate(payment.creation_date_str, 'MMM/dd/yy HH:mm:ss', 'en-US');
});
setTimeout(() => { this.flgAnimate = false; }, 5000);
setTimeout(() => { this.flgAnimate = false; }, 3000);
if (this.flgLoading[0] !== 'error') {
this.flgLoading[0] = (undefined !== this.paymentJSONArr[0]) ? false : true;
}
@ -92,7 +92,7 @@ export class PaymentsComponent implements OnInit, OnDestroy {
this.store.dispatch(new RTLActions.OpenSpinner('Decoding Payment...'));
this.store.dispatch(new RTLActions.DecodePayment(this.paymentRequest));
this.rtlEffects.setDecodedPayment
.pipe(takeUntil(this.unsub[1]))
.pipe(take(1))
.subscribe(decodedPayment => {
this.paymentDecoded = decodedPayment;
if (undefined !== this.paymentDecoded.timestamp_str) {
@ -121,7 +121,7 @@ export class PaymentsComponent implements OnInit, OnDestroy {
]
}}));
this.rtlEffects.closeConfirm
.pipe(takeUntil(this.unsub[2]))
.pipe(take(1))
.subscribe(confirmRes => {
if (confirmRes) {
this.paymentDecoded.num_satoshis = confirmRes[0].inputValue;
@ -135,7 +135,7 @@ export class PaymentsComponent implements OnInit, OnDestroy {
type: 'CONFIRM', titleMessage: 'Send Payment', noBtnText: 'Cancel', yesBtnText: 'Send', message: JSON.stringify(this.paymentDecoded)
}}));
this.rtlEffects.closeConfirm
.pipe(takeUntil(this.unsub[3]))
.pipe(take(1))
.subscribe(confirmRes => {
if (confirmRes) {
this.store.dispatch(new RTLActions.OpenSpinner('Sending Payment...'));
@ -162,6 +162,7 @@ export class PaymentsComponent implements OnInit, OnDestroy {
resetData() {
this.form.reset();
this.paymentDecoded = {};
}
onPaymentClick(selRow: Payment, event: any) {

View File

@ -68,7 +68,7 @@ export class PeersComponent implements OnInit, OnDestroy {
if (undefined !== rtlStore.peers) {
this.peers = new MatTableDataSource<Peer>([...rtlStore.peers]);
this.peers.data = rtlStore.peers;
setTimeout(() => { this.flgAnimate = false; }, 5000);
setTimeout(() => { this.flgAnimate = false; }, 3000);
}
this.peers.sort = this.sort;
if (this.flgLoading[0] !== 'error') {

View File

@ -2,9 +2,9 @@ import { trigger, state, animate, transition, style } from '@angular/animations'
export const newlyAddedRowAnimation = [
trigger('newlyAddedRowAnimation', [
state('notAdded, void', style({ transform: 'translateX(0)' })),
state('added', style({ transform: 'translateX(1.5)', border: '1px solid' })),
transition('added <=> notAdded', animate('2000ms ease-out')),
transition('added <=> void', animate('2000ms ease-out'))
state('notAdded, void', style({ transform: 'translateX(0%)' })),
state('added', style({ transform: 'translateX(100%)'})),
transition('added <=> notAdded', animate('1000ms ease-out')),
transition('added <=> void', animate('0ms ease-out'))
])
];