From 25f62bda96a6c6c54dfbb1fe10e74c0e161a80fb Mon Sep 17 00:00:00 2001
From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:15:49 +0530
Subject: [PATCH] PFM-4640

---
 frontend/mgramseva/lib/providers/collect_payment_provider.dart | 3 ++-
 frontend/mgramseva/lib/screeens/common/payment_success.dart    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/mgramseva/lib/providers/collect_payment_provider.dart b/frontend/mgramseva/lib/providers/collect_payment_provider.dart
index 18cae1c35..160318192 100644
--- a/frontend/mgramseva/lib/providers/collect_payment_provider.dart
+++ b/frontend/mgramseva/lib/providers/collect_payment_provider.dart
@@ -33,6 +33,7 @@ import 'package:provider/provider.dart';
 import 'package:screenshot/screenshot.dart';
 
 import '../components/house_connection_and_bill/js_connnector.dart' as js;
+import '../env/app_config.dart';
 import '../model/localization/language.dart';
 import '../repository/core_repo.dart';
 import 'common_provider.dart';
@@ -620,7 +621,7 @@ class CollectPaymentProvider with ChangeNotifier {
           "tenantId": tenantId
         },
         "callbackUrl":
-            "https://mgramseva-uat.psegs.in/mgramseva/paymentSuccess",
+            "${apiBaseUrl}mgramseva/paymentSuccess",
         "additionalDetails": {"isWhatsapp": false,"connectionType":query["connectionType"]}
       }
     };
diff --git a/frontend/mgramseva/lib/screeens/common/payment_success.dart b/frontend/mgramseva/lib/screeens/common/payment_success.dart
index b3e6e409d..9d4cb6ea8 100644
--- a/frontend/mgramseva/lib/screeens/common/payment_success.dart
+++ b/frontend/mgramseva/lib/screeens/common/payment_success.dart
@@ -142,7 +142,7 @@ class _PaymentSuccessState extends State<PaymentSuccess> {
             backButton: false,
             isWithoutLogin: true,
             isConsumer: true,
-            amount: '${transactionObject.transaction!.first.currencyCode!}${transactionObject.transaction!.first.transactionAmount!}',
+            amount: '${transactionObject.transaction!.first.currencyCode! ?? ''} ${transactionObject.transaction!.first.txnAmount! ?? '0'}',
           )
         : NoLoginFailurePage(i18.payment.PAYMENT_FAILED);
   }