Merge branch 'master' into direct-payment-api

espresso-cash · Jan 24, 2025 · 44e5aa6 · 44e5aa6
2 parents 3b009da + 740ae7e
commit 44e5aa6
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 44 deletions.
diff --git a/packages/espressocash_app/CHANGELOG.md b/packages/espressocash_app/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.140.0
+
+ - **FIX**: passing correct partner (#1672).
+ - **FEAT**: add brij logging (#1673).
+
 ## 1.139.1
 
  - **FIX**: pass partner to brij (#1671).

diff --git a/...spressocash_app/lib/features/ramp/partners/brij/services/brij_off_ramp_order_service.dart b/...spressocash_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)
@@ -60,17 +62,24 @@ class BrijOffRampOrderService implements Disposable {
               OffRampOrderStatus.refunded,
               OffRampOrderStatus.rejected,
             ]) &
-            tbl.partner.equalsValue(RampPartner.brij),
+            tbl.partner.isInValues([RampPartner.brij, RampPartner.scalexBrij]),
       );
 
     final orders = await query.get();
 
     for (final order in orders) {
-      if (order.partner != RampPartner.brij) {
-        continue;
+      switch (order.partner) {
+        case RampPartner.kado:
+        case RampPartner.coinflow:
+        case RampPartner.scalex:
+        case RampPartner.guardarian:
+        case RampPartner.rampNetwork:
+        case RampPartner.moneygram:
+          continue;
+        case RampPartner.brij:
+        case RampPartner.scalexBrij:
+          _subscribe(order.id);
       }
-
-      _subscribe(order.id);
     }
   }
 
@@ -80,6 +89,10 @@ class BrijOffRampOrderService implements Disposable {
         .watchSingleOrNull()
         .whereNotNull()
         .asyncExpand<OffRampOrderRowsCompanion?>((order) {
+          logMessage(
+            message: 'BrijOffRampOrderStatusChange',
+            data: order.toSentry(),
+          );
           switch (order.status) {
             case OffRampOrderStatus.waitingPartnerReview:
               _waitingPartnerReviewWatcher(order);
@@ -156,10 +169,11 @@ class BrijOffRampOrderService implements Disposable {
   AsyncResult<String> create({
     required CryptoAmount submittedAmount,
     required FiatAmount receiveAmount,
-    required String partnerAuthPk,
+    required RampPartner partner,
   }) =>
       tryEitherAsync((_) async {
         {
+          final partnerAuthPk = partner.partnerPK ?? '';
           await _kycRepository.grantPartnerAccess(partnerAuthPk);
 
           final user = await _kycRepository.fetchUser();
@@ -194,7 +208,7 @@ class BrijOffRampOrderService implements Disposable {
             created: DateTime.now(),
             humanStatus: '',
             machineStatus: '',
-            partner: RampPartner.brij,
+            partner: partner,
             status: OffRampOrderStatus.waitingPartnerReview,
             transaction: '',
             depositAddress: '',
@@ -210,7 +224,7 @@ class BrijOffRampOrderService implements Disposable {
               );
 
           _analytics.rampInitiated(
-            partnerName: RampPartner.brij.name,
+            partnerName: partner.name,
             rampType: RampType.offRamp.name,
             amount: submittedAmount.value.toString(),
             countryCode: countryCode,

diff --git a/...espressocash_app/lib/features/ramp/partners/brij/services/brij_on_ramp_order_service.dart b/...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)
@@ -45,17 +47,24 @@ class BrijOnRampOrderService implements Disposable {
               OnRampOrderStatus.completed,
               OnRampOrderStatus.failure,
             ]) &
-            tbl.partner.equalsValue(RampPartner.brij),
+            tbl.partner.isInValues([RampPartner.brij, RampPartner.scalexBrij]),
       );
 
     final orders = await query.get();
 
     for (final order in orders) {
-      if (order.partner != RampPartner.brij) {
-        continue;
+      switch (order.partner) {
+        case RampPartner.kado:
+        case RampPartner.coinflow:
+        case RampPartner.scalex:
+        case RampPartner.guardarian:
+        case RampPartner.rampNetwork:
+        case RampPartner.moneygram:
+          continue;
+        case RampPartner.brij:
+        case RampPartner.scalexBrij:
+          _subscribe(order.id);
       }
-
-      _subscribe(order.id);
     }
   }
 
@@ -65,6 +74,10 @@ class BrijOnRampOrderService implements Disposable {
         .watchSingleOrNull()
         .whereNotNull()
         .asyncExpand<OnRampOrderRowsCompanion?>((order) {
+          logMessage(
+            message: 'BrijOnRampOrderStatusChange',
+            data: order.toSentry(),
+          );
           switch (order.status) {
             case OnRampOrderStatus.waitingPartnerReview:
               _waitingPartnerReviewWatcher(order);
@@ -99,10 +112,11 @@ class BrijOnRampOrderService implements Disposable {
   AsyncResult<String> create({
     required FiatAmount submittedAmount,
     required CryptoAmount receiveAmount,
-    required String partnerAuthPk,
+    required RampPartner partner,
   }) =>
       tryEitherAsync((_) async {
         {
+          final partnerAuthPk = partner.partnerPK ?? '';
           await _kycRepository.grantPartnerAccess(partnerAuthPk);
 
           final orderId = await _kycRepository.createOnRampOrder(
@@ -123,7 +137,7 @@ class BrijOnRampOrderService implements Disposable {
             isCompleted: false,
             created: DateTime.now(),
             txHash: '',
-            partner: RampPartner.brij,
+            partner: partner,
             receiveAmount: receiveAmount.value,
             status: OnRampOrderStatus.waitingPartnerReview,
             bankAccount: null,
@@ -140,7 +154,7 @@ class BrijOnRampOrderService implements Disposable {
           final countryCode = _kycSharingService.value?.countryCode;
 
           _analytics.rampInitiated(
-            partnerName: RampPartner.brij.name,
+            partnerName: partner.name,
             rampType: RampType.onRamp.name,
             amount: submittedAmount.value.toString(),
             countryCode: countryCode ?? '',

diff --git a/packages/espressocash_app/lib/features/ramp/partners/brij/widgets/launch.dart b/packages/espressocash_app/lib/features/ramp/partners/brij/widgets/launch.dart
@@ -120,7 +120,7 @@ extension BuildContextExt on BuildContext {
           .create(
             receiveAmount: equivalentAmount,
             submittedAmount: submittedAmount as FiatAmount,
-            partnerAuthPk: partner.partnerPK ?? '',
+            partner: partner,
           )
           .then(
             (order) => order.fold(
@@ -226,7 +226,7 @@ extension BuildContextExt on BuildContext {
           .create(
             receiveAmount: equivalentAmount,
             submittedAmount: submittedAmount,
-            partnerAuthPk: partner.partnerPK ?? '',
+            partner: partner,
           )
           .then(
             (order) => order.fold(

diff --git a/...essocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart b/...essocash_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<OffRampOrderRowsCompanion?>((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<String, dynamic> 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/...ressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart b/...ressocash_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<OnRampOrderRowsCompanion?>((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<String, dynamic> 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
@@ -0,0 +1,23 @@
+import '../../../data/db/db.dart';
+
+extension OffRampOrderRowExt on OffRampOrderRow {
+  Map<String, dynamic> 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<String, dynamic> toSentry() => toJson()
+    ..removeWhere(
+      (key, value) => value == null || value == '' || value == 0.0,
+    );
+}
diff --git a/packages/espressocash_app/lib/features/ramp/services/on_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/services/on_ramp_order_service.dart
@@ -223,7 +223,10 @@ class OnRampOrderService implements Disposable {
           ) as FiatAmount,
         );
 
-        final submittedAmount = row.partner == RampPartner.brij
+        final isFiat = row.partner == RampPartner.brij ||
+            row.partner == RampPartner.scalexBrij;
+
+        final submittedAmount = isFiat
             ? FiatAmount(
                 value: row.amount,
                 fiatCurrency: currencyFromString(row.fiatSymbol ?? 'USD'),

diff --git a/packages/espressocash_app/pubspec.yaml b/packages/espressocash_app/pubspec.yaml
@@ -1,7 +1,7 @@
 name: espressocash_app
 description: Espresso Cash mobile wallet for Solana
 publish_to: "none"
-version: 1.139.1
+version: 1.140.0
 
 environment:
   sdk: ">=3.4.0 <4.0.0"