From dcc065a985d98971d2bcddddd1d62872677990dc Mon Sep 17 00:00:00 2001 From: Vlad Sumin <46864104+Merculiar@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:43:20 +0200 Subject: [PATCH] fix: passing correct partner (#1672) --- .../services/brij_off_ramp_order_service.dart | 24 ++++++++++++------- .../services/brij_on_ramp_order_service.dart | 24 ++++++++++++------- .../ramp/partners/brij/widgets/launch.dart | 4 ++-- .../ramp/services/on_ramp_order_service.dart | 5 +++- 4 files changed, 38 insertions(+), 19 deletions(-) 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..3b53143e7 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 @@ -60,17 +60,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); } } @@ -156,10 +163,11 @@ class BrijOffRampOrderService implements Disposable { AsyncResult 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 +202,7 @@ class BrijOffRampOrderService implements Disposable { created: DateTime.now(), humanStatus: '', machineStatus: '', - partner: RampPartner.brij, + partner: partner, status: OffRampOrderStatus.waitingPartnerReview, transaction: '', depositAddress: '', @@ -210,7 +218,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/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..b359f8289 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 @@ -45,17 +45,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); } } @@ -99,10 +106,11 @@ class BrijOnRampOrderService implements Disposable { AsyncResult 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 +131,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 +148,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 index 41ae1076a..bc555326d 100644 --- 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/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 index 311f049f4..4b40df5f7 100644 --- 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'),