Merge branch 'master' into feat/store-token-list-localdb

espresso-cash · Aug 15, 2024 · dd363aa · dd363aa
2 parents 6e60d45 + 3d74bdc
commit dd363aa
Show file tree

Hide file tree

Showing 29 changed files with 1,754 additions and 170 deletions.
diff --git a/packages/espressocash_app/lib/data/db/db.dart b/packages/espressocash_app/lib/data/db/db.dart
@@ -24,7 +24,7 @@ class OutgoingTransferRows extends Table {
   Set<Column<Object>> get primaryKey => {id};
 }
 
-const int latestVersion = 55;
+const int latestVersion = 56;
 
 const _tables = [
   OutgoingTransferRows,
@@ -151,7 +151,10 @@ class MyDatabase extends _$MyDatabase {
               offRampOrderRows.referenceNumber,
             );
           }
-          if (from < 55) {
+          if (from >= 40 && from < 55) {
+            await m.addColumn(offRampOrderRows, offRampOrderRows.refundAmount);
+          }
+          if (from < 56) {
             await m.createTable(tokenRows);
           }
         },
@@ -212,6 +215,7 @@ class OffRampOrderRows extends Table with AmountMixin, EntityMixin {
   TextColumn get stellarTxHash => text().nullable()();
   IntColumn get bridgeAmount => integer().nullable()();
   TextColumn get referenceNumber => text().nullable()();
+  IntColumn get refundAmount => integer().nullable()();
 }
 
 enum OnRampOrderStatus {

diff --git a/packages/espressocash_app/lib/features/analytics/analytics_manager.dart b/packages/espressocash_app/lib/features/analytics/analytics_manager.dart
@@ -31,6 +31,10 @@ class AnalyticsManager {
     }
   }
 
+  void setStellarAddress(String? address) {
+    _analytics.getPeople().set('stellarWalletAddress', address);
+  }
+
   void setUsdcBalance(Decimal value) {
     _analytics.getPeople().set('usdcBalance', value.toDouble());
   }
@@ -68,4 +72,20 @@ class AnalyticsManager {
         'directPaymentSent',
         properties: {'amount': amount.toDouble()},
       );
+
+  void paymentRequestLinkCreated({
+    required Decimal amount,
+  }) =>
+      _analytics.track(
+        'paymentRequestLinkCreated',
+        properties: {'amount': amount.toDouble()},
+      );
+
+  void paymentRequestLinkPaid({
+    required Decimal amount,
+  }) =>
+      _analytics.track(
+        'paymentRequestLinkPaid',
+        properties: {'amount': amount.toDouble()},
+      );
 }
diff --git a/...ssocash_app/lib/features/incoming_link_payments/screens/incoming_link_payment_screen.dart b/...ssocash_app/lib/features/incoming_link_payments/screens/incoming_link_payment_screen.dart
@@ -15,7 +15,6 @@ import '../../transactions/widgets/transfer_progress.dart';
 import '../../transactions/widgets/transfer_success.dart';
 import '../data/ilp_repository.dart';
 import '../models/incoming_link_payment.dart';
-import '../widgets/extensions.dart';
 import '../widgets/invalid_escrow_error_widget.dart';
 
 class IncomingLinkPaymentScreen extends StatefulWidget {
@@ -68,7 +67,6 @@ class _IncomingLinkPaymentScreenState extends State<IncomingLinkPaymentScreen> {
                       ? const InvalidEscrowErrorWidget()
                       : TransferError(
                           onBack: () => Navigator.pop(context),
-                          onRetry: () => context.retryILP(payment),
                         ),
                   orElse: () => TransferProgress(
                     onBack: () => Navigator.pop(context),

diff --git a/packages/espressocash_app/lib/features/incoming_link_payments/services/ilp_service.dart b/packages/espressocash_app/lib/features/incoming_link_payments/services/ilp_service.dart
@@ -84,23 +84,6 @@ class ILPService implements Disposable {
     return payment;
   }
 
-  Future<IncomingLinkPayment> retry(
-    IncomingLinkPayment payment, {
-    required ECWallet account,
-  }) async {
-    final status = await _createTx(
-      escrow: await payment.escrow.keyPair,
-      account: account,
-    );
-
-    final newPayment = payment.copyWith(status: status);
-
-    await _repository.save(newPayment);
-    _subscribe(payment.id);
-
-    return newPayment;
-  }
-
   Future<ILPStatus> _createTx({
     required ECWallet account,
     required Ed25519HDKeyPair escrow,

diff --git a/packages/espressocash_app/lib/features/incoming_link_payments/widgets/extensions.dart b/packages/espressocash_app/lib/features/incoming_link_payments/widgets/extensions.dart
@@ -5,7 +5,6 @@ import 'package:solana/solana.dart';
 import '../../../di.dart';
 import '../../../ui/loader.dart';
 import '../../accounts/models/account.dart';
-import '../models/incoming_link_payment.dart';
 import '../services/ilp_service.dart';
 
 extension BuildContextExt on BuildContext {
@@ -23,17 +22,6 @@ extension BuildContextExt on BuildContext {
 
         return payment.id;
       });
-
-  Future<void> retryILP(IncomingLinkPayment payment) =>
-      runWithLoader(this, () async {
-        final span = _start(function: 'retryILP');
-
-        await sl<ILPService>().retry(
-          payment,
-          account: sl<MyAccount>().wallet,
-        );
-        await span.finish();
-      });
 }
 
 ISentrySpan _start({required String function}) => Sentry.startTransaction(

diff --git a/...es/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_details_screen.dart b/...es/espressocash_app/lib/features/outgoing_direct_payments/screens/odp_details_screen.dart
@@ -85,7 +85,6 @@ class _ODPDetailsScreenState extends State<ODPDetailsScreen> {
                   ),
                   txFailure: (it) => TransferError(
                     onBack: () => Navigator.pop(context),
-                    onRetry: () => context.retryODP(paymentId: payment.id),
                     onCancel: () => _handleCancel(payment.id),
                     reason: it.reason,
                   ),

diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/services/odp_service.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/services/odp_service.dart
@@ -73,26 +73,6 @@ class ODPService {
     return payment;
   }
 
-  Future<void> retry(
-    String paymentId, {
-    required ECWallet account,
-  }) async {
-    final payment = await _repository.load(paymentId);
-    if (payment == null || !payment.isRetriable) return;
-
-    final status = await _createTx(
-      account: account,
-      receiver: payment.receiver,
-      amount: payment.amount,
-      reference: payment.reference,
-    );
-
-    final newPayment = payment.copyWith(status: status);
-
-    await _repository.save(newPayment);
-    _subscribe(newPayment.id);
-  }
-
   Future<void> cancel(String paymentId) async {
     final payment = await _repository.load(paymentId);
     if (payment == null || !payment.isRetriable) return;

diff --git a/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart b/packages/espressocash_app/lib/features/outgoing_direct_payments/widgets/extensions.dart
@@ -31,14 +31,6 @@ extension BuildContextExt on BuildContext {
         return payment.id;
       });
 
-  Future<void> retryODP({required String paymentId}) =>
-      runWithLoader(this, () async {
-        await sl<ODPService>().retry(
-          paymentId,
-          account: sl<MyAccount>().wallet,
-        );
-      });
-
   Future<void> cancelODP({required String paymentId}) =>
       runWithLoader(this, () async {
         await sl<ODPService>().cancel(paymentId);

diff --git a/packages/espressocash_app/lib/features/outgoing_link_payments/screens/olp_screen.dart b/packages/espressocash_app/lib/features/outgoing_link_payments/screens/olp_screen.dart
@@ -131,12 +131,6 @@ class _OLPScreenState extends State<OLPScreen> {
               cancelButton,
             ],
             txFailure: (s) => [
-              CpButton(
-                size: CpButtonSize.big,
-                width: double.infinity,
-                text: context.l10n.retry,
-                onPressed: () => context.retryOLP(payment: payment),
-              ),
               cancelButton,
             ],
             cancelTxFailure: (s) => [

diff --git a/packages/espressocash_app/lib/features/outgoing_link_payments/services/olp_service.dart b/packages/espressocash_app/lib/features/outgoing_link_payments/services/olp_service.dart
@@ -109,23 +109,6 @@ class OLPService implements Disposable {
     return payment;
   }
 
-  Future<OutgoingLinkPayment> retry(
-    OutgoingLinkPayment payment, {
-    required ECWallet account,
-  }) async {
-    final status = await _createTx(
-      amount: payment.amount,
-      account: account,
-    );
-
-    final newPayment = payment.copyWith(status: status);
-
-    await _repository.save(newPayment);
-    _subscribe(payment.id);
-
-    return newPayment;
-  }
-
   Future<OutgoingLinkPayment> cancel(
     OutgoingLinkPayment payment, {
     required ECWallet account,

diff --git a/packages/espressocash_app/lib/features/outgoing_link_payments/widgets/extensions.dart b/packages/espressocash_app/lib/features/outgoing_link_payments/widgets/extensions.dart
@@ -33,16 +33,6 @@ extension BuildContextExt on BuildContext {
         );
         await span.finish();
       });
-
-  Future<void> retryOLP({required OutgoingLinkPayment payment}) =>
-      runWithLoader<void>(this, () async {
-        final span = _start(function: 'retryOLP');
-        await sl<OLPService>().retry(
-          payment,
-          account: sl<MyAccount>().wallet,
-        );
-        await span.finish();
-      });
 }
 
 ISentrySpan _start({required String function}) => Sentry.startTransaction(

diff --git a/packages/espressocash_app/lib/features/payment_request/services/payment_request_service.dart b/packages/espressocash_app/lib/features/payment_request/services/payment_request_service.dart
@@ -12,6 +12,7 @@ import 'package:solana/solana_pay.dart';
 import 'package:uuid/uuid.dart';
 
 import '../../accounts/auth_scope.dart';
+import '../../analytics/analytics_manager.dart';
 import '../../balances/services/refresh_balance.dart';
 import '../../currency/models/amount.dart';
 import '../../tokens/token.dart';
@@ -23,12 +24,14 @@ class PaymentRequestService implements Disposable {
   PaymentRequestService(
     this._repository,
     this._solanaClient,
+    this._analyticsManager,
     this._refreshBalance,
     this._ecClient,
   );
 
   final PaymentRequestRepository _repository;
   final SolanaClient _solanaClient;
+  final AnalyticsManager _analyticsManager;
   final RefreshBalance _refreshBalance;
   final EspressoCashClient _ecClient;
 
@@ -126,6 +129,10 @@ class PaymentRequestService implements Disposable {
         ),
       );
 
+      _analyticsManager.paymentRequestLinkPaid(
+        amount: request.payRequest.amount ?? Decimal.zero,
+      );
+
       _refreshBalance();
 
       await _subscriptions[request.id]?.cancel();
@@ -178,6 +185,8 @@ class PaymentRequestService implements Disposable {
     );
     await _repository.save(paymentRequest);
 
+    _analyticsManager.paymentRequestLinkCreated(amount: amount);
+
     _subscribe(paymentRequest);
 
     return paymentRequest;

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
@@ -664,6 +664,20 @@ class MoneygramOffRampOrderService implements Disposable {
 
     final solanaAddress = _ecWallet.address;
 
+    final refundAmount = await _ecClient
+        .calculateMoneygramFee(
+          MoneygramFeeRequestDto(
+            type: RampTypeDto.onRamp,
+            amount: (int.parse(response.amount) / 10000000).toString(),
+          ),
+        )
+        .then(
+          (e) => Amount.fromDecimal(
+            value: Decimal.parse(e.totalAmount),
+            currency: Currency.usdc,
+          ),
+        );
+
     final bridgeTx = await _ecClient
         .swapToSolana(
           SwapToSolanaRequestDto(
@@ -695,6 +709,7 @@ class MoneygramOffRampOrderService implements Disposable {
         : OffRampOrderRowsCompanion(
             stellarTxHash: Value(hash),
             status: const Value(OffRampOrderStatus.waitingForRefundBridge),
+            refundAmount: Value(refundAmount.value),
           );
   }
 

diff --git a/packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart b/packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart
@@ -398,12 +398,14 @@ class _Timeline extends StatelessWidget {
 
     final bridgingToStellar = CpTimelineItem(
       title: context.l10n.bridgingText,
-      trailing: order.bridgeAmount?.let(
-        (e) => e.isZero ? null : e.format(context.locale, maxDecimals: 2),
-      ),
     );
     final amountSent = CpTimelineItem(
       title: context.l10n.offRampWithdrawSent,
+      trailing: isMoneygramOrder
+          ? order.bridgeAmount?.let(
+              (e) => e.isZero ? null : e.format(context.locale, maxDecimals: 2),
+            )
+          : null,
     );
     final paymentSuccess = CpTimelineItem(
       title: context.l10n.offRampWithdrawReceived,
@@ -412,10 +414,18 @@ class _Timeline extends StatelessWidget {
     );
     final paymentCanceled = CpTimelineItem(
       title: context.l10n.offRampWithdrawCancelledTitle,
+      trailing: isMoneygramOrder
+          ? order.refundAmount?.let(
+              (e) => e.isZero ? null : e.format(context.locale, maxDecimals: 2),
+            )
+          : null,
       subtitle: order.resolved?.let((t) => context.formatDate(t)),
     );
-    const refunding = CpTimelineItem(
+    final refunding = CpTimelineItem(
       title: 'Refunding USDC',
+      trailing: order.bridgeAmount?.let(
+        (e) => e.isZero ? null : e.format(context.locale, maxDecimals: 2),
+      ),
     );
 
     final normalItems = [
@@ -549,6 +559,7 @@ extension on OffRampOrderStatus {
       this == OffRampOrderStatus.waitingForRefundBridge;
 
   bool get isWaitingForBridge =>
+      this == OffRampOrderStatus.preProcessing ||
       this == OffRampOrderStatus.waitingForRefundBridge ||
       this == OffRampOrderStatus.postProcessing;
 

diff --git a/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart
@@ -47,6 +47,7 @@ typedef OffRampOrder = ({
   String? authToken,
   String? referenceNumber,
   CryptoAmount? bridgeAmount,
+  CryptoAmount? refundAmount,
 });
 
 @Singleton(scope: authScope)
@@ -154,6 +155,9 @@ class OffRampOrderService implements Disposable {
           .maybeWhere((it) => it.isNotEmpty)
           ?.let(Ed25519HDPublicKey.fromBase58);
 
+      final refundAmount = row.refundAmount
+          ?.let((it) => CryptoAmount(value: it, cryptoCurrency: Currency.usdc));
+
       return (
         id: row.id,
         created: row.created,
@@ -171,6 +175,7 @@ class OffRampOrderService implements Disposable {
         authToken: row.authToken,
         referenceNumber: row.referenceNumber,
         bridgeAmount: bridgeAmount,
+        refundAmount: refundAmount,
       );
     });
   }

diff --git a/packages/espressocash_app/lib/features/ramp/widgets/on_ramp_deposit_widget.dart b/packages/espressocash_app/lib/features/ramp/widgets/on_ramp_deposit_widget.dart
@@ -265,7 +265,8 @@ class _MoneygramDepositContent extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    Assets.gifs.moneygramConfirmationAnimation.image(),
+                    Assets.gifs.moneygramConfirmationAnimation
+                        .image(width: 320),
                     const SizedBox(height: 16),
                     Assets.images.moneygramLogo.image(height: 32),
                     const SizedBox(height: 16),