diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d143b4c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,90 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+ 
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+ 
+
+# VS Code
+#.vscode/
+
+ 
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+ 
+
+# Symbolication related
+app.*.symbols
+
+ 
+
+# Obfuscation related
+app.*.map.json
+
+ 
+
+# Android Studio build artifacts
+/android/app/debug
+/android/app/profile
+/android/app/release
+
+ 
+
+# FVM Version Cache
+.fvm/
+
+ 
+
+# Android - machine specific
+**/android/local.properties
+**/android/.gradle/
+**/android/captures/
+**/android/key.properties
+*.jks
+
+ 
+
+# iOS - generated files
+**/ios/Pods/
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/ephemeral/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+ 
+
+# Secrets / Firebase
+google-services.json
+GoogleService-Info.plist
+.env
+.env.*
+
+ 
+
+# Windows
+Thumbs.db
\ No newline at end of file
diff --git a/lib/app/modules/internal_transaction_otp/controllers/internal_transaction_otp_controller.dart b/lib/app/modules/internal_transaction_otp/controllers/internal_transaction_otp_controller.dart
index 8a0c000..6a42fc5 100644
--- a/lib/app/modules/internal_transaction_otp/controllers/internal_transaction_otp_controller.dart
+++ b/lib/app/modules/internal_transaction_otp/controllers/internal_transaction_otp_controller.dart
@@ -50,15 +50,15 @@ class InternalTransactionOtpController extends GetxController {
       return;
     }
 
-    // transactionSubmitRequestModel.pinType = "TRAN";
-    //
-    // transactionSubmitRequestModel.obpPincode = pinPutController.text;
+    transactionSubmitRequestModel.pinType = "TRAN";
+
+    transactionSubmitRequestModel.obpPincode = pinPutController.text;
 
     Get.toNamed(Routes.RECIPIENT_DETAILS,
-    //     arguments: {
-    //   AppConstants.SEND_TRANS_STEP1_DATA: transactionSubmitRequestModel,
-    //   AppConstants.EXCHANGE_RATE: exchangeRate,
-    // }
+        arguments: {
+      AppConstants.SEND_TRANS_STEP1_DATA: transactionSubmitRequestModel,
+      AppConstants.EXCHANGE_RATE: exchangeRate,
+    }
     );
   }
 
diff --git a/lib/app/modules/new_beneficiary/views/new_beneficiary_view.dart b/lib/app/modules/new_beneficiary/views/new_beneficiary_view.dart
index a3d1f41..b842222 100644
--- a/lib/app/modules/new_beneficiary/views/new_beneficiary_view.dart
+++ b/lib/app/modules/new_beneficiary/views/new_beneficiary_view.dart
@@ -124,7 +124,7 @@ class NewBeneficiaryView extends GetView<NewBeneficiaryController> {
                                     ],
                                   ),
                                 ),
-                                readOnly: true,
+                                // readOnly: true,
                                 showCursor: false,
                                 onClick: () {
                                   controller.selectContact();
@@ -170,7 +170,7 @@ class NewBeneficiaryView extends GetView<NewBeneficiaryController> {
                                 onChanged: (val) {
                                   controller.recipientCardNameField.clear();
                                 },
-                                readOnly: true,
+                                // readOnly: true,
                                 showCursor: false,
                                 onClick: () {
                                   controller.selectContact();
diff --git a/lib/app/modules/u_send/controllers/u_send_controller.dart b/lib/app/modules/u_send/controllers/u_send_controller.dart
index ee1ff0e..a3e4aba 100644
--- a/lib/app/modules/u_send/controllers/u_send_controller.dart
+++ b/lib/app/modules/u_send/controllers/u_send_controller.dart
@@ -125,18 +125,35 @@ class USendController extends GetxController {
     selectedDepositAccount.value = item.data as DepositAccount;
   }
 
-  void updateSelectedCurrency(/*DropDown? item*/ AccountInquiryResponseModel model) {
+  // void updateSelectedCurrency(/*DropDown? item*/ AccountInquiryResponseModel model) {
+  //   print("************************model>> $model");
+  //
+  //   for (int i = 0; i < SessionCache.instance.exchangeRateList.length; i++) {
+  //     print("************************elementAt(i).pcrCurrcode>> ${SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrcode}");
+  //     if (SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrcode == model.pcrCurrcode) {
+  //       currencySymbol.value = SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrshort;
+  //       selectedExchangeRate = SessionCache.instance.exchangeRateList.elementAt(i);
+  //       exchangeRateField.setText(selectedExchangeRate!.perEratrateact.toString());
+  //       break;
+  //     }
+  //   }
+  // }
+
+  void updateSelectedCurrency(DropDown? item) {
+    if (item == null) return;
+
+    // Get ExchangeRate object from dropdown data
+    ExchangeRate model = item.data as ExchangeRate;
+
     print("************************model>> $model");
 
-    for (int i = 0; i < SessionCache.instance.exchangeRateList.length; i++) {
-      print("************************elementAt(i).pcrCurrcode>> ${SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrcode}");
-      if (SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrcode == model.pcrCurrcode) {
-        currencySymbol.value = SessionCache.instance.exchangeRateList.elementAt(i).pcrCurrshort;
-        selectedExchangeRate = SessionCache.instance.exchangeRateList.elementAt(i);
-        exchangeRateField.setText(selectedExchangeRate!.perEratrateact.toString());
-        break;
-      }
-    }
+    currencySymbol.value = model.pcrCurrshort ?? "";
+
+    selectedExchangeRate = model;
+
+    exchangeRateField.setText(
+      selectedExchangeRate!.perEratrateact.toString(),
+    );
   }
 
   void updateRecipientDetail(DropDown? item) {
@@ -315,7 +332,7 @@ class USendController extends GetxController {
       receiverAccountTitle = accountInquiryList.first.mbmBkmstitle;
       receiverAccountNumber = accountInquiryList.first.mbmBkmsnumber;
       recipientCardNameField.setText(receiverAccountTitle);
-      updateSelectedCurrency(accountInquiryList.first);
+      // updateSelectedCurrency(accountInquiryList.first);
       return;
     }
     Get.dialog(
@@ -349,7 +366,7 @@ class USendController extends GetxController {
                                   receiverAccountTitle = accountInquiryList[index].mbmBkmstitle;
                                   receiverAccountNumber = accountInquiryList[index].mbmBkmsnumber;
                                   recipientCardNameField.setText(receiverAccountTitle);
-                                  updateSelectedCurrency(accountInquiryList[index]);
+                                  // updateSelectedCurrency(accountInquiryList[index]);
                                   Get.back();
                                 },
                                 child: Column(children: [
diff --git a/lib/app/modules/u_send/views/u_send_view.dart b/lib/app/modules/u_send/views/u_send_view.dart
index 781e9bf..a5dc163 100644
--- a/lib/app/modules/u_send/views/u_send_view.dart
+++ b/lib/app/modules/u_send/views/u_send_view.dart
@@ -126,7 +126,7 @@ class USendView extends GetView<USendController> {
                                               ],
                                             ),
                                           ),
-                                          readOnly: true,
+                                          // readOnly: true,
                                           showCursor: false,
                                           onClick: () {
                                             controller.selectContact();
@@ -172,7 +172,7 @@ class USendView extends GetView<USendController> {
                                           onChanged: (val) {
                                             controller.recipientCardNameField.clear();
                                           },
-                                          readOnly: true,
+                                          // readOnly: true,
                                           showCursor: false,
                                           onClick: () {
                                             controller.selectContact();
@@ -219,7 +219,7 @@ class USendView extends GetView<USendController> {
                             dropDownType: DropDownType.SPECIAL,
                             items: controller.allCurrencieList,
                             onItemSelected: (item) {
-                              controller.updateSelectedCurrency(item as AccountInquiryResponseModel);
+                              controller.updateSelectedCurrency(item);
                             },
                             suffixIcon: SizedBox(
                               width: 100,