diff --git a/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_off_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_off_ramp_order_service.dart index f7b01b6eb..c0fe1f997 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_off_ramp_order_service.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_off_ramp_order_service.dart @@ -12,6 +12,7 @@ import 'package:uuid/uuid.dart'; import '../../../../../config.dart'; import '../../../../../data/db/db.dart'; +import '../../../../../utils/errors.dart'; import '../../../../accounts/auth_scope.dart'; import '../../../../accounts/models/ec_wallet.dart'; import '../../../../analytics/analytics_manager.dart'; @@ -25,6 +26,7 @@ import '../../../../tokens/token.dart'; import '../../../../transactions/models/tx_results.dart'; import '../../../../transactions/services/resign_tx.dart'; import '../../../../transactions/services/tx_sender.dart'; +import '../../../services/extensions.dart'; import '../models/brij_order_status.dart'; @Singleton(scope: authScope) @@ -80,6 +82,10 @@ class BrijOffRampOrderService implements Disposable { .watchSingleOrNull() .whereNotNull() .asyncExpand((order) { + logMessage( + message: 'BrijOffRampOrderStatusChange', + data: order.toSentry(), + ); switch (order.status) { case OffRampOrderStatus.waitingPartnerReview: _waitingPartnerReviewWatcher(order); diff --git a/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_on_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_on_ramp_order_service.dart index 60162bc8d..d777f0310 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_on_ramp_order_service.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/brij/services/brij_on_ramp_order_service.dart @@ -8,6 +8,7 @@ import 'package:rxdart/rxdart.dart'; import 'package:uuid/uuid.dart'; import '../../../../../data/db/db.dart'; +import '../../../../../utils/errors.dart'; import '../../../../accounts/auth_scope.dart'; import '../../../../analytics/analytics_manager.dart'; import '../../../../currency/models/amount.dart'; @@ -17,6 +18,7 @@ import '../../../../kyc_sharing/utils/kyc_utils.dart'; import '../../../../ramp_partner/models/ramp_partner.dart'; import '../../../../ramp_partner/models/ramp_type.dart'; import '../../../../tokens/token.dart'; +import '../../../services/extensions.dart'; import '../models/brij_order_status.dart'; @Singleton(scope: authScope) @@ -65,6 +67,10 @@ class BrijOnRampOrderService implements Disposable { .watchSingleOrNull() .whereNotNull() .asyncExpand((order) { + logMessage( + message: 'BrijOnRampOrderStatusChange', + data: order.toSentry(), + ); switch (order.status) { case OnRampOrderStatus.waitingPartnerReview: _waitingPartnerReviewWatcher(order); diff --git a/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart b/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart index c15257418..f38c7a190 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart @@ -30,6 +30,7 @@ import '../../../../transactions/services/resign_tx.dart'; import '../../../../transactions/services/tx_confirm.dart'; import '../../../../transactions/services/tx_sender.dart'; import '../../../data/my_database_ext.dart'; +import '../../../services/extensions.dart'; import '../../../services/off_ramp_order_service.dart'; import '../data/allbridge_client.dart'; import '../data/allbridge_dto.dart' hide TransactionStatus; @@ -105,7 +106,7 @@ class MoneygramOffRampOrderService implements Disposable { .asyncExpand((order) { logMessage( message: 'MGOffRampOrderStatusChange', - data: order.toSentry, + data: order.toSentry(), ); switch (order.status) { @@ -845,18 +846,3 @@ class MoneygramOffRampOrderService implements Disposable { } const _minimumInitBalance = 1.5; // 1.5 XLM - -extension on OffRampOrderRow { - Map get toSentry { - final json = toJson(); - - const filter = ['transaction', 'slot']; - - json.removeWhere( - (key, value) => - value == null || value == '' || filter.contains(key) || value == 0.0, - ); - - return json; - } -} diff --git a/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart b/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart index e4ab0977e..a3fb73a14 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart @@ -25,6 +25,7 @@ import '../../../../stellar/service/stellar_client.dart'; import '../../../../tokens/token.dart'; import '../../../../transactions/models/tx_results.dart'; import '../../../../transactions/services/tx_confirm.dart'; +import '../../../services/extensions.dart'; import '../data/allbridge_client.dart'; import '../data/allbridge_dto.dart' hide TransactionStatus; import '../data/dto.dart'; @@ -92,7 +93,7 @@ class MoneygramOnRampOrderService implements Disposable { .asyncExpand((order) { logMessage( message: 'MGOnRampOrderStatusChange', - data: order.toSentry, + data: order.toSentry(), ); switch (order.status) { @@ -487,10 +488,3 @@ class MoneygramOnRampOrderService implements Disposable { } const _minimumInitBalance = 1.5; // 1.5 XLM - -extension on OnRampOrderRow { - Map get toSentry => toJson() - ..removeWhere( - (key, value) => value == null || value == '' || value == 0.0, - ); -} diff --git a/packages/espressocash_app/lib/features/ramp/services/extensions.dart b/packages/espressocash_app/lib/features/ramp/services/extensions.dart new file mode 100644 index 000000000..7a48b247c --- /dev/null +++ b/packages/espressocash_app/lib/features/ramp/services/extensions.dart @@ -0,0 +1,23 @@ +import '../../../data/db/db.dart'; + +extension OffRampOrderRowExt on OffRampOrderRow { + Map toSentry() { + final json = toJson(); + + const filter = ['transaction', 'slot']; + + json.removeWhere( + (key, value) => + value == null || value == '' || filter.contains(key) || value == 0.0, + ); + + return json; + } +} + +extension OnRampOrderRowExt on OnRampOrderRow { + Map toSentry() => toJson() + ..removeWhere( + (key, value) => value == null || value == '' || value == 0.0, + ); +}