Merge branch 'master' into status-buttons

espresso-cash · Dec 16, 2024 · 67f6ebf · 67f6ebf
2 parents 966295e + 7b792aa
commit 67f6ebf
Showing 1 changed file with 14 additions and 7 deletions.
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
@@ -21,7 +21,7 @@ import '../../tokens/token.dart';
 typedef OnRampOrder = ({
   String id,
   DateTime created,
-  CryptoAmount submittedAmount,
+  Amount submittedAmount,
   CryptoAmount? receiveAmount,
   RampPartner partner,
   OnRampOrderStatus status,
@@ -222,15 +222,22 @@ class OnRampOrderService implements Disposable {
           ) as FiatAmount,
         );
 
+        final submittedAmount = row.partner == RampPartner.brij
+            ? FiatAmount(
+                value: row.amount,
+                fiatCurrency: currencyFromString(row.fiatSymbol ?? 'USD'),
+              )
+            : CryptoAmount(
+                value: row.amount,
+                cryptoCurrency: CryptoCurrency(
+                  token: token ?? Token.unk,
+                ),
+              );
+
         return (
           id: row.id,
           created: row.created,
-          submittedAmount: CryptoAmount(
-            value: row.amount,
-            cryptoCurrency: CryptoCurrency(
-              token: token ?? Token.unk,
-            ),
-          ),
+          submittedAmount: submittedAmount,
           receiveAmount: row.receiveAmount?.let(
             (amount) => CryptoAmount(
               value: amount,