fix: moneygram offramp bridge amount (#1556)

packages/espressocash_app/lib/features/currency/models/amount.dart

@@ -109,6 +109,8 @@ extension CryptoAmountExt on CryptoAmount {
       copyWith(value: currency.decimalToInt(decimal));
 
   CryptoAmount round(int scale) => copyWithDecimal(decimal.round(scale: scale));
+
+  CryptoAmount floor(int scale) => copyWithDecimal(decimal.floor(scale: scale));
 }
 
 extension FiatAmountExt on FiatAmount {

packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_off_ramp_service.dart

@@ -104,11 +104,8 @@ class MoneygramOffRampOrderService implements Disposable {
         .watchSingle()
         .asyncExpand<OffRampOrderRowsCompanion?>((order) {
           logMessage(
-            message: 'Moneygram off ramp order status update',
-            data: {
-              'orderId': orderId,
-              'status': order.status.name,
-            },
+            message: 'MGOffRampOrderStatusChange',
+            data: order.toSentry,
           );
 
           switch (order.status) {
@@ -573,12 +570,16 @@ class MoneygramOffRampOrderService implements Disposable {
         return;
       }
 
-      final bridgeAmount = int.parse(destination.amount) ~/ 10;
+      final amount = int.parse(destination.amount) ~/ 10;
+
+      final bridgeAmount =
+          CryptoAmount(value: amount, cryptoCurrency: Currency.usdc)
+              .floor(Currency.usd.decimals);
 
       await statement.write(
         OffRampOrderRowsCompanion(
           status: const Value(OffRampOrderStatus.ready),
-          bridgeAmount: Value(bridgeAmount),
+          bridgeAmount: Value(bridgeAmount.value),
         ),
       );
 
@@ -828,3 +829,18 @@ 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;
+  }
+}

packages/espressocash_app/lib/features/ramp/partners/moneygram/service/moneygram_on_ramp_service.dart

@@ -91,11 +91,8 @@ class MoneygramOnRampOrderService implements Disposable {
         .whereNotNull()
         .asyncExpand<OnRampOrderRowsCompanion?>((order) {
           logMessage(
-            message: 'Moneygram on ramp order status update',
-            data: {
-              'orderId': orderId,
-              'status': order.status.name,
-            },
+            message: 'MGOnRampOrderStatusChange',
+            data: order.toSentry,
           );
 
           switch (order.status) {
@@ -483,3 +480,10 @@ 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,
+    );
+}

packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart

@@ -128,8 +128,9 @@ class OffRampOrderScreenContent extends StatelessWidget {
         context.l10n.offRampWithdrawOngoing(
           totalAmount.format(locale),
         ),
-      OffRampOrderStatus.waitingForPartner =>
-        context.l10n.offRampWaitingForPartner,
+      OffRampOrderStatus.waitingForPartner => isMoneygramOrder
+          ? context.l10n.offRampWithdrawalInProgress
+          : context.l10n.offRampWaitingForPartner,
       OffRampOrderStatus.depositTxConfirmError ||
       OffRampOrderStatus.depositError =>
         context.l10n.offRampDepositError,
@@ -383,8 +384,11 @@ class _Timeline extends StatelessWidget {
   Widget build(BuildContext context) {
     final isMoneygramOrder = order.partner == RampPartner.moneygram;
     final CpTimelineStatus timelineStatus = order.status.toTimelineStatus();
-    final animated = timelineStatus == CpTimelineStatus.inProgress &&
-        order.status != OffRampOrderStatus.ready;
+    final animatedForMoneygram = (order.status != OffRampOrderStatus.ready &&
+            order.status != OffRampOrderStatus.waitingForPartner) ||
+        !isMoneygramOrder;
+    final animated =
+        timelineStatus == CpTimelineStatus.inProgress && animatedForMoneygram;
 
     final int activeItem = isMoneygramOrder
         ? order.status.toActiveItemForMoneygram()
@@ -400,7 +404,9 @@ class _Timeline extends StatelessWidget {
       title: context.l10n.bridgingText,
     );
     final amountSent = CpTimelineItem(
-      title: context.l10n.offRampWithdrawSent,
+      title: isMoneygramOrder
+          ? context.l10n.moneygramCashAvailable
+          : context.l10n.offRampWithdrawSent,
       trailing: isMoneygramOrder
           ? order.bridgeAmount?.let(
               (e) => e.isZero ? null : e.format(context.locale, maxDecimals: 2),
@@ -545,12 +551,10 @@ extension on OffRampOrderStatus {
         OffRampOrderStatus.depositTxReady ||
         OffRampOrderStatus.waitingForRefundBridge ||
         OffRampOrderStatus.sendingDepositTx ||
+        OffRampOrderStatus.waitingForPartner ||
         OffRampOrderStatus.refunded =>
           2,
-        OffRampOrderStatus.waitingForPartner ||
-        OffRampOrderStatus.failure ||
-        OffRampOrderStatus.completed =>
-          3,
+        OffRampOrderStatus.failure || OffRampOrderStatus.completed => 3,
       };
 
   bool get isRefunding =>

packages/espressocash_app/lib/l10n/intl_en.arb

@@ -859,5 +859,9 @@
   "onRampCancelTitle": "Cancel Deposit",
   "@onRampCancelTitle": {},
   "onRampCancelSubtitle": "Are you sure you want to cancel this deposit?",
-  "@onRampCancelSubtitle": {}
+  "@onRampCancelSubtitle": {},
+  "offRampWithdrawalInProgress": "Withdrawing in progress...",
+  "@offRampWithdrawalInProgress": {},
+  "moneygramCashAvailable": "Cash is available at Moneygram location",
+  "@moneygramCashAvailable": {}
 }