mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-17 09:46:39 +01:00
Cw 314 trocador receive screen update (#823)
* Change receive screen ui * Upgrade flutter packages * revert Upgrade flutter packages * revert Upgrade flutter packages * Adjust flow for anon invoice page navigation * Add receive screen ui * Implement anonpay invoice * Add invoice detail to transactions page * Implement donation link * Fix transaction filter and details view * Save donation link * Fix transaction display issues * Fix formatting * Fix merge conflict * Fix localization * Fix transaction amount display * Fix transaction limit for fiat * Update fix from code review * Fix issues from code review * Make amountTo nullable to avoid potential * Remove encoding for description in donation link * Remove optional params from request * Fix QR image version * Refactor QRCode, fix issues from code review * Pass version to QRCode full page --------- Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
This commit is contained in:
co-authored by
OmarHatem
parent
893a267de6
commit
3006679560
@@ -0,0 +1,34 @@
|
||||
import 'dart:async';
|
||||
import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
|
||||
import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
|
||||
import 'package:hive/hive.dart';
|
||||
import 'package:mobx/mobx.dart';
|
||||
|
||||
part 'anonpay_transactions_store.g.dart';
|
||||
|
||||
class AnonpayTransactionsStore = AnonpayTransactionsStoreBase with _$AnonpayTransactionsStore;
|
||||
|
||||
abstract class AnonpayTransactionsStoreBase with Store {
|
||||
AnonpayTransactionsStoreBase({
|
||||
required this.anonpayInvoiceInfoSource,
|
||||
}) : transactions = <AnonpayTransactionListItem>[] {
|
||||
anonpayInvoiceInfoSource.watch().listen(
|
||||
(_) async => await updateTransactionList(),
|
||||
);
|
||||
updateTransactionList();
|
||||
}
|
||||
|
||||
Box<AnonpayInvoiceInfo> anonpayInvoiceInfoSource;
|
||||
|
||||
@observable
|
||||
List<AnonpayTransactionListItem> transactions;
|
||||
|
||||
@action
|
||||
Future<void> updateTransactionList() async {
|
||||
transactions = anonpayInvoiceInfoSource.values
|
||||
.map(
|
||||
(transaction) => AnonpayTransactionListItem(transaction: transaction),
|
||||
)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
|
||||
import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
|
||||
import 'package:mobx/mobx.dart';
|
||||
import 'package:cw_core/transaction_direction.dart';
|
||||
import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
|
||||
import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
|
||||
import 'package:cake_wallet/generated/i18n.dart';
|
||||
|
||||
part 'transaction_filter_store.g.dart';
|
||||
|
||||
@@ -57,8 +57,8 @@ abstract class TransactionFilterStoreBase with Store {
|
||||
@action
|
||||
void changeEndDate(DateTime date) => endDate = date;
|
||||
|
||||
List<TransactionListItem> filtered({required List<TransactionListItem> transactions}) {
|
||||
var _transactions = <TransactionListItem>[];
|
||||
List<ActionListItem> filtered({required List<ActionListItem> transactions}) {
|
||||
var _transactions = <ActionListItem>[];
|
||||
final needToFilter = !displayAll ||
|
||||
(startDate != null && endDate != null);
|
||||
|
||||
@@ -67,16 +67,26 @@ abstract class TransactionFilterStoreBase with Store {
|
||||
var allowed = true;
|
||||
|
||||
if (allowed && startDate != null && endDate != null) {
|
||||
if(item is TransactionListItem){
|
||||
allowed = (startDate?.isBefore(item.transaction.date) ?? false)
|
||||
&& (endDate?.isAfter(item.transaction.date) ?? false);
|
||||
}else if(item is AnonpayTransactionListItem){
|
||||
allowed = (startDate?.isBefore(item.transaction.createdAt) ?? false)
|
||||
&& (endDate?.isAfter(item.transaction.createdAt) ?? false);
|
||||
}
|
||||
}
|
||||
|
||||
if (allowed && (!displayAll)) {
|
||||
if(item is TransactionListItem){
|
||||
allowed = (displayOutgoing &&
|
||||
item.transaction.direction ==
|
||||
TransactionDirection.outgoing) ||
|
||||
(displayIncoming &&
|
||||
item.transaction.direction == TransactionDirection.incoming);
|
||||
} else if(item is AnonpayTransactionListItem){
|
||||
allowed = displayIncoming;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return allowed;
|
||||
|
||||
Reference in New Issue
Block a user